[gatein-commits] gatein SVN: r3742 - exo/portal/branches/3.1.x.

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2010-08-03 08:47:21 -0400 (Tue, 03 Aug 2010)
New Revision: 3742

Modified:
   exo/portal/branches/3.1.x/README.txt
   exo/portal/branches/3.1.x/pom.xml
Log:
EXOGTN-5 : JCR dependency update


Modified: exo/portal/branches/3.1.x/README.txt
===================================================================
--- exo/portal/branches/3.1.x/README.txt	2010-08-03 10:32:56 UTC (rev 3741)
+++ exo/portal/branches/3.1.x/README.txt	2010-08-03 12:47:21 UTC (rev 3742)
@@ -1,48 +1,62 @@
-Welcome to GateIn:
+Welcome to GateIn (eXo branch):
 ===========================
 
-This will explain you how to build a package of GateIn with Tomcat or JBoss.
+This will explain you how to build a package of GateIn with Tomcat or JBoss.
 
 *****************
 * COMPILATION
 *****************
 
 * mvn install
-For example: mvn install
+For example: mvn install
 
 Note: If you run "mvn install" twice in a row without cleaning, one test will
 fail. To workaround this issue you will need to delete the test data located
 here: component/portal/target/temp/
 
-**********************
-* MAVEN CONFIGURATION:
-**********************
-
-* edit packaging/profiles.xml and replace the values mentioned so that:
-  * ${exo.projects.directory.dependencies} directory contains :
-  ** ${exo.projects.app.tomcat.version}/ a clean Tomcat installation, to be used as packaging template
-  ** ${exo.projects.app.jboss.version}/ a clean JBoss installation, to be used as packaging template
+**********************
+* MAVEN CONFIGURATION:
+**********************
 
+* edit packaging/profiles.xml and replace the values mentioned so that:
+  * ${exo.projects.directory.dependencies} directory contains :
+  ** ${exo.projects.app.tomcat.version}/ a clean Tomcat installation, to be used as packaging template
+  ** ${exo.projects.app.jboss.version}/ a clean JBoss installation, to be used as packaging template
+
 * See http://maven.apache.org/guides/introduction/introduction-to-profiles.html for more informations
-  
-Alternatively you can edit your local settings.xml to add the information
-provided in profiles.xml. It will override what's in the provided file.
-
-*****************
-* PACKAGING:
-*****************
+  
+Alternatively you can edit your local settings.xml to add the information
+provided in profiles.xml. It will override what's in the provided file.
 
-* mvn install -Ppkg-tomcat
+***************
+* DEPENDENCIES:
+***************
+
+By default GateIn depends on the snapshot of the upcoming JCR versions.
+
+A stable profile is provided to build GateIn with the latest stable release of the JCR dependencies.
+
+To build the snapshot tomcat release
+* mvn install -Ppkg-tomcat
+
+To build the stable tomcat release
+* mvn install -Ppkg-tomcat,stable
+
+*****************
+* PACKAGING:
+*****************
+
+* mvn install -Ppkg-tomcat
 ** Creates a Tomcat delivery in packaging/pkg/target/tomcat/ 
-
-* mvn install -Ppkg-jbossas
+
+* mvn install -Ppkg-jbossas
 ** Creates a JBossAS delivery in packaging/pkg/target/jboss/
-
-*****************
-* STARTING:
-*****************
-* On Tomcat: go to the tomcat directory (or unzip the archive in your favorite location) and execute 'bin/gatein.sh start' ('bin/gatein.bat start' on Windows)
-* On JBoss: go to the jboss directory (or unzip the archive in your favorite location) and execute 'bin/run.sh start' ('bin/run.bat start' on Windows)
-
-* Go to http://localhost:8080/portal to see the homepage of the portal. That's it. 
 
+*****************
+* STARTING:
+*****************
+* On Tomcat: go to the tomcat directory (or unzip the archive in your favorite location) and execute 'bin/gatein.sh start' ('bin/gatein.bat start' on Windows)
+* On JBoss: go to the jboss directory (or unzip the archive in your favorite location) and execute 'bin/run.sh start' ('bin/run.bat start' on Windows)
+
+* Go to http://localhost:8080/portal to see the homepage of the portal. That's it. 
+

Modified: exo/portal/branches/3.1.x/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/pom.xml	2010-08-03 10:32:56 UTC (rev 3741)
+++ exo/portal/branches/3.1.x/pom.xml	2010-08-03 12:47:21 UTC (rev 3742)
@@ -37,10 +37,10 @@
    <name>GateIn - Portal</name>
 
    <properties>
-      <org.exoplatform.kernel.version>2.2.2-GA</org.exoplatform.kernel.version>
-      <org.exoplatform.core.version>2.3.2-GA</org.exoplatform.core.version>
-      <org.exoplatform.ws.version>2.1.2-GA</org.exoplatform.ws.version>
-      <org.exoplatform.jcr.version>1.12.2-GA</org.exoplatform.jcr.version>
+      <org.exoplatform.kernel.version>2.2.3-GA-SNAPSHOT</org.exoplatform.kernel.version>
+      <org.exoplatform.core.version>2.3.3-GA-SNAPSHOT</org.exoplatform.core.version>
+      <org.exoplatform.ws.version>2.1.3-GA-SNAPSHOT</org.exoplatform.ws.version>
+      <org.exoplatform.jcr.version>1.12.3-GA-SNAPSHOT</org.exoplatform.jcr.version>
       <org.jibx.version>1.2.1</org.jibx.version>
       <org.shindig.version>1.0-r790473-Patch02</org.shindig.version>
       <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
@@ -776,7 +776,18 @@
    </build>
 
   <profiles>
+
     <profile>
+      <id>stable</id>
+      <properties>
+        <org.exoplatform.kernel.version>2.2.2-GA</org.exoplatform.kernel.version>
+         <org.exoplatform.core.version>2.3.2-GA</org.exoplatform.core.version>
+         <org.exoplatform.ws.version>2.1.2-GA</org.exoplatform.ws.version>
+         <org.exoplatform.jcr.version>1.12.2-GA</org.exoplatform.jcr.version>
+      </properties>
+    </profile>
+
+    <profile>
       <id>hsqldb</id>
       <activation>
         <activeByDefault>true</activeByDefault>