Author: mstruk Date: 2011-04-13 10:37:22 -0400 (Wed, 13 Apr 2011) New Revision: 6209 Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/integration.war/WEB-INF/web.xml portal/trunk/pom.xml Log: GTNPORTAL-1812 Packaging that supports JBossAS6 and does away with javascript packager - replaced wci-tomcat with wci-jboss6 for jboss-as6 packaging Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-13 14:36:54 UTC (rev 6208) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-13 14:37:22 UTC (rev 6209) @@ -315,7 +315,7 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat6</artifactId> + <artifactId>wci-jboss6</artifactId> </dependency> <dependency> <groupId>org.gatein.wci</groupId> Modified: portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/integration.war/WEB-INF/web.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/integration.war/WEB-INF/web.xml 2011-04-13 14:36:54 UTC (rev 6208) +++ portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/integration.war/WEB-INF/web.xml 2011-04-13 14:37:22 UTC (rev 6209) @@ -30,7 +30,7 @@ </context-param> <servlet> <servlet-name>ContainerServlet</servlet-name> - <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class> + <servlet-class>org.gatein.wci.jboss.JB6ContainerServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> </web-app> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2011-04-13 14:36:54 UTC (rev 6208) +++ portal/trunk/pom.xml 2011-04-13 14:37:22 UTC (rev 6209) @@ -274,6 +274,11 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> + <artifactId>wci-jboss6</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> <artifactId>wci-jetty</artifactId> <version>${org.gatein.wci.version}</version> </dependency>