[gatein-commits] gatein SVN: r6786 - in sandbox/as7_support: pc/jboss-as7-integration/modules and 2 other directories.

Author: mstruk Date: 2011-07-01 08:33:34 -0400 (Fri, 01 Jul 2011) New Revision: 6786 Modified: sandbox/as7_support/README.txt sandbox/as7_support/pc/jboss-as7-integration/modules/build.xml sandbox/as7_support/pc/jboss-as7-integration/modules/pom.xml sandbox/as7_support/pc/portal/src/assemble/simple-portal-jboss7-ear.xml sandbox/as7_support/pc/portal/src/main/java/org/gatein/pc/portal/SimplePortalInitializer.java Log: Build fixes Modified: sandbox/as7_support/README.txt =================================================================== --- sandbox/as7_support/README.txt 2011-07-01 07:57:12 UTC (rev 6785) +++ sandbox/as7_support/README.txt 2011-07-01 12:33:34 UTC (rev 6786) @@ -29,7 +29,7 @@ cd bin ./standalone.sh (or just 'standalone' on Windows) -You should see exactly one stacktrace deliberately thrown by FailOnInitPortlet. +You should see exactly one stacktrace deliberately thrown by FailDuringInitPortlet. Goto: http://localhost:8080/simple-portal Modified: sandbox/as7_support/pc/jboss-as7-integration/modules/build.xml =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/modules/build.xml 2011-07-01 07:57:12 UTC (rev 6785) +++ sandbox/as7_support/pc/jboss-as7-integration/modules/build.xml 2011-07-01 12:33:34 UTC (rev 6786) @@ -75,6 +75,7 @@ <module-def name="org.gatein.pc"> <maven-resource group="org.gatein.pc" artifact="pc-api" /> <maven-resource group="org.gatein.pc" artifact="pc-portlet" /> + <maven-resource group="org.staxnav" artifact="staxnav.core" /> </module-def> <module-def name="javax.portlet"> Modified: sandbox/as7_support/pc/jboss-as7-integration/modules/pom.xml =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/modules/pom.xml 2011-07-01 07:57:12 UTC (rev 6785) +++ sandbox/as7_support/pc/jboss-as7-integration/modules/pom.xml 2011-07-01 12:33:34 UTC (rev 6786) @@ -138,6 +138,11 @@ </dependency> <dependency> + <groupId>org.staxnav</groupId> + <artifactId>staxnav.core</artifactId> + </dependency> + + <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> </dependency> Modified: sandbox/as7_support/pc/portal/src/assemble/simple-portal-jboss7-ear.xml =================================================================== --- sandbox/as7_support/pc/portal/src/assemble/simple-portal-jboss7-ear.xml 2011-07-01 07:57:12 UTC (rev 6785) +++ sandbox/as7_support/pc/portal/src/assemble/simple-portal-jboss7-ear.xml 2011-07-01 12:33:34 UTC (rev 6786) @@ -11,33 +11,14 @@ <dependencySets> <dependencySet> - <outputDirectory></outputDirectory> + <outputDirectory>.</outputDirectory> <outputFileNameMapping>samples${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> - <include>org.gatein.pc:pc-samples:war:*:basic-portlet</include> - <include>org.gatein.pc:pc-samples:war:*:eventdebug-portlet</include> - <include>org.gatein.pc:pc-samples:war:*:google-portlet</include> - <include>org.gatein.pc:pc-samples:war:*:jsp-portlet</include> - <include>org.gatein.pc:pc-samples:war:*:remotecontroller-portlet</include> - <include>org.gatein.pc:pc-samples:war:*:shoppingcart-portlet</include> - <include>org.gatein.pc:pc-samples:jar:*:shoppingcart-event</include> + <include>org.gatein.pc:pc-samples:war:*:*</include> + <include>org.gatein.pc:pc-samples:jar:*:*</include> </includes> </dependencySet> - <!--dependencySet> - <outputDirectory>lib</outputDirectory> - <includes> - <include>org.gatein.common:common-common</include> - <include>org.gatein.common:common-logging</include> - <include>javax.portlet:portlet-api</include> - <include>org.gatein.wci:wci-wci</include> - <include>org.gatein.wci:wci-jboss6</include> - - <include>org.gatein.pc:pc-portlet</include> - <include>org.gatein.pc:pc-api</include> - <include>javax.ccpp:ccpp</include> - </includes> - </dependencySet--> <dependencySet> <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory> <includes> Modified: sandbox/as7_support/pc/portal/src/main/java/org/gatein/pc/portal/SimplePortalInitializer.java =================================================================== --- sandbox/as7_support/pc/portal/src/main/java/org/gatein/pc/portal/SimplePortalInitializer.java 2011-07-01 07:57:12 UTC (rev 6785) +++ sandbox/as7_support/pc/portal/src/main/java/org/gatein/pc/portal/SimplePortalInitializer.java 2011-07-01 12:33:34 UTC (rev 6786) @@ -1,6 +1,6 @@ package org.gatein.pc.portal; -import org.gatein.pc.mc.PortletApplicationDeployer; +import org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer; import org.gatein.pc.portlet.PortletInvokerInterceptor; import org.gatein.pc.portlet.aspects.CCPPInterceptor; import org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor;