刘基城 / cnlive_live_web · Commits

Commit 27ab84fca99ace0fc03946fe4c49c55ca158134f

Authored by 刘基城
1 parent 655fb5f2

no message

Inline Side-by-side
Showing 2 changed files with 13 additions and 11 deletions
.settings/org.eclipse.wst.common.component
  View file @27ab84f
@@ -14,6 +14,18 @@ @@ -14,6 +14,18 @@
14 <dependent-module archiveName="smart-framework-4.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework"> 14 <dependent-module archiveName="smart-framework-4.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework">
15 <dependency-type>uses</dependency-type> 15 <dependency-type>uses</dependency-type>
16 </dependent-module> 16 </dependent-module>
  17 + <dependent-module archiveName="smart-plugin-job-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-job/smart-plugin-job">
  18 + <dependency-type>uses</dependency-type>
  19 + </dependent-module>
  20 + <dependent-module archiveName="smart-plugin-dbcp-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-dbcp/smart-plugin-dbcp">
  21 + <dependency-type>uses</dependency-type>
  22 + </dependent-module>
  23 + <dependent-module archiveName="smart-plugin-rest-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-rest/smart-plugin-rest">
  24 + <dependency-type>uses</dependency-type>
  25 + </dependent-module>
  26 + <dependent-module archiveName="smart-plugin-i18n-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-i18n/smart-plugin-i18n">
  27 + <dependency-type>uses</dependency-type>
  28 + </dependent-module>
17 <dependent-module archiveName="cnlive_mam_commons-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_mam_commons/cnlive_mam_commons"> 29 <dependent-module archiveName="cnlive_mam_commons-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_mam_commons/cnlive_mam_commons">
18 <dependency-type>uses</dependency-type> 30 <dependency-type>uses</dependency-type>
19 </dependent-module> 31 </dependent-module>
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
  View file @27ab84f
1 -<<<<<<< HEAD  
2 #Generated by Maven Integration for Eclipse 1 #Generated by Maven Integration for Eclipse
3 -#Fri Aug 12 13:57:45 CST 2016 2 +#Fri Aug 19 13:26:02 CST 2016
4 version=0.0.1-SNAPSHOT 3 version=0.0.1-SNAPSHOT
5 groupId=com.cnlive.mz.live.web 4 groupId=com.cnlive.mz.live.web
6 m2e.projectName=cnlive_live_web 5 m2e.projectName=cnlive_live_web
7 m2e.projectLocation=D\:\\1_CNLIVE_JAVA_CODE\\cnlive_live_web 6 m2e.projectLocation=D\:\\1_CNLIVE_JAVA_CODE\\cnlive_live_web
8 artifactId=cnlive_live_web 7 artifactId=cnlive_live_web
9 -=======  
10 -#Generated by Maven Integration for Eclipse  
11 -#Fri Aug 12 09:21:48 CST 2016  
12 -version=0.0.1-SNAPSHOT  
13 -groupId=com.cnlive.mz.live.web  
14 -m2e.projectName=cnlive_live_web  
15 -m2e.projectLocation=C\:\\Users\\Administrator\\git\\cnlive_live_web  
16 -artifactId=cnlive_live_web  
17 ->>>>>>> 9af6d59d2e41245dd80094af4cc10cc6f67a725d