shuzheng 9 anni fa
parent
commit
7c1db8c009

+ 3 - 2
zheng-cms/zheng-cms-web/pom.xml

@@ -88,11 +88,12 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.0.0.v20130308</version>
+                <!--<version>9.0.0.v20130308</version>-->
+                <version>9.2.7.v20150116</version>
                 <configuration>
                     <scanIntervalSeconds>3</scanIntervalSeconds>
                     <webApp>
-                        <contextPath>/zheng-cms-web</contextPath>
+                        <contextPath>/</contextPath>
                     </webApp>
                     <httpConnector>
                         <port>2224</port>

+ 0 - 0
zheng-cms/zheng-cms-web/src/main/resources/ehcache.xml → zheng-cms/zheng-cms-web/src/main/resources/test-ehcache.xml


+ 1 - 1
zheng-cms/zheng-cms-web/src/main/resources/applicationContext-ehcache.xml → zheng-cms/zheng-cms-web/src/main/resources/test-spring-ehcache.xml

@@ -18,7 +18,7 @@
 
 	<!-- cache管理器配置 -->
 	<bean id="cacheManagerFactory" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
-		<property name="configLocation"  value="classpath:ehcache.xml"/>
+		<property name="configLocation"  value="classpath:test-ehcache.xml"/>
 		<property name="shared" value="true" />
 	</bean>
 

+ 0 - 0
zheng-upms/zheng-upms-dao/src/resources/generatorConfig.xml → zheng-upms/zheng-upms-dao/src/main/resources/generatorConfig.xml


+ 0 - 0
zheng-upms/zheng-upms-dao/src/resources/jdbc.properties → zheng-upms/zheng-upms-dao/src/main/resources/jdbc.properties


+ 0 - 0
zheng-upms/zheng-upms-dao/src/resources/redis.properties → zheng-upms/zheng-upms-dao/src/main/resources/redis.properties


+ 3 - 2
zheng-upms/zheng-upms-server/pom.xml

@@ -80,11 +80,12 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.0.0.v20130308</version>
+                <!--<version>9.0.0.v20130308</version>-->
+                <version>9.2.7.v20150116</version>
                 <configuration>
                     <scanIntervalSeconds>3</scanIntervalSeconds>
                     <webApp>
-                        <contextPath>/zheng-upms-server</contextPath>
+                        <contextPath>/</contextPath>
                     </webApp>
                     <httpConnector>
                         <port>1111</port>