Author: fdesbois Date: 2009-08-19 10:07:44 +0200 (Wed, 19 Aug 2009) New Revision: 26 Modified: trunk/choreg-admin-webapp/ trunk/choreg-admin-webapp/pom.xml trunk/choreg-admin-webapp/src/main/webapp/META-INF/context.xml trunk/choreg-test-webapp/ trunk/choreg-test-webapp/pom.xml trunk/choreg-test-webapp/src/main/webapp/META-INF/context.xml trunk/pom.xml Log: - Change scope for OASIS CIQ Api and XMLBeans - Add server configuration for NetBeans Property changes on: trunk/choreg-admin-webapp ___________________________________________________________________ Modified: svn:ignore - target + target profiles.xml Modified: trunk/choreg-admin-webapp/pom.xml =================================================================== --- trunk/choreg-admin-webapp/pom.xml 2009-08-19 08:06:23 UTC (rev 25) +++ trunk/choreg-admin-webapp/pom.xml 2009-08-19 08:07:44 UTC (rev 26) @@ -67,8 +67,10 @@ <!-- ************************************************************* --> <packaging>war</packaging> + <properties> + <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> + </properties> +</project> -</project> - Modified: trunk/choreg-admin-webapp/src/main/webapp/META-INF/context.xml =================================================================== --- trunk/choreg-admin-webapp/src/main/webapp/META-INF/context.xml 2009-08-19 08:06:23 UTC (rev 25) +++ trunk/choreg-admin-webapp/src/main/webapp/META-INF/context.xml 2009-08-19 08:07:44 UTC (rev 26) @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<Context antiJARLocking="true" path="/choreg-admin-webapp-1.0.0-alpha-2-SNAPSHOT"/> +<Context antiJARLocking="true" path="/choreg-admin"/> Property changes on: trunk/choreg-test-webapp ___________________________________________________________________ Modified: svn:ignore - target + target profiles.xml Modified: trunk/choreg-test-webapp/pom.xml =================================================================== --- trunk/choreg-test-webapp/pom.xml 2009-08-19 08:06:23 UTC (rev 25) +++ trunk/choreg-test-webapp/pom.xml 2009-08-19 08:07:44 UTC (rev 26) @@ -26,7 +26,6 @@ <groupId>org.chorem</groupId> <artifactId>oasis-ciq-api</artifactId> <version>${project.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.xmlbeans</groupId> @@ -67,8 +66,10 @@ <!-- ************************************************************* --> <packaging>war</packaging> + <properties> + <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> + </properties> +</project> -</project> - Modified: trunk/choreg-test-webapp/src/main/webapp/META-INF/context.xml =================================================================== --- trunk/choreg-test-webapp/src/main/webapp/META-INF/context.xml 2009-08-19 08:06:23 UTC (rev 25) +++ trunk/choreg-test-webapp/src/main/webapp/META-INF/context.xml 2009-08-19 08:07:44 UTC (rev 26) @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<Context antiJARLocking="true" path="/choreg-test-webapp-1.0.0-alpha-2-SNAPSHOT"/> +<Context antiJARLocking="true" path="/choreg-test"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-19 08:06:23 UTC (rev 25) +++ trunk/pom.xml 2009-08-19 08:07:44 UTC (rev 26) @@ -40,7 +40,6 @@ <groupId>org.apache.xmlbeans</groupId> <artifactId>xmlbeans</artifactId> <version>2.4.0</version> - <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId>