Author: mstruk Date: 2011-07-26 12:38:31 -0400 (Tue, 26 Jul 2011) New Revision: 6932 Added: sandbox/as7_support/trunk/pc/portal/src/main/resources/simple-portal-war/demo/demo-jpb.jsp Removed: sandbox/as7_support/trunk/pc/portal/src/main/resources/jboss7/simple-portal.war/WEB-INF/jboss-web.xml Modified: sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/build.xml sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/lib.xml sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/pom.xml sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/src/main/resources/modules/org/gatein/wci/main/module.xml sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/download-jboss.xml sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/pom.xml sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml sandbox/as7_support/trunk/pc/jboss-as7-integration/pom.xml sandbox/as7_support/trunk/pc/pom.xml sandbox/as7_support/trunk/pc/portal/pom.xml sandbox/as7_support/trunk/pc/portal/src/assemble/simple-portal-jboss7-ear.xml sandbox/as7_support/trunk/pc/portal/src/main/resources/jboss7/META-INF/application.xml sandbox/as7_support/trunk/pc/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp Log: AS7.Final packaging Modified: sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/build.xml =================================================================== --- sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/build.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/build.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -24,7 +24,7 @@ <import file="lib.xml"/> - <property name="output.dir" value="target/jboss-${jboss.as.release.version}"/> + <property name="output.dir" value="target/jboss-as-${jboss.as.release.version}"/> <target name="copy-files"> <copy todir="${output.dir}"> <fileset dir="src/main/resources"> @@ -70,6 +70,8 @@ <maven-resource group="org.gatein.wci" artifact="wci-wci" /> <maven-resource group="org.gatein.common" artifact="common-common" /> <maven-resource group="org.gatein.common" artifact="common-logging" /> + <maven-resource group="org.slf4j" artifact="slf4j-api" /> + <maven-resource group="org.slf4j" artifact="slf4j-log4j12" /> </module-def> <module-def name="org.gatein.pc"> Modified: sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/lib.xml =================================================================== --- sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/lib.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/lib.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -24,7 +24,7 @@ <property name="src.dir" value="src"/> <property name="module.repo.src.dir" value="${src.dir}/main/resources/modules"/> - <property name="output.dir" value="target/jboss-${jboss.as.release.version}"/> + <property name="output.dir" value="target/jboss-as-${jboss.as.release.version}"/> <property name="module.repo.output.dir" value="${output.dir}/modules"/> <property name="module.xml" value="module.xml"/> Modified: sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/pom.xml =================================================================== --- sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/pom.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/pom.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -88,6 +88,15 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + + <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> <exclusions> Modified: sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/src/main/resources/modules/org/gatein/wci/main/module.xml =================================================================== --- sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/src/main/resources/modules/org/gatein/wci/main/module.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/jboss-as7-integration/modules/src/main/resources/modules/org/gatein/wci/main/module.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -30,6 +30,7 @@ <dependencies> <module name="javax.servlet.api" /> <module name="org.jboss.as.web" /> - <module name="org.slf4j" /> + <!--module name="org.slf4j" /--> + <module name="org.apache.log4j" /> </dependencies> </module> Modified: sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/download-jboss.xml =================================================================== --- sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/download-jboss.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/download-jboss.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -10,11 +10,13 @@ </get> <!-- Fetch .sha1 file --> + <!-- <get dest="${dest}.sha1" skipexisting="true"> <url url="${url}.sha1"/> </get> - + --> <!-- Validate checksum --> + <!-- <local name="checksum.matches"/> <local name="checksum.matches.fail"/> <checksum file="${dest}" algorithm="sha" fileext=".sha1" @@ -23,6 +25,6 @@ <equals arg1="${checksum.matches}" arg2="false"/> </condition> <fail if="checksum.matches.fail">Checksum validation failed! (for: ${dest})</fail> - + --> </target> </project> \ No newline at end of file Modified: sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/pom.xml =================================================================== --- sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/pom.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/pom.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -17,11 +17,11 @@ <name>GateIn - Portlet Container (JBoss AS7 Integration Packaging - SimplePortal)</name> <properties> - <jbossas.version>7.0.0.CR1</jbossas.version> + <jbossas.version>${version.jboss.as}</jbossas.version> <jbossas.dist.version>${jbossas.version}</jbossas.dist.version> <servers.dir>${project.basedir}/servers</servers.dir> <jbossas.path>${servers.dir}</jbossas.path> - <jbossas.name>jboss-${jbossas.version}</jbossas.name> + <jbossas.name>jboss-as-${jbossas.version}</jbossas.name> <jbossas.dir>${jbossas.path}/${jbossas.name}</jbossas.dir> <gatein.working.dir>${project.build.directory}/${jbossas.name}</gatein.working.dir> <jbossas.target.dir>${gatein.working.dir}</jbossas.target.dir> @@ -139,7 +139,7 @@ </activation> <properties> - <exo.projects.app.jboss7.version>jboss-7.0.0.CR1</exo.projects.app.jboss7.version> + <exo.projects.app.jboss7.version>jboss-as-${version.jboss.as}</exo.projects.app.jboss7.version> <servers.dir>${exo.projects.directory.dependencies}</servers.dir> <jbossas.name>${exo.projects.app.jboss7.version}</jbossas.name> </properties> @@ -272,7 +272,7 @@ </fail> <property name="jbossas.zip" - value="${jbossas.path}/jboss-as-build-${jbossas.dist.version}.zip"/> + value="${jbossas.path}/jboss-as-${jbossas.dist.version}.zip"/> <!-- Autocreate servers.dir if necessary --> <mkdir dir="${jbossas.path}"/> @@ -281,7 +281,7 @@ <ant antfile="${project.basedir}/download-jboss.xml"> <target name="download-jboss"/> <property name="url" - value="http://download.jboss.org/jbossas/7.0/jboss-${jbossas.dist.ve... + value="http://download.jboss.org/jbossas/7.0/jboss-as-${jbossas.dist... <property name="dest" value="${jbossas.zip}"/> </ant> Modified: sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml =================================================================== --- sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -25,7 +25,7 @@ <module xmlns="urn:jboss:module:1.0" name="org.jboss.as.web"> <resources> - <resource-root path="jboss-as-web-7.0.0.CR1.jar"/> + <resource-root path="jboss-as-web-7.0.0.Final.jar"/> <resource-root path="jasper-jdt-7.0.0.Beta8.jar"/> <resource-root path="jbossweb-7.0.0.CR4.jar"/> <!-- Insert resources here --> Modified: sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml =================================================================== --- sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/jboss-as7-integration/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -213,6 +213,7 @@ <module identifier="org.apache.aries.jmx" startlevel="2"/> <module identifier="org.apache.felix.eventadmin" startlevel="2"/> <module identifier="org.apache.felix.metatype" startlevel="2"/> + <module identifier="org.apache.felix.scr" startlevel="2"/> <module identifier="org.apache.felix.webconsole" startlevel="2"/> <module identifier="org.jboss.osgi.jmx" startlevel="2"/> <module identifier="org.jboss.osgi.http" startlevel="2"/> @@ -244,10 +245,11 @@ </core-environment> <coordinator-environment default-timeout="300"/> </subsystem> - <subsystem xmlns="urn:jboss:domain:web:1.0"> + <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host"> <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/> - <virtual-server name="localhost" enable-welcome-root="true"> - <alias name="example.com" /> + <virtual-server name="default-host" enable-welcome-root="true"> + <alias name="localhost" /> + <alias name="example.com" /> </virtual-server> </subsystem> <subsystem xmlns="urn:jboss:domain:weld:1.0" /> Modified: sandbox/as7_support/trunk/pc/jboss-as7-integration/pom.xml =================================================================== --- sandbox/as7_support/trunk/pc/jboss-as7-integration/pom.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/jboss-as7-integration/pom.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -16,8 +16,8 @@ <name>GateIn - Portlet Container (JBoss AS7 Integration)</name> <properties> - <version.jboss.as>7.0.0.CR1</version.jboss.as> - <jboss.as.release.version>7.0.0.CR1</jboss.as.release.version> + <version.jboss.as>7.0.0.Final</version.jboss.as> + <jboss.as.release.version>${version.jboss.as}</jboss.as.release.version> <version.org.jboss.vfs>3.0.0.GA</version.org.jboss.vfs> </properties> Modified: sandbox/as7_support/trunk/pc/pom.xml =================================================================== --- sandbox/as7_support/trunk/pc/pom.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/pom.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -47,6 +47,7 @@ <properties> <version.gatein.common>2.0.4-Beta03</version.gatein.common> + <version.slf4j>1.5.8</version.slf4j> <version.gatein.wci>2.1.0-Beta05-SNAPSHOT</version.gatein.wci> <version.apache.portals.bridges>1.0.4</version.apache.portals.bridges> <version.apache.taglibs>1.1.2</version.apache.taglibs> @@ -93,6 +94,18 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${version.slf4j}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${version.slf4j}</version> + </dependency> + + <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-mc</artifactId> <version>${version.gatein.common}</version> Modified: sandbox/as7_support/trunk/pc/portal/pom.xml =================================================================== --- sandbox/as7_support/trunk/pc/portal/pom.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/portal/pom.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -180,6 +180,14 @@ <version>${project.version}</version> <classifier>shoppingcart-event</classifier> </dependency> + + <dependency> + <groupId>org.jboss.portletbridge.examples</groupId> + <artifactId>jsf2portlet</artifactId> + <version>3.0.0.Beta1</version> + <type>war</type> + <scope>runtime</scope> + </dependency> </dependencies> <build> Modified: sandbox/as7_support/trunk/pc/portal/src/assemble/simple-portal-jboss7-ear.xml =================================================================== --- sandbox/as7_support/trunk/pc/portal/src/assemble/simple-portal-jboss7-ear.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/portal/src/assemble/simple-portal-jboss7-ear.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -18,8 +18,13 @@ <include>org.gatein.pc:pc-samples:jar:*:*</include> </includes> </dependencySet> - <dependencySet> + <outputDirectory>.</outputDirectory> + <includes> + <include>org.jboss.portletbridge.examples:jsf2portlet:war:*</include> + </includes> + </dependencySet> + <dependencySet> <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory> <includes> Modified: sandbox/as7_support/trunk/pc/portal/src/main/resources/jboss7/META-INF/application.xml =================================================================== --- sandbox/as7_support/trunk/pc/portal/src/main/resources/jboss7/META-INF/application.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/portal/src/main/resources/jboss7/META-INF/application.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -50,6 +50,12 @@ </web> </module> <module> + <web> + <web-uri>jsf2portlet-3.0.0.Beta1.war</web-uri> + <context-root>/jsf2-portlet</context-root> + </web> + </module> + <module> <ejb>samples-shoppingcart-event.jar</ejb> </module> </application> \ No newline at end of file Deleted: sandbox/as7_support/trunk/pc/portal/src/main/resources/jboss7/simple-portal.war/WEB-INF/jboss-web.xml =================================================================== --- sandbox/as7_support/trunk/pc/portal/src/main/resources/jboss7/simple-portal.war/WEB-INF/jboss-web.xml 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/portal/src/main/resources/jboss7/simple-portal.war/WEB-INF/jboss-web.xml 2011-07-26 16:38:31 UTC (rev 6932) @@ -1,73 +0,0 @@ -<?xml version="1.0"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2011, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated by the @authors tag. See the ~ - ~ copyright.txt in the distribution for a full listing of ~ - ~ individual contributors. ~ - ~ ~ - ~ This is free software; you can redistribute it and/or modify it ~ - ~ under the terms of the GNU Lesser General Public License as ~ - ~ published by the Free Software Foundation; either version 2.1 of ~ - ~ the License, or (at your option) any later version. ~ - ~ ~ - ~ This software is distributed in the hope that it will be useful, ~ - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ - ~ Lesser General Public License for more details. ~ - ~ ~ - ~ You should have received a copy of the GNU Lesser General Public ~ - ~ License along with this software; if not, write to the Free ~ - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<jboss-web xmlns="http://www.jboss.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-web_6_0.xsd" - version="6.0"> -<!-- -xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-web_7_0.xsd" - version="7.0" - --> - <!--listener> - <class-name>org.gatein.pc.portal.JBossWebContainerListener</class-name> - <listener-type>CONTAINER</listener-type> - <param> - <description>Debug level (DEBUG, INFO, WARN, ERROR)</description> - <param-name>debugLevel</param-name> - <param-value>debug</param-value> - </param> - </listener--> - <!--listener> - <class-name>org.gatein.wci.jboss.JB6WebLifecycleListener</class-name> - <listener-type>LIFECYCLE</listener-type> - <param> - <description>Perform cross-context logout? (true by default)</description> - <param-name>crossContextLogout</param-name> - <param-value>true</param-value> - </param> - </listener--> - - <!--listener> - <class-name>org.gatein.pc.portal.JBossWebLifecycleListener</class-name> - <listener-type>LIFECYCLE</listener-type> - <param> - <description>Perform cross-context logout? (true by default)</description> - <param-name>crossContextLogout</param-name> - <param-value>true</param-value> - </param> - </listener--> - <!--listener> - <class-name>org.gatein.pc.portal.JBossWebServletInstanceListener</class-name> - <listener-type>SERVLET_INSTANCE</listener-type> - </listener> - <listener> - <class-name>org.gatein.pc.portal.JBossWebServletContainerListener</class-name> - <listener-type>SERVLET_CONTAINER</listener-type> - </listener> - <listener> - <class-name>org.gatein.pc.portal.JBossWebServletLifecycleListener</class-name> - <listener-type>SERVLET_LIFECYCLE</listener-type> - </listener--> -</jboss-web> \ No newline at end of file Added: sandbox/as7_support/trunk/pc/portal/src/main/resources/simple-portal-war/demo/demo-jpb.jsp =================================================================== --- sandbox/as7_support/trunk/pc/portal/src/main/resources/simple-portal-war/demo/demo-jpb.jsp (rev 0) +++ sandbox/as7_support/trunk/pc/portal/src/main/resources/simple-portal-war/demo/demo-jpb.jsp 2011-07-26 16:38:31 UTC (rev 6932) @@ -0,0 +1,17 @@ +<%@ page contentType="text/html" %> +<%@ page language="java" %> +<%@ taglib prefix="xportal" tagdir="/WEB-INF/tags/portal" %> +<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> +<%@ page isELIgnored="false" %> + +<%@ include file="/layouts/header.jsp" %> + +<portal:page> + <xportal:1column> + <jsp:attribute name="leftcol"> + <xportal:portlet name="jsf2portlet" applicationName="jsf2-portlet"/> + </jsp:attribute> + </xportal:1column> +</portal:page> + +<%@ include file="/layouts/footer.jsp" %> Modified: sandbox/as7_support/trunk/pc/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp =================================================================== --- sandbox/as7_support/trunk/pc/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2011-07-26 15:30:55 UTC (rev 6931) +++ sandbox/as7_support/trunk/pc/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2011-07-26 16:38:31 UTC (rev 6932) @@ -35,6 +35,9 @@ <li> <a href="${pageContext.request.contextPath}/demo/demo5.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'demo5.jsp' ? 'selected' : ''}">Demo5</a> </li> + <li> + <a href="${pageContext.request.contextPath}/demo/demo-jpb.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'demo-jpb.jsp' ? 'selected' : ''}">PortletBridge Demo</a> + </li> <!-- <li> <a href="${pageContext.request.contextPath}/demo/jsr-301.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'jsr-301.jsp' ? 'selected' : ''}">JSR-301 Demo</a>