[gatein-commits] gatein SVN: r8267 - in portal/trunk: examples/portal/ear and 12 other directories.

Author: mstruk Date: 2011-12-20 18:00:26 -0500 (Tue, 20 Dec 2011) New Revision: 8267 Removed: portal/trunk/packaging/jboss-as7/modules/src/main/resources/modules/sun/ Modified: portal/trunk/examples/extension/ear/pom.xml portal/trunk/examples/portal/ear/pom.xml portal/trunk/packaging/jboss-as7/README.txt portal/trunk/packaging/jboss-as7/extension/pom.xml portal/trunk/packaging/jboss-as7/extension/src/test/java/org/gatein/integration/jboss/as7/support/AbstractParsingTest.java portal/trunk/packaging/jboss-as7/modules/build.xml portal/trunk/packaging/jboss-as7/modules/pom.xml portal/trunk/packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/lib/main/module.xml portal/trunk/packaging/jboss-as7/pkg/package.xml portal/trunk/packaging/jboss-as7/pkg/pom.xml portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.properties portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.xml portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/deployments/gatein-sample-extension.ear/META-INF/application.xml portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/deployments/gatein-sample-portal.ear/META-INF/application.xml portal/trunk/packaging/jboss-as7/pom.xml Log: GTNPORTAL-2154 Support for JBoss AS7 - upgraded supported version to JBoss AS 7.1.0.Beta1b Modified: portal/trunk/examples/extension/ear/pom.xml =================================================================== --- portal/trunk/examples/extension/ear/pom.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/examples/extension/ear/pom.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -74,6 +74,7 @@ <webModule> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> + <bundleFileName>sample-ext.war</bundleFileName> <contextRoot>sample-ext</contextRoot> </webModule> <jarModule> Modified: portal/trunk/examples/portal/ear/pom.xml =================================================================== --- portal/trunk/examples/portal/ear/pom.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/examples/portal/ear/pom.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -81,11 +81,13 @@ <webModule> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> + <bundleFileName>sample-portal.war</bundleFileName> <contextRoot>sample-portal</contextRoot> </webModule> <webModule> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> + <bundleFileName>rest-sample-portal.war</bundleFileName> <contextRoot>rest-sample-portal</contextRoot> </webModule> <jarModule> Modified: portal/trunk/packaging/jboss-as7/README.txt =================================================================== --- portal/trunk/packaging/jboss-as7/README.txt 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/README.txt 2011-12-20 23:00:26 UTC (rev 8267) @@ -30,10 +30,11 @@ Known Issues ============ -- Only JBoss AS 7.0.2.Final is supported at the moment. It does not work with JBoss AS 7.0.0.Final or with more recent JBoss AS 7.1.0-Alpha versions. +- Only one JBoss AS 7 version is supported at one time. At the moment it's JBoss AS 7.1.0.Beta1b, previous commits (r7651,r8230) work with JBoss AS 7.0.2.Final. - WSRP is not yet supported - <distributable/> is not yet supported - Sample ears have been repackaged as their current default packaging is not supported +- Exception occurs, and is ignored when logging out (EXOJCR-1619) @@ -45,8 +46,8 @@ Checkout the dependencies sources from sandbox: -svn co http://anonsvn.jboss.org/repos/gatein/sandbox/as7_support/tags/AS7-Beta01 -cd AS7-Beta01 +svn co http://anonsvn.jboss.org/repos/gatein/sandbox/as7_support/tags/AS7-Beta02 +cd AS7-Beta02 This will checkout specific versions of wci and exo.kernel.container, and a new gatein-naming component. @@ -73,7 +74,7 @@ mvn clean install -Set CONTAINERS_DIR env variable to point to a directory containing your application servers (i.e. export CONTAINERS_DIR=$HOME/devel/containers). If you already have ‘jboss-as-7.0.2.Final’ in your CONTAINERS_DIR, then remove ‘,download’ from the next command: +Set CONTAINERS_DIR env variable to point to a directory containing your application servers (i.e. export CONTAINERS_DIR=$HOME/devel/containers). If you already have ‘jboss-as-7.1.0.Beta1b’ in your CONTAINERS_DIR, then remove ‘,download’ from the next command: cd packaging/jboss-as7 mvn clean install -Ppkg-jbossas7,download -Dexo.projects.directory.dependencies=$CONTAINERS_DIR @@ -82,7 +83,7 @@ Now that we successfully built GateIn including JBoss AS7 support, let’s run it: -cd pkg/target/jboss-as-7.0.2.Final/bin +cd pkg/target/jboss-as-7.1.0.Beta1b/bin ./standalone.sh Modified: portal/trunk/packaging/jboss-as7/extension/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as7/extension/pom.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/extension/pom.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -28,7 +28,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging.jboss7</artifactId> - <version>3.2.0-M02-SNAPSHOT</version> + <version>3.2.0-CR01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -74,4 +74,17 @@ </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + <compilerArgument>-proc:none</compilerArgument> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: portal/trunk/packaging/jboss-as7/extension/src/test/java/org/gatein/integration/jboss/as7/support/AbstractParsingTest.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/test/java/org/gatein/integration/jboss/as7/support/AbstractParsingTest.java 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/extension/src/test/java/org/gatein/integration/jboss/as7/support/AbstractParsingTest.java 2011-12-20 23:00:26 UTC (rev 8267) @@ -139,7 +139,7 @@ /** * Parse the subsystem xml and create the operations that will be passed into the controller * - * @param allows Additional steps that should be done to the controller before initializing our extension + * @param additionalParsers Additional steps that should be done to the controller before initializing our extension * @param subsystemXml the subsystem xml to be parsed * @return the created operations */ @@ -395,7 +395,7 @@ ModelControllerService(final AdditionalInitialization additionalPreStep, final ControlledProcessState processState, final StringConfigurationPersister persister) { - super(OperationContext.Type.SERVER, persister, processState, DESC_PROVIDER, null); + super(OperationContext.Type.SERVER, persister, processState, DESC_PROVIDER, null, null); this.persister = persister; this.additionalInit = additionalPreStep; } @@ -414,7 +414,7 @@ rootRegistration.registerOperationHandler(READ_OPERATION_DESCRIPTION_OPERATION, GlobalOperationHandlers.READ_OPERATION_DESCRIPTION, CommonProviders.READ_OPERATION_PROVIDER, true); rootRegistration.registerOperationHandler(WRITE_ATTRIBUTE_OPERATION, GlobalOperationHandlers.WRITE_ATTRIBUTE, CommonProviders.WRITE_ATTRIBUTE_PROVIDER, true); - ExtensionContext context = new ExtensionContextImpl(rootRegistration, null, persister); + ExtensionContext context = new ExtensionContextImpl(rootRegistration, null, persister, ExtensionContext.ProcessType.STANDALONE_SERVER); if (additionalInit != null) { additionalInit.initializeExtraSubystemsAndModel(context, rootResource, rootRegistration); Modified: portal/trunk/packaging/jboss-as7/modules/build.xml =================================================================== --- portal/trunk/packaging/jboss-as7/modules/build.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/modules/build.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -267,9 +267,6 @@ <maven-resource group="org.jboss.slf4j" artifact="slf4j-jboss-logmanager" /> </module-def> - <module-def name="sun.jdk.xml"> - </module-def> - <module-def name="org.hsqldb"> <maven-resource group="hsqldb" artifact="hsqldb" /> </module-def> Modified: portal/trunk/packaging/jboss-as7/modules/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as7/modules/pom.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/modules/pom.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging.jboss7</artifactId> - <version>3.2.0-M02-SNAPSHOT</version> + <version>3.2.0-CR01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/lib/main/module.xml =================================================================== --- portal/trunk/packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/lib/main/module.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/lib/main/module.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -22,65 +22,55 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<module xmlns="urn:jboss:module:1.0" name="org.gatein.lib"> +<module xmlns="urn:jboss:module:1.1" name="org.gatein.lib"> <resources> <!-- Insert resources here --> </resources> <dependencies> - <module name="system" export="true"> - <imports> - <exclude-set> - <path name="javax/xml/bind"/> - <path name="javax/xml/bind/annotation"/> - </exclude-set> - </imports> - </module> + <module name="javax.api"/> - <!-- picketlink idm dependencies --> - <module name="com.sun.xml.bind" services="export" export="true" /> - <module name="javax.xml.bind.api" /> - <module name="org.dom4j" /> + <system export="true"> + <paths> + <path name="sun/misc"/> + </paths> + </system> - <!--module name="sun.jdk" /--> - <!-- TODO try maybe: module name="javax.xml.jaxp-provider" /--> - <module name="sun.jdk.xml" /> - <module name="javax.api"/> - <module name="javax.jcr.api" /> - <module name="javax.portlet.api" export="true"/> - <module name="javax.servlet.api" /> - <module name="javax.servlet.jsp.api" /> - <module name="javax.ws.rs.api" /> - <module name="org.gatein.common" /> - <module name="org.apache.commons.logging" /> - <module name="org.apache.commons.collections" /> - <module name="org.apache.httpcomponents" /> - <module name="org.apache.xerces" /> - <module name="org.gatein.naming" export="true"/> - <module name="org.gatein.pc" /> - <module name="org.gatein.wci" export="true"/> - <module name="org.hibernate" slot="gatein" /> - <module name="org.javassist"/> - <module name="org.slf4j" slot="gatein" /> - <module name="org.staxnav" /> + <module name="org.apache.xerces" services="export" export="true"/> + <module name="com.sun.xml.bind" services="export" export="true" /> + <module name="javax.xml.bind.api" /> + <module name="org.dom4j" /> - <!-- gatein-naming.jar dependencies --> - <module name="org.jboss.threads"/> - <module name="org.jboss.logging"/> + <module name="javax.jcr.api" /> + <module name="javax.portlet.api" export="true"/> + <module name="javax.servlet.api" /> + <module name="javax.servlet.jsp.api" /> + <module name="javax.ws.rs.api" /> + <module name="org.gatein.common" /> + <module name="org.apache.commons.logging" /> + <module name="org.apache.commons.collections" /> + <module name="org.apache.httpcomponents" /> + <module name="org.gatein.naming" export="true"/> + <module name="org.gatein.pc" /> + <module name="org.gatein.wci" export="true"/> + <module name="org.hibernate" slot="gatein" /> + <module name="org.javassist"/> + <module name="org.slf4j" slot="gatein" /> + <module name="org.staxnav" /> - <!-- oeg.exoplatform.services dependencies --> - <module name="org.hsqldb" /> - <module name="org.jboss.common-core" /> + <module name="org.jboss.threads"/> + <module name="org.jboss.logging"/> - <!-- oeg.exoplatform.services.rest dependencies --> - <module name="javax.inject.api" /> + <module name="org.hsqldb" /> + <module name="org.jboss.common-core" /> - <!-- jbosscache dependencies --> - <module name="javax.resource.api" /> - <module name="javax.transaction.api" /> - <module name="org.jboss.jts" /> + <module name="javax.inject.api" /> - <module name="javax.annotation.api" /> + <module name="javax.resource.api" /> + <module name="javax.transaction.api" /> + <module name="org.jboss.jts" /> + <module name="javax.annotation.api"/> + <module name="org.jboss.msc"/> </dependencies> </module> Modified: portal/trunk/packaging/jboss-as7/pkg/package.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/package.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/pkg/package.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -63,10 +63,10 @@ <copy todir="${jbossas.target.dir}/standalone/deployments/gatein-sample-portal.ear/lib" > <fileset refid="org.exoplatform.portal:exo.portal.sample.portal.jar:jar"/> </copy> - <copy todir="${jbossas.target.dir}/standalone/deployments/gatein-sample-portal.ear" > + <copy tofile="${jbossas.target.dir}/standalone/deployments/gatein-sample-portal.ear/sample-portal.war" > <fileset refid="org.exoplatform.portal:exo.portal.sample.portal.war:war"/> </copy> - <copy todir="${jbossas.target.dir}/standalone/deployments/gatein-sample-portal.ear" > + <copy tofile="${jbossas.target.dir}/standalone/deployments/gatein-sample-portal.ear/rest-sample-portal.war" > <fileset refid="org.exoplatform.portal:exo.portal.sample.portal.rest-war:war"/> </copy> @@ -80,7 +80,7 @@ <copy todir="${jbossas.target.dir}/standalone/deployments/gatein-sample-extension.ear/lib" > <fileset refid="org.exoplatform.portal:exo.portal.sample.extension.jar:jar"/> </copy> - <copy todir="${jbossas.target.dir}/standalone/deployments/gatein-sample-extension.ear" > + <copy tofile="${jbossas.target.dir}/standalone/deployments/gatein-sample-extension.ear/sample-ext.war" > <fileset refid="org.exoplatform.portal:exo.portal.sample.extension.war:war"/> </copy> Modified: portal/trunk/packaging/jboss-as7/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/pom.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/pkg/pom.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -8,7 +8,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging.jboss7</artifactId> - <version>3.2.0-M02-SNAPSHOT</version> + <version>3.2.0-CR01-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss7.pkg</artifactId> @@ -17,7 +17,6 @@ <name>GateIn for JBoss AS 7.x.x packaging</name> <properties> - <version.jboss.as>7.0.2.Final</version.jboss.as> <jbossas.dist.version>${version.jboss.as}</jbossas.dist.version> <servers.dir>${project.basedir}/servers</servers.dir> <jbossas.path>${servers.dir}</jbossas.path> @@ -249,6 +248,7 @@ </activation> <properties> + <exo.projects.app.jboss7.version>jboss-as-${jbossas.dist.version}</exo.projects.app.jboss7.version> <servers.dir>${exo.projects.directory.dependencies}</servers.dir> <jbossas.name>${exo.projects.app.jboss7.version}</jbossas.name> </properties> @@ -390,7 +390,7 @@ <ant antfile="${project.basedir}/download-jboss.xml"> <target name="download-jboss"/> <property name="url" - value="http://download.jboss.org/jbossas/7.0/jboss-as-${jbossas.dist... + value="http://download.jboss.org/jbossas/7.1/jboss-as-${jbossas.dist... <property name="dest" value="${jbossas.zip}"/> </ant> Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -22,42 +22,44 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<module xmlns="urn:jboss:module:1.0" name="org.jboss.as.web"> +<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.web"> <resources> - <resource-root path="jboss-as-web-7.0.2.Final.jar"/> - <resource-root path="jasper-jdt-7.0.0.Beta8.jar"/> - <resource-root path="jbossweb-7.0.1.Final.jar"/> - <!-- Insert resources here --> + <resource-root path="jboss-as-web-7.1.0.Beta1b.jar"/> + <resource-root path="jasper-jdt-7.0.3.Final.jar"/> + <resource-root path="jbossweb-7.0.3.Final.jar"/> + <!-- Insert resources here --> </resources> <dependencies> - <module name="sun.jdk"/> - <module name="com.sun.jsf-impl"/> - <module name="javax.annotation.api"/> - <module name="javax.api"/> - <module name="javax.faces.api"/> - <module name="javax.servlet.api"/> - <module name="javax.servlet.jsp.api"/> - <module name="org.jboss.jandex"/> - <module name="org.jboss.staxmapper"/> - <module name="org.jboss.as.clustering.web.spi" optional="true"/> - <module name="org.jboss.as.controller"/> - <module name="org.jboss.as.ee"/> - <module name="org.jboss.as.naming"/> - <module name="org.jboss.as.network"/> - <module name="org.jboss.as.security"/> - <module name="org.jboss.as.server"/> - <module name="org.jboss.as.threads"/> - <module name="org.jboss.invocation"/> - <module name="org.jboss.metadata"/> - <module name="org.jboss.modules"/> - <module name="org.jboss.msc"/> - <module name="org.jboss.threads"/> - <module name="org.jboss.vfs"/> - <module name="org.jboss.logging"/> - <module name="org.jboss.common-core"/> - <module name="org.picketbox"/> - <module name="org.gatein.wci"/> + <module name="sun.jdk"/> + <module name="com.sun.jsf-impl"/> + <module name="javax.annotation.api"/> + <module name="javax.api"/> + <module name="javax.faces.api"/> + <module name="javax.security.auth.message.api"/> + <module name="javax.servlet.api"/> + <module name="javax.servlet.jsp.api"/> + <module name="org.jboss.jandex"/> + <module name="org.jboss.staxmapper"/> + <module name="org.jboss.as.clustering.web.spi" optional="true"/> + <module name="org.jboss.as.controller"/> + <module name="org.jboss.as.ee"/> + <module name="org.jboss.as.naming"/> + <module name="org.jboss.as.network"/> + <module name="org.jboss.as.security"/> + <module name="org.jboss.as.server"/> + <module name="org.jboss.as.threads"/> + <module name="org.jboss.invocation"/> + <module name="org.jboss.metadata"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.msc"/> + <module name="org.jboss.threads"/> + <module name="org.jboss.vfs"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core"/> + <module name="org.picketbox"/> + <module name="javax.security.jacc.api"/> + <module name="org.gatein.wci"/> </dependencies> </module> Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.properties =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.properties 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.properties 2011-12-20 23:00:26 UTC (rev 8267) @@ -41,6 +41,8 @@ gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml +gatein.jcr.workspace.default=portal-system +gatein.jcr.workspace.system=system # IDM gatein.idm.datasource.name=java:jdbcidm @@ -59,7 +61,8 @@ gatein.email.smtp.socketFactory.port=465 gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory -# Global portlet.xml +# Portlet container configuration +gatein.portlet.validation=true gatein.portlet.config=${gatein.conf.dir}/portlet.xml # Portal configuration Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -48,6 +48,9 @@ <string>eXoGadgets</string> </value> <value> + <string>gwtGadgets</string> + </value> + <value> <string>eXoGadgetServer</string> </value> <value> Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -1,26 +1,6 @@ -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2011, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file 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. - --> +<?xml version='1.0' encoding='UTF-8'?> -<server xmlns="urn:jboss:domain:1.0"> +<server xmlns="urn:jboss:domain:1.1"> <extensions> <extension module="org.jboss.as.clustering.infinispan"/> @@ -29,9 +9,11 @@ <extension module="org.jboss.as.ee"/> <extension module="org.jboss.as.ejb3"/> <extension module="org.jboss.as.jaxrs"/> + <extension module="org.jboss.as.jdr"/> <extension module="org.jboss.as.jmx"/> <extension module="org.jboss.as.jpa"/> <extension module="org.jboss.as.logging"/> + <extension module="org.jboss.as.mail"/> <extension module="org.jboss.as.naming"/> <extension module="org.jboss.as.osgi"/> <extension module="org.jboss.as.pojo"/> @@ -40,43 +22,46 @@ <extension module="org.jboss.as.security"/> <extension module="org.jboss.as.threads"/> <extension module="org.jboss.as.transactions"/> - <extension module="org.jboss.as.web" /> - <extension module="org.jboss.as.weld" /> + <extension module="org.jboss.as.web"/> + <extension module="org.jboss.as.webservices"/> + <extension module="org.jboss.as.weld"/> <extension module="org.gatein"/> </extensions> <management> - <security-realms> - <security-realm name="PropertiesMgmtSecurityRealm"> - <authentication> - <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir" /> - </authentication> - </security-realm> - </security-realms> + <security-realms> + <security-realm name="ManagementRealm"> + <authentication> + <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/> + </authentication> + </security-realm> + </security-realms> <management-interfaces> - <native-interface interface="management" port="9999" /> - <http-interface interface="management" port="9990"/> + <native-interface security-realm="ManagementRealm"> + <socket-binding native="management-native"/> + </native-interface> + <http-interface security-realm="ManagementRealm"> + <socket-binding http="management-http"/> + </http-interface> </management-interfaces> </management> <profile> - <!--subsystem xmlns="urn:jboss:domain:logging:1.1"> + <subsystem xmlns="urn:jboss:domain:logging:1.1"> <console-handler name="CONSOLE"> <level name="INFO"/> <formatter> <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> </formatter> </console-handler> - <periodic-rotating-file-handler name="FILE"> - <level name="INFO"/> <formatter> <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> </formatter> <file relative-to="jboss.server.log.dir" path="server.log"/> <suffix value=".yyyy-MM-dd"/> + <append value="true"/> </periodic-rotating-file-handler> - <logger category="com.arjuna"> <level name="WARN"/> </logger> @@ -86,7 +71,12 @@ <logger category="sun.rmi"> <level name="WARN"/> </logger> - + <logger category="jacorb"> + <level name="WARN"/> + </logger> + <logger category="jacorb.config"> + <level name="ERROR"/> + </logger> <root-logger> <level name="INFO"/> <handlers> @@ -94,66 +84,11 @@ <handler name="FILE"/> </handlers> </root-logger> - </subsystem--> - <subsystem xmlns="urn:jboss:domain:logging:1.0"> - <console-handler name="CONSOLE" autoflush="true"> - <level name="TRACE"/> - <formatter> - <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> - </formatter> - </console-handler> - <periodic-rotating-file-handler name="FILE" autoflush="true"> - <level name="INFO"/> - <formatter> - <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> - </formatter> - <file relative-to="jboss.server.log.dir" path="server.log"/> - <suffix value=".yyyy-MM-dd"/> - </periodic-rotating-file-handler> - <logger category="org"> - <level name="INFO"/> - </logger> - <logger category="exo"> - <level name="INFO"/> - </logger> - <logger category="net"> - <level name="INFO"/> - </logger> - <logger category="javax"> - <level name="INFO"/> - </logger> - <logger category="com"> - <level name="INFO"/> - </logger> - <logger category="com.arjuna"> - <level name="WARN"/> - </logger> - <logger category="org.apache.tomcat.util.modeler"> - <level name="WARN"/> - </logger> - <logger category="org.jboss.msc"> - <level name="DEBUG"/> - </logger> - <logger category="org.jboss.as.server.deployment"> - <level name="DEBUG"/> - </logger> - <logger category="sun.rmi"> - <level name="WARN"/> - </logger> - <logger category="org.gatein.integration"> - <level name="TRACE"/> - </logger> - <root-logger> - <level name="TRACE"/> - <handlers> - <handler name="CONSOLE"/> - <handler name="FILE"/> - </handlers> - </root-logger> - </subsystem> + </subsystem> <subsystem xmlns="urn:jboss:domain:datasources:1.0"> <datasources> - <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" pool-name="H2DS"> + <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" + pool-name="H2DS"> <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> <driver>h2</driver> <pool></pool> @@ -170,27 +105,37 @@ </datasources> </subsystem> <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0"> - <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments" deployment-timeout="300"/> + <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments" deployment-timeout="3000"/> </subsystem> - <subsystem xmlns="urn:jboss:domain:ee:1.0" /> - <subsystem xmlns="urn:jboss:domain:ejb3:1.1" lite="true"> - <!-- EJB3 pools --> - <pools> - <bean-instance-pools> - <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" - instance-acquisition-timeout-unit="MINUTES"/> - </bean-instance-pools> - </pools> - - <!-- Session bean configurations --> + <subsystem xmlns="urn:jboss:domain:ee:1.0"/> + <subsystem xmlns="urn:jboss:domain:ejb3:1.2"> <session-bean> <stateless> <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/> </stateless> + <stateful default-access-timeout="5000"/> + <singleton default-access-timeout="5000"/> </session-bean> - + <mdb> + <resource-adapter-ref resource-adapter-name="hornetq-ra"/> + <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> + </mdb> + <pools> + <bean-instance-pools> + <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/> + <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/> + </bean-instance-pools> + </pools> + <async thread-pool-name="default"/> + <timer-service thread-pool-name="default"> + <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/> + </timer-service> + <remote connector-ref="remoting-connector" thread-pool-name="default"/> + <thread-pools> + <thread-pool name="default" max-threads="10" keepalive-time="100"/> + </thread-pools> </subsystem> - <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="hibernate"> + <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="hibernate"> <cache-container name="hibernate" default-cache="local-query"> <local-cache name="entity"> <eviction strategy="LRU" max-entries="10000"/> @@ -206,111 +151,104 @@ </cache-container> </subsystem> <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> - <subsystem xmlns="urn:jboss:domain:jca:1.0"> - <archive-validation enabled="false" /> - <bean-validation enabled="false" /> + <subsystem xmlns="urn:jboss:domain:jca:1.1"> + <archive-validation enabled="false"/> + <bean-validation enabled="false"/> <default-workmanager> <short-running-threads blocking="true"> - <core-threads count="10" per-cpu="20"/> - <queue-length count="10" per-cpu="20"/> - <max-threads count="10" per-cpu="20"/> - <keepalive-time time="10" unit="seconds"/> + <core-threads count="10" per-cpu="20"/> + <queue-length count="10" per-cpu="20"/> + <max-threads count="10" per-cpu="20"/> + <keepalive-time time="10" unit="seconds"/> </short-running-threads> <long-running-threads blocking="true"> - <core-threads count="10" per-cpu="20"/> - <queue-length count="10" per-cpu="20"/> - <max-threads count="10" per-cpu="20"/> - <keepalive-time time="10" unit="seconds"/> + <core-threads count="10" per-cpu="20"/> + <queue-length count="10" per-cpu="20"/> + <max-threads count="10" per-cpu="20"/> + <keepalive-time time="10" unit="seconds"/> </long-running-threads> </default-workmanager> </subsystem> - <subsystem xmlns="urn:jboss:domain:jmx:1.0"> - <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" /> - </subsystem> + <subsystem xmlns="urn:jboss:domain:jdr:1.0"/> + <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true"/> <subsystem xmlns="urn:jboss:domain:jpa:1.0"> <jpa default-datasource=""/> </subsystem> - <subsystem xmlns="urn:jboss:domain:naming:1.0" /> - <subsystem xmlns="urn:jboss:domain:pojo:1.0" /> - <subsystem xmlns="urn:jboss:domain:osgi:1.0" activation="lazy"> + <subsystem xmlns="urn:jboss:domain:mail:1.0"> + <mail-session jndi-name="java:jboss/mail/Default"> + <smtp-server outbound-socket-binding-ref="mail-smtp"/> + </mail-session> + </subsystem> + <subsystem xmlns="urn:jboss:domain:naming:1.1"/> + <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy"> <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager"> - <property name="manager.root">jboss-osgi</property> + <property name="manager.root" value="jboss-osgi"/> </configuration> <properties> - <!-- - A comma seperated list of module identifiers. Each system module - is added as a dependency to the OSGi framework module. The packages - from these system modules can be made visible as framework system packages. - http://www.osgi.org/javadoc/r4v42/org/osgi/framework/Constants.html#FRAME... - --> - <property name="org.jboss.osgi.system.modules"> - org.apache.commons.logging, - org.apache.log4j, - org.jboss.as.osgi, - org.slf4j, - </property> - <!-- - Framework environment property identifying extra packages which the system bundle - must export from the current execution environment - --> - <property name="org.osgi.framework.system.packages.extra"> - org.apache.commons.logging;version=1.1.1, - org.apache.log4j;version=1.2, - org.jboss.as.osgi.service;version=7.0, - org.jboss.osgi.deployment.interceptor;version=1.0, - org.jboss.osgi.spi.capability;version=1.0, - org.jboss.osgi.spi.util;version=1.0, - org.jboss.osgi.testing;version=1.0, - org.jboss.osgi.vfs;version=1.0, - org.slf4j;version=1.5.10, - </property> <!-- Specifies the beginning start level of the framework --> <property name="org.osgi.framework.startlevel.beginning">1</property> </properties> - <modules> + <capabilities> <!-- modules registered with the OSGi layer on startup --> - <module identifier="javaee.api"/> - <module identifier="org.jboss.logging"/> + <capability name="javax.api"/> + <capability name="javax.servlet.api"/> + <capability name="javax.transaction.api"/> <!-- bundles installed on startup --> - <module identifier="org.apache.aries.util"/> - <module identifier="org.jboss.osgi.webconsole"/> - <module identifier="org.osgi.compendium"/> + <capability name="org.apache.aries.util"/> + <capability name="org.jboss.osgi.webconsole"/> + <capability name="org.osgi.compendium"/> <!-- bundles started in startlevel 1 --> - <module identifier="org.apache.felix.log" startlevel="1"/> - <module identifier="org.jboss.osgi.logging" startlevel="1"/> - <module identifier="org.apache.felix.configadmin" startlevel="1"/> - <module identifier="org.jboss.as.osgi.configadmin" startlevel="1"/> + <capability name="org.apache.felix.log" startlevel="1"/> + <capability name="org.jboss.osgi.logging" startlevel="1"/> + <capability name="org.apache.felix.configadmin" startlevel="1"/> + <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/> <!-- bundles started in startlevel 2 --> - <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"/> + <capability name="org.apache.aries.jmx" startlevel="2"/> + <capability name="org.apache.felix.eventadmin" startlevel="2"/> + <capability name="org.apache.felix.metatype" startlevel="2"/> + <capability name="org.apache.felix.scr" startlevel="2"/> + <capability name="org.apache.felix.webconsole" startlevel="2"/> + <capability name="org.jboss.netty" startlevel="2"/> + <capability name="org.jboss.osgi.jmx" startlevel="2"/> + <capability name="org.jboss.osgi.http" startlevel="2"/> + <capability name="org.projectodd.stilts" startlevel="2"/> <!-- bundles started in startlevel 3 --> - <module identifier="org.jboss.osgi.blueprint" startlevel="3"/> - <module identifier="org.jboss.osgi.webapp" startlevel="3"/> - <module identifier="org.jboss.osgi.xerces" startlevel="3"/> - </modules> + <capability name="org.jboss.osgi.blueprint" startlevel="3"/> + <capability name="org.jboss.osgi.webapp" startlevel="3"/> + <capability name="org.jboss.osgi.xerces" startlevel="3"/> + </capabilities> </subsystem> - <subsystem xmlns="urn:jboss:domain:remoting:1.0"/> - <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0" /> + <subsystem xmlns="urn:jboss:domain:pojo:1.0"/> + <subsystem xmlns="urn:jboss:domain:remoting:1.1"> + <connector name="remoting-connector" socket-binding="remoting"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/> <subsystem xmlns="urn:jboss:domain:sar:1.0"/> - <subsystem xmlns="urn:jboss:domain:security:1.0"> + <subsystem xmlns="urn:jboss:domain:security:1.1"> <security-domains> <security-domain name="other" cache-type="default"> <authentication> - <login-module code="Disabled" flag="required"/> + <login-module code="UsersRoles" flag="required"/> </authentication> </security-domain> + <security-domain name="jboss-web-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jboss-ejb-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> <security-domain name="gatein-domain" cache-type="default"> <authentication> <login-module code="org.gatein.wci.security.WCILoginModule" flag="optional"> <module-option name="portalContainerName" value="portal"/> <module-option name="realmName" value="gatein-domain"/> </login-module> - <login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required"> + <login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" + flag="required"> <module-option name="portalContainerName" value="portal"/> <module-option name="realmName" value="gatein-domain"/> </login-module> @@ -326,7 +264,8 @@ <module-option name="portalContainerName" value="sample-portal"/> <module-option name="realmName" value="gatein-domain-sample-portal"/> </login-module> - <login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required"> + <login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" + flag="required"> <module-option name="portalContainerName" value="sample-portal"/> <module-option name="realmName" value="gatein-domain-sample-portal"/> </login-module> @@ -339,36 +278,59 @@ </security-domains> </subsystem> <subsystem xmlns="urn:jboss:domain:threads:1.0"/> - <subsystem xmlns="urn:jboss:domain:transactions:1.0"> - <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> + <subsystem xmlns="urn:jboss:domain:transactions:1.1"> <core-environment> <process-id> - <uuid /> + <uuid/> </process-id> </core-environment> + <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> <coordinator-environment default-timeout="300"/> </subsystem> - <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"/> + <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host"> + <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/> <virtual-server name="default-host" enable-welcome-root="true"> - <alias name="localhost" /> - <alias name="example.com" /> + <alias name="localhost"/> + <alias name="example.com"/> </virtual-server> </subsystem> - <subsystem xmlns="urn:jboss:domain:weld:1.0" /> + <subsystem xmlns="urn:jboss:domain:webservices:1.0" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:jaxwsconfig="urn:jboss:jbossws-jaxws-config:4.0"> + <modify-wsdl-address>true</modify-wsdl-address> + <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host> + <!-- + <wsdl-port>8080</wsdl-port> + <wsdl-secure-port>8443</wsdl-secure-port> + --> + <endpoint-config> + <jaxwsconfig:config-name>Standard-Endpoint-Config</jaxwsconfig:config-name> + </endpoint-config> + <endpoint-config> + <jaxwsconfig:config-name>Recording-Endpoint-Config</jaxwsconfig:config-name> + <jaxwsconfig:pre-handler-chains> + <javaee:handler-chain xmlns="http://java.sun.com/xml/ns/javaee"> + <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>RecordingHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </jaxwsconfig:pre-handler-chains> + </endpoint-config> + </subsystem> + <subsystem xmlns="urn:jboss:domain:weld:1.0"/> <subsystem xmlns="urn:jboss:domain:gatein:1.0"> - <deployment-archives> - <archive name="gatein.ear" main="true" /> - <archive name="gatein-sample-extension.ear" /> - <archive name="gatein-sample-portal.ear" /> - <archive name="gatein-sample-skin.war" /> - </deployment-archives> - <portlet-war-dependencies> - <dependency name="org.gatein.lib" import-services="true" /> - <dependency name="org.gatein.wci"/> - <dependency name="javax.portlet.api"/> - </portlet-war-dependencies> - </subsystem> + <deployment-archives> + <archive name="gatein.ear" main="true"/> + <archive name="gatein-sample-extension.ear"/> + <archive name="gatein-sample-portal.ear"/> + <archive name="gatein-sample-skin.war"/> + </deployment-archives> + <portlet-war-dependencies> + <dependency name="org.gatein.lib" import-services="true"/> + <dependency name="org.gatein.wci"/> + <dependency name="javax.portlet.api"/> + </portlet-war-dependencies> + </subsystem> </profile> <interfaces> @@ -376,20 +338,28 @@ <inet-address value="${jboss.bind.address.management:127.0.0.1}"/> </interface> <interface name="public"> - <inet-address value="${jboss.bind.address:127.0.0.1}"/> + <inet-address value="${jboss.bind.address:127.0.0.1}"/> </interface> </interfaces> <socket-binding-group name="standard-sockets" default-interface="public"> <socket-binding name="http" port="8080"/> <socket-binding name="https" port="8443"/> + <socket-binding name="jacorb" port="3528"/> + <socket-binding name="jacorb-ssl" port="3529"/> <socket-binding name="jmx-connector-registry" interface="management" port="1090"/> <socket-binding name="jmx-connector-server" interface="management" port="1091"/> - <socket-binding name="jndi" port="1099"/> + <socket-binding name="management-native" interface="management" port="9999"/> + <socket-binding name="management-http" interface="management" port="9990"/> + <socket-binding name="messaging" port="5445"/> + <socket-binding name="messaging-throughput" port="5455"/> <socket-binding name="osgi-http" interface="management" port="8090"/> <socket-binding name="remoting" port="4447"/> <socket-binding name="txn-recovery-environment" port="4712"/> <socket-binding name="txn-status-manager" port="4713"/> + <outbound-socket-binding name="mail-smtp"> + <remote-destination host="localhost" port="25"/> + </outbound-socket-binding> </socket-binding-group> -</server> +</server> \ No newline at end of file Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/deployments/gatein-sample-extension.ear/META-INF/application.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/deployments/gatein-sample-extension.ear/META-INF/application.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/deployments/gatein-sample-extension.ear/META-INF/application.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -7,7 +7,7 @@ <description>GateIn Sample Extension Ear</description> <module> <web> - <web-uri>exo.portal.sample.extension.war-3.2.0-M02-SNAPSHOT.war</web-uri> + <web-uri>sample-ext.war</web-uri> <context-root>sample-ext</context-root> </web> </module> Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/deployments/gatein-sample-portal.ear/META-INF/application.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/deployments/gatein-sample-portal.ear/META-INF/application.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/deployments/gatein-sample-portal.ear/META-INF/application.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -7,13 +7,13 @@ <description>GateIn Sample Portal Ear</description> <module> <web> - <web-uri>exo.portal.sample.portal.war-3.2.0-M02-SNAPSHOT.war</web-uri> + <web-uri>sample-portal.war</web-uri> <context-root>sample-portal</context-root> </web> </module> <module> <web> - <web-uri>exo.portal.sample.portal.rest-war-3.2.0-M02-SNAPSHOT.war</web-uri> + <web-uri>rest-sample-portal.war</web-uri> <context-root>rest-sample-portal</context-root> </web> </module> Modified: portal/trunk/packaging/jboss-as7/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pom.xml 2011-12-20 22:24:07 UTC (rev 8266) +++ portal/trunk/packaging/jboss-as7/pom.xml 2011-12-20 23:00:26 UTC (rev 8267) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.2.0-M02-SNAPSHOT</version> + <version>3.2.0-CR01-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss7</artifactId> @@ -12,11 +12,11 @@ <name>GateIn JBoss AS 7.x.x packaging</name> <properties> - <version.jboss.as.release>7.0.2.Final</version.jboss.as.release> - <version.jboss.as>7.0.2.Final</version.jboss.as> + <version.jboss.as.release>7.1.0.Beta1b</version.jboss.as.release> + <version.jboss.as>7.1.0.Beta1b</version.jboss.as> <version.org.jboss.vfs>3.0.0.GA</version.org.jboss.vfs> <version.org.gatein.wci.as7>2.1.0-Beta07-AS7-Beta01</version.org.gatein.wci.as7> - <version.exo.kernel.as7>2.3.1-GA-AS7-Beta01</version.exo.kernel.as7> + <version.exo.kernel.as7>2.3.2-GA-AS7-Beta02</version.exo.kernel.as7> <version.org.gatein.naming>1.0.0-Beta01</version.org.gatein.naming> <exo.projects.app.jboss7.version>jboss-as-${version.jboss.as.release}</exo.projects.app.jboss7.version> </properties>