Author: fdesbois Date: 2009-08-19 10:09:20 +0200 (Wed, 19 Aug 2009) New Revision: 44 Modified: trunk/bonzoms-business/pom.xml trunk/bonzoms-business/src/main/webapp/META-INF/context.xml trunk/bonzoms-ui/pom.xml trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/AppModule.java trunk/bonzoms-ui/src/main/webapp/META-INF/context.xml trunk/pom.xml Log: - Change scope for OASIS CIQ Api and XMLBeans - Delete old build method for injection of ServiceUIPerson (tapestry does'nt work in embedded mode ClassNoDefFoundError) Modified: trunk/bonzoms-business/pom.xml =================================================================== --- trunk/bonzoms-business/pom.xml 2009-08-11 09:03:20 UTC (rev 43) +++ trunk/bonzoms-business/pom.xml 2009-08-19 08:09:20 UTC (rev 44) @@ -52,13 +52,10 @@ <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>1.1.112</version> - <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> - <type>jar</type> </dependency> </dependencies> <!-- ************************************************************* --> Modified: trunk/bonzoms-business/src/main/webapp/META-INF/context.xml =================================================================== --- trunk/bonzoms-business/src/main/webapp/META-INF/context.xml 2009-08-11 09:03:20 UTC (rev 43) +++ trunk/bonzoms-business/src/main/webapp/META-INF/context.xml 2009-08-19 08:09:20 UTC (rev 44) @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<Context antiJARLocking="true" path="/bonzoms-business-1.0.0-rc-2-SNAPSHOT"/> +<Context antiJARLocking="true" path="/bonzoms-business-1.0.0-rc-3-SNAPSHOT"/> Modified: trunk/bonzoms-ui/pom.xml =================================================================== --- trunk/bonzoms-ui/pom.xml 2009-08-11 09:03:20 UTC (rev 43) +++ trunk/bonzoms-ui/pom.xml 2009-08-19 08:09:20 UTC (rev 44) @@ -51,5 +51,8 @@ <!-- ************************************************************* --> <packaging>war</packaging> + <properties> + <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> + </properties> +</project> -</project> Modified: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/AppModule.java =================================================================== --- trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/AppModule.java 2009-08-11 09:03:20 UTC (rev 43) +++ trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/AppModule.java 2009-08-19 08:09:20 UTC (rev 44) @@ -98,19 +98,18 @@ * @param configuration Tapestry configuration to contribution * @param servicePerson test */ - public static void contributeRegistryStartup(OrderedConfiguration<Runnable> configuration, - @InjectService("ServiceUIPerson") ServiceUIPerson servicePerson) + public static void contributeRegistryStartup(OrderedConfiguration<Runnable> configuration) { try { - configuration.add("BonzomsStartup", new BonzomsManager(servicePerson)); + configuration.add("BonzomsStartup", new BonzomsManager()); } catch (NoClassDefFoundError eee) { System.out.println("AppModule.contributeRegistryStartup() : ChoremRegistry unavailable"); } } - public ServiceUIPerson buildServiceUIPerson(@InjectService("PageRenderLinkSource") PageRenderLinkSource pageRender) { + /*public ServiceUIPerson buildServiceUIPerson(@InjectService("PageRenderLinkSource") PageRenderLinkSource pageRender) { return new ServiceUIPerson(pageRender); - } + }*/ /** * Construct service to launch when Tapestry shutdown. Depends on existence of ChoReg in the application server. Modified: trunk/bonzoms-ui/src/main/webapp/META-INF/context.xml =================================================================== --- trunk/bonzoms-ui/src/main/webapp/META-INF/context.xml 2009-08-11 09:03:20 UTC (rev 43) +++ trunk/bonzoms-ui/src/main/webapp/META-INF/context.xml 2009-08-19 08:09:20 UTC (rev 44) @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<Context antiJARLocking="true" path="/bonzoms-ui-1.0.0-rc-2-SNAPSHOT"/> +<Context antiJARLocking="true" path="/bonzoms"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-11 09:03:20 UTC (rev 43) +++ trunk/pom.xml 2009-08-19 08:09:20 UTC (rev 44) @@ -38,7 +38,6 @@ <groupId>org.chorem</groupId> <artifactId>oasis-ciq-api</artifactId> <version>${choreg.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> @@ -59,9 +58,14 @@ <groupId>org.apache.xmlbeans</groupId> <artifactId>xmlbeans</artifactId> <version>2.4.0</version> - <scope>provided</scope> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> <version>${tapestry.version}</version>