Author: mstruk Date: 2011-06-30 06:52:00 -0400 (Thu, 30 Jun 2011) New Revision: 6778 Modified: sandbox/as7_support/README.txt sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java sandbox/as7_support/pc/jboss-as7-integration/pkg/pom.xml sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml sandbox/as7_support/pc/jboss-as7-integration/pom.xml sandbox/as7_support/pc/pom.xml sandbox/as7_support/wci/jboss/jboss7/pom.xml Log: Upgraded to jbossas-7.0.0.CR1 Modified: sandbox/as7_support/README.txt =================================================================== --- sandbox/as7_support/README.txt 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/README.txt 2011-06-30 10:52:00 UTC (rev 6778) @@ -21,11 +21,11 @@ cd jboss-as7-integration mvn install -Ppkg-jbossas7,download -Dexo.projects.directory.dependencies=SERVERS_DIR -(the previous command automatically downloads jboss-7.0.0.Beta3 build and unpacks it into SERVERS_DIR. If you already have this JBoss AS7 build in SERVERS_DIR you can omit 'download' profile) +(the previous command automatically downloads jboss-7.0.0.CR1 build and unpacks it into SERVERS_DIR. If you already have this JBoss AS7 build in SERVERS_DIR you can omit 'download' profile) cp pkg cd target -cd jboss-7.0.0.Beta3 +cd jboss-7.0.0.CR1 cd bin ./standalone.sh (or just 'standalone' on Windows) Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2011-06-30 10:52:00 UTC (rev 6778) @@ -25,7 +25,7 @@ import org.jboss.as.controller.ExtensionContext; import org.jboss.as.controller.SubsystemRegistration; import org.jboss.as.controller.parsing.ExtensionParsingContext; -import org.jboss.as.controller.registry.ModelNodeRegistration; +import org.jboss.as.controller.registry.ManagementResourceRegistration; import org.jboss.as.controller.registry.OperationEntry; import org.jboss.logging.Logger; @@ -46,7 +46,7 @@ public void initialize(ExtensionContext context) { log.debugf("Activating GateIn Extension"); final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME); - final ModelNodeRegistration registration = subsystem.registerSubsystemModel(GateInSubsystemDescriptionProviders.SUBSYSTEM); + final ManagementResourceRegistration registration = subsystem.registerSubsystemModel(GateInSubsystemDescriptionProviders.SUBSYSTEM); registration.registerOperationHandler(ADD, GateInSubsystemAdd.INSTANCE, GateInSubsystemAdd.INSTANCE, false); registration.registerOperationHandler(DESCRIBE, GateInSubsystemDescribe.INSTANCE, GateInSubsystemDescribe.INSTANCE, false, OperationEntry.EntryType.PRIVATE); subsystem.registerXMLElementWriter(GateInSubsystemParser.getInstance()); Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2011-06-30 10:52:00 UTC (rev 6778) @@ -23,30 +23,24 @@ import org.gatein.integration.jboss.as7.deployment.PortletWarClassloadingDependencyProcessor; import org.gatein.integration.jboss.as7.deployment.PortletWarDeploymentInitializingProcessor; -import org.jboss.as.controller.BasicOperationResult; -import org.jboss.as.controller.ModelAddOperationHandler; +import org.jboss.as.controller.AbstractBoottimeAddStepHandler; import org.jboss.as.controller.OperationContext; import org.jboss.as.controller.OperationFailedException; -import org.jboss.as.controller.OperationResult; -import org.jboss.as.controller.ResultHandler; -import org.jboss.as.controller.RuntimeTask; -import org.jboss.as.controller.RuntimeTaskContext; +import org.jboss.as.controller.ServiceVerificationHandler; import org.jboss.as.controller.descriptions.DescriptionProvider; -import org.jboss.as.server.BootOperationContext; -import org.jboss.as.server.BootOperationHandler; +import org.jboss.as.server.AbstractDeploymentChainStep; +import org.jboss.as.server.DeploymentProcessorTarget; import org.jboss.as.server.deployment.Phase; import org.jboss.dmr.ModelNode; +import org.jboss.msc.service.ServiceController; +import java.util.List; import java.util.Locale; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE; - /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemAdd implements ModelAddOperationHandler, BootOperationHandler, DescriptionProvider { +public class GateInSubsystemAdd extends AbstractBoottimeAddStepHandler implements DescriptionProvider { static final GateInSubsystemAdd INSTANCE = new GateInSubsystemAdd(); static final int STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT = 0x0B80; @@ -56,36 +50,39 @@ } - public ModelNode getModelDescription(Locale locale) { - return GateInSubsystemDescriptions.getSubsystemDescription(locale); + protected void populateModel(ModelNode operation, ModelNode model) { + ModelNode ourContainerConfig = new ModelNode(); + model.get(Constants.CONTAINER_CONFIG).set(ourContainerConfig); } - public OperationResult execute(final OperationContext updateContext, final ModelNode operation, final ResultHandler resultHandler) throws OperationFailedException { - final ModelNode config = operation.get(Constants.CONTAINER_CONFIG); + protected void performBoottime(OperationContext context, ModelNode operation, ModelNode model, + ServiceVerificationHandler verificationHandler, + List<ServiceController<?>> newControllers) throws OperationFailedException { + final ModelNode config = operation.get(Constants.CONTAINER_CONFIG); + context.addStep(new AbstractDeploymentChainStep() { + protected void execute(DeploymentProcessorTarget processorTarget) { + final SharedPortletTldsMetaDataBuilder tldsBuilder = new SharedPortletTldsMetaDataBuilder(); - final ModelNode subModel = updateContext.getSubModel(); - subModel.get(Constants.CONTAINER_CONFIG).set(config); + processorTarget.addDeploymentProcessor(Phase.PARSE, STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT, new PortletWarDeploymentInitializingProcessor()); + processorTarget.addDeploymentProcessor(Phase.DEPENDENCIES, DEPENDENCIES_PORTLET_MODULE, + new PortletWarClassloadingDependencyProcessor(tldsBuilder.create())); + } + }, OperationContext.Stage.RUNTIME); +/* + final WebServerService service = new WebServerService(defaultVirtualServer, useNative); + newControllers.add(context.getServiceTarget().addService(WebSubsystemServices.JBOSS_WEB, service) + .addDependency(AbstractPathService.pathNameOf(TEMP_DIR), String.class, service.getPathInjector()) + .addDependency(DependencyType.OPTIONAL, ServiceName.JBOSS.append("mbean", "server"), MBeanServer.class, service.getMbeanServer()) + .setInitialMode(Mode.ON_DEMAND) + .install()); +*/ + } - if (updateContext instanceof BootOperationContext) { - final BootOperationContext ctx = (BootOperationContext) updateContext; - updateContext.getRuntimeContext().setRuntimeTask(new RuntimeTask() { - public void execute(RuntimeTaskContext context) throws OperationFailedException { + protected boolean requiresRuntimeVerification() { + return false; + } - SharedPortletTldsMetaDataBuilder tldsBuilder = new SharedPortletTldsMetaDataBuilder(); - - ctx.addDeploymentProcessor(Phase.PARSE, STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT, new PortletWarDeploymentInitializingProcessor()); - ctx.addDeploymentProcessor(Phase.DEPENDENCIES, DEPENDENCIES_PORTLET_MODULE, - new PortletWarClassloadingDependencyProcessor(tldsBuilder.create())); - resultHandler.handleResultComplete(); - } - }); - } else { - resultHandler.handleResultComplete(); - } - - final ModelNode compensatingOperation = new ModelNode(); - compensatingOperation.get(OP).set(REMOVE); - compensatingOperation.get(OP_ADDR).set(operation.require(OP_ADDR)); - return new BasicOperationResult(compensatingOperation); + public ModelNode getModelDescription(Locale locale) { + return GateInSubsystemDescriptions.getSubsystemDescription(locale); } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java 2011-06-30 10:52:00 UTC (rev 6778) @@ -21,12 +21,10 @@ */ package org.gatein.integration.jboss.as7; -import org.jboss.as.controller.BasicOperationResult; -import org.jboss.as.controller.ModelQueryOperationHandler; import org.jboss.as.controller.OperationContext; -import org.jboss.as.controller.OperationResult; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.as.controller.OperationStepHandler; import org.jboss.as.controller.PathAddress; -import org.jboss.as.controller.ResultHandler; import org.jboss.as.controller.descriptions.DescriptionProvider; import org.jboss.as.controller.operations.common.Util; import org.jboss.dmr.ModelNode; @@ -40,16 +38,17 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemDescribe implements ModelQueryOperationHandler, DescriptionProvider { +public class GateInSubsystemDescribe implements OperationStepHandler, DescriptionProvider { static final GateInSubsystemDescribe INSTANCE = new GateInSubsystemDescribe(); /** {@inheritDoc} */ @Override - public OperationResult execute(final OperationContext context, final ModelNode operation, final ResultHandler resultHandler) { + public void execute(OperationContext context, ModelNode operation) throws OperationFailedException + { final ModelNode result = new ModelNode(); final PathAddress rootAddress = PathAddress.pathAddress(PathAddress.pathAddress(operation.require(OP_ADDR)).getLastElement()); - final ModelNode subModel = context.getSubModel(); + final ModelNode subModel = context.readModel(PathAddress.EMPTY_ADDRESS); final ModelNode subsystemAdd = new ModelNode(); subsystemAdd.get(OP).set(ADD); @@ -58,10 +57,7 @@ subsystemAdd.get(Constants.CONTAINER_CONFIG).set(subModel.get(Constants.CONTAINER_CONFIG)); } result.add(subsystemAdd); - - resultHandler.handleResultFragment(Util.NO_LOCATION, result); - resultHandler.handleResultComplete(); - return new BasicOperationResult(); + context.completeStep(); } @Override Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2011-06-30 10:52:00 UTC (rev 6778) @@ -34,7 +34,6 @@ import org.jboss.modules.ModuleIdentifier; import org.jboss.modules.ModuleLoader; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -65,9 +64,9 @@ final ModuleSpecification moduleSpecification = deploymentUnit.getAttachment(Attachments.MODULE_SPECIFICATION); // Add module dependencies - moduleSpecification.addDependency(new ModuleDependency(moduleLoader, GATEIN_WCI, false, false, false)); - moduleSpecification.addDependency(new ModuleDependency(moduleLoader, GATEIN_PC, false, false, false)); - moduleSpecification.addDependency(new ModuleDependency(moduleLoader, JAVAX_PORTLET, false, false, false)); + moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, GATEIN_WCI, false, false, false)); + moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, GATEIN_PC, false, false, false)); + moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, JAVAX_PORTLET, false, false, false)); // Provide tlds for portlet taglibs provideTlds(deploymentUnit); Modified: sandbox/as7_support/pc/jboss-as7-integration/pkg/pom.xml =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/pkg/pom.xml 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/pkg/pom.xml 2011-06-30 10:52:00 UTC (rev 6778) @@ -17,7 +17,7 @@ <name>GateIn - Portlet Container (JBoss AS7 Integration Packaging - SimplePortal)</name> <properties> - <jbossas.version>7.0.0.Beta3</jbossas.version> + <jbossas.version>7.0.0.CR1</jbossas.version> <jbossas.dist.version>${jbossas.version}</jbossas.dist.version> <servers.dir>${project.basedir}/servers</servers.dir> <jbossas.path>${servers.dir}</jbossas.path> @@ -139,7 +139,7 @@ </activation> <properties> - <exo.projects.app.jboss7.version>jboss-7.0.0.Beta3</exo.projects.app.jboss7.version> + <exo.projects.app.jboss7.version>jboss-7.0.0.CR1</exo.projects.app.jboss7.version> <servers.dir>${exo.projects.directory.dependencies}</servers.dir> <jbossas.name>${exo.projects.app.jboss7.version}</jbossas.name> </properties> @@ -281,7 +281,7 @@ <ant antfile="${project.basedir}/download-jboss.xml"> <target name="download-jboss"/> <property name="url" - value="https://repository.jboss.org/nexus/content/groups/public-jbos... + value="http://download.jboss.org/jbossas/7.0/jboss-${jbossas.dist.ve... <property name="dest" value="${jbossas.zip}"/> </ant> Modified: sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2011-06-30 10:52:00 UTC (rev 6778) @@ -25,9 +25,9 @@ <module xmlns="urn:jboss:module:1.0" name="org.jboss.as.web"> <resources> - <resource-root path="jboss-as-web-7.0.0.Beta3.jar"/> + <resource-root path="jboss-as-web-7.0.0.CR1.jar"/> <resource-root path="jasper-jdt-7.0.0.Beta8.jar"/> - <resource-root path="jbossweb-7.0.0.Beta11.jar"/> + <resource-root path="jbossweb-7.0.0.CR4.jar"/> <!-- Insert resources here --> </resources> @@ -40,10 +40,14 @@ <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"/> @@ -55,4 +59,4 @@ <module name="org.picketbox"/> <module name="org.gatein.wci"/> </dependencies> -</module> +</module> \ No newline at end of file Modified: sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2011-06-30 10:52:00 UTC (rev 6778) @@ -1,8 +1,29 @@ -<?xml version='1.0' encoding='UTF-8'?> +<!-- + ~ 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. + --> -<server name="example" xmlns="urn:jboss:domain:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:domain:1.0 jboss_7_0.xsd urn:jboss:domain:arquillian:1.0 jboss-arquillian.xsd urn:jboss:domain:connector:1.0 jboss-connector.xsd urn:jboss:domain:datasources:1.0 jboss-datasources.xsd urn:jboss:domain:ejb3:1.0 jboss-ejb3.xsd urn:jboss:domain:ee:1.0 jboss-ee.xsd urn:jboss:domain:jaxrs:1.0 jboss-jaxrs.xsd urn:jboss:domain:jmx:1.0 jboss-jmx.xsd urn:jboss:domain:jpa:1.0 jboss-jpa.xsd urn:jboss:domain:messaging:1.0 jboss-messaging.xsd urn:jboss:domain:naming:1.0 jboss-naming.xsd urn:jboss:domain:osgi:1.0 jboss-osgi.xsd urn:jboss:domain:remoting:1.0 jboss-remoting.xsd urn:jboss:domain:resourceadapters:1.0 jboss-resource-adapters.xsd urn:jboss:domain:sar:1.0 jboss-sar.xsd urn:jboss:domain:threads:1.0 jboss-threads.xsd urn:jboss:domain:transactions:1.0 jboss-txn.xsd urn:jboss:domain:web:1.0 jboss-web.xsd urn:jboss:domain:deployment-scanner:1.0 jbos! s-deployment-scanner.xsd urn:jboss:domain:security:1.0 jboss-security.xsd urn:jboss:domain:webservices:1.0 jboss-webservices.xsd urn:jboss:domain:weld:1.0 jboss-weld.xsd urn:jboss:domain:gatein:1.0 jboss-gatein.xsd"> +<server xmlns="urn:jboss:domain:1.0"> + <extensions> - <extension module="org.jboss.as.arquillian.service"/> + <extension module="org.jboss.as.clustering.infinispan"/> <extension module="org.jboss.as.connector"/> <extension module="org.jboss.as.deployment-scanner"/> <extension module="org.jboss.as.ee"/> @@ -11,7 +32,6 @@ <extension module="org.jboss.as.jmx"/> <extension module="org.jboss.as.jpa"/> <extension module="org.jboss.as.logging"/> - <extension module="org.jboss.as.messaging"/> <extension module="org.jboss.as.naming"/> <extension module="org.jboss.as.osgi"/> <extension module="org.jboss.as.remoting"/> @@ -19,28 +39,35 @@ <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.webservices"/> - <extension module="org.jboss.as.weld"/> + <extension module="org.jboss.as.web" /> + <extension module="org.jboss.as.weld" /> <extension module="org.gatein"/> </extensions> - <paths> - <path name="absolute" path="tmp"/> - <path name="relative" path="relative" relative-to="absolute"/> - </paths> - <management-interfaces> - <native-interface interface="default" port="9999"/> - <http-interface interface="default" port="9990"/> - </management-interfaces> - <profile name="undefined"> + + <management> + <security-realms> + <security-realm name="PropertiesMgmtSecurityRealm"> + <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"/> + </management-interfaces> + </management> + + <profile> <subsystem xmlns="urn:jboss:domain:logging:1.0"> - <console-handler name="CONSOLE" autoflush="true"> + <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" autoflush="true"> + + <periodic-rotating-file-handler name="FILE"> <level name="INFO"/> <formatter> <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> @@ -48,6 +75,7 @@ <file relative-to="jboss.server.log.dir" path="server.log"/> <suffix value=".yyyy-MM-dd"/> </periodic-rotating-file-handler> + <logger category="com.arjuna"> <level name="WARN"/> </logger> @@ -57,6 +85,7 @@ <logger category="sun.rmi"> <level name="WARN"/> </logger> + <root-logger> <level name="INFO"/> <handlers> @@ -65,282 +94,186 @@ </handlers> </root-logger> </subsystem> - <subsystem xmlns="urn:jboss:domain:threads:1.0"> - <bounded-queue-thread-pool name="jca-short-running" blocking="true" allow-core-timeout="false"> - <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"/> - </bounded-queue-thread-pool> - <bounded-queue-thread-pool name="jca-long-running" blocking="true" allow-core-timeout="false"> - <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"/> - </bounded-queue-thread-pool> - <bounded-queue-thread-pool name="ejb3-async" blocking="true" allow-core-timeout="false"> - <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"/> - </bounded-queue-thread-pool> - <scheduled-thread-pool name="remoting"> - <max-threads count="10" per-cpu="20"/> - <keepalive-time time="10" unit="SECONDS"/> - </scheduled-thread-pool> - </subsystem> - <subsystem xmlns="urn:jboss:domain:arquillian:1.0"/> - <subsystem xmlns="urn:jboss:domain:ee:1.0"/> - <subsystem xmlns="urn:jboss:domain:ejb3:1.0"/> - <subsystem xmlns="urn:jboss:domain:naming:1.0"/> - <subsystem xmlns="urn:jboss:domain:security:1.0"> - <security-domains> - <security-domain name="other"> - <authentication> - <login-module code="UsersRoles" flag="required"/> - </authentication> - </security-domain> - </security-domains> - </subsystem> - <subsystem xmlns="urn:jboss:domain:remoting:1.0" thread-pool="remoting"/> - <subsystem xmlns="urn:jboss:domain:jmx:1.0"> - <jmx-connector server-binding="jmx-connector-server" registry-binding="jmx-connector-registry"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> - <subsystem xmlns="urn:jboss:domain:jpa:1.0"/> - <subsystem xmlns="urn:jboss:domain:sar:1.0"/> - <subsystem xmlns="urn:jboss:domain:transactions:1.0"> - <core-environment socket-binding="txn-socket-process-id"/> - <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> - <coordinator-environment/> - <object-store/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:connector:1.0"> - <archive-validation enabled="false"/> - <bean-validation enabled="false"/> - <default-workmanager short-running-thread-pool="jca-short-running" long-running-thread-pool="jca-long-running"/> - </subsystem> <subsystem xmlns="urn:jboss:domain:datasources:1.0"> <datasources> - <datasource jndi-name="java:/H2DS" pool-name="H2DS" enabled="true" use-java-context="true"> - <connection-url> - jdbc:h2:mem:test;DB_CLOSE_DELAY=-1 - </connection-url> - <driver-class> - org.h2.Driver - </driver-class> - <driver> - org.h2.Driver#1.2 - </driver> - <pool> - <prefill> - true - </prefill> - <use-strict-min> - false - </use-strict-min> - </pool> + <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> <security> - <user-name> - sa - </user-name> - <password> - sa - </password> + <user-name>sa</user-name> + <password>sa</password> </security> - <validation> - <validate-on-match> - false - </validate-on-match> - <background-validation> - false - </background-validation> - <useFastFail> - false - </useFastFail> - </validation> - <statement/> + <validation></validation> + <timeout></timeout> + <statement></statement> </datasource> + <drivers> + <driver name="h2" module="com.h2database.h2"> + <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class> + </driver> + </drivers> </datasources> - <drivers> - <driver module="com.h2database.h2"/> - </drivers> </subsystem> - <subsystem xmlns="urn:jboss:domain:resourceadapters:1.0"/> + <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0"> + <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments" /> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ee:1.0" /> + <subsystem xmlns="urn:jboss:domain:ejb3:1.0" /> + <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="hibernate"> + <cache-container name="hibernate" default-cache="local-query"> + <local-cache name="entity"> + <eviction strategy="LRU" max-entries="10000"/> + <expiration max-idle="100000"/> + </local-cache> + <local-cache name="local-query"> + <eviction strategy="LRU" max-entries="10000"/> + <expiration max-idle="100000"/> + </local-cache> + <local-cache name="timestamps"> + <eviction strategy="NONE"/> + </local-cache> + </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" /> + <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"/> + </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"/> + </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:jpa:1.0"> + <jpa default-datasource=""/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:naming:1.0" /> <subsystem xmlns="urn:jboss:domain:osgi:1.0" activation="lazy"> <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager"> - <property name="manager.root"> - jboss-osgi - </property> + <property name="manager.root">jboss-osgi</property> </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.log4j, - org.jboss.as.osgi, + 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.log4j;version=1.2, - org.jboss.as.osgi.service;version=7.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.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> - <module identifier="org.jboss.as.arquillian.aggregate"/> + <!-- modules registered with the OSGi layer on startup --> + <module identifier="javaee.api"/> <module identifier="org.jboss.logging"/> - <module identifier="org.apache.aries.jmx" start="true"/> + <!-- bundles installed on startup --> <module identifier="org.apache.aries.util"/> - <module identifier="org.apache.felix.configadmin" start="true"/> - <module identifier="org.jboss.as.osgi.configadmin" start="true"/> - <module identifier="org.jboss.osgi.common" start="true"/> - <module identifier="org.jboss.osgi.jmx" start="true"/> + <module identifier="org.jboss.osgi.webconsole"/> <module identifier="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"/> + <!-- 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.webconsole" startlevel="2"/> + <module identifier="org.jboss.osgi.jmx" startlevel="2"/> + <module identifier="org.jboss.osgi.http" 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> </subsystem> - <subsystem xmlns="urn:jboss:domain:messaging:1.0"> - <acceptors> - <in-vm-acceptor name="in-vm" server-id="0"/> - <netty-acceptor name="netty" socket-binding="messaging"/> - <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput"> - <param key="batch-delay" value="50"/> - <param key="direct-deliver" value="false"/> - </netty-acceptor> - </acceptors> - <address-settings> - <address-setting match="#"> - <dead-letter-address> - jms.queue.DLQ - </dead-letter-address> - <expiry-address> - jms.queue.ExpiryQueue - </expiry-address> - <redelivery-delay> - 0 - </redelivery-delay> - <max-size-bytes> - 10485760 - </max-size-bytes> - <message-counter-history-day-limit> - 10 - </message-counter-history-day-limit> - <address-full-policy> - BLOCK - </address-full-policy> - </address-setting> - </address-settings> - <connectors> - <in-vm-connector name="in-vm" server-id="0"/> - <netty-connector name="netty" socket-binding="messaging"/> - <netty-connector name="netty-throughput" socket-binding="messaging-throughput"> - <param key="batch-delay" value="50"/> - </netty-connector> - </connectors> - <journal-min-files> - 2 - </journal-min-files> - <journal-type> - NIO - </journal-type> - <journal-file-size> - 102400 - </journal-file-size> - <persistence-enabled> - false - </persistence-enabled> - <security-settings> - <security-setting match="#"> - <permission type="send" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - </security-setting> - </security-settings> + <subsystem xmlns="urn:jboss:domain:remoting:1.0"/> + <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"> + <security-domains> + <security-domain name="other" cache-type="default"> + <authentication> + <login-module code="UsersRoles" flag="required"/> + </authentication> + </security-domain> + </security-domains> </subsystem> - <subsystem xmlns="urn:jboss:domain:messaging:jms:1.0"> - <connection-factory name="InVmConnectionFactory"> - <connectors> - <connector-ref connector-name="in-vm" backup-connector-name="netty"/> - </connectors> - <entries> - <entry name="java:/ConnectionFactory"/> - </entries> - </connection-factory> - <connection-factory name="RemoteConnectionFactory"> - <connectors> - <connector-ref connector-name="netty" backup-connector-name="in-vm"/> - </connectors> - <entries> - <entry name="RemoteConnectionFactory"/> - </entries> - </connection-factory> - <queue name="testQueue"> - <entry name="queue/test"/> - </queue> - <topic name="testTopic"> - <entry name="topic/test"/> - </topic> + <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"/> + <core-environment> + <process-id> + <uuid /> + </process-id> + </core-environment> + <coordinator-environment default-timeout="300"/> </subsystem> <subsystem xmlns="urn:jboss:domain:web:1.0"> - <connector name="http" protocol="HTTP/1.1" socket-binding="http" scheme="http"/> - <virtual-server name="localhost"> - <alias name="example.com"/> + <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> </subsystem> - <subsystem xmlns="urn:jboss:domain:weld:1.0"/> - <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0"> - <deployment-scanner name="default" path="deployments" scan-interval="5000" relative-to="jboss.server.base.dir"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:webservices:1.0"> - <configuration> - <webServiceHost> - localhost - </webServiceHost> - <modifySOAPAddress> - true - </modifySOAPAddress> - </configuration> - </subsystem> + <subsystem xmlns="urn:jboss:domain:weld:1.0" /> + <subsystem xmlns="urn:jboss:domain:gatein:1.0"/> </profile> + <interfaces> - <interface name="default"> + <interface name="management"> <inet-address value="127.0.0.1"/> </interface> - <interface name="any"> - <any-address/> + <interface name="public"> + <inet-address value="127.0.0.1"/> </interface> - <interface name="complex"> - <any> - <subnet-match value="192.168.0.0/16"/> - <public-address/> - </any> - <not> - <site-local-address/> - </not> - <up/> - <multicast/> - </interface> </interfaces> - <socket-binding-group name="standard-sockets" default-interface="default"> - <socket-binding name="jndi" port="1099"/> + + <socket-binding-group name="standard-sockets" default-interface="public"> + <socket-binding name="http" port="8080"/> + <socket-binding name="https" port="8443"/> <socket-binding name="jmx-connector-registry" port="1090"/> <socket-binding name="jmx-connector-server" port="1091"/> - <socket-binding name="http" port="8080"/> - <socket-binding name="https" port="8447"/> + <socket-binding name="jndi" port="1099"/> <socket-binding name="osgi-http" port="8090"/> <socket-binding name="remoting" port="4447"/> <socket-binding name="txn-recovery-environment" port="4712"/> <socket-binding name="txn-status-manager" port="4713"/> - <socket-binding name="txn-socket-process-id" port="4714"/> - <socket-binding name="messaging" port="5445"/> - <socket-binding name="messaging-throughput" port="5455"/> </socket-binding-group> - <system-properties> - <property name="foo" value="bar"/> - <property name="key" value="value"/> - </system-properties> - <deployments> - <deployment name="simple-portal.ear" runtime-name="simple-portal.ear" sha1="1682d34c7e562db7d6ad53624f9e41fbb0398e13"/> - </deployments> -</server> \ No newline at end of file + +</server> Modified: sandbox/as7_support/pc/jboss-as7-integration/pom.xml =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/pom.xml 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/pom.xml 2011-06-30 10:52:00 UTC (rev 6778) @@ -16,8 +16,8 @@ <name>GateIn - Portlet Container (JBoss AS7 Integration)</name> <properties> - <version.jboss.as>7.0.0.Beta3</version.jboss.as> - <jboss.as.release.version>7.0.0.Beta3</jboss.as.release.version> + <version.jboss.as>7.0.0.CR1</version.jboss.as> + <jboss.as.release.version>7.0.0.CR1</jboss.as.release.version> <version.org.jboss.vfs>3.0.0.GA</version.org.jboss.vfs> </properties> Modified: sandbox/as7_support/pc/pom.xml =================================================================== --- sandbox/as7_support/pc/pom.xml 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/pom.xml 2011-06-30 10:52:00 UTC (rev 6778) @@ -47,7 +47,7 @@ <properties> <version.gatein.common>2.0.4-Beta03</version.gatein.common> - <version.gatein.wci>2.1.0-Beta03-SNAPSHOT</version.gatein.wci> + <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> <version.apache.log4j>1.2.14</version.apache.log4j> Modified: sandbox/as7_support/wci/jboss/jboss7/pom.xml =================================================================== --- sandbox/as7_support/wci/jboss/jboss7/pom.xml 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/wci/jboss/jboss7/pom.xml 2011-06-30 10:52:00 UTC (rev 6778) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-jboss</artifactId> - <version>2.1.0-Beta03-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss7</artifactId>