Author: mstruk Date: 2011-04-25 05:59:41 -0400 (Mon, 25 Apr 2011) New Revision: 6345 Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/web.xml portal/trunk/packaging/jboss-as6/pkg/pom.xml Log: GTNPORTAL-1812 Packaging that supports JBossAS6 and does away with javascript packager - fixed gatein-sample-skin example, and put back samples in jboss-as6 packaging Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/web.xml 2011-04-25 03:40:04 UTC (rev 6344) +++ portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/web.xml 2011-04-25 09:59:41 UTC (rev 6345) @@ -21,9 +21,11 @@ --> -<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.5"> +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee + http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> <display-name>gatein-sample-skin</display-name> <filter> <filter-name>ResourceRequestFilter</filter-name> Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-25 03:40:04 UTC (rev 6344) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-25 09:59:41 UTC (rev 6345) @@ -803,7 +803,7 @@ </dependency> <!-- Ear files --> - <!--dependency> + <dependency> <?move gatein-sample-portal.ear?> <groupId>org.exoplatform.portal</groupId> <artifactId>gatein-sample-portal</artifactId> @@ -816,7 +816,7 @@ <artifactId>gatein-sample-extension</artifactId> <type>ear</type> <version>${project.version}</version> - </dependency--> + </dependency> <dependency> <?move starter-gatein.ear?> <groupId>org.exoplatform.portal</groupId> @@ -885,12 +885,12 @@ <artifactId>exo.portal.portlet.dashboard</artifactId> <type>war</type> </dependency> - <!--dependency> + <dependency> <?move gatein-sample-skin.war?> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>gatein-sample-skin</artifactId> <type>war</type> - </dependency--> + </dependency> </dependencies> <build>