gatein SVN: r8269 - portal/trunk/component/web/security/src/main/java/org/exoplatform/web/security.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2011-12-29 01:53:16 -0500 (Thu, 29 Dec 2011)
New Revision: 8269
Modified:
portal/trunk/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java
Log:
GTNPORTAL-2318 the initialURI need to be encoded during transition between login processes
Modified: portal/trunk/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java
===================================================================
--- portal/trunk/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java 2011-12-24 00:32:24 UTC (rev 8268)
+++ portal/trunk/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java 2011-12-29 06:53:16 UTC (rev 8269)
@@ -28,6 +28,7 @@
import org.gatein.wci.security.WCILoginController;
import java.io.IOException;
+import java.net.URLEncoder;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
@@ -91,7 +92,7 @@
}
//
- String redirectURI = req.getContextPath() + "/dologin?initialURI=" + uri;
+ String redirectURI = req.getContextPath() + "/dologin?initialURI=" + URLEncoder.encode(uri, "UTF-8");
resp.sendRedirect(resp.encodeRedirectURL(redirectURI));
}
}
12 years, 12 months
- 1
- 0
gatein SVN: r8268 - in portal/trunk/packaging/jboss-as7: extension/src/main/java/org/gatein/integration/jboss/as7 and 3 other directories.
by do-not-reply＠jboss.org
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>
13 years
- 1
- 0
gatein SVN: r8267 - in portal/trunk: examples/portal/ear and 12 other directories.
by do-not-reply＠jboss.org
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.version}/jb..."/>
+ value="http://download.jboss.org/jbossas/7.1/jboss-as-${jbossas.dist.version}/jb..."/>
<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>
13 years
- 1
- 0
gatein SVN: r8266 - sandbox/as7_support/tags.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-12-20 17:24:07 -0500 (Tue, 20 Dec 2011)
New Revision: 8266
Added:
sandbox/as7_support/tags/AS7-Beta02/
Log:
Re-tagged AS7-Beta02
13 years
- 1
- 0
gatein SVN: r8265 - sandbox/as7_support/tags.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-12-20 17:22:01 -0500 (Tue, 20 Dec 2011)
New Revision: 8265
Removed:
sandbox/as7_support/tags/AS7-Beta02/
Log:
Botched tagging AS7-Beta02
13 years
- 1
- 0
gatein SVN: r8264 - sandbox/as7_support/tags.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-12-20 16:55:49 -0500 (Tue, 20 Dec 2011)
New Revision: 8264
Added:
sandbox/as7_support/tags/AS7-Beta02/
Log:
Tagged AS7-Beta02
13 years
- 1
- 0
gatein SVN: r8263 - in sandbox/as7_support/branches/gatein-as7/exo.kernel.container: src/main/resources/conf and 9 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-12-20 16:53:18 -0500 (Tue, 20 Dec 2011)
New Revision: 8263
Modified:
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/pom.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/resources/conf/configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/resources/conf/portal/configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/conf/portal/test-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/conf/test-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/configuration-bad-schema.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/collection-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-plugin-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/config-manager-configuration-a.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/config-manager-configuration-b.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/config-manager-configuration-c.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/empty-config.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/field-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-with-parameter-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/init-param-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/test-component-plugin-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/empty-config.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-both-settings-with-default-portal-def.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-both-settings.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-default-portal-def.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-empty-default-portal-def.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-empty-portal-def.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-empty-portal-def2.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings-with-default-portal-def.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings-with-default-portal-def2.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings2.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def2.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-defs.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-settings-with-default-portal-def.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-settings.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-invalid-values.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-def.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs2.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values2.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/sample-gtn-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/empty-config.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration1.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration2.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration3.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration4.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration5.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/managedby-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/portal-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/registration-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/root-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/scoped-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/configuration1.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/configuration2.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/portal-configuration1.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/portal-configuration2.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/root-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/portal-container-config-with-settings.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/portal-container-test-settings-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-with-path-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-with-profile-configuration.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/request-lifecycle-configuration.xml
Log:
Merged exo.kernel.container changes for 2.3.2-GA
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/pom.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/pom.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -12,10 +12,10 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
- <version>2.3.1-GA-AS7-Beta01</version>
+ <version>2.3.2-GA-AS7-Beta02</version>
<name>eXo Kernel :: Container</name>
<description>eXo Kernel Container</description>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/resources/conf/configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/resources/conf/configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/resources/conf/configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -19,8 +19,8 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd">
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<container-lifecycle-plugin>
<type>org.exoplatform.container.monitor.jvm.AddJVMComponentsToRootContainer</type>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/resources/conf/portal/configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/resources/conf/portal/configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/resources/conf/portal/configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -19,8 +19,8 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd http://www.exoplatform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplatform.org/xml/ns/kernel_1_0.xsd">
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<!--
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/conf/portal/test-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/conf/portal/test-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/conf/portal/test-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -19,8 +19,8 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<!-- ============================================================================= -->
<!-- U N I T C O N F I G U R A T I O N -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/conf/test-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/conf/test-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/conf/test-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -19,8 +19,8 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<!-- ============================================================================= -->
<!-- U N I T C O N F I G U R A T I O N -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/configuration-bad-schema.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/configuration-bad-schema.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/configuration-bad-schema.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<foo/>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<container-lifecycle-plugin>
<type>component.type</type>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/collection-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/collection-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/collection-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component profiles="bar">
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-plugin-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-plugin-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-plugin-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/config-manager-configuration-a.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/config-manager-configuration-a.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/config-manager-configuration-a.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/config-manager-configuration-b.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/config-manager-configuration-b.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/config-manager-configuration-b.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/config-manager-configuration-c.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/config-manager-configuration-c.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/config-manager-configuration-c.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/empty-config.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/empty-config.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/empty-config.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
</configuration>
\ No newline at end of file
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/field-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/field-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/field-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<import>empty</import>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-with-parameter-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-with-parameter-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-with-parameter-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<import>${db.configuration.path}/db.xml</import>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/init-param-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/init-param-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/init-param-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/test-component-plugin-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/test-component-plugin-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/test-component-plugin-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/empty-config.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/empty-config.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/empty-config.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
</configuration>
\ No newline at end of file
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-both-settings-with-default-portal-def.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-both-settings-with-default-portal-def.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-both-settings-with-default-portal-def.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-both-settings.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-both-settings.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-both-settings.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-default-portal-def.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-default-portal-def.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-default-portal-def.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-empty-default-portal-def.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-empty-default-portal-def.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-empty-default-portal-def.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-empty-portal-def.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-empty-portal-def.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-empty-portal-def.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-empty-portal-def2.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-empty-portal-def2.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-empty-portal-def2.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings-with-default-portal-def.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings-with-default-portal-def.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings-with-default-portal-def.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings-with-default-portal-def2.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings-with-default-portal-def2.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings-with-default-portal-def2.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings2.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings2.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-external-settings2.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def2.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def2.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def2.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-defs.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-defs.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-defs.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-settings-with-default-portal-def.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-settings-with-default-portal-def.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-settings-with-default-portal-def.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-settings.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-settings.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-settings.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-invalid-values.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-invalid-values.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-invalid-values.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-def.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-def.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-def.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<type>org.exoplatform.container.definition.PortalContainerConfig</type>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<type>org.exoplatform.container.definition.PortalContainerConfig</type>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs2.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs2.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs2.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<type>org.exoplatform.container.definition.PortalContainerConfig</type>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<type>org.exoplatform.container.definition.PortalContainerConfig</type>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values2.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values2.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values2.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<type>org.exoplatform.container.definition.PortalContainerConfig</type>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/sample-gtn-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/sample-gtn-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/sample-gtn-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -1,5 +1,5 @@
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/empty-config.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/empty-config.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/empty-config.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,7 +21,7 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
</configuration>
\ No newline at end of file
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration1.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration1.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration1.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>ManagedWithExplicitObjectName</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration2.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration2.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration2.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>Foo</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration3.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration3.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration3.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>ManagedWithObjectNameTemplateOverriddenByExplicitObjectName</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration4.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration4.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration4.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>ManagedManagementAware</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration5.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration5.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/configuration5.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>org.exoplatform.container.jmx.support.ManagedComponentRequestLifeCycle</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/managedby-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/managedby-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/managedby-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>ManagedByManager</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/portal-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/portal-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/portal-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>PortalManagementAware</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/registration-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/registration-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/registration-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>Foo</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/root-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/root-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/root-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<type>org.exoplatform.container.definition.PortalContainerConfig</type>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/scoped-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/scoped-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/jmx/scoped-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>ManagedWithExplicitObjectName</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/configuration1.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/configuration1.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/configuration1.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>Foo</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/configuration2.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/configuration2.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/configuration2.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>Foo</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/portal-configuration1.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/portal-configuration1.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/portal-configuration1.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>org.exoplatform.container.management.ManagementProviderImpl</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/portal-configuration2.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/portal-configuration2.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/portal-configuration2.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<key>org.exoplatform.container.management.ManagementProviderImpl</key>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/root-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/root-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/management/root-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -21,8 +21,8 @@
-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
<component>
<type>org.exoplatform.container.definition.PortalContainerConfig</type>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/portal-container-config-with-settings.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/portal-container-config-with-settings.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/portal-container-config-with-settings.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<!-- The full qualified name of the PortalContainerConfig -->
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/portal-container-test-settings-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/portal-container-test-settings-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/portal-container-test-settings-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -7,7 +7,7 @@
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.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<type>org.exoplatform.container.TestPortalContainer$MyComponent</type>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -19,7 +19,7 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-with-path-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-with-path-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-with-path-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -19,7 +19,7 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-with-profile-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-with-profile-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-with-profile-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -19,7 +19,7 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/request-lifecycle-configuration.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/request-lifecycle-configuration.xml 2011-12-20 18:37:40 UTC (rev 8262)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/org/exoplatform/container/request-lifecycle-configuration.xml 2011-12-20 21:53:18 UTC (rev 8263)
@@ -19,7 +19,7 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsdhttp://www.exoplaform.org..."
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
13 years
- 1
- 0
gatein SVN: r8262 - portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2011-12-20 13:37:40 -0500 (Tue, 20 Dec 2011)
New Revision: 8262
Modified:
portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml
Log:
GTNPORTAL-2315 Make it more PDF friendly
Modified: portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml
===================================================================
--- portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml 2011-12-20 17:46:03 UTC (rev 8261)
+++ portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml 2011-12-20 18:37:40 UTC (rev 8262)
@@ -14,12 +14,32 @@
</para>
<para>
In &PRODUCT; we support these kinds of authentication:
- <step>J2EE FORM based authentication</step>
- <step><emphasis>RememberMe</emphasis> authentication (user checks <emphasis>Remember my login</emphasis> checkbox in login form)</step>
- <step>SSO servers integration (CAS, JOSSO, OpenSSO) - more informations in <xref linkend="chap-Reference_Guide-SSO_Single_Sign_On" /></step>
- <step>SPNEGO authentication with Kerberos ticket - more informations in <xref linkend="Single_Sign_On-SPNEGO" /></step>
- <step>Cluster authentication with loadbalancer or with JBoss SSO valve. See <xref linkend="sect-Reference_Guide_eXo_JCR_1.14-SSO_Single_Sign_On-Enabling_SSO_using_JBoss_SSO_Valve" /></step>
</para>
+ <itemizedlist>
+ <listitem>
+ <para>J2EE FORM based authentication</para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>RememberMe</emphasis> authentication (user checks <emphasis>Remember my login</emphasis> checkbox in login form)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ SSO servers integration (CAS, JOSSO, OpenSSO) - more informations in <xref linkend="chap-Reference_Guide-SSO_Single_Sign_On" />
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ SPNEGO authentication with Kerberos ticket - more informations in <xref linkend="Single_Sign_On-SPNEGO" />
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Cluster authentication with loadbalancer or with JBoss SSO valve. See <xref linkend="sect-Reference_Guide_eXo_JCR_1.14-SSO_Single_Sign_On-Enabling_SSO_using_JBoss_SSO_Valve" />
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
Authentication workflow consists of more HTTP requests and redirects with couple of handshakes in it. Source code related to
authentication is partially in WCI module, because authentication process is little different on <ulink type="http" url="http://www.jcp.org/en/jsr/detail?id=154">Servlet 2.5</ulink>
@@ -90,22 +110,26 @@
performs WCI login. WCI layer can recognize current servlet container and so that it can decide if it's old container with Servlet API 2.5 (JBoss 5, Tomcat 6)
or newer with Servlet API 3.0 (JBoss 6, JBoss 7, Tomcat 7).
</para>
- <para>
- <step>
- <emphasis role="bold">Servlet 3.0 case</emphasis> - New servlet API supports programmatic authentication by calling method
- <emphasis>HttpServletRequest.login(String username, String password)</emphasis>. This will directly call JAAS authentication without
- need to perform any more redirects.
- </step>
- <step>
- <emphasis role="bold">Servlet 2.5 case</emphasis> - There is not standard support for programmatic authentication and so we need
- another redirection to special URL like
- <ulink type="http" url="http://localhost:8080/portal/j_security_check?j_username=root&j_passw...">http://localhost:8080/portal/j_security_check?j_username=root&j_passw...</ulink>
- which will trigger JAAS authentication.
- You can notice that in this case, JAAS authentication is not triggered with real password of user but with WCI ticket. WCI ticket is
- created by InitiateLoginServlet during WCI login and it's saved into WCI <emphasis>TicketService</emphasis>.
- The purpose of WCI ticket is to avoid using of real password in URL during redirection.
- </step>
- </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis role="bold">Servlet 3.0 case</emphasis> - New servlet API supports programmatic authentication by calling method
+ <emphasis>HttpServletRequest.login(String username, String password)</emphasis>. This will directly call JAAS authentication without
+ need to perform any more redirects.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">Servlet 2.5 case</emphasis> - There is not standard support for programmatic authentication and so we need
+ another redirection to special URL like
+ <ulink type="http" url="http://localhost:8080/portal/j_security_check?j_username=root&j_passw...">http://localhost:8080/portal/j_security_check?j_username=root&j_passw...</ulink>
+ which will trigger JAAS authentication.
+ You can notice that in this case, JAAS authentication is not triggered with real password of user but with WCI ticket. WCI ticket is
+ created by InitiateLoginServlet during WCI login and it's saved into WCI <emphasis>TicketService</emphasis>.
+ The purpose of WCI ticket is to avoid using of real password in URL during redirection.
+ </para>
+ </listitem>
+ </itemizedlist>
</section>
<section id="sect-Reference_Guide-Authentication_Authorization_Intro-LoginModules">
<title>Login modules</title>
@@ -148,17 +172,24 @@
</programlisting>
<para>
You are free to add some new login modules or completely replace existing login modules with some of your own. Few points to mention:
- <step>
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
It's possible to login user through existing login modules with his real password (credentials like username: <emphasis>root</emphasis>/ password: <emphasis>gtn</emphasis>),
but also with WCI ticket (credentials like username: <emphasis>root</emphasis>/password: <emphasis>wci-ticket-458791</emphasis>).
Login modules stack supports both of these kinds of authentication.
- </step>
- <step>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
Authentication through WCI ticket is used for FORM based authentication in Servlet 2.5 containers (JBoss 5 or Tomcat 6).
Majority of other cases (Servlet 3.0 login, JBoss SSO valve login, login through <ulink type="http" url="http://code.google.com/p/crsh/">Crash</ulink>,
BASIC authentication etc) are using the case with real password.
- </step>
- <step>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
Authentication starts with invoke of method <emphasis>login</emphasis> on each login module. After all <emphasis>login</emphasis>
methods are invoked, then authentication continue by invoke of method <emphasis>commit</emphasis> on each login module.
Both methods <emphasis>login</emphasis> or <emphasis>commit</emphasis> can throw LoginException.
@@ -166,33 +197,41 @@
login module. By returning "false" from method login, you can ensure that login module is ignored. This is not specific to EPP
but it's generic to JAAS and more info about login modules in general can be found
<ulink type="http" url="http://docs.oracle.com/javase/6/docs/technotes/guides/security/jaas/JAASR...">here</ulink>.
- </step>
- </para>
+ </para>
+ </listitem>
+ </itemizedlist>
<section id="sect-Authentication_Authorization_Intro-existingLM">
<title>Existing login modules</title>
<para>
- Here is some brief description of existing login modules:
- <step>
- <emphasis role="bold">WCILoginModule</emphasis> - This login module is useful when authentication is performed with JAAS password like
- WCI ticket. It simply validates if WCI ticket is valid and then it finds real username and password of user from WCI <emphasis>TicketService</emphasis> and save
- it into sharedState map. Username is saved under key <emphasis>javax.security.auth.login.name</emphasis> and
- Password (real password like "gtn") is saved under key <emphasis>javax.security.auth.login.password</emphasis>.
- </step>
+ Here is some brief description of existing login modules:
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis role="bold">WCILoginModule</emphasis> - This login module is useful when authentication is performed with JAAS password like
+ WCI ticket. It simply validates if WCI ticket is valid and then it finds real username and password of user from WCI <emphasis>TicketService</emphasis> and save
+ it into sharedState map. Username is saved under key <emphasis>javax.security.auth.login.name</emphasis> and
+ Password (real password like "gtn") is saved under key <emphasis>javax.security.auth.login.password</emphasis>.
+ </para>
+ </listitem>
+ </itemizedlist>
<note>
If you trigger JAAS authentication with username/password like "root"/"gtn" and not with password like WCI ticket, then WCILoginModule is useless
and it throws LoginException. But you can notice that WCILoginModule is declared as "optional" which means that login failure in WCILoginModule
is not a problem for whole login process.
</note>
- <para>
- <step>
+ <itemizedlist>
+ <listitem>
+ <para>
<emphasis role="bold">PortalLoginModule</emphasis> - This login module is actually used mainly for login in cluster environment.
Assumption is working session replication between two cluster nodes. After successful authentication on cluster node1 will
method <emphasis>commit</emphasis> add flag (attribute <emphasis>AUTHENTICATED_CREDENTIALS</emphasis>) to HTTP session and this
flag can then be used to reauthentication on node2 when it executes method <emphasis>login</emphasis>.
More info in section <xref linkend="sect-Authentication_Authorization_Intro-ClusterLogin" />.
- </step>
- <step>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<emphasis role="bold">SharedStateLoginModule</emphasis> - This login module is actually the one, which triggers real
authentication of user with usage of <emphasis>Authenticator</emphasis> interface. It takes the username and password from
sharedState map from attributes <emphasis>javax.security.auth.login.name</emphasis> and <emphasis>javax.security.auth.login.password</emphasis>.
@@ -200,29 +239,32 @@
username and password against OrganizationService and portal identity database. Result of successful authentication is object
<emphasis>Identity</emphasis>, which is saved to sharedState map under key <emphasis>exo.security.identity</emphasis>.
More info in <xref linkend="sect-Authentication_Authorization_Intro-authenticatorAndRolesExtractor" />.
- </step>
- </para>
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
SharedStateLoginModule assumes that mentioned attributes for username and password are already placed in sharedState map,
which was actually done by WCILoginModule. If attributes are not in sharedState map, SharedStateLoginModule is simply ignored
(method "login" returns false).
</para>
- <para>
- <step>
+ <itemizedlist>
+ <listitem>
+ <para>
<emphasis role="bold">JbossLoginModule</emphasis> - previous login modules (like WCILoginModule and SharedStateLoginModule)
are useful for authentication flow with WCI ticket. <emphasis role="bold">DefaultLoginModule</emphasis> (superclass of JbossLoginModule)
is used for second case (authentication with real password instead of WCI ticket).
First it checks if Identity object has been already created and saved into sharedState map by SharedStateLoginModule.
If not, then it means that WCI ticket authentication was not successful and so it tries to login with real password of user.
It also uses <emphasis>Authentication.validateUser(Credential[] credentials)</emphasis> for authentication check.
- </step>
- </para>
- <para>
- In method <emphasis>JbossLoginModule.commit</emphasis>, we need to assign our Identity object to IdentityRegistry, which will be
- used later for authorization. We also need to create JAAS principals (UserPrincipal and RolesPrincipal) and assign them to our
- authenticated Subject. This is needed for JBoss AS server, so that it can properly recognize name of logged user and his roles
- on JBoss AS level.
- </para>
+ </para>
+ <para>
+ In method <emphasis>JbossLoginModule.commit</emphasis>, we need to assign our Identity object to IdentityRegistry, which will be
+ used later for authorization. We also need to create JAAS principals (UserPrincipal and RolesPrincipal) and assign them to our
+ authenticated Subject. This is needed for JBoss AS server, so that it can properly recognize name of logged user and his roles
+ on JBoss AS level.
+ </para>
+ </listitem>
+ </itemizedlist>
</section><!-- Ending section with existing login modules -->
<section id="sect-Authentication_Authorization_Intro-createNewLM">
<title>Creating your own login module</title>
@@ -233,9 +275,15 @@
</para>
<para>
We have actually two levels of authentication and overall result of JAAS authentication should properly handle both these cases:
- <step>Authentication on application server level</step>
- <step>Authentication on GateIn level</step>
</para>
+ <itemizedlist>
+ <listitem>
+ <para>Authentication on application server level</para>
+ </listitem>
+ <listitem>
+ <para>Authentication on GateIn level</para>
+ </listitem>
+ </itemizedlist>
<section id="sect-Authentication_Authorization_Intro-authenticationAppServerLevel">
<title>Authentication on application server level</title>
<para>
@@ -298,17 +346,28 @@
<para>
Method <emphasis>createIdentity</emphasis> is used to create instance of object <emphasis>org.exoplatform.services.security.Identity</emphasis>,
which encapsulates all important informations about single user like:
- <step>username</step>
- <step>set of Memberships (MembershipEntry objects) which user belongs to. <emphasis>Membership</emphasis> is object,
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ username
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ set of Memberships (MembershipEntry objects) which user belongs to. <emphasis>Membership</emphasis> is object,
which contains informations about <emphasis>membershipType</emphasis> (manager, member, validator, ... ) and about <emphasis>group</emphasis> (/platform/users,
/platform/administrators, /partners, /organization/management/executiveBoard, ... ).
- </step>
- <step>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
set of Strings with JAAS roles of given user. JAAS roles are simple Strings, which are mapped from MembershipEntry objects.
There is another special component <emphasis>org.exoplatform.services.security.RolesExtractor</emphasis>,
which is used to map JAAS roles from MembershipEntry objects. RolesExtractor interface looks like this:
- </step>
- </para>
+ </para>
+ </listitem>
+ </itemizedlist>
<programlisting language="Java" role="Java">
<![CDATA[
public interface RolesExtractor
@@ -359,35 +418,48 @@
</para>
<section id="sect-Authentication_Authorization_Intro-RememberMeAuthentication-howDoesItWork">
<title>How does it work</title>
- <para>
- <step>
- User checks the checkbox "Remember my login" on login screen of &PRODUCT; . Then he submit the form.
- </step>
- <step>
- HTTP request like <emphasis>http://localhost:8080/portal/login?initialURI=/portal/classic&usernam...</emphasis> is send to server
- </step>
- <step>
+ <itemizedlist>
+ <listitem>
+ <para>
+ User checks the checkbox "Remember my login" on login screen of &PRODUCT; . Then he submit the form.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ HTTP request like <emphasis>http://localhost:8080/portal/login?initialURI=/portal/classic&usernam...</emphasis> is send to server
+ </para>
+ </listitem>
+ <listitem>
+ <para>
Request is processed by PortalLoginController servlet.
Servlet obtains instance of <emphasis>RemindPasswordTokenService</emphasis> and save user credentials into JCR. It generates and returns special token (key) for later use.
Then it creates cookie called <emphasis>rememberme</emphasis> and use returned token as value of cookie.
- </step>
- </para>
+ </para>
+ </listitem>
+ </itemizedlist>
</section>
<section id="sect-Authentication_Authorization_Intro-RememberMeAuthentication-reauthentication">
<title>Reauthentication</title>
- <para>
- <step>After some time, user wants to reauthenticate. Let's assume that his HTTP Session is already expired but his RememberMe
- cookie is still active.
- </step>
- <step>
+ <itemizedlist>
+ <listitem>
+ <para>
+ After some time, user wants to reauthenticate. Let's assume that his HTTP Session is already expired but his RememberMe
+ cookie is still active.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
User send HTTP request to some portal page (ie. <emphasis>http://localhost:8080/portal/classic</emphasis> ).
- </step>
- <step>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
There is special HTTP Filter <emphasis role="bold">RememberMeFilter</emphasis> configured in web.xml, which checks
rememberme cookie and then it retrieves credentials of user from RemindPasswordTokenService. Now filter redirects request to
PortalLoginController and authentication process goes in same way as for normal FORM based authentication.
- </step>
- </para>
+ </para>
+ </listitem>
+ </itemizedlist>
</section>
<section id="sect-Authentication_Authorization_Intro-RememberMeAuthentication-RemindPasswordTokenService">
<title>RemindPasswordTokenService</title>
@@ -505,13 +577,19 @@
<title>Authorization overview</title>
<para>
In previous section, we learned about JAAS authentication and about login modules. So we know that result of authentication are:
- <step>
- JAAS Subject with principals for username (UserPrincipal) and for JAAS roles (RolesPrincipal).
- </step>
- <step>
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ JAAS Subject with principals for username (UserPrincipal) and for JAAS roles (RolesPrincipal).
+ </para>
+ </listitem>
+ <listitem>
+ <para>
Identity object, which encapsulates username, all memberships and all JAAS roles. This Identity object is bound to IdentityRegistry component.
- </step>
- </para>
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
Authorization in &PRODUCT; actually happens on two levels:
</para>
@@ -547,22 +625,34 @@
</para>
<para>
Authorization on portal level looks like this:
- <step>user send HTTP request to some URL in portal</step>
- <step>
- HTTP request is processed through <emphasis role="bold">SetCurrentIdentityFilter</emphasis>, which is declared in
- <emphasis>deploy/gatein.ear/02portal.war/WEB-INF/web.xml</emphasis>.
- </step>
- <step>
- SetCurrentIdentityFilter reads username of current user from <emphasis>HttpServletRequest.getRemoteUser()</emphasis>.
- Then it looks for Identity of this user in IdentityRegistry, where Identity has been saved during authentication.
- Found Identity is then encapsulated into <emphasis role="bold">ConversationState</emphasis> object and bound into ThreadLocal variable.
- </step>
- <step>
- UserACL is able to obtain Identity of current user from method <emphasis>UserACL.getIdentity()</emphasis>, which simply calls
- <emphasis>ConversationState.getCurrent().getIdentity()</emphasis> for find current Identity bound to ThreadLocal.
- Now UserACL has identity of user and so that it can performs any security checks.
- </step>
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ user send HTTP request to some URL in portal
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ HTTP request is processed through <emphasis role="bold">SetCurrentIdentityFilter</emphasis>, which is declared in
+ <emphasis>deploy/gatein.ear/02portal.war/WEB-INF/web.xml</emphasis>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ SetCurrentIdentityFilter reads username of current user from <emphasis>HttpServletRequest.getRemoteUser()</emphasis>.
+ Then it looks for Identity of this user in IdentityRegistry, where Identity has been saved during authentication.
+ Found Identity is then encapsulated into <emphasis role="bold">ConversationState</emphasis> object and bound into ThreadLocal variable.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ UserACL is able to obtain Identity of current user from method <emphasis>UserACL.getIdentity()</emphasis>, which simply calls
+ <emphasis>ConversationState.getCurrent().getIdentity()</emphasis> for find current Identity bound to ThreadLocal.
+ Now UserACL has identity of user and so that it can performs any security checks.
+ </para>
+ </listitem>
+ </itemizedlist>
</section>
</section><!-- Ending section Authorization overview -->
</section>
13 years
- 1
- 0
gatein SVN: r8261 - in portal/trunk/docs/reference-guide/en-US: images/AuthenticationAndIdentity/Overview and 2 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2011-12-20 12:46:03 -0500 (Tue, 20 Dec 2011)
New Revision: 8261
Added:
portal/trunk/docs/reference-guide/en-US/images/AuthenticationAndIdentity/Overview/
portal/trunk/docs/reference-guide/en-US/images/AuthenticationAndIdentity/Overview/loginScreen.png
portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml
Modified:
portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity.xml
Log:
GTNPORTAL-2315 more documentation about authentication and authorization
Added: portal/trunk/docs/reference-guide/en-US/images/AuthenticationAndIdentity/Overview/loginScreen.png
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en-US/images/AuthenticationAndIdentity/Overview/loginScreen.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml
===================================================================
--- portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml (rev 0)
+++ portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml 2011-12-20 17:46:03 UTC (rev 8261)
@@ -0,0 +1,569 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
+ %BOOK_ENTITIES;
+ ]>
+<section id="sect-Reference_Guide-Authentication_Authorization_Intro">
+ <title>Authentication and Authorization intro</title>
+ <section id="sect-Reference_Guide-Authentication_Authorization_Intro-Authentication">
+ <title>Authentication overview</title>
+ <para>
+ Authentication in &PRODUCT; is based on <ulink type="http" url="http://docs.oracle.com/javase/6/docs/technotes/guides/security/jaas/JAASR...">JAAS</ulink>
+ and by default it's standard J2EE FORM based authentication. However authentication workflow is not so easy and straightforward,
+ because we support many different authentication use cases, so that we can leverage authentication process according to our needs.
+ </para>
+ <para>
+ In &PRODUCT; we support these kinds of authentication:
+ <step>J2EE FORM based authentication</step>
+ <step><emphasis>RememberMe</emphasis> authentication (user checks <emphasis>Remember my login</emphasis> checkbox in login form)</step>
+ <step>SSO servers integration (CAS, JOSSO, OpenSSO) - more informations in <xref linkend="chap-Reference_Guide-SSO_Single_Sign_On" /></step>
+ <step>SPNEGO authentication with Kerberos ticket - more informations in <xref linkend="Single_Sign_On-SPNEGO" /></step>
+ <step>Cluster authentication with loadbalancer or with JBoss SSO valve. See <xref linkend="sect-Reference_Guide_eXo_JCR_1.14-SSO_Single_Sign_On-Enabling_SSO_using_JBoss_SSO_Valve" /></step>
+ </para>
+ <para>
+ Authentication workflow consists of more HTTP requests and redirects with couple of handshakes in it. Source code related to
+ authentication is partially in WCI module, because authentication process is little different on <ulink type="http" url="http://www.jcp.org/en/jsr/detail?id=154">Servlet 2.5</ulink>
+ containers and <ulink type="http" url="http://www.jcp.org/en/jsr/detail?id=315">Servlet 3.0</ulink> containers.
+ </para>
+ <para>
+ First you can see in <emphasis role="bold">deploy/gatein.ear/02portal.war/WEB-INF/web.xml</emphasis> that authentication is triggered by accessing some of secured URL:
+ </para>
+ <programlisting language="XML" role="XML">
+<![CDATA[
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>user authentication</web-resource-name>
+ <url-pattern>/dologin</url-pattern>
+ <url-pattern>/private/*</url-pattern>
+ <url-pattern>/g/*</url-pattern>
+ <url-pattern>/u/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>users</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <transport-guarantee>NONE</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+]]>
+ </programlisting>
+ <para>
+ This means that access to some of these URL like <ulink type="http" url="http://localhost:8080/portal/dologin">http://localhost:8080/portal/dologin</ulink>
+ will directly trigger J2EE authentication in case that user is not logged. Access to this URL also means that user needs to be in JAAS group <emphasis>users</emphasis>,
+ otherwise he can authenticate but he will have HTTP error like <emphasis>403 Forbidden</emphasis>.
+ </para>
+ <para>
+ In next part of the file we can see that authentication is FORM based and it starts by redirection to <emphasis>/initiatelogin</emphasis>
+ URL, which is actually mapped to <emphasis role="bold">InitiateLoginServlet</emphasis> .
+ </para>
+ <programlisting language="XML" role="XML">
+<![CDATA[
+ <login-config>
+ <auth-method>FORM</auth-method>
+ <realm-name>gatein-domain</realm-name>
+ <form-login-config>
+ <form-login-page>/initiatelogin</form-login-page>
+ <form-error-page>/errorlogin</form-error-page>
+ </form-login-config>
+ </login-config>
+]]>
+ </programlisting>
+ <para>
+ <emphasis>InitiateLoginServlet</emphasis> simply redirects user to login page placed in <emphasis role="bold">deploy/gatein.ear/02portal.war/login/jsp/login.jsp</emphasis> .
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/AuthenticationAndIdentity/Overview/loginScreen.png" format="PNG" align="center"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/AuthenticationAndIdentity/Overview/loginScreen.png" scalefit="1" format="PNG" align="center"/>
+ </imageobject>
+ </mediaobject>
+ </para>
+ <para>
+ So if you want to change somehow the look and feel of this login page, you can do it in this JSP file.
+ You can also change image or CSS placed in <emphasis role="bold">deploy/gatein.ear/login/skin</emphasis> .
+ </para>
+ <para>
+ After user submit his login form, he is redirected to login URL, which looks like
+ <ulink type="http" value="http://localhost:8080/portal/login?username=root&password=gtn&ini...">http://localhost:8080/portal/login?username=root&password=gtn&ini...</ulink>.
+ This URL is mapped to <emphasis role="bold">PortalLoginController</emphasis> servlet, which stores credentials and redirects again to InitiateLoginServlet, which
+ performs WCI login. WCI layer can recognize current servlet container and so that it can decide if it's old container with Servlet API 2.5 (JBoss 5, Tomcat 6)
+ or newer with Servlet API 3.0 (JBoss 6, JBoss 7, Tomcat 7).
+ </para>
+ <para>
+ <step>
+ <emphasis role="bold">Servlet 3.0 case</emphasis> - New servlet API supports programmatic authentication by calling method
+ <emphasis>HttpServletRequest.login(String username, String password)</emphasis>. This will directly call JAAS authentication without
+ need to perform any more redirects.
+ </step>
+ <step>
+ <emphasis role="bold">Servlet 2.5 case</emphasis> - There is not standard support for programmatic authentication and so we need
+ another redirection to special URL like
+ <ulink type="http" url="http://localhost:8080/portal/j_security_check?j_username=root&j_passw...">http://localhost:8080/portal/j_security_check?j_username=root&j_passw...</ulink>
+ which will trigger JAAS authentication.
+ You can notice that in this case, JAAS authentication is not triggered with real password of user but with WCI ticket. WCI ticket is
+ created by InitiateLoginServlet during WCI login and it's saved into WCI <emphasis>TicketService</emphasis>.
+ The purpose of WCI ticket is to avoid using of real password in URL during redirection.
+ </step>
+ </para>
+ </section>
+ <section id="sect-Reference_Guide-Authentication_Authorization_Intro-LoginModules">
+ <title>Login modules</title>
+ <para>
+ So finally we are redirected to JAAS authentication. GateIn is using it's own security domain <emphasis role="bold">gatein-domain</emphasis>
+ with set of predefined login modules. Login module configuration for gatein-domain is in file <emphasis role="bold">deploy/gatein.ear/META-INF/gatein-jboss-beans.xml</emphasis>
+ in JBoss and in file <emphasis role="bold">GATEIN_HOME/conf/jaas.conf</emphasis> in Tomcat. By default we can see this login modules stack:
+ </para>
+ <programlisting language="XML" role="XML">
+<![CDATA[
+ <login-module code="org.gatein.wci.security.WCILoginModule" flag="optional">
+ <module-option name="portalContainerName">portal</module-option>
+ <module-option name="realmName">gatein-domain</module-option>
+ </login-module>
+ <login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required">
+ <module-option name="portalContainerName">portal</module-option>
+ <module-option name="realmName">gatein-domain</module-option>
+ </login-module>
+ <login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required">
+ <module-option name="portalContainerName">portal</module-option>
+ <module-option name="realmName">gatein-domain</module-option>
+ </login-module>
+
+ <!-- Uncomment this part to check on each login if user is member of "/platform/users" group and if not
+ create such membership -->
+ <!--
+ <login-module code="org.exoplatform.services.organization.idm.CustomMembershipLoginModule" flag="required">
+ <module-option name="portalContainerName">portal</module-option>
+ <module-option name="realmName">gatein-domain</module-option>
+ <module-option name="membershipType">member</module-option>
+ <module-option name="groupId">/platform/users</module-option>
+ </login-module>
+ -->
+
+ <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required">
+ <module-option name="portalContainerName">portal</module-option>
+ <module-option name="realmName">gatein-domain</module-option>
+ </login-module>
+]]>
+ </programlisting>
+ <para>
+ You are free to add some new login modules or completely replace existing login modules with some of your own. Few points to mention:
+ <step>
+ It's possible to login user through existing login modules with his real password (credentials like username: <emphasis>root</emphasis>/ password: <emphasis>gtn</emphasis>),
+ but also with WCI ticket (credentials like username: <emphasis>root</emphasis>/password: <emphasis>wci-ticket-458791</emphasis>).
+ Login modules stack supports both of these kinds of authentication.
+ </step>
+ <step>
+ Authentication through WCI ticket is used for FORM based authentication in Servlet 2.5 containers (JBoss 5 or Tomcat 6).
+ Majority of other cases (Servlet 3.0 login, JBoss SSO valve login, login through <ulink type="http" url="http://code.google.com/p/crsh/">Crash</ulink>,
+ BASIC authentication etc) are using the case with real password.
+ </step>
+ <step>
+ Authentication starts with invoke of method <emphasis>login</emphasis> on each login module. After all <emphasis>login</emphasis>
+ methods are invoked, then authentication continue by invoke of method <emphasis>commit</emphasis> on each login module.
+ Both methods <emphasis>login</emphasis> or <emphasis>commit</emphasis> can throw LoginException.
+ If it happens, then whole authentication ends unsuccessfully, which in next turn invokes method <emphasis>abort</emphasis> on each
+ login module. By returning "false" from method login, you can ensure that login module is ignored. This is not specific to EPP
+ but it's generic to JAAS and more info about login modules in general can be found
+ <ulink type="http" url="http://docs.oracle.com/javase/6/docs/technotes/guides/security/jaas/JAASR...">here</ulink>.
+ </step>
+ </para>
+ <section id="sect-Authentication_Authorization_Intro-existingLM">
+ <title>Existing login modules</title>
+ <para>
+ Here is some brief description of existing login modules:
+ <step>
+ <emphasis role="bold">WCILoginModule</emphasis> - This login module is useful when authentication is performed with JAAS password like
+ WCI ticket. It simply validates if WCI ticket is valid and then it finds real username and password of user from WCI <emphasis>TicketService</emphasis> and save
+ it into sharedState map. Username is saved under key <emphasis>javax.security.auth.login.name</emphasis> and
+ Password (real password like "gtn") is saved under key <emphasis>javax.security.auth.login.password</emphasis>.
+ </step>
+ </para>
+ <note>
+ If you trigger JAAS authentication with username/password like "root"/"gtn" and not with password like WCI ticket, then WCILoginModule is useless
+ and it throws LoginException. But you can notice that WCILoginModule is declared as "optional" which means that login failure in WCILoginModule
+ is not a problem for whole login process.
+ </note>
+ <para>
+ <step>
+ <emphasis role="bold">PortalLoginModule</emphasis> - This login module is actually used mainly for login in cluster environment.
+ Assumption is working session replication between two cluster nodes. After successful authentication on cluster node1 will
+ method <emphasis>commit</emphasis> add flag (attribute <emphasis>AUTHENTICATED_CREDENTIALS</emphasis>) to HTTP session and this
+ flag can then be used to reauthentication on node2 when it executes method <emphasis>login</emphasis>.
+ More info in section <xref linkend="sect-Authentication_Authorization_Intro-ClusterLogin" />.
+ </step>
+ <step>
+ <emphasis role="bold">SharedStateLoginModule</emphasis> - This login module is actually the one, which triggers real
+ authentication of user with usage of <emphasis>Authenticator</emphasis> interface. It takes the username and password from
+ sharedState map from attributes <emphasis>javax.security.auth.login.name</emphasis> and <emphasis>javax.security.auth.login.password</emphasis>.
+ Then it calls <emphasis>Authenticator.validateUser(Credential[] credentials)</emphasis>, which performs real authentication of
+ username and password against OrganizationService and portal identity database. Result of successful authentication is object
+ <emphasis>Identity</emphasis>, which is saved to sharedState map under key <emphasis>exo.security.identity</emphasis>.
+ More info in <xref linkend="sect-Authentication_Authorization_Intro-authenticatorAndRolesExtractor" />.
+ </step>
+ </para>
+ <para>
+ SharedStateLoginModule assumes that mentioned attributes for username and password are already placed in sharedState map,
+ which was actually done by WCILoginModule. If attributes are not in sharedState map, SharedStateLoginModule is simply ignored
+ (method "login" returns false).
+ </para>
+ <para>
+ <step>
+ <emphasis role="bold">JbossLoginModule</emphasis> - previous login modules (like WCILoginModule and SharedStateLoginModule)
+ are useful for authentication flow with WCI ticket. <emphasis role="bold">DefaultLoginModule</emphasis> (superclass of JbossLoginModule)
+ is used for second case (authentication with real password instead of WCI ticket).
+ First it checks if Identity object has been already created and saved into sharedState map by SharedStateLoginModule.
+ If not, then it means that WCI ticket authentication was not successful and so it tries to login with real password of user.
+ It also uses <emphasis>Authentication.validateUser(Credential[] credentials)</emphasis> for authentication check.
+ </step>
+ </para>
+ <para>
+ In method <emphasis>JbossLoginModule.commit</emphasis>, we need to assign our Identity object to IdentityRegistry, which will be
+ used later for authorization. We also need to create JAAS principals (UserPrincipal and RolesPrincipal) and assign them to our
+ authenticated Subject. This is needed for JBoss AS server, so that it can properly recognize name of logged user and his roles
+ on JBoss AS level.
+ </para>
+ </section><!-- Ending section with existing login modules -->
+ <section id="sect-Authentication_Authorization_Intro-createNewLM">
+ <title>Creating your own login module</title>
+ <para>
+ Before creating your own login module, it's recommended to study source code of existing login modules to better understand whole
+ JAAS authentication process. You need to have good knowledge so that you can properly decide where your login module should be
+ placed and if you need to replace some existing login modules or simply attach your own module to existing chain.
+ </para>
+ <para>
+ We have actually two levels of authentication and overall result of JAAS authentication should properly handle both these cases:
+ <step>Authentication on application server level</step>
+ <step>Authentication on GateIn level</step>
+ </para>
+ <section id="sect-Authentication_Authorization_Intro-authenticationAppServerLevel">
+ <title>Authentication on application server level</title>
+ <para>
+ Application server needs to properly recognize that user is successfuly logged and it has assigned his JAAS roles. Unfortunately this part is not
+ standardized and is specific for each AS. For example in JBoss AS, you need to ensure that JAAS Subject has assigned principal with username (UserPrincipal)
+ and also RolesPrincipal, which has name "Roles" and it contains list of JAAS roles. This part is actually done in
+ <emphasis>JbossLoginModule.commit()</emphasis>. In Tomcat, this flow is little different, which means Tomcat has it's own
+ <emphasis>TomcatLoginModule</emphasis>.
+ </para>
+ <para>
+ After successful authentication, user needs to be at least in JAAS role "users" because this role is declared in web.xml
+ as you saw above. JAAS roles are extracted by special algorithm from &PRODUCT; memberships. See below in section with RolesExtractor.
+ </para>
+ </section>
+ <section id="sect-Authentication_Authorization_Intro-authenticationGateInServerLevel">
+ <title>Authentication on &PRODUCT; level</title>
+ <para>
+ Login process needs to create special object <emphasis role="bold">org.exoplatform.services.security.Identity</emphasis> and register this
+ object into &PRODUCT; component <emphasis role="bold">IdentityRegistry</emphasis>. This Identity object should encapsulate username of authenticated user,
+ Memberships of this user and also JAAS roles.
+ Identity object can be easily created with interface <emphasis role="bold">Authenticator</emphasis> as can be seen below.
+ </para>
+ </section>
+ <para>
+ So have this in mind, if you will extend or replace existing login modules.
+ </para>
+ </section><!-- Ending section with your own login module -->
+ <section id="sect-Authentication_Authorization_Intro-authenticatorAndRolesExtractor">
+ <title>Authenticator and RolesExtractor</title>
+ <para>
+ Authenticator is important component in authentication process. Actually interface <emphasis>org.exoplatform.services.security.Authenticator</emphasis> looks like this:
+ </para>
+ <programlisting language="Java" role="Java">
+<![CDATA[
+public interface Authenticator
+{
+
+ /**
+ * Authenticate user and return userId.
+ *
+ * @param credentials - list of users credentials (such as name/password, X509
+ * certificate etc)
+ * @return userId
+ */
+ String validateUser(Credential[] credentials) throws LoginException, Exception;
+
+ /**
+ * @param userId.
+ * @return Identity
+ */
+ Identity createIdentity(String userId) throws Exception;
+
+}
+ ]]>
+ </programlisting>
+ <para>
+ Method <emphasis>validateUser</emphasis> is used to check whether given credentials (username and password) are really valid.
+ So it performs real authentication. It returns back username if credentials are correct. Otherwise LoginException is thrown.
+ </para>
+ <para>
+ Method <emphasis>createIdentity</emphasis> is used to create instance of object <emphasis>org.exoplatform.services.security.Identity</emphasis>,
+ which encapsulates all important informations about single user like:
+ <step>username</step>
+ <step>set of Memberships (MembershipEntry objects) which user belongs to. <emphasis>Membership</emphasis> is object,
+ which contains informations about <emphasis>membershipType</emphasis> (manager, member, validator, ... ) and about <emphasis>group</emphasis> (/platform/users,
+ /platform/administrators, /partners, /organization/management/executiveBoard, ... ).
+ </step>
+ <step>
+ set of Strings with JAAS roles of given user. JAAS roles are simple Strings, which are mapped from MembershipEntry objects.
+ There is another special component <emphasis>org.exoplatform.services.security.RolesExtractor</emphasis>,
+ which is used to map JAAS roles from MembershipEntry objects. RolesExtractor interface looks like this:
+ </step>
+ </para>
+ <programlisting language="Java" role="Java">
+ <![CDATA[
+public interface RolesExtractor
+{
+
+ /**
+ * Extracts J2EE roles from userId and|or groups the user belongs to both
+ * parameters may be null
+ *
+ * @param userId
+ * @param memberships
+ */
+ Set<String> extractRoles(String userId, Set<MembershipEntry> memberships);
+}
+ ]]>
+ </programlisting>
+ <para>
+ Default implementation <emphasis>DefaultRolesExtractorImpl</emphasis> is based on special algorithm, which uses name of role from
+ the root of the group (for example for role "/organization/management/something" we have JAAS role "organization"). Only exception is group "platform" where
+ we use 2nd level as name of group. For example from group "/platform/users" we have JAAS role "users".
+ </para>
+ <para>
+ <emphasis role="bold">Example: </emphasis>
+ We have user <emphasis>root</emphasis>, which has memberships <emphasis>member:/platform/users</emphasis>, <emphasis>manager:/platform/administrators</emphasis>,
+ <emphasis>validator:/platform/managers</emphasis>, <emphasis>member:/partners</emphasis>, <emphasis>member:/customers/acme</emphasis>,
+ <emphasis>member:/organization/management/board</emphasis>.
+ In this case we will have JAAS roles: <emphasis>users</emphasis>, <emphasis>administrators</emphasis>, <emphasis>managers</emphasis>,
+ <emphasis>partners</emphasis>, <emphasis>customers</emphasis>, <emphasis>organization</emphasis>.
+ </para>
+ <para>
+ Default implementation of Authenticator is <emphasis>OrganizationAuthenticatorImpl</emphasis>, which is implementation based on
+ <emphasis>OrganizationService</emphasis>. See <xref linkend="sect-Reference_Guide-APIs-Organization_API"/> .
+ </para>
+ <para>
+ You can override default implementation of mentioned interfaces Authenticator and RolesExtractor if default behaviour is not suitable for your needs.
+ Consult documentation of <emphasis>eXo kernel</emphasis> for more info.
+ </para>
+ </section><!-- Ending section Authenticator and RolesExtractor -->
+ </section><!-- Ending section with login modules -->
+ <section id="sect-Authentication_Authorization_Intro-differentAuthWorkflows">
+ <title>Different authentication workflows</title>
+ <section id="sect-Authentication_Authorization_Intro-RememberMeAuthentication">
+ <title>RememberMe authentication</title>
+ <para>
+ In default login dialog, you can notice that there is "Remember my login" checkbox, which users can use to persist their login on his
+ workstation. Default validity period of RememberMe cookie is 1 day (it is configurable), and so user can be logged for whole day
+ before he need to reauthenticate again with his credentials.
+ </para>
+ <section id="sect-Authentication_Authorization_Intro-RememberMeAuthentication-howDoesItWork">
+ <title>How does it work</title>
+ <para>
+ <step>
+ User checks the checkbox "Remember my login" on login screen of &PRODUCT; . Then he submit the form.
+ </step>
+ <step>
+ HTTP request like <emphasis>http://localhost:8080/portal/login?initialURI=/portal/classic&usernam...</emphasis> is send to server
+ </step>
+ <step>
+ Request is processed by PortalLoginController servlet.
+ Servlet obtains instance of <emphasis>RemindPasswordTokenService</emphasis> and save user credentials into JCR. It generates and returns special token (key) for later use.
+ Then it creates cookie called <emphasis>rememberme</emphasis> and use returned token as value of cookie.
+ </step>
+ </para>
+ </section>
+ <section id="sect-Authentication_Authorization_Intro-RememberMeAuthentication-reauthentication">
+ <title>Reauthentication</title>
+ <para>
+ <step>After some time, user wants to reauthenticate. Let's assume that his HTTP Session is already expired but his RememberMe
+ cookie is still active.
+ </step>
+ <step>
+ User send HTTP request to some portal page (ie. <emphasis>http://localhost:8080/portal/classic</emphasis> ).
+ </step>
+ <step>
+ There is special HTTP Filter <emphasis role="bold">RememberMeFilter</emphasis> configured in web.xml, which checks
+ rememberme cookie and then it retrieves credentials of user from RemindPasswordTokenService. Now filter redirects request to
+ PortalLoginController and authentication process goes in same way as for normal FORM based authentication.
+ </step>
+ </para>
+ </section>
+ <section id="sect-Authentication_Authorization_Intro-RememberMeAuthentication-RemindPasswordTokenService">
+ <title>RemindPasswordTokenService</title>
+ <para>
+ This is special service used during RememberMe authentication workflow.
+ It's configurable in file <emphasis>deploy/gatein.ear/02portal.war/WEB-INF/conf/common/remindpwd-configuration.xml</emphasis> .
+ For more info, look at section <xref linkend="sect-Reference_Guide-Authentication_Token_Configuration" />
+ </para>
+ <para>
+ Another thing is that you can encrypt passwords before store them into JCR. More info is in section <xref linkend="sect-Reference_Guide-Authentication_and_Identity-Password_Encryption" />.
+ </para>
+ </section>
+ </section>
+ <section id="sect-Authentication_Authorization_Intro-BASICAuthentication">
+ <title>BASIC authentication</title>
+ <para>
+ &PRODUCT; is using FORM based authentication by default but it's not a problem with switch to different authentication type like BASIC.
+ Only needed thing is to configure it properly in <emphasis>deploy/gatein.ear/02portal.war/WEB-INF/web.xml</emphasis> like this:
+ </para>
+ <programlisting language="XML" role="XML">
+ <![CDATA[
+<!--
+ <login-config>
+ <auth-method>FORM</auth-method>
+ <realm-name>gatein-domain</realm-name>
+ <form-login-config>
+ <form-login-page>/initiatelogin</form-login-page>
+ <form-error-page>/errorlogin</form-error-page>
+ </form-login-config>
+ </login-config>
+-->
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>gatein-domain</realm-name>
+ </login-config
+ ]]>
+ </programlisting>
+ <para>
+ In this case user will see login dialog from browser instead of GateIn login.jsp page. JAAS authentication will be performed with
+ real credentials of user (ie. <emphasis>root</emphasis>/<emphasis>gtn</emphasis>). WCI ticket is not used with BASIC authentication.
+ </para>
+ </section>
+ <section id="sect-Authentication_Authorization_Intro-ClusterLogin">
+ <title>Cluster login</title>
+ <para>
+ &PRODUCT; supports automatic login propagation in cluster environment. Cluster login relies on HTTP session replication.
+ It's useful for situations like this:
+ </para>
+ <procedure>
+ <step>
+ <para>
+ You have Apache loadbalancer and two portal nodes <emphasis>node1</emphasis> and <emphasis>node2</emphasis>
+ </para>
+ </step>
+ <step>
+ <para>
+ User will send request to loadbalancer and he will be redirected to node1. All his requests will be then processed on node1 (sticky session).
+ </para>
+ </step>
+ <step>
+ <para>
+ User login on loadbalancer (which is redirected to node1)
+ </para>
+ </step>
+ <step>
+ <para>
+ node1 is killed
+ </para>
+ </step>
+ <step>
+ <para>
+ User will send another HTTP request. He will now be redirected to node2 because node1 is killed. Now user will be
+ automatically logged on node2 as well thanks to session replication, because he still has same HTTP session, which was
+ replicated from node1 to node2. So end user shouldn't recognize any change even if his work is now done on different node of
+ cluster.
+ </para>
+ </step>
+ </procedure>
+ <para>
+ This login workflow works thanks to <emphasis>PortalLoginModule</emphasis>, which is able to save special attribute into HTTP session as
+ flag that user is already logged. Then reauthentication on node2 is working thanks to servlet filter <emphasis>ClusteredSSOFilter</emphasis>,
+ which is able to automatically trigger programmatic authentication.
+ </para>
+ <note>
+ ClusteredSSOFilter is using proprietary JBossWeb API for trigger programmatic authentication and so it's working only on JBoss AS.
+ It is not working on other servers like Tomcat or Jetty.
+ </note>
+ <para>
+ There is also possibility for integration with JBoss clustered SSO valve (See <xref linkend="sect-Reference_Guide_eXo_JCR_1.14-SSO_Single_Sign_On-Enabling_SSO_using_JBoss_SSO_Valve" />).
+ </para>
+ </section>
+ <section id="sect-Authentication_Authorization_Intro-SSOLogin">
+ <title>SSO login</title>
+ <para>
+ &PRODUCT; also supports integration with couple of well-known SSO frameworks (CAS, JOSSO, OpenSSO). When user wants login, he is not
+ redirected to portal login form but to SSO server login form. After successful login with SSO server,
+ he gains ticket represented by special cookie (name of cookie differs for each SSO server). Then user is redirected back to &PRODUCT;,
+ where we need to perform agent validation of SSO ticket against SSO server. We still need to create Identity object and bind it to
+ IdentityRegistry (this is same as in default authentication), which is done thanks to Authenticator component.
+ </para>
+ <para>
+ In other words, you need to ensure that users, which are logged successfuly through SSO, needs to be also in &PRODUCT; identity
+ database because SSO server is used only for authentication, but authorization is handled completely by &PRODUCT;, which assumes that
+ user exists in portal DB. If users are not in DB, Identity object won't be
+ created and you will have 403 Forbidden errors even if you authenticate successfuly. For details about SSO integration,
+ see <xref linkend="chap-Reference_Guide-SSO_Single_Sign_On" />.
+ </para>
+ <para>
+ Same applies for SPNEGO authentication (See <xref linkend="Single_Sign_On-SPNEGO" />). In this case, you need to ensure that your
+ Kerberos users are also created in &PRODUCT; database.
+ </para>
+ </section>
+ </section><!-- Ending section different authentication workflows -->
+ <section id="sect-Authentication_Authorization_Intro-authorization">
+ <title>Authorization overview</title>
+ <para>
+ In previous section, we learned about JAAS authentication and about login modules. So we know that result of authentication are:
+ <step>
+ JAAS Subject with principals for username (UserPrincipal) and for JAAS roles (RolesPrincipal).
+ </step>
+ <step>
+ Identity object, which encapsulates username, all memberships and all JAAS roles. This Identity object is bound to IdentityRegistry component.
+ </step>
+ </para>
+ <para>
+ Authorization in &PRODUCT; actually happens on two levels:
+ </para>
+ <section id="sect-Authentication_Authorization_Intro-servletContainerAuthorization">
+ <title>Servlet container authorization</title>
+ <para>
+ First round of authorization is servlet container authorization based on secured URL from <emphasis>web.xml</emphasis>. We saw above in
+ web.xml snippet that secured URL are accessible only for users from role <emphasis>users</emphasis>:
+ </para>
+ <programlisting language="XML" role="XML">
+ <![CDATA[
+ <auth-constraint>
+ <role-name>users</role-name>
+ </auth-constraint>
+ ]]>
+ </programlisting>
+ <para>
+ This actually means that our user needs to be in &PRODUCT; role <emphasis>/platform/users</emphasis> (For details see <xref linkend="sect-Authentication_Authorization_Intro-authenticatorAndRolesExtractor" />).
+ In other words, if we successfuly authenticate but our user is not in group /platform/users, then it means that he is not in
+ JAAS role <emphasis>users</emphasis>, which in next turn means that he will have authorization error <emphasis role="bold">403 Forbidden</emphasis> thrown by servlet container.
+ </para>
+ <para>
+ You can change the behaviour and possibly add some more <emphasis>auth-constraint</emphasis> elements into web.xml. However this
+ protection of resources based on web.xml is not standard &PRODUCT; way and it's mentioned here mainly for illustration purposes.
+ </para>
+ </section>
+ <section id="sect-Authentication_Authorization_Intro-gateInAuthorization">
+ <title>Portal level authorization</title>
+ <para>
+ Second round of authorization is based on component <emphasis role="bold">UserACL</emphasis> (See <xref linkend="sect-Reference_Guide-Portal_Default_Permission_Configuration" />).
+ We can declare access and edit permissions for portals, pages and/or portlets. UserACL is then used to check if our user has particular permissions to access or edit specified resource.
+ Important object with informations about roles of our user is mentioned <emphasis>Identity</emphasis> object created during JAAS authentication.
+ </para>
+ <para>
+ Authorization on portal level looks like this:
+ <step>user send HTTP request to some URL in portal</step>
+ <step>
+ HTTP request is processed through <emphasis role="bold">SetCurrentIdentityFilter</emphasis>, which is declared in
+ <emphasis>deploy/gatein.ear/02portal.war/WEB-INF/web.xml</emphasis>.
+ </step>
+ <step>
+ SetCurrentIdentityFilter reads username of current user from <emphasis>HttpServletRequest.getRemoteUser()</emphasis>.
+ Then it looks for Identity of this user in IdentityRegistry, where Identity has been saved during authentication.
+ Found Identity is then encapsulated into <emphasis role="bold">ConversationState</emphasis> object and bound into ThreadLocal variable.
+ </step>
+ <step>
+ UserACL is able to obtain Identity of current user from method <emphasis>UserACL.getIdentity()</emphasis>, which simply calls
+ <emphasis>ConversationState.getCurrent().getIdentity()</emphasis> for find current Identity bound to ThreadLocal.
+ Now UserACL has identity of user and so that it can performs any security checks.
+ </step>
+ </para>
+ </section>
+ </section><!-- Ending section Authorization overview -->
+</section>
+
Modified: portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity.xml
===================================================================
--- portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity.xml 2011-12-20 09:06:07 UTC (rev 8260)
+++ portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity.xml 2011-12-20 17:46:03 UTC (rev 8261)
@@ -5,6 +5,7 @@
]>
<chapter id="chap-Reference_Guide-Authentication_And_Identity">
<title>Authentication and Identity</title>
+ <xi:include href="AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="AuthenticationAndIdentity/PasswordEncryption.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="AuthenticationAndIdentity/PredefinedUserConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
13 years
- 1
- 0
gatein SVN: r8260 - in components/wci/trunk: test/core/src/main/resources/org/gatein/portal/test/web/endpoint and 1 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2011-12-20 04:06:07 -0500 (Tue, 20 Dec 2011)
New Revision: 8260
Added:
components/wci/trunk/test/core/src/main/java/org/gatein/wci/endpoint/LoginControllerTestCase.java
Modified:
components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/endpoint/server-beans.xml
components/wci/trunk/wci/src/main/java/org/gatein/wci/security/WCILoginController.java
Log:
GTNWCI-28 Protectet methods in WCILoginController for dealing with credentials
Added: components/wci/trunk/test/core/src/main/java/org/gatein/wci/endpoint/LoginControllerTestCase.java
===================================================================
--- components/wci/trunk/test/core/src/main/java/org/gatein/wci/endpoint/LoginControllerTestCase.java (rev 0)
+++ components/wci/trunk/test/core/src/main/java/org/gatein/wci/endpoint/LoginControllerTestCase.java 2011-12-20 09:06:07 UTC (rev 8260)
@@ -0,0 +1,133 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2011, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.gatein.wci.endpoint;
+
+import org.gatein.wci.TestServlet;
+import org.gatein.wci.WebRequest;
+import org.gatein.wci.WebResponse;
+import org.gatein.wci.security.Credentials;
+import org.gatein.wci.security.WCILoginController;
+import org.jboss.unit.Failure;
+import org.jboss.unit.driver.DriverCommand;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.driver.response.FailureResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.jboss.unit.api.Assert.assertEquals;
+import static org.jboss.unit.api.Assert.assertNotNull;
+import static org.jboss.unit.api.Assert.assertNull;
+
+/**
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class LoginControllerTestCase extends EndPointTestCase
+{
+ private final TestWCILoginController wciLoginController = new TestWCILoginController();
+
+ @Override
+ public DriverResponse service(TestServlet testServlet, WebRequest req, WebResponse resp) throws ServletException, IOException
+ {
+ if (getRequestCount() == 0)
+ {
+ // Test that credentials are not set
+ assertNull("Credentials should be null before first invocation of WCILoginController", wciLoginController.getCredentials(req));
+
+ // Processing request with wciLoginController
+ wciLoginController.service(req, resp);
+
+ // Test that credentials are set at this moment and are equalst to "root"/"gtn"
+ Credentials credentials = wciLoginController.getCredentials(req);
+ testCredentials(credentials, "root", "gtn");
+
+ // Test that we can change credentials by invoke of setCredentials
+ Credentials johnCredentials = new Credentials("john", "johnPassword");
+ wciLoginController.setCredentials(req, johnCredentials);
+ testCredentials(wciLoginController.getCredentials(req), "john", "johnPassword");
+
+ // Use mary credentials for next request
+ Map<String, String[]> params = new HashMap<String, String[]>();
+ params.put("username", new String[]{"mary"});
+ params.put("password", new String[]{"maryPassword"});
+ String url = resp.renderURL("/", params, null);
+ return new InvokeGetResponse(url);
+ }
+ else if (getRequestCount() == 1)
+ {
+ // Test that we still have credentials of john
+ testCredentials(wciLoginController.getCredentials(req), "john", "johnPassword");
+
+ // Test that we have credentials of mary after processing request
+ wciLoginController.service(req, resp);
+ testCredentials(wciLoginController.getCredentials(req), "mary", "maryPassword");
+
+ return new EndTestResponse();
+ }
+
+ return new FailureResponse(Failure.createAssertionFailure("End test reached"));
+ }
+
+ @Override
+ public DriverResponse invoke(TestServlet testServlet, DriverCommand driverCommand)
+ {
+ if (getRequestCount() == -1)
+ {
+ return new InvokeGetResponse(rewriteURL(testServlet, "/?username=root&password=gtn"));
+ }
+ else
+ {
+ return new FailureResponse(Failure.createAssertionFailure(""));
+ }
+ }
+
+ private void testCredentials(Credentials credentials, String expectedUsername, String expectedPassword)
+ {
+ assertNotNull("Credentials should not be null", credentials);
+ assertEquals(credentials.getUsername(), expectedUsername);
+ assertEquals(credentials.getPassword(), expectedPassword);
+ }
+
+ // This subclass is needed for access to protected methods getCredentials and setCredentials of WCILoginController
+ private class TestWCILoginController extends WCILoginController
+ {
+
+ @Override
+ protected Credentials getCredentials(HttpServletRequest req)
+ {
+ return super.getCredentials(req);
+ }
+
+ @Override
+ protected void setCredentials(HttpServletRequest req, Credentials credentials)
+ {
+ super.setCredentials(req, credentials);
+ }
+ }
+}
Modified: components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/endpoint/server-beans.xml
===================================================================
--- components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/endpoint/server-beans.xml 2011-12-18 21:14:23 UTC (rev 8259)
+++ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/endpoint/server-beans.xml 2011-12-20 09:06:07 UTC (rev 8260)
@@ -102,5 +102,14 @@
</uninstall>
</bean>
+ <bean name="LoginControllerTestCase" class="org.gatein.wci.endpoint.LoginControllerTestCase">
+ <install bean="TestSuite" method="mount">
+ <parameter><this/></parameter>
+ </install>
+ <uninstall bean="TestSuite" method="unmount">
+ <parameter><this/></parameter>
+ </uninstall>
+ </bean>
+
</deployment>
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/security/WCILoginController.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/security/WCILoginController.java 2011-12-18 21:14:23 UTC (rev 8259)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/security/WCILoginController.java 2011-12-20 09:06:07 UTC (rev 8260)
@@ -43,7 +43,7 @@
String password = req.getParameter("password");
if (
- req.getSession().getAttribute(Credentials.CREDENTIALS) != null
+ getCredentials(req) != null
&& username == null
&& password == null
) return;
@@ -52,9 +52,9 @@
if (username != null && password != null)
{
- log.debug("Found username and password and set credentials in http session");
+ log.debug("Found username and password. Save credentials for later use.");
Credentials credentials = new Credentials(username, password);
- req.getSession().setAttribute(Credentials.CREDENTIALS, credentials);
+ setCredentials(req, credentials);
}
}
@@ -62,4 +62,14 @@
{
doGet(req, resp);
}
+
+ protected Credentials getCredentials(HttpServletRequest req)
+ {
+ return (Credentials)req.getSession().getAttribute(Credentials.CREDENTIALS);
+ }
+
+ protected void setCredentials(HttpServletRequest req, Credentials credentials)
+ {
+ req.getSession().setAttribute(Credentials.CREDENTIALS, credentials);
+ }
}
13 years
- 1
- 0