[exo-jcr-commits] exo-jcr SVN: r5758 - in kernel/branches: 2.3.6-GA-JBAS7 and 15 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Sat Mar 3 02:25:01 EST 2012


Author: tolusha
Date: 2012-03-03 02:24:58 -0500 (Sat, 03 Mar 2012)
New Revision: 5758

Added:
   kernel/branches/2.3.6-GA-JBAS7/
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons.test/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.cache/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.command/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.common/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.container/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/packaging/module/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/pom.xml
Removed:
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons.test/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.cache/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.command/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.common/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.container/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/packaging/module/pom.xml
   kernel/branches/2.3.6-GA-JBAS7/pom.xml
Log:
[maven-release-plugin]  copy for branch 2.3.6-GA-JBAS7

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.commons/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,116 +0,0 @@
-
-   <!--
-
-      Copyright (C) 2009 eXo Platform SAS. 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.
-   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>kernel-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-
-   <artifactId>exo.kernel.commons</artifactId>
-
-   <name>eXo Kernel :: Commons Utils</name>
-   <description>eXo Commons</description>
-
-   <dependencies>
-      <dependency>
-         <groupId>eu.medsea.mimeutil</groupId>
-         <artifactId>mime-util</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>xpp3</groupId>
-         <artifactId>xpp3</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>commons-logging</groupId>
-         <artifactId>commons-logging</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-api</artifactId>
-         <scope>compile</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>log4j</groupId>
-         <artifactId>log4j</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons.test</artifactId>
-      </dependency>
-   </dependencies>
-
-   <build>
-      <testResources>
-         <testResource>
-            <directory>src/test/resources</directory>
-            <includes>
-               <include>**/*.properties</include>
-               <include>**/test*</include>
-            </includes>
-         </testResource>
-      </testResources>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-            </configuration>
-         </plugin>
-         <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>prepare-test-policy</id>
-                  <phase>process-test-resources</phase>
-                  <configuration>
-                     <tasks>
-                        <echo>Creating Access Policy for tests</echo>
-                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
-                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
-                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
-                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
-                           <fileset dir="${project.basedir}/src/test/resources/">
-                              <include name="test.policy" />
-                           </fileset>
-                           <filterset>
-                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
-                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
-                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
-                           </filterset>
-                        </copy>
-                     </tasks>
-                  </configuration>
-                  <goals>
-                     <goal>run</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <dependencies>
-               <dependency>
-                  <groupId>ant</groupId>
-                  <artifactId>ant-optional</artifactId>
-                  <version>1.5.3-1</version>
-               </dependency>
-            </dependencies>
-         </plugin>
-      </plugins>
-   </build>
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.commons/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,116 @@
+
+   <!--
+
+      Copyright (C) 2009 eXo Platform SAS. 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.
+   -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>kernel-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>exo.kernel.commons</artifactId>
+
+   <name>eXo Kernel :: Commons Utils</name>
+   <description>eXo Commons</description>
+
+   <dependencies>
+      <dependency>
+         <groupId>eu.medsea.mimeutil</groupId>
+         <artifactId>mime-util</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>xpp3</groupId>
+         <artifactId>xpp3</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>commons-logging</groupId>
+         <artifactId>commons-logging</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
+         <scope>compile</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-log4j12</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>log4j</groupId>
+         <artifactId>log4j</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons.test</artifactId>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <testResources>
+         <testResource>
+            <directory>src/test/resources</directory>
+            <includes>
+               <include>**/*.properties</include>
+               <include>**/test*</include>
+            </includes>
+         </testResource>
+      </testResources>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+            </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>prepare-test-policy</id>
+                  <phase>process-test-resources</phase>
+                  <configuration>
+                     <tasks>
+                        <echo>Creating Access Policy for tests</echo>
+                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
+                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
+                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
+                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
+                           <fileset dir="${project.basedir}/src/test/resources/">
+                              <include name="test.policy" />
+                           </fileset>
+                           <filterset>
+                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
+                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
+                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
+                           </filterset>
+                        </copy>
+                     </tasks>
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>ant</groupId>
+                  <artifactId>ant-optional</artifactId>
+                  <version>1.5.3-1</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+      </plugins>
+   </build>
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons.test/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.commons.test/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons.test/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,27 +0,0 @@
-
-   <!--
-
-      Copyright (C) 2009 eXo Platform SAS. 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.
-   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>kernel-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-
-   <artifactId>exo.kernel.commons.test</artifactId>
-
-   <name>eXo Kernel :: Commons :: Test Util</name>
-   <description>eXo Commons Test Util</description>
-
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons.test/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.commons.test/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons.test/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.commons.test/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,27 @@
+
+   <!--
+
+      Copyright (C) 2009 eXo Platform SAS. 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.
+   -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>kernel-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>exo.kernel.commons.test</artifactId>
+
+   <name>eXo Kernel :: Commons :: Test Util</name>
+   <description>eXo Commons Test Util</description>
+
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.component.cache/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.cache/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,107 +0,0 @@
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-
-    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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>kernel-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-
-   <artifactId>exo.kernel.component.cache</artifactId>
-
-   <name>eXo Kernel :: Component :: Cache Service</name>
-   <description>exoplatform Cache services implementation</description>
-
-   <dependencies>
-      <dependency>
-         <groupId>org.exoplatform.tool</groupId>
-         <artifactId>exo.tool.framework.junit</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.container</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons.test</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
-      </dependency>       
-   </dependencies>
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-            </configuration>
-         </plugin>
-         <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>prepare-test-policy</id>
-                  <phase>process-test-resources</phase>
-                  <configuration>
-                     <tasks>
-                        <echo>Creating Access Policy for tests</echo>
-                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
-                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
-                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
-                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
-                           <fileset dir="${project.basedir}/src/test/resources/">
-                              <include name="test.policy" />
-                           </fileset>
-                           <filterset>
-                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
-                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
-                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
-                           </filterset>
-                        </copy>
-                     </tasks>                     
-                  </configuration>
-                  <goals>
-                     <goal>run</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <dependencies>
-               <dependency>
-                  <groupId>ant</groupId>
-                  <artifactId>ant-optional</artifactId>
-                  <version>1.5.3-1</version>
-               </dependency>
-            </dependencies>
-         </plugin>
-      </plugins>
-   </build>
-
-</project>
\ No newline at end of file

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.cache/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.component.cache/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.cache/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.cache/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,107 @@
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>kernel-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>exo.kernel.component.cache</artifactId>
+
+   <name>eXo Kernel :: Component :: Cache Service</name>
+   <description>exoplatform Cache services implementation</description>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.exoplatform.tool</groupId>
+         <artifactId>exo.tool.framework.junit</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.container</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons.test</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-log4j12</artifactId>
+      </dependency>       
+   </dependencies>
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+            </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>prepare-test-policy</id>
+                  <phase>process-test-resources</phase>
+                  <configuration>
+                     <tasks>
+                        <echo>Creating Access Policy for tests</echo>
+                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
+                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
+                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
+                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
+                           <fileset dir="${project.basedir}/src/test/resources/">
+                              <include name="test.policy" />
+                           </fileset>
+                           <filterset>
+                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
+                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
+                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
+                           </filterset>
+                        </copy>
+                     </tasks>                     
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>ant</groupId>
+                  <artifactId>ant-optional</artifactId>
+                  <version>1.5.3-1</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+      </plugins>
+   </build>
+
+</project>
\ No newline at end of file

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.component.command/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.command/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,121 +0,0 @@
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-
-    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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>kernel-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-
-   <artifactId>exo.kernel.component.command</artifactId>
-
-   <name>eXo Kernel :: Component :: Command Service</name>
-   <description>exoplatform command services implementation</description>
-
-   <dependencies>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.container</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons.test</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>commons-chain</groupId>
-         <artifactId>commons-chain</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>xml-apis</groupId>
-               <artifactId>xml-apis</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-      <dependency>
-         <groupId>commons-digester</groupId>
-         <artifactId>commons-digester</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>xml-apis</groupId>
-         <artifactId>xml-apis</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
-         <scope>test</scope>
-      </dependency>
-   </dependencies>
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-            </configuration>
-         </plugin>
-         <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>prepare-test-policy</id>
-                  <phase>process-test-resources</phase>
-                  <configuration>
-                     <tasks>
-                        <echo>Creating Access Policy for tests</echo>
-                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
-                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
-                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
-                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
-                           <fileset dir="${project.basedir}/src/test/resources/">
-                              <include name="test.policy" />
-                           </fileset>
-                           <filterset>
-                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
-                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
-                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
-                           </filterset>
-                        </copy>
-                     </tasks>                     
-                  </configuration>
-                  <goals>
-                     <goal>run</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <dependencies>
-               <dependency>
-                  <groupId>ant</groupId>
-                  <artifactId>ant-optional</artifactId>
-                  <version>1.5.3-1</version>
-               </dependency>
-            </dependencies>
-         </plugin>
-      </plugins>
-   </build>
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.command/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.component.command/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.command/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.command/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,121 @@
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>kernel-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>exo.kernel.component.command</artifactId>
+
+   <name>eXo Kernel :: Component :: Command Service</name>
+   <description>exoplatform command services implementation</description>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.container</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons.test</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>commons-chain</groupId>
+         <artifactId>commons-chain</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>xml-apis</groupId>
+               <artifactId>xml-apis</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+      <dependency>
+         <groupId>commons-digester</groupId>
+         <artifactId>commons-digester</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>xml-apis</groupId>
+         <artifactId>xml-apis</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-log4j12</artifactId>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+            </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>prepare-test-policy</id>
+                  <phase>process-test-resources</phase>
+                  <configuration>
+                     <tasks>
+                        <echo>Creating Access Policy for tests</echo>
+                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
+                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
+                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
+                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
+                           <fileset dir="${project.basedir}/src/test/resources/">
+                              <include name="test.policy" />
+                           </fileset>
+                           <filterset>
+                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
+                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
+                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
+                           </filterset>
+                        </copy>
+                     </tasks>                     
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>ant</groupId>
+                  <artifactId>ant-optional</artifactId>
+                  <version>1.5.3-1</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+      </plugins>
+   </build>
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.component.common/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.common/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,176 +0,0 @@
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-
-    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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>kernel-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-
-   <artifactId>exo.kernel.component.common</artifactId>
-
-   <name>eXo Kernel :: Component :: Common Service</name>
-   <description>exoplatform common services implementation</description>
-
-   <dependencies>
-      <dependency>
-         <groupId>org.exoplatform.tool</groupId>
-         <artifactId>exo.tool.framework.junit</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.container</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons.test</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>javax.activation</groupId>
-         <artifactId>activation</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
-      </dependency>      
-      <dependency>
-         <groupId>xpp3</groupId>
-         <artifactId>xpp3</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.ow2.jotm</groupId>
-         <artifactId>jotm-core</artifactId>
-         <scope>provided</scope>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.resource</groupId>
-               <artifactId>connector</artifactId>
-            </exclusion>
-            <exclusion>
-               <groupId>log4j</groupId>
-               <artifactId>log4j</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-      <dependency>
-         <groupId>javax.resource</groupId>
-         <artifactId>connector-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>quartz</groupId>
-         <artifactId>quartz</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>picocontainer</groupId>
-         <artifactId>picocontainer</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>javax.mail</groupId>
-         <artifactId>mail</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>javax.transaction</groupId>
-         <artifactId>jta</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jgroups</groupId>
-         <artifactId>jgroups</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>com.atomikos</groupId>
-         <artifactId>transactions-jta</artifactId>
-         <scope>provided</scope>
-      </dependency>
-   </dependencies>
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-                <systemProperties>
-                  <!-- We add this system property due to some incompatibility between IPv6 and 
-                  some JVM of Linux distributions such as Ubuntu and Fedora-->
-                  <property>
-                     <name>java.net.preferIPv4Stack</name>
-                     <value>true</value>
-                  </property>
-                  <!-- Avoid the firewall -->
-                  <property>
-                     <name>bind.address</name>
-                     <value>127.0.0.1</value>
-                  </property>
-                  <property>
-                     <name>jgroups.stack</name>
-                     <value>udp</value>
-                  </property>
-               </systemProperties>
-            </configuration>
-         </plugin>
-         <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>prepare-test-policy</id>
-                  <phase>process-test-resources</phase>
-                  <configuration>
-                     <tasks>
-                        <echo>Creating Access Policy for tests</echo>
-                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
-                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
-                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
-                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
-                           <fileset dir="${project.basedir}/src/test/resources/">
-                              <include name="test.policy" />
-                           </fileset>
-                           <filterset>
-                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
-                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
-                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
-                           </filterset>
-                        </copy>
-                     </tasks>                     
-                  </configuration>
-                  <goals>
-                     <goal>run</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <dependencies>
-               <dependency>
-                  <groupId>ant</groupId>
-                  <artifactId>ant-optional</artifactId>
-                  <version>1.5.3-1</version>
-               </dependency>
-            </dependencies>
-         </plugin>
-      </plugins>
-   </build>
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.common/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.component.common/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.common/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.common/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,176 @@
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>kernel-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>exo.kernel.component.common</artifactId>
+
+   <name>eXo Kernel :: Component :: Common Service</name>
+   <description>exoplatform common services implementation</description>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.exoplatform.tool</groupId>
+         <artifactId>exo.tool.framework.junit</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.container</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons.test</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.activation</groupId>
+         <artifactId>activation</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-log4j12</artifactId>
+      </dependency>      
+      <dependency>
+         <groupId>xpp3</groupId>
+         <artifactId>xpp3</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.ow2.jotm</groupId>
+         <artifactId>jotm-core</artifactId>
+         <scope>provided</scope>
+         <exclusions>
+            <exclusion>
+               <groupId>javax.resource</groupId>
+               <artifactId>connector</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>log4j</groupId>
+               <artifactId>log4j</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+      <dependency>
+         <groupId>javax.resource</groupId>
+         <artifactId>connector-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>quartz</groupId>
+         <artifactId>quartz</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>picocontainer</groupId>
+         <artifactId>picocontainer</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.mail</groupId>
+         <artifactId>mail</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.transaction</groupId>
+         <artifactId>jta</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jgroups</groupId>
+         <artifactId>jgroups</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>com.atomikos</groupId>
+         <artifactId>transactions-jta</artifactId>
+         <scope>provided</scope>
+      </dependency>
+   </dependencies>
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+                <systemProperties>
+                  <!-- We add this system property due to some incompatibility between IPv6 and 
+                  some JVM of Linux distributions such as Ubuntu and Fedora-->
+                  <property>
+                     <name>java.net.preferIPv4Stack</name>
+                     <value>true</value>
+                  </property>
+                  <!-- Avoid the firewall -->
+                  <property>
+                     <name>bind.address</name>
+                     <value>127.0.0.1</value>
+                  </property>
+                  <property>
+                     <name>jgroups.stack</name>
+                     <value>udp</value>
+                  </property>
+               </systemProperties>
+            </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>prepare-test-policy</id>
+                  <phase>process-test-resources</phase>
+                  <configuration>
+                     <tasks>
+                        <echo>Creating Access Policy for tests</echo>
+                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
+                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
+                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
+                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
+                           <fileset dir="${project.basedir}/src/test/resources/">
+                              <include name="test.policy" />
+                           </fileset>
+                           <filterset>
+                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
+                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
+                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
+                           </filterset>
+                        </copy>
+                     </tasks>                     
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>ant</groupId>
+                  <artifactId>ant-optional</artifactId>
+                  <version>1.5.3-1</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+      </plugins>
+   </build>
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,112 +0,0 @@
-
-<!-- Copyright (C) 2009 eXo Platform SAS. 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.exoplatform.kernel</groupId>
-		<artifactId>kernel-parent</artifactId>
-		<version>2.3.6-GA</version>
-	</parent>
-	<artifactId>exo.kernel.component.ext.cache.impl.infinispan.v5</artifactId>
-	<name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name>
-	<description>Infinispan Implementation for the Cache Service</description>
-	<dependencies>
-		<dependency>
-			<groupId>org.exoplatform.kernel</groupId>
-			<artifactId>exo.kernel.commons.test</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.exoplatform.kernel</groupId>
-			<artifactId>exo.kernel.component.cache</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.exoplatform.kernel</groupId>
-			<artifactId>exo.kernel.component.common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.infinispan</groupId>
-			<artifactId>infinispan-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jgroups</groupId>
-			<artifactId>jgroups</artifactId>
-			<version>3.0.4.Final</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-					<systemProperties>
-						<!-- We add this system property due to some incompatibility between IPv6 and some JVM of Linux distributions such as Ubuntu and Fedora -->
-						<property>
-							<name>java.net.preferIPv4Stack</name>
-							<value>true</value>
-						</property>
-						<!-- Avoid the firewall -->
-						<property>
-							<name>jgroups.bind_addr</name>
-							<value>127.0.0.1</value>
-						</property>
-					</systemProperties>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>prepare-test-policy</id>
-						<phase>process-test-resources</phase>
-						<configuration>
-							<tasks>
-								<echo>Creating Access Policy for tests</echo>
-								<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
-								<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
-								<makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
-								<copy todir="${project.build.testOutputDirectory}" overwrite="true">
-									<fileset dir="${project.basedir}/src/test/resources/">
-										<include name="test.policy" />
-									</fileset>
-									<filterset>
-										<filter token="MAVEN_REPO" value="${localRepositoryURL}" />
-										<filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
-										<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
-									</filterset>
-								</copy>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>ant</groupId>
-						<artifactId>ant-optional</artifactId>
-						<version>1.5.3-1</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-	</build>
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,112 @@
+
+<!-- Copyright (C) 2009 eXo Platform SAS. 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.exoplatform.kernel</groupId>
+		<artifactId>kernel-parent</artifactId>
+		<version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+	</parent>
+	<artifactId>exo.kernel.component.ext.cache.impl.infinispan.v5</artifactId>
+	<name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name>
+	<description>Infinispan Implementation for the Cache Service</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.exoplatform.kernel</groupId>
+			<artifactId>exo.kernel.commons.test</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.exoplatform.kernel</groupId>
+			<artifactId>exo.kernel.component.cache</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.exoplatform.kernel</groupId>
+			<artifactId>exo.kernel.component.common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.infinispan</groupId>
+			<artifactId>infinispan-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jgroups</groupId>
+			<artifactId>jgroups</artifactId>
+			<version>3.0.4.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+					<systemProperties>
+						<!-- We add this system property due to some incompatibility between IPv6 and some JVM of Linux distributions such as Ubuntu and Fedora -->
+						<property>
+							<name>java.net.preferIPv4Stack</name>
+							<value>true</value>
+						</property>
+						<!-- Avoid the firewall -->
+						<property>
+							<name>jgroups.bind_addr</name>
+							<value>127.0.0.1</value>
+						</property>
+					</systemProperties>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>prepare-test-policy</id>
+						<phase>process-test-resources</phase>
+						<configuration>
+							<tasks>
+								<echo>Creating Access Policy for tests</echo>
+								<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
+								<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
+								<makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
+								<copy todir="${project.build.testOutputDirectory}" overwrite="true">
+									<fileset dir="${project.basedir}/src/test/resources/">
+										<include name="test.policy" />
+									</fileset>
+									<filterset>
+										<filter token="MAVEN_REPO" value="${localRepositoryURL}" />
+										<filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
+										<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
+									</filterset>
+								</copy>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>ant</groupId>
+						<artifactId>ant-optional</artifactId>
+						<version>1.5.3-1</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,134 +0,0 @@
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-
-    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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>kernel-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-   <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
-   <name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name>
-   <description>JBoss Cache Implementation for the Cache Service</description>
-   <dependencies>
-      <dependency>
-         <groupId>org.exoplatform.tool</groupId>
-         <artifactId>exo.tool.framework.junit</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons.test</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.container</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.component.cache</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.cache</groupId>
-         <artifactId>jbosscache-core</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jgroups</groupId>
-         <artifactId>jgroups</artifactId>
-      </dependency>             
-   </dependencies>
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-               <systemProperties>
-                  <!-- We add this system property due to some incompatibility between IPv6 and 
-                  some JVM of Linux distributions such as Ubuntu and Fedora-->
-                  <property>
-                     <name>java.net.preferIPv4Stack</name>
-                     <value>true</value>
-                  </property>
-                  <!-- Avoid the firewall -->
-                  <property>
-                     <name>bind.address</name>
-                     <value>127.0.0.1</value>
-                  </property>
-                  <property>
-                     <name>jgroups.stack</name>
-                     <value>udp</value>
-                  </property>
-                  <property>
-                     <name>allow.shareable.cache</name>
-                     <value>true</value>
-                  </property>
-               </systemProperties>
-            </configuration>
-         </plugin>
-         <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>prepare-test-policy</id>
-                  <phase>process-test-resources</phase>
-                  <configuration>
-                     <tasks>
-                        <echo>Creating Access Policy for tests</echo>
-                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
-                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
-                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
-                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
-                           <fileset dir="${project.basedir}/src/test/resources/">
-                              <include name="test.policy" />
-                           </fileset>
-                           <filterset>
-                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
-                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
-                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
-                           </filterset>
-                        </copy>
-                     </tasks>                     
-                  </configuration>
-                  <goals>
-                     <goal>run</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <dependencies>
-               <dependency>
-                  <groupId>ant</groupId>
-                  <artifactId>ant-optional</artifactId>
-                  <version>1.5.3-1</version>
-               </dependency>
-            </dependencies>
-         </plugin>
-      </plugins>
-   </build>
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,134 @@
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>kernel-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+   <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
+   <name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name>
+   <description>JBoss Cache Implementation for the Cache Service</description>
+   <dependencies>
+      <dependency>
+         <groupId>org.exoplatform.tool</groupId>
+         <artifactId>exo.tool.framework.junit</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons.test</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.container</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.component.cache</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.cache</groupId>
+         <artifactId>jbosscache-core</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-log4j12</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jgroups</groupId>
+         <artifactId>jgroups</artifactId>
+      </dependency>             
+   </dependencies>
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+               <systemProperties>
+                  <!-- We add this system property due to some incompatibility between IPv6 and 
+                  some JVM of Linux distributions such as Ubuntu and Fedora-->
+                  <property>
+                     <name>java.net.preferIPv4Stack</name>
+                     <value>true</value>
+                  </property>
+                  <!-- Avoid the firewall -->
+                  <property>
+                     <name>bind.address</name>
+                     <value>127.0.0.1</value>
+                  </property>
+                  <property>
+                     <name>jgroups.stack</name>
+                     <value>udp</value>
+                  </property>
+                  <property>
+                     <name>allow.shareable.cache</name>
+                     <value>true</value>
+                  </property>
+               </systemProperties>
+            </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>prepare-test-policy</id>
+                  <phase>process-test-resources</phase>
+                  <configuration>
+                     <tasks>
+                        <echo>Creating Access Policy for tests</echo>
+                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
+                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
+                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
+                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
+                           <fileset dir="${project.basedir}/src/test/resources/">
+                              <include name="test.policy" />
+                           </fileset>
+                           <filterset>
+                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
+                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
+                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
+                           </filterset>
+                        </copy>
+                     </tasks>                     
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>ant</groupId>
+                  <artifactId>ant-optional</artifactId>
+                  <version>1.5.3-1</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+      </plugins>
+   </build>
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,115 +0,0 @@
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-
-    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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>kernel-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-   <artifactId>exo.kernel.component.ext.rpc.impl.jgroups.v3</artifactId>
-   <name>eXo Kernel :: RPC Service Extension :: JGroups 3 Implementation</name>
-   <description>The JGroups 3 implementation of the RPC service</description>
-   <dependencies>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons.test</artifactId>
-      </dependency>        
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.component.common</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jgroups</groupId>
-         <artifactId>jgroups</artifactId>
-         <version>3.0.4.Final</version>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
-      </dependency>                   
-   </dependencies>
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-                <systemProperties>
-                  <!-- We add this system property due to some incompatibility between IPv6 and 
-                  some JVM of Linux distributions such as Ubuntu and Fedora-->
-                  <property>
-                     <name>java.net.preferIPv4Stack</name>
-                     <value>true</value>
-                  </property>
-                  <!-- Avoid the firewall -->
-                  <property>
-                     <name>jgroups.bind_addr</name>
-                     <value>127.0.0.1</value>
-                  </property>
-                  <property>
-                     <name>jgroups.stack</name>
-                     <value>udp</value>
-                  </property>
-               </systemProperties>
-            </configuration>
-         </plugin>
-         <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>prepare-test-policy</id>
-                  <phase>process-test-resources</phase>
-                  <configuration>
-                     <tasks>
-                        <echo>Creating Access Policy for tests</echo>
-                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
-                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
-                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
-                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
-                           <fileset dir="${project.basedir}/src/test/resources/">
-                              <include name="test.policy" />
-                           </fileset>
-                           <filterset>
-                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
-                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
-                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
-                           </filterset>
-                        </copy>
-                     </tasks>                     
-                  </configuration>
-                  <goals>
-                     <goal>run</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <dependencies>
-               <dependency>
-                  <groupId>ant</groupId>
-                  <artifactId>ant-optional</artifactId>
-                  <version>1.5.3-1</version>
-               </dependency>
-            </dependencies>
-         </plugin>
-      </plugins>
-   </build>
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,115 @@
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>kernel-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+   <artifactId>exo.kernel.component.ext.rpc.impl.jgroups.v3</artifactId>
+   <name>eXo Kernel :: RPC Service Extension :: JGroups 3 Implementation</name>
+   <description>The JGroups 3 implementation of the RPC service</description>
+   <dependencies>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons.test</artifactId>
+      </dependency>        
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.component.common</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jgroups</groupId>
+         <artifactId>jgroups</artifactId>
+         <version>3.0.4.Final</version>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-log4j12</artifactId>
+      </dependency>                   
+   </dependencies>
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+                <systemProperties>
+                  <!-- We add this system property due to some incompatibility between IPv6 and 
+                  some JVM of Linux distributions such as Ubuntu and Fedora-->
+                  <property>
+                     <name>java.net.preferIPv4Stack</name>
+                     <value>true</value>
+                  </property>
+                  <!-- Avoid the firewall -->
+                  <property>
+                     <name>jgroups.bind_addr</name>
+                     <value>127.0.0.1</value>
+                  </property>
+                  <property>
+                     <name>jgroups.stack</name>
+                     <value>udp</value>
+                  </property>
+               </systemProperties>
+            </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>prepare-test-policy</id>
+                  <phase>process-test-resources</phase>
+                  <configuration>
+                     <tasks>
+                        <echo>Creating Access Policy for tests</echo>
+                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
+                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
+                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
+                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
+                           <fileset dir="${project.basedir}/src/test/resources/">
+                              <include name="test.policy" />
+                           </fileset>
+                           <filterset>
+                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
+                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
+                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
+                           </filterset>
+                        </copy>
+                     </tasks>                     
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>ant</groupId>
+                  <artifactId>ant-optional</artifactId>
+                  <version>1.5.3-1</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+      </plugins>
+   </build>
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.container/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.container/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.container/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,144 +0,0 @@
-
-   <!--
-      Copyright (C) 2009 eXo Platform SAS. 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.
-   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>kernel-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-   <artifactId>exo.kernel.container</artifactId>
-   <name>eXo Kernel :: Container</name>
-   <description>eXo Kernel Container</description>
-   <dependencies>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons.test</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.tool</groupId>
-         <artifactId>exo.tool.framework.junit</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>servlet-api</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>picocontainer</groupId>
-         <artifactId>picocontainer</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>commons-beanutils</groupId>
-         <artifactId>commons-beanutils</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jibx</groupId>
-         <artifactId>jibx-run</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.codehaus.woodstox</groupId>
-               <artifactId>wstx-asl</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-      <dependency>
-         <groupId>org.jibx</groupId>
-         <artifactId>jibx-bind</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.codehaus.woodstox</groupId>
-               <artifactId>wstx-asl</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-      <dependency>
-         <groupId>org.jibx</groupId>
-         <artifactId>jibx-extras</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>xpp3</groupId>
-         <artifactId>xpp3</artifactId>
-         <version>1.1.3.4.O</version>
-      </dependency>
-   </dependencies>
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.jibx</groupId>
-            <artifactId>maven-jibx-plugin</artifactId>
-            <configuration>
-               <directory>src/main/resources</directory>
-               <includes>
-                  <includes>binding.xml</includes>
-               </includes>
-            </configuration>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>bind</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>prepare-test-policy</id>
-                  <phase>process-test-resources</phase>
-                  <configuration>
-                     <tasks>
-                        <echo>Creating Access Policy for tests</echo>
-                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
-                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
-                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
-                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
-                           <fileset dir="${project.basedir}/src/test/resources/">
-                              <include name="test.policy" />
-                           </fileset>
-                           <filterset>
-                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
-                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
-                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
-                           </filterset>
-                        </copy>
-                     </tasks>                     
-                  </configuration>
-                  <goals>
-                     <goal>run</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <dependencies>
-               <dependency>
-                  <groupId>ant</groupId>
-                  <artifactId>ant-optional</artifactId>
-                  <version>1.5.3-1</version>
-               </dependency>
-            </dependencies>
-         </plugin>
-      </plugins>
-   </build>
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.container/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.container/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.container/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.container/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,144 @@
+
+   <!--
+      Copyright (C) 2009 eXo Platform SAS. 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.
+   -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>kernel-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+   <artifactId>exo.kernel.container</artifactId>
+   <name>eXo Kernel :: Container</name>
+   <description>eXo Kernel Container</description>
+   <dependencies>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons.test</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.tool</groupId>
+         <artifactId>exo.tool.framework.junit</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.servlet</groupId>
+         <artifactId>servlet-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>picocontainer</groupId>
+         <artifactId>picocontainer</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>commons-beanutils</groupId>
+         <artifactId>commons-beanutils</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-log4j12</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jibx</groupId>
+         <artifactId>jibx-run</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.codehaus.woodstox</groupId>
+               <artifactId>wstx-asl</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+      <dependency>
+         <groupId>org.jibx</groupId>
+         <artifactId>jibx-bind</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.codehaus.woodstox</groupId>
+               <artifactId>wstx-asl</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+      <dependency>
+         <groupId>org.jibx</groupId>
+         <artifactId>jibx-extras</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>xpp3</groupId>
+         <artifactId>xpp3</artifactId>
+         <version>1.1.3.4.O</version>
+      </dependency>
+   </dependencies>
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+            </configuration>
+         </plugin>
+         <plugin>
+            <groupId>org.jibx</groupId>
+            <artifactId>maven-jibx-plugin</artifactId>
+            <configuration>
+               <directory>src/main/resources</directory>
+               <includes>
+                  <includes>binding.xml</includes>
+               </includes>
+            </configuration>
+            <executions>
+               <execution>
+                  <goals>
+                     <goal>bind</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>prepare-test-policy</id>
+                  <phase>process-test-resources</phase>
+                  <configuration>
+                     <tasks>
+                        <echo>Creating Access Policy for tests</echo>
+                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
+                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
+                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
+                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
+                           <fileset dir="${project.basedir}/src/test/resources/">
+                              <include name="test.policy" />
+                           </fileset>
+                           <filterset>
+                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
+                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
+                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
+                           </filterset>
+                        </copy>
+                     </tasks>                     
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>ant</groupId>
+                  <artifactId>ant-optional</artifactId>
+                  <version>1.5.3-1</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+      </plugins>
+   </build>
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,59 +0,0 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>mc-integration-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-
-   <artifactId>exo.kernel.mc-int</artifactId>
-
-   <name>eXo Kernel :: MC Kernel Integration :: Implementation</name>
-   <description>MC Kernel Integration Implementation</description>
-
-   <dependencies>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.container</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>servlet-api</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>picocontainer</groupId>
-         <artifactId>picocontainer</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.microcontainer</groupId>
-         <artifactId>jboss-kernel</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.microcontainer</groupId>
-         <artifactId>jboss-aop-mc-int</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.mc-int</groupId>
-         <artifactId>jboss-mc-int-common</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.mc-int</groupId>
-         <artifactId>jboss-mc-int-servlet</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.cl</groupId>
-         <artifactId>jboss-classloader</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.mc-kernel-extras</artifactId>
-      </dependency>
-   </dependencies>
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,59 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>mc-integration-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>exo.kernel.mc-int</artifactId>
+
+   <name>eXo Kernel :: MC Kernel Integration :: Implementation</name>
+   <description>MC Kernel Integration Implementation</description>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.container</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.servlet</groupId>
+         <artifactId>servlet-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>picocontainer</groupId>
+         <artifactId>picocontainer</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.microcontainer</groupId>
+         <artifactId>jboss-kernel</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.microcontainer</groupId>
+         <artifactId>jboss-aop-mc-int</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.mc-int</groupId>
+         <artifactId>jboss-mc-int-common</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.mc-int</groupId>
+         <artifactId>jboss-mc-int-servlet</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.cl</groupId>
+         <artifactId>jboss-classloader</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.mc-kernel-extras</artifactId>
+      </dependency>
+   </dependencies>
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,36 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>mc-integration-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-
-   <artifactId>exo.kernel.mc-int-demo</artifactId>
-
-   <name>eXo Kernel :: MC Kernel Integration :: Demo</name>
-   <description>MC Kernel Integration Demo</description>
-
-   <dependencies>
-      <dependency>
-         <groupId>picocontainer</groupId>
-         <artifactId>picocontainer</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.mc-int</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.microcontainer</groupId>
-         <artifactId>jboss-kernel</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>javax.transaction</groupId>
-         <artifactId>jta</artifactId>
-         <version>1.0.1B</version>
-      </dependency>
-   </dependencies>
-
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,36 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>mc-integration-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>exo.kernel.mc-int-demo</artifactId>
+
+   <name>eXo Kernel :: MC Kernel Integration :: Demo</name>
+   <description>MC Kernel Integration Demo</description>
+
+   <dependencies>
+      <dependency>
+         <groupId>picocontainer</groupId>
+         <artifactId>picocontainer</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.mc-int</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.microcontainer</groupId>
+         <artifactId>jboss-kernel</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.transaction</groupId>
+         <artifactId>jta</artifactId>
+         <version>1.0.1B</version>
+      </dependency>
+   </dependencies>
+
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,397 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>mc-integration-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-
-   <artifactId>exo.kernel.mc-int-tests</artifactId>
-   <packaging>war</packaging>
-
-   <name>eXo Kernel :: MC Kernel Integration :: Tests</name>
-   <description>MC Kernel Integration Tests</description>
-
-   <dependencies>
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <version>4.7</version>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.container</artifactId> 
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.commons.test</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
-         <artifactId>exo.kernel.mc-int-demo</artifactId>
-      </dependency>
-   </dependencies>
-
-   <build>
-      <plugins>
-         <plugin>
-            <artifactId>maven-war-plugin</artifactId>
-            <configuration>
-               <!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -->
-               <!--packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes-->
-               <packagingIncludes>WEB-INF/lib/junit-*.jar,WEB-INF/classes/**</packagingIncludes>
-               <archive>
-                  <manifest>
-                     <addClasspath>false</addClasspath>
-                     <!-- Doesn't seem to be working: -->
-                     <!--classpathPrefix>gatein.ear/lib/</classpathPrefix-->
-                  </manifest>
-               </archive>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-               <skip>true</skip>
-            </configuration>
-         </plugin>
-         <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>prepare-test-policy</id>
-                  <phase>process-test-resources</phase>
-                  <configuration>
-                     <tasks>
-                        <echo>Creating Access Policy for tests</echo>
-                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
-                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
-                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
-                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
-                           <fileset dir="${project.basedir}/src/test/resources/">
-                              <include name="test.policy" />
-                           </fileset>
-                           <filterset>
-                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
-                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
-                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
-                           </filterset>
-                        </copy>
-                     </tasks>                     
-                  </configuration>
-                  <goals>
-                     <goal>run</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <dependencies>
-               <dependency>
-                  <groupId>ant</groupId>
-                  <artifactId>ant-optional</artifactId>
-                  <version>1.5.3-1</version>
-               </dependency>
-            </dependencies>
-         </plugin>
-      </plugins>
-   </build>
-
-   <profiles>
-      <profile>
-         <id>tests</id>
-         <build>
-            <finalName>eXo-kernel-integration-tests-${project.version}</finalName>
-            <defaultGoal>integration-test</defaultGoal> 
-            <plugins>               
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-surefire-plugin</artifactId>
-                  <configuration>
-                     <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-                     <excludes>
-                        <exclude>**/it/Test*.java</exclude>
-                     </excludes>
-                  </configuration>
-                  <executions>
-                     <execution>
-                        <id>integration-tests</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                           <goal>test</goal>
-                        </goals>
-                        <configuration>
-                           <skip>false</skip>
-                           <excludes>
-                              <exclude>none</exclude>
-                           </excludes>
-                           <includes>
-                              <include>**/it/Test*.java</include>
-                           </includes>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin> 
-            </plugins>
-         </build>
-      </profile>
-
-      <profile>
-         <id>tests-with-jboss</id>
-         <build>
-            <finalName>eXo-kernel-integration-tests-${project.version}</finalName>
-            <defaultGoal>integration-test</defaultGoal>
-            <plugins>            
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-enforcer-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>jbossas-check-environment-ready</id>
-                        <goals>
-                           <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                           <rules>
-                              <requireProperty>
-                                 <property>jboss.home</property>
-                                 <message>"You must define the property jboss.home to give the path to the package/pkg built GateIn JBoss instance"</message>
-                              </requireProperty>
-                              <requireFilesExist>
-                                 <files>
-                                    <file>${jboss.home}</file>
-                                 </files>
-                                 <message>"JBossAS directory doesn't exist : ${jboss.home}"</message>
-                              </requireFilesExist>
-                              <requireFilesExist>
-                                 <files>
-                                    <file>${jboss.home}/server/${jboss.conf}/deploy/gatein.ear</file>
-                                 </files>
-                                 <message>"JBossAS directory has no gatein.ear deployed: ${jboss.home}/server/${jboss.conf}/deploy/gatein.ear"</message>
-                              </requireFilesExist>
-                           </rules>
-                           <fail>true</fail>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>            
-
-               <plugin>
-                  <groupId>org.codehaus.cargo</groupId>
-                  <artifactId>cargo-maven2-plugin</artifactId>
-                  <version>1.0</version>
-                  <configuration>
-                     <wait>false</wait>
-                     <container>
-                        <containerId>jboss5x</containerId>
-                        <type>installed</type>
-                        <home>${jboss.home}</home>
-                        <timeout>300000</timeout>
-                        <output>${jboss.home}/server/${jboss.conf}/log/output.log</output>
-                     </container>
-                     <configuration>
-                        <type>existing</type>
-                        <home>${jboss.home}/server/${jboss.conf}</home>
-                        <properties>
-                           <cargo.jboss.configuration>${jboss.conf}</cargo.jboss.configuration>
-                           <cargo.servlet.port>${jboss.port}</cargo.servlet.port>
-                           <cargo.rmi.port>1099</cargo.rmi.port>
-                           <cargo.jvmargs>-Xmx768m -XX:MaxPermSize=128m</cargo.jvmargs>
-                        </properties>
-                        <!--
-                           This module's artifact (.war) gets deployed automatically by cargo,
-                           but we don't use it for integration tests.
-                           We use some previously installed build of the same artifact,
-                           deployed under a different name as part of package/pkg build.
-                           It is bound to a different context than the one deployed by cargo.
-                           We only use cargo to start and stop jboss.
-                         -->
-                        <!--deployables>
-                           <deployable>
-                              <groupId>${project.groupId}</groupId>
-                              <artifactId>${project.artifactId}</artifactId>
-                              <type>${project.packaging}</type>
-                           </deployable>
-                        </deployables-->
-                     </configuration>
-                  </configuration>
-
-                  <executions>
-                     <execution>
-                        <id>start-container</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                           <goal>start</goal>
-                        </goals>
-                     </execution>
-                     <execution>
-                        <id>stop-container</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                           <goal>stop</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-surefire-plugin</artifactId>
-                  <configuration>
-                     <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-                     <excludes>
-                        <exclude>**/it/Test*.java</exclude>
-                     </excludes>
-                  </configuration>
-                  <executions>
-                     <execution>
-                        <id>integration-tests</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                           <goal>test</goal>
-                        </goals>
-                        <configuration>
-                           <skip>false</skip>
-                           <excludes>
-                              <exclude>none</exclude>
-                           </excludes>
-                           <includes>
-                              <include>**/it/Test*.java</include>
-                           </includes>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-         <properties>
-           <jboss.conf>default</jboss.conf>
-           <jboss.port>8080</jboss.port>
-         </properties>
-      </profile>
-
-      <profile>
-         <id>tests-with-tomcat</id>
-         <build>
-            <finalName>eXo-kernel-integration-tests-${project.version}</finalName>
-            <defaultGoal>integration-test</defaultGoal>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-enforcer-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>tomcat-check-environment-ready</id>
-                        <goals>
-                           <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                           <rules>
-                              <requireProperty>
-                                 <property>tomcat.home</property>
-                                 <message>"You must define the property tomcat.home to give the path to the package/pkg built GateIn Tomcat instance"</message>
-                              </requireProperty>
-                              <requireFilesExist>
-                                 <files>
-                                    <file>${tomcat.home}</file>
-                                 </files>
-                                 <message>"Tomcat directory doesn't exist : ${tomcat.home}"</message>
-                              </requireFilesExist>
-                              <requireFilesExist>
-                                 <files>
-                                    <file>${tomcat.home}/webapps/portal.war</file>
-                                 </files>
-                                 <message>"Tomcat directory has no portal.war deployed: ${tomcat.home}/webapps/portal.war"</message>
-                              </requireFilesExist>
-                           </rules>
-                           <fail>true</fail>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>               
-               <plugin>
-                  <groupId>org.codehaus.cargo</groupId>
-                  <artifactId>cargo-maven2-plugin</artifactId>
-                  <version>1.0</version>
-                  <configuration>
-                     <wait>false</wait>
-                     <container>
-                        <containerId>tomcat6x</containerId>
-                        <type>installed</type>
-                        <home>${tomcat.home}</home>
-                        <timeout>300000</timeout>
-                        <output>${tomcat.home}/logs/output.log</output>
-                     </container>
-                     <configuration>
-                        <type>existing</type>
-                        <home>${tomcat.home}</home>
-                        <properties>
-                           <cargo.servlet.port>${tomcat.port}</cargo.servlet.port>
-                           <cargo.jvmargs>-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Xmx512m -XX:MaxPermSize=128m</cargo.jvmargs>
-                           <cargo.logging>low</cargo.logging>
-                        </properties>
-                        <!--
-                           This module's artifact (.war) gets deployed automatically by cargo,
-                           but we don't use it for integration tests.
-                           We use some previously installed build of the same artifact,
-                           deployed under a different name as part of package/pkg build.
-                           It is bound to a different context than the one deployed by cargo.
-                           We only use cargo to start and stop tomcat.
-                         -->
-                     </configuration>
-                  </configuration>
-
-                  <executions>
-                     <execution>
-                        <id>start-container</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                           <goal>start</goal>
-                        </goals>
-                     </execution>
-                     <execution>
-                        <id>stop-container</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                           <goal>stop</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-surefire-plugin</artifactId>
-                  <configuration>
-                     <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
-                     <excludes>
-                        <exclude>**/it/Test*.java</exclude>
-                     </excludes>
-                  </configuration>
-                  <executions>
-                     <execution>
-                        <id>integration-tests</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                           <goal>test</goal>
-                        </goals>
-                        <configuration>
-                           <skip>false</skip>
-                           <excludes>
-                              <exclude>none</exclude>
-                           </excludes>
-                           <includes>
-                              <include>**/it/Test*.java</include>
-                           </includes>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-         <properties>
-           <tomcat.port>8080</tomcat.port>
-         </properties>
-      </profile>      
-   </profiles>
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,397 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>mc-integration-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>exo.kernel.mc-int-tests</artifactId>
+   <packaging>war</packaging>
+
+   <name>eXo Kernel :: MC Kernel Integration :: Tests</name>
+   <description>MC Kernel Integration Tests</description>
+
+   <dependencies>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>4.7</version>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.container</artifactId> 
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.commons.test</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.exoplatform.kernel</groupId>
+         <artifactId>exo.kernel.mc-int-demo</artifactId>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <artifactId>maven-war-plugin</artifactId>
+            <configuration>
+               <!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -->
+               <!--packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes-->
+               <packagingIncludes>WEB-INF/lib/junit-*.jar,WEB-INF/classes/**</packagingIncludes>
+               <archive>
+                  <manifest>
+                     <addClasspath>false</addClasspath>
+                     <!-- Doesn't seem to be working: -->
+                     <!--classpathPrefix>gatein.ear/lib/</classpathPrefix-->
+                  </manifest>
+               </archive>
+            </configuration>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+               <skip>true</skip>
+            </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>prepare-test-policy</id>
+                  <phase>process-test-resources</phase>
+                  <configuration>
+                     <tasks>
+                        <echo>Creating Access Policy for tests</echo>
+                        <makeurl file="${settings.localRepository}" property="localRepositoryURL" />
+                        <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
+                        <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" />
+                        <copy todir="${project.build.testOutputDirectory}" overwrite="true">
+                           <fileset dir="${project.basedir}/src/test/resources/">
+                              <include name="test.policy" />
+                           </fileset>
+                           <filterset>
+                              <filter token="MAVEN_REPO" value="${localRepositoryURL}" />
+                              <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" />
+                              <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
+                           </filterset>
+                        </copy>
+                     </tasks>                     
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>ant</groupId>
+                  <artifactId>ant-optional</artifactId>
+                  <version>1.5.3-1</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+      </plugins>
+   </build>
+
+   <profiles>
+      <profile>
+         <id>tests</id>
+         <build>
+            <finalName>eXo-kernel-integration-tests-${project.version}</finalName>
+            <defaultGoal>integration-test</defaultGoal> 
+            <plugins>               
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+                     <excludes>
+                        <exclude>**/it/Test*.java</exclude>
+                     </excludes>
+                  </configuration>
+                  <executions>
+                     <execution>
+                        <id>integration-tests</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                           <goal>test</goal>
+                        </goals>
+                        <configuration>
+                           <skip>false</skip>
+                           <excludes>
+                              <exclude>none</exclude>
+                           </excludes>
+                           <includes>
+                              <include>**/it/Test*.java</include>
+                           </includes>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin> 
+            </plugins>
+         </build>
+      </profile>
+
+      <profile>
+         <id>tests-with-jboss</id>
+         <build>
+            <finalName>eXo-kernel-integration-tests-${project.version}</finalName>
+            <defaultGoal>integration-test</defaultGoal>
+            <plugins>            
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-enforcer-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>jbossas-check-environment-ready</id>
+                        <goals>
+                           <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                           <rules>
+                              <requireProperty>
+                                 <property>jboss.home</property>
+                                 <message>"You must define the property jboss.home to give the path to the package/pkg built GateIn JBoss instance"</message>
+                              </requireProperty>
+                              <requireFilesExist>
+                                 <files>
+                                    <file>${jboss.home}</file>
+                                 </files>
+                                 <message>"JBossAS directory doesn't exist : ${jboss.home}"</message>
+                              </requireFilesExist>
+                              <requireFilesExist>
+                                 <files>
+                                    <file>${jboss.home}/server/${jboss.conf}/deploy/gatein.ear</file>
+                                 </files>
+                                 <message>"JBossAS directory has no gatein.ear deployed: ${jboss.home}/server/${jboss.conf}/deploy/gatein.ear"</message>
+                              </requireFilesExist>
+                           </rules>
+                           <fail>true</fail>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>            
+
+               <plugin>
+                  <groupId>org.codehaus.cargo</groupId>
+                  <artifactId>cargo-maven2-plugin</artifactId>
+                  <version>1.0</version>
+                  <configuration>
+                     <wait>false</wait>
+                     <container>
+                        <containerId>jboss5x</containerId>
+                        <type>installed</type>
+                        <home>${jboss.home}</home>
+                        <timeout>300000</timeout>
+                        <output>${jboss.home}/server/${jboss.conf}/log/output.log</output>
+                     </container>
+                     <configuration>
+                        <type>existing</type>
+                        <home>${jboss.home}/server/${jboss.conf}</home>
+                        <properties>
+                           <cargo.jboss.configuration>${jboss.conf}</cargo.jboss.configuration>
+                           <cargo.servlet.port>${jboss.port}</cargo.servlet.port>
+                           <cargo.rmi.port>1099</cargo.rmi.port>
+                           <cargo.jvmargs>-Xmx768m -XX:MaxPermSize=128m</cargo.jvmargs>
+                        </properties>
+                        <!--
+                           This module's artifact (.war) gets deployed automatically by cargo,
+                           but we don't use it for integration tests.
+                           We use some previously installed build of the same artifact,
+                           deployed under a different name as part of package/pkg build.
+                           It is bound to a different context than the one deployed by cargo.
+                           We only use cargo to start and stop jboss.
+                         -->
+                        <!--deployables>
+                           <deployable>
+                              <groupId>${project.groupId}</groupId>
+                              <artifactId>${project.artifactId}</artifactId>
+                              <type>${project.packaging}</type>
+                           </deployable>
+                        </deployables-->
+                     </configuration>
+                  </configuration>
+
+                  <executions>
+                     <execution>
+                        <id>start-container</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                           <goal>start</goal>
+                        </goals>
+                     </execution>
+                     <execution>
+                        <id>stop-container</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                           <goal>stop</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+               </plugin>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+                     <excludes>
+                        <exclude>**/it/Test*.java</exclude>
+                     </excludes>
+                  </configuration>
+                  <executions>
+                     <execution>
+                        <id>integration-tests</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                           <goal>test</goal>
+                        </goals>
+                        <configuration>
+                           <skip>false</skip>
+                           <excludes>
+                              <exclude>none</exclude>
+                           </excludes>
+                           <includes>
+                              <include>**/it/Test*.java</include>
+                           </includes>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+         <properties>
+           <jboss.conf>default</jboss.conf>
+           <jboss.port>8080</jboss.port>
+         </properties>
+      </profile>
+
+      <profile>
+         <id>tests-with-tomcat</id>
+         <build>
+            <finalName>eXo-kernel-integration-tests-${project.version}</finalName>
+            <defaultGoal>integration-test</defaultGoal>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-enforcer-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>tomcat-check-environment-ready</id>
+                        <goals>
+                           <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                           <rules>
+                              <requireProperty>
+                                 <property>tomcat.home</property>
+                                 <message>"You must define the property tomcat.home to give the path to the package/pkg built GateIn Tomcat instance"</message>
+                              </requireProperty>
+                              <requireFilesExist>
+                                 <files>
+                                    <file>${tomcat.home}</file>
+                                 </files>
+                                 <message>"Tomcat directory doesn't exist : ${tomcat.home}"</message>
+                              </requireFilesExist>
+                              <requireFilesExist>
+                                 <files>
+                                    <file>${tomcat.home}/webapps/portal.war</file>
+                                 </files>
+                                 <message>"Tomcat directory has no portal.war deployed: ${tomcat.home}/webapps/portal.war"</message>
+                              </requireFilesExist>
+                           </rules>
+                           <fail>true</fail>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>               
+               <plugin>
+                  <groupId>org.codehaus.cargo</groupId>
+                  <artifactId>cargo-maven2-plugin</artifactId>
+                  <version>1.0</version>
+                  <configuration>
+                     <wait>false</wait>
+                     <container>
+                        <containerId>tomcat6x</containerId>
+                        <type>installed</type>
+                        <home>${tomcat.home}</home>
+                        <timeout>300000</timeout>
+                        <output>${tomcat.home}/logs/output.log</output>
+                     </container>
+                     <configuration>
+                        <type>existing</type>
+                        <home>${tomcat.home}</home>
+                        <properties>
+                           <cargo.servlet.port>${tomcat.port}</cargo.servlet.port>
+                           <cargo.jvmargs>-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Xmx512m -XX:MaxPermSize=128m</cargo.jvmargs>
+                           <cargo.logging>low</cargo.logging>
+                        </properties>
+                        <!--
+                           This module's artifact (.war) gets deployed automatically by cargo,
+                           but we don't use it for integration tests.
+                           We use some previously installed build of the same artifact,
+                           deployed under a different name as part of package/pkg build.
+                           It is bound to a different context than the one deployed by cargo.
+                           We only use cargo to start and stop tomcat.
+                         -->
+                     </configuration>
+                  </configuration>
+
+                  <executions>
+                     <execution>
+                        <id>start-container</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                           <goal>start</goal>
+                        </goals>
+                     </execution>
+                     <execution>
+                        <id>stop-container</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                           <goal>stop</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+               </plugin>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+                     <excludes>
+                        <exclude>**/it/Test*.java</exclude>
+                     </excludes>
+                  </configuration>
+                  <executions>
+                     <execution>
+                        <id>integration-tests</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                           <goal>test</goal>
+                        </goals>
+                        <configuration>
+                           <skip>false</skip>
+                           <excludes>
+                              <exclude>none</exclude>
+                           </excludes>
+                           <includes>
+                              <include>**/it/Test*.java</include>
+                           </includes>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+         <properties>
+           <tomcat.port>8080</tomcat.port>
+         </properties>
+      </profile>      
+   </profiles>
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,23 +0,0 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>mc-integration-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-
-   <artifactId>exo.kernel.mc-kernel-extras</artifactId>
-
-   <name>eXo Kernel :: MC Kernel Extras</name>
-   <description>MC Kernel 2.2.0 classes that aren't available in mc-kernel 2.0.6.GA</description>
-
-   <dependencies>
-      <dependency>
-            <groupId>org.jboss.microcontainer</groupId>
-            <artifactId>jboss-kernel</artifactId>
-      </dependency>
-   </dependencies>
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,23 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>mc-integration-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>exo.kernel.mc-kernel-extras</artifactId>
+
+   <name>eXo Kernel :: MC Kernel Extras</name>
+   <description>MC Kernel 2.2.0 classes that aren't available in mc-kernel 2.0.6.GA</description>
+
+   <dependencies>
+      <dependency>
+            <groupId>org.jboss.microcontainer</groupId>
+            <artifactId>jboss-kernel</artifactId>
+      </dependency>
+   </dependencies>
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/exo.kernel.mc-integration/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,92 +0,0 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.exoplatform.kernel</groupId>
-      <artifactId>kernel-parent</artifactId>
-      <version>2.3.6-GA</version>
-   </parent>
-
-   <artifactId>mc-integration-parent</artifactId>
-   <packaging>pom</packaging>
-
-   <name>eXo Kernel :: MC Kernel Integration</name>
-   <description>MC Kernel Integration</description>
-
-   <properties>
-      <!--version.parent>2.2.0-Beta05-SNAPSHOT</version.parent-->
-      <version.jboss.mc>2.0.6.GA</version.jboss.mc>
-      <version.jboss.mc-int>2.2.0.Alpha2</version.jboss.mc-int>
-      <version.jboss.classloader>2.0.7.GA</version.jboss.classloader>
-
-   </properties>
-   <modules>
-      <module>exo.kernel.mc-int</module>
-      <module>exo.kernel.mc-kernel-extras</module>
-      <module>exo.kernel.mc-int-demo</module>
-      <module>exo.kernel.mc-int-tests</module>
-   </modules>
-
-   <dependencyManagement>
-      <dependencies>
-        <dependency>
-           <groupId>org.exoplatform.kernel</groupId>
-           <artifactId>exo.kernel.commons</artifactId>
-           <version>${project.version}</version>
-        </dependency>
-        <dependency>
-           <groupId>org.exoplatform.kernel</groupId>
-           <artifactId>exo.kernel.container</artifactId>
-           <version>${project.version}</version>
-        </dependency>
-        <dependency>
-           <groupId>org.exoplatform.kernel</groupId>
-           <artifactId>exo.kernel.mc-int</artifactId>
-           <version>${project.version}</version>
-        </dependency>
-        <dependency>
-           <groupId>org.exoplatform.kernel</groupId>
-           <artifactId>exo.kernel.mc-int-demo</artifactId>
-           <version>${project.version}</version>
-        </dependency>
-         <dependency>
-           <groupId>org.exoplatform.kernel</groupId>
-           <artifactId>exo.kernel.mc-kernel-extras</artifactId>
-           <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.microcontainer</groupId>
-            <artifactId>jboss-dependency</artifactId>
-            <version>${version.jboss.mc}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.microcontainer</groupId>
-            <artifactId>jboss-kernel</artifactId>
-            <version>${version.jboss.mc}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.microcontainer</groupId>
-            <artifactId>jboss-aop-mc-int</artifactId>
-            <version>${version.jboss.mc}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.mc-int</groupId>
-            <artifactId>jboss-mc-int-common</artifactId>
-            <version>${version.jboss.mc-int}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.mc-int</groupId>
-            <artifactId>jboss-mc-int-servlet</artifactId>
-            <version>${version.jboss.mc-int}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.cl</groupId>
-            <artifactId>jboss-classloader</artifactId>
-            <version>${version.jboss.classloader}</version>
-         </dependency>
-      </dependencies>
-   </dependencyManagement>
-
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/exo.kernel.mc-integration/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/exo.kernel.mc-integration/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,92 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>kernel-parent</artifactId>
+      <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>mc-integration-parent</artifactId>
+   <packaging>pom</packaging>
+
+   <name>eXo Kernel :: MC Kernel Integration</name>
+   <description>MC Kernel Integration</description>
+
+   <properties>
+      <!--version.parent>2.2.0-Beta05-SNAPSHOT</version.parent-->
+      <version.jboss.mc>2.0.6.GA</version.jboss.mc>
+      <version.jboss.mc-int>2.2.0.Alpha2</version.jboss.mc-int>
+      <version.jboss.classloader>2.0.7.GA</version.jboss.classloader>
+
+   </properties>
+   <modules>
+      <module>exo.kernel.mc-int</module>
+      <module>exo.kernel.mc-kernel-extras</module>
+      <module>exo.kernel.mc-int-demo</module>
+      <module>exo.kernel.mc-int-tests</module>
+   </modules>
+
+   <dependencyManagement>
+      <dependencies>
+        <dependency>
+           <groupId>org.exoplatform.kernel</groupId>
+           <artifactId>exo.kernel.commons</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+        <dependency>
+           <groupId>org.exoplatform.kernel</groupId>
+           <artifactId>exo.kernel.container</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+        <dependency>
+           <groupId>org.exoplatform.kernel</groupId>
+           <artifactId>exo.kernel.mc-int</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+        <dependency>
+           <groupId>org.exoplatform.kernel</groupId>
+           <artifactId>exo.kernel.mc-int-demo</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+         <dependency>
+           <groupId>org.exoplatform.kernel</groupId>
+           <artifactId>exo.kernel.mc-kernel-extras</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.microcontainer</groupId>
+            <artifactId>jboss-dependency</artifactId>
+            <version>${version.jboss.mc}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.microcontainer</groupId>
+            <artifactId>jboss-kernel</artifactId>
+            <version>${version.jboss.mc}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.microcontainer</groupId>
+            <artifactId>jboss-aop-mc-int</artifactId>
+            <version>${version.jboss.mc}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.mc-int</groupId>
+            <artifactId>jboss-mc-int-common</artifactId>
+            <version>${version.jboss.mc-int}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.mc-int</groupId>
+            <artifactId>jboss-mc-int-servlet</artifactId>
+            <version>${version.jboss.mc-int}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.cl</groupId>
+            <artifactId>jboss-classloader</artifactId>
+            <version>${version.jboss.classloader}</version>
+         </dependency>
+      </dependencies>
+   </dependencyManagement>
+
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/packaging/module/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/packaging/module/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/packaging/module/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,68 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <parent>
-       <groupId>org.exoplatform.kernel</groupId>
-       <artifactId>kernel-parent</artifactId>
-       <version>2.3.6-GA</version>
-       <relativePath>../../pom.xml</relativePath>
-   </parent>
-
-   <modelVersion>4.0.0</modelVersion>
-   <artifactId>kernel.packaging.module</artifactId>
-   <packaging>pom</packaging>
-   <name>eXo Kernel Build module</name>
-
-   <properties>
-        <exobuild.name>kernel</exobuild.name>
-        <exobuild.type>module</exobuild.type>
-        <enforcer.skip>true</enforcer.skip>
-   </properties>
-
-   <build>
-       <plugins>
-           <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                  <execution>
-                    <id>prepare</id>
-                    <phase>package</phase>
-                    <goals>
-                      <goal>copy-resources</goal>
-                    </goals>
-                    <configuration>
-                      <outputDirectory>target</outputDirectory>
-                      <resources>
-                          <resource>
-                            <directory>src/main/javascript</directory>
-                            <filtering>true</filtering>
-                          </resource>
-                      </resources>
-                    </configuration>
-                  </execution>
-                </executions>
-           </plugin>
-           <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.3</version>
-                <executions>
-                  <execution>
-                    <id>attach-artifacts</id>
-                    <phase>package</phase>
-                    <goals>
-                      <goal>attach-artifact</goal>
-                    </goals>
-                    <configuration>
-                      <artifacts>
-                        <artifact>
-                          <file>target/${exobuild.name}.packaging.${exobuild.type}.js</file>
-                          <type>js</type>
-                        </artifact>
-                      </artifacts>
-                    </configuration>
-                  </execution>
-                </executions>
-            </plugin>
-       </plugins>
-   </build> 
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/packaging/module/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/packaging/module/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/packaging/module/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/packaging/module/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,68 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <parent>
+       <groupId>org.exoplatform.kernel</groupId>
+       <artifactId>kernel-parent</artifactId>
+       <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+       <relativePath>../../pom.xml</relativePath>
+   </parent>
+
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>kernel.packaging.module</artifactId>
+   <packaging>pom</packaging>
+   <name>eXo Kernel Build module</name>
+
+   <properties>
+        <exobuild.name>kernel</exobuild.name>
+        <exobuild.type>module</exobuild.type>
+        <enforcer.skip>true</enforcer.skip>
+   </properties>
+
+   <build>
+       <plugins>
+           <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                  <execution>
+                    <id>prepare</id>
+                    <phase>package</phase>
+                    <goals>
+                      <goal>copy-resources</goal>
+                    </goals>
+                    <configuration>
+                      <outputDirectory>target</outputDirectory>
+                      <resources>
+                          <resource>
+                            <directory>src/main/javascript</directory>
+                            <filtering>true</filtering>
+                          </resource>
+                      </resources>
+                    </configuration>
+                  </execution>
+                </executions>
+           </plugin>
+           <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.3</version>
+                <executions>
+                  <execution>
+                    <id>attach-artifacts</id>
+                    <phase>package</phase>
+                    <goals>
+                      <goal>attach-artifact</goal>
+                    </goals>
+                    <configuration>
+                      <artifacts>
+                        <artifact>
+                          <file>target/${exobuild.name}.packaging.${exobuild.type}.js</file>
+                          <type>js</type>
+                        </artifact>
+                      </artifacts>
+                    </configuration>
+                  </execution>
+                </executions>
+            </plugin>
+       </plugins>
+   </build> 
+</project>

Deleted: kernel/branches/2.3.6-GA-JBAS7/pom.xml
===================================================================
--- kernel/tags/2.3.6-GA/pom.xml	2012-03-03 07:18:33 UTC (rev 5756)
+++ kernel/branches/2.3.6-GA-JBAS7/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -1,290 +0,0 @@
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-
-    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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.exoplatform</groupId>
-      <artifactId>foundation-parent</artifactId>
-      <version>9</version>
-   </parent>
-
-   <groupId>org.exoplatform.kernel</groupId>
-   <artifactId>kernel-parent</artifactId>
-   <version>2.3.6-GA</version>
-   <packaging>pom</packaging>
-
-   <name>eXo Kernel</name>
-
-   <properties>
-      <exo.product.name>exo-kernel</exo.product.name>
-      <exo.product.specification>2.3</exo.product.specification>
-      <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version>
-      <forkMode>always</forkMode>
-   </properties>
-
-   <scm>
-      <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.3.6-GA</connection>
-      <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.3.6-GA</developerConnection>
-      <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.3.6-GA</url>
-   </scm>
-
-   <modules>
-      <module>exo.kernel.container</module>
-      <module>exo.kernel.commons</module>
-      <module>exo.kernel.commons.test</module>
-      <module>exo.kernel.component.common</module>
-      <module>exo.kernel.component.ext.rpc.impl.jgroups.v3</module>
-      <module>exo.kernel.component.cache</module>
-      <module>exo.kernel.component.ext.cache.impl.jboss.v3</module>
-      <module>exo.kernel.component.ext.cache.impl.infinispan.v5</module>
-      <module>exo.kernel.component.command</module>
-      <module>exo.kernel.mc-integration</module>
-      <module>packaging/module</module>
-   </modules>
-
-   <dependencyManagement>
-      <dependencies>
-         <dependency>
-            <groupId>org.exoplatform.tool</groupId>
-            <artifactId>exo.tool.framework.junit</artifactId>
-            <version>${org.exoplatform.framework.junit.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.exoplatform.kernel</groupId>
-            <artifactId>exo.kernel.container</artifactId>
-            <version>${project.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.exoplatform.kernel</groupId>
-            <artifactId>exo.kernel.commons</artifactId>
-            <version>${project.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.exoplatform.kernel</groupId>
-            <artifactId>exo.kernel.commons.test</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-         </dependency>
-         <dependency>
-            <groupId>org.exoplatform.kernel</groupId>
-            <artifactId>exo.kernel.component.common</artifactId>
-            <version>${project.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.exoplatform.kernel</groupId>
-            <artifactId>exo.kernel.component.cache</artifactId>
-            <version>${project.version}</version>
-         </dependency>         
-         <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3</artifactId>
-            <version>1.1.4c</version>
-         </dependency>
-         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
-         </dependency>
-         <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.8.3</version>
-         </dependency>
-         <dependency>
-            <groupId>commons-chain</groupId>
-            <artifactId>commons-chain</artifactId>
-            <version>1.2</version>
-         </dependency>
-         <dependency>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-            <version>1.8.1</version>
-         </dependency>
-         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.5.8</version>
-            <scope>test</scope>
-         </dependency>
-         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.5.8</version>
-            <scope>test</scope>
-         </dependency>
-         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
-            <scope>test</scope>
-         </dependency>
-         <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>1.0.b2</version>
-         </dependency>
-         <dependency>
-            <groupId>eu.medsea.mimeutil</groupId>
-            <artifactId>mime-util</artifactId>
-            <version>2.1.3</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>org.slf4j</groupId>
-                  <artifactId>slf4j-log4j12</artifactId>
-               </exclusion>
-               <exclusion>
-                  <groupId>log4j</groupId>
-                  <artifactId>log4j</artifactId>
-               </exclusion>
-            </exclusions>            
-         </dependency>
-         <dependency>
-            <groupId>quartz</groupId>
-            <artifactId>quartz</artifactId>
-            <version>1.5.2</version>
-         </dependency>
-         <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4.4</version>
-         </dependency>
-         <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
-         </dependency>
-         <dependency>
-            <groupId>javax.resource</groupId>
-            <artifactId>connector-api</artifactId>
-            <version>1.5</version>
-         </dependency>
-         <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-            <version>1.1</version>
-         </dependency>
-         <dependency>
-            <groupId>picocontainer</groupId>
-            <artifactId>picocontainer</artifactId>
-            <version>1.1</version>
-         </dependency>
-         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-         </dependency>
-         <dependency>
-            <groupId>org.jgroups</groupId>
-            <artifactId>jgroups</artifactId>
-            <version>2.6.20.Final</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.cache</groupId>
-            <artifactId>jbosscache-core</artifactId>
-            <version>3.2.7.GA</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>jgroups</groupId>
-                  <artifactId>jgroups</artifactId>
-               </exclusion>
-            </exclusions>            
-         </dependency>         
-         <dependency>
-            <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-core</artifactId>
-            <version>5.1.1.FINAL</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-bind</artifactId>
-            <version>${version.jibx.plugin}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-extras</artifactId>
-            <version>${version.jibx.plugin}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-run</artifactId>
-            <version>${version.jibx.plugin}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.ow2.jotm</groupId>
-            <artifactId>jotm-core</artifactId>
-            <version>2.1.9</version>
-         </dependency>
-         <dependency>
-            <groupId>com.atomikos</groupId>
-            <artifactId>transactions-jta</artifactId>
-            <version>3.7.0</version>
-         </dependency>
-      </dependencies>
-   </dependencyManagement>
-
-   <dependencies>
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <scope>test</scope>
-      </dependency>
-   </dependencies>
-
-   <profiles>
-      <profile>
-         <id>release</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <artifactId>maven-assembly-plugin</artifactId>
-                  <dependencies>
-                     <dependency>
-                        <groupId>org.apache.apache.resources</groupId>
-                        <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                        <version>1.0.2</version>
-                     </dependency>
-                  </dependencies>
-                  <executions>
-                     <execution>
-                        <id>source-release-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                           <goal>single</goal>
-                        </goals>
-                        <configuration>
-                          <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                          <descriptorRefs>
-                             <descriptorRef>source-release</descriptorRef>
-                          </descriptorRefs>
-                          <tarLongFileFormat>gnu</tarLongFileFormat>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
-
-</project>

Copied: kernel/branches/2.3.6-GA-JBAS7/pom.xml (from rev 5757, kernel/tags/2.3.6-GA/pom.xml)
===================================================================
--- kernel/branches/2.3.6-GA-JBAS7/pom.xml	                        (rev 0)
+++ kernel/branches/2.3.6-GA-JBAS7/pom.xml	2012-03-03 07:24:58 UTC (rev 5758)
@@ -0,0 +1,290 @@
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.exoplatform</groupId>
+      <artifactId>foundation-parent</artifactId>
+      <version>9</version>
+   </parent>
+
+   <groupId>org.exoplatform.kernel</groupId>
+   <artifactId>kernel-parent</artifactId>
+   <version>2.3.6-GA-JBAS7-SNAPSHOT</version>
+   <packaging>pom</packaging>
+
+   <name>eXo Kernel</name>
+
+   <properties>
+      <exo.product.name>exo-kernel</exo.product.name>
+      <exo.product.specification>2.3</exo.product.specification>
+      <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version>
+      <forkMode>always</forkMode>
+   </properties>
+
+   <scm>
+      <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.3.6-GA-JBAS7</connection>
+      <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.3.6-GA-JBAS7</developerConnection>
+      <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.3.6-GA-JBAS7</url>
+   </scm>
+
+   <modules>
+      <module>exo.kernel.container</module>
+      <module>exo.kernel.commons</module>
+      <module>exo.kernel.commons.test</module>
+      <module>exo.kernel.component.common</module>
+      <module>exo.kernel.component.ext.rpc.impl.jgroups.v3</module>
+      <module>exo.kernel.component.cache</module>
+      <module>exo.kernel.component.ext.cache.impl.jboss.v3</module>
+      <module>exo.kernel.component.ext.cache.impl.infinispan.v5</module>
+      <module>exo.kernel.component.command</module>
+      <module>exo.kernel.mc-integration</module>
+      <module>packaging/module</module>
+   </modules>
+
+   <dependencyManagement>
+      <dependencies>
+         <dependency>
+            <groupId>org.exoplatform.tool</groupId>
+            <artifactId>exo.tool.framework.junit</artifactId>
+            <version>${org.exoplatform.framework.junit.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.kernel</groupId>
+            <artifactId>exo.kernel.container</artifactId>
+            <version>${project.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.kernel</groupId>
+            <artifactId>exo.kernel.commons</artifactId>
+            <version>${project.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.kernel</groupId>
+            <artifactId>exo.kernel.commons.test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.kernel</groupId>
+            <artifactId>exo.kernel.component.common</artifactId>
+            <version>${project.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.kernel</groupId>
+            <artifactId>exo.kernel.component.cache</artifactId>
+            <version>${project.version}</version>
+         </dependency>         
+         <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+            <version>1.1.4c</version>
+         </dependency>
+         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+         </dependency>
+         <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.8.3</version>
+         </dependency>
+         <dependency>
+            <groupId>commons-chain</groupId>
+            <artifactId>commons-chain</artifactId>
+            <version>1.2</version>
+         </dependency>
+         <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <version>1.8.1</version>
+         </dependency>
+         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.5.8</version>
+            <scope>test</scope>
+         </dependency>
+         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.8</version>
+            <scope>test</scope>
+         </dependency>
+         <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.16</version>
+            <scope>test</scope>
+         </dependency>
+         <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>1.0.b2</version>
+         </dependency>
+         <dependency>
+            <groupId>eu.medsea.mimeutil</groupId>
+            <artifactId>mime-util</artifactId>
+            <version>2.1.3</version>
+            <exclusions>
+               <exclusion>
+                  <groupId>org.slf4j</groupId>
+                  <artifactId>slf4j-log4j12</artifactId>
+               </exclusion>
+               <exclusion>
+                  <groupId>log4j</groupId>
+                  <artifactId>log4j</artifactId>
+               </exclusion>
+            </exclusions>            
+         </dependency>
+         <dependency>
+            <groupId>quartz</groupId>
+            <artifactId>quartz</artifactId>
+            <version>1.5.2</version>
+         </dependency>
+         <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4.4</version>
+         </dependency>
+         <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+         </dependency>
+         <dependency>
+            <groupId>javax.resource</groupId>
+            <artifactId>connector-api</artifactId>
+            <version>1.5</version>
+         </dependency>
+         <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+            <version>1.1</version>
+         </dependency>
+         <dependency>
+            <groupId>picocontainer</groupId>
+            <artifactId>picocontainer</artifactId>
+            <version>1.1</version>
+         </dependency>
+         <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+         </dependency>
+         <dependency>
+            <groupId>org.jgroups</groupId>
+            <artifactId>jgroups</artifactId>
+            <version>2.6.20.Final</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.cache</groupId>
+            <artifactId>jbosscache-core</artifactId>
+            <version>3.2.7.GA</version>
+            <exclusions>
+               <exclusion>
+                  <groupId>jgroups</groupId>
+                  <artifactId>jgroups</artifactId>
+               </exclusion>
+            </exclusions>            
+         </dependency>         
+         <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-core</artifactId>
+            <version>5.1.1.FINAL</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jibx</groupId>
+            <artifactId>jibx-bind</artifactId>
+            <version>${version.jibx.plugin}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jibx</groupId>
+            <artifactId>jibx-extras</artifactId>
+            <version>${version.jibx.plugin}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jibx</groupId>
+            <artifactId>jibx-run</artifactId>
+            <version>${version.jibx.plugin}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.ow2.jotm</groupId>
+            <artifactId>jotm-core</artifactId>
+            <version>2.1.9</version>
+         </dependency>
+         <dependency>
+            <groupId>com.atomikos</groupId>
+            <artifactId>transactions-jta</artifactId>
+            <version>3.7.0</version>
+         </dependency>
+      </dependencies>
+   </dependencyManagement>
+
+   <dependencies>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+
+   <profiles>
+      <profile>
+         <id>release</id>
+         <build>
+            <plugins>
+               <plugin>
+                  <artifactId>maven-assembly-plugin</artifactId>
+                  <dependencies>
+                     <dependency>
+                        <groupId>org.apache.apache.resources</groupId>
+                        <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                        <version>1.0.2</version>
+                     </dependency>
+                  </dependencies>
+                  <executions>
+                     <execution>
+                        <id>source-release-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                           <goal>single</goal>
+                        </goals>
+                        <configuration>
+                          <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                          <descriptorRefs>
+                             <descriptorRef>source-release</descriptorRef>
+                          </descriptorRefs>
+                          <tarLongFileFormat>gnu</tarLongFileFormat>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+
+</project>



More information about the exo-jcr-commits mailing list