Skip to content

Commit 2f26552

Browse files
author
leijing
committed
fix conflicts
1 parent f1ca044 commit 2f26552

File tree

8 files changed

+854
-21
lines changed

8 files changed

+854
-21
lines changed

‎.gitignore

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +0,0 @@
1-
*.class
2-
3-
# Mobile Tools for Java (J2ME)
4-
.mtj.tmp/
5-
6-
# Package Files #
7-
*.jar
8-
*.war
9-
*.ear
10-
11-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
12-
hs_err_pid*
13-
14-
#ide config
15-
.metadata
16-
.recommenders
17-
18-
#add rules
19-
*.xml
20-
!pom.xml
21-
*.iml

‎group16/2562124714/.idea/dictionaries/zhangwj.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎group16/2562124714/.idea/misc.xml

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎group16/2562124714/.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎group16/2562124714/.idea/workspace.xml

Lines changed: 780 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎group16/2562124714/2562124714.iml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
7+
</content>
8+
<orderEntry type="inheritedJdk" />
9+
<orderEntry type="sourceFolder" forTests="false" />
10+
<orderEntry type="module-library">
11+
<library name="JUnit4">
12+
<CLASSES>
13+
<root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" />
14+
<root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
15+
</CLASSES>
16+
<JAVADOC />
17+
<SOURCES />
18+
</library>
19+
</orderEntry>
20+
</component>
21+
</module>

‎group16/313001956/.settings/org.eclipse.wst.common.project.facet.core.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<faceted-project>
3+
<fixed facet="jst.web"/>
4+
<fixed facet="wst.jsdt.web"/>
5+
<fixed facet="java"/>
6+
<installed facet="java" version="1.6"/>
7+
<installed facet="jst.web" version="3.0"/>
8+
<installed facet="wst.jsdt.web" version="1.0"/>
9+
</faceted-project>

‎liuxin/src/com/coderising/litestruts/struts.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<struts>
3+
<action name="login" class="com.coderising.action.LoginAction">
4+
<result name="success">/jsp/homepage.jsp</result>
5+
<result name="fail">/jsp/showLogin.jsp</result>
6+
</action>
7+
<action name="logout" class="com.coderising.action.LogoutAction">
8+
<result = "success">/jsp/welcome.jsp</result>
9+
<result = "error">/jsp/error.jsp</result>
10+
</action>
11+
</struts>

0 commit comments

Comments
 (0)