Author: mstruk
Date: 2011-12-23 19:32:24 -0500 (Fri, 23 Dec 2011)
New Revision: 8268
Modified:
portal/trunk/packaging/jboss-as7/README.txt
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java
portal/trunk/packaging/jboss-as7/extension/src/test/java/org/gatein/integration/jboss/as7/support/AbstractParsingTest.java
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/standalone.xml
portal/trunk/packaging/jboss-as7/pom.xml
Log:
GTNPORTAL-2154 Support for JBoss AS7
- upgraded supported version to JBoss AS 7.1.0.CR1
Modified: portal/trunk/packaging/jboss-as7/README.txt
===================================================================
--- portal/trunk/packaging/jboss-as7/README.txt 2011-12-20 23:00:26 UTC (rev 8267)
+++ portal/trunk/packaging/jboss-as7/README.txt 2011-12-24 00:32:24 UTC (rev 8268)
@@ -30,7 +30,7 @@
Known Issues
============
-- 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.
+- Only one JBoss AS 7 version is supported at one time. At the moment it's JBoss AS
7.1.0.CR1.
- WSRP is not yet supported
- <distributable/> is not yet supported
- Sample ears have been repackaged as their current default packaging is not supported
@@ -74,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.1.0.Beta1b’ 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.CR1’ 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
@@ -83,7 +83,7 @@
Now that we successfully built GateIn including JBoss AS7 support, let’s run it:
-cd pkg/target/jboss-as-7.1.0.Beta1b/bin
+cd pkg/target/jboss-as-7.1.0.CR1/bin
./standalone.sh
Modified:
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java
===================================================================
---
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java 2011-12-20
23:00:26 UTC (rev 8267)
+++
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java 2011-12-24
00:32:24 UTC (rev 8268)
@@ -22,7 +22,7 @@
package org.gatein.integration.jboss.as7;
import org.jboss.metadata.parser.jsp.TldMetaDataParser;
-import org.jboss.metadata.parser.util.NoopXmlResolver;
+import org.jboss.metadata.parser.util.NoopXMLResolver;
import org.jboss.metadata.web.spec.TldMetaData;
import org.jboss.modules.Module;
import org.jboss.modules.ModuleClassLoader;
@@ -87,7 +87,7 @@
try
{
final XMLInputFactory inputFactory = XMLInputFactory.newInstance();
- inputFactory.setXMLResolver(NoopXmlResolver.create());
+ inputFactory.setXMLResolver(NoopXMLResolver.create());
XMLStreamReader xmlReader = inputFactory.createXMLStreamReader(is);
return TldMetaDataParser.parse(xmlReader);
}
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
23:00:26 UTC (rev 8267)
+++
portal/trunk/packaging/jboss-as7/extension/src/test/java/org/gatein/integration/jboss/as7/support/AbstractParsingTest.java 2011-12-24
00:32:24 UTC (rev 8268)
@@ -29,8 +29,10 @@
import org.jboss.as.controller.ExtensionContext;
import org.jboss.as.controller.ExtensionContextImpl;
import org.jboss.as.controller.ModelController;
-import org.jboss.as.controller.OperationContext;
import org.jboss.as.controller.PathAddress;
+import org.jboss.as.controller.ProcessType;
+import org.jboss.as.controller.RunningMode;
+import org.jboss.as.controller.RunningModeControl;
import org.jboss.as.controller.descriptions.DescriptionProvider;
import org.jboss.as.controller.descriptions.common.CommonProviders;
import org.jboss.as.controller.operations.common.Util;
@@ -395,7 +397,7 @@
ModelControllerService(final AdditionalInitialization additionalPreStep, final
ControlledProcessState processState, final StringConfigurationPersister persister)
{
- super(OperationContext.Type.SERVER, persister, processState, DESC_PROVIDER,
null, null);
+ super(ProcessType.STANDALONE_SERVER, new RunningModeControl(RunningMode.NORMAL),
persister, processState, DESC_PROVIDER, null, null);
this.persister = persister;
this.additionalInit = additionalPreStep;
}
@@ -414,7 +416,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.ProcessType.STANDALONE_SERVER);
+ ExtensionContext context = new ExtensionContextImpl(rootRegistration, null,
persister, ProcessType.STANDALONE_SERVER);
if (additionalInit != null)
{
additionalInit.initializeExtraSubystemsAndModel(context, rootResource,
rootRegistration);
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
23:00:26 UTC (rev 8267)
+++
portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2011-12-24
00:32:24 UTC (rev 8268)
@@ -25,9 +25,9 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.web">
<resources>
- <resource-root path="jboss-as-web-7.1.0.Beta1b.jar"/>
+ <resource-root path="jboss-as-web-7.1.0.CR1.jar"/>
<resource-root path="jasper-jdt-7.0.3.Final.jar"/>
- <resource-root path="jbossweb-7.0.3.Final.jar"/>
+ <resource-root path="jbossweb-7.0.7.Final.jar"/>
<!-- Insert resources here -->
</resources>
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
23:00:26 UTC (rev 8267)
+++
portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2011-12-24
00:32:24 UTC (rev 8268)
@@ -8,6 +8,7 @@
<extension module="org.jboss.as.deployment-scanner"/>
<extension module="org.jboss.as.ee"/>
<extension module="org.jboss.as.ejb3"/>
+ <extension module="org.jboss.as.jaxr"/>
<extension module="org.jboss.as.jaxrs"/>
<extension module="org.jboss.as.jdr"/>
<extension module="org.jboss.as.jmx"/>
@@ -88,7 +89,7 @@
<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">
+ pool-name="ExampleDS">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
<driver>h2</driver>
<pool></pool>
@@ -105,7 +106,7 @@
</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="3000"/>
+ <deployment-scanner scan-interval="5000"
relative-to="jboss.server.base.dir" path="deployments"
deployment-timeout="300"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:ee:1.0"/>
<subsystem xmlns="urn:jboss:domain:ejb3:1.2">
@@ -113,7 +114,7 @@
<stateless>
<bean-instance-pool-ref
pool-name="slsb-strict-max-pool"/>
</stateless>
- <stateful default-access-timeout="5000"/>
+ <stateful default-access-timeout="5000"
cache-ref="simple"/>
<singleton default-access-timeout="5000"/>
</session-bean>
<mdb>
@@ -126,6 +127,13 @@
<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>
+ <caches>
+ <cache name="simple"
aliases="NoPassivationCache"/>
+ <cache name="passivating"
passivation-store-ref="file" aliases="SimpleStatefulCache"/>
+ </caches>
+ <passivation-stores>
+ <file-passivation-store name="file"/>
+ </passivation-stores>
<async thread-pool-name="default"/>
<timer-service thread-pool-name="default">
<data-store path="timer-service-data"
relative-to="jboss.server.data.dir"/>
@@ -150,6 +158,10 @@
</local-cache>
</cache-container>
</subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxr:1.0">
+ <connection-factory
jndi-name="java:jboss/jaxr/ConnectionFactory"/>
+ <juddi-server publish-url="http://localhost:8080/juddi/publish"
query-url="http://localhost:8080/juddi/query"/>
+ </subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
<subsystem xmlns="urn:jboss:domain:jca:1.1">
<archive-validation enabled="false"/>
@@ -170,7 +182,9 @@
</default-workmanager>
</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:jmx:1.1">
+ <show-model value="true"/>
+ </subsystem>
<subsystem xmlns="urn:jboss:domain:jpa:1.0">
<jpa default-datasource=""/>
</subsystem>
@@ -342,15 +356,15 @@
</interface>
</interfaces>
- <socket-binding-group name="standard-sockets"
default-interface="public">
+ <socket-binding-group name="standard-sockets"
default-interface="public"
port-offset="${jboss.socket.binding.port-offset:0}">
<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="management-native"
interface="management" port="9999"/>
- <socket-binding name="management-http"
interface="management" port="9990"/>
+ <socket-binding name="management-native"
interface="management"
port="${jboss.management.native.port:9999}"/>
+ <socket-binding name="management-http"
interface="management" port="${jboss.management.http.port:9990}"/>
<socket-binding name="messaging" port="5445"/>
<socket-binding name="messaging-throughput"
port="5455"/>
<socket-binding name="osgi-http" interface="management"
port="8090"/>
Modified: portal/trunk/packaging/jboss-as7/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as7/pom.xml 2011-12-20 23:00:26 UTC (rev 8267)
+++ portal/trunk/packaging/jboss-as7/pom.xml 2011-12-24 00:32:24 UTC (rev 8268)
@@ -12,8 +12,8 @@
<name>GateIn JBoss AS 7.x.x packaging</name>
<properties>
- <version.jboss.as.release>7.1.0.Beta1b</version.jboss.as.release>
- <version.jboss.as>7.1.0.Beta1b</version.jboss.as>
+ <version.jboss.as.release>7.1.0.CR1</version.jboss.as.release>
+ <version.jboss.as>7.1.0.CR1</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.2-GA-AS7-Beta02</version.exo.kernel.as7>