[exo-jcr-commits] exo-jcr SVN: r5644 - in jcr/trunk/applications: exo.jcr.applications.tomcat and 3 other directories.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2012-02-15 10:05:38 -0500 (Wed, 15 Feb 2012)
New Revision: 5644

Modified:
   jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
   jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
   jcr/trunk/applications/product-patches/as/jonas/bin/nt/jonas.bat
   jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas
   jcr/trunk/applications/product-patches/as/jonas/exo-readme.txt
Log:
EXOJCR-1764: AS deployment cleanup

Modified: jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml	2012-02-15 14:32:39 UTC (rev 5643)
+++ jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml	2012-02-15 15:05:38 UTC (rev 5644)
@@ -157,8 +157,11 @@
 
                   <!-- Copying patch directory -->
                   <copy todir="${exo.projects.directory.working}/exo-jonas/" verbose="true" overwrite="true">
-                    <fileset dir="${basedir}/../product-patches/as/jonas/" />
+                     <fileset dir="${basedir}/../product-patches/as/jonas/" />
                   </copy>
+                  <replace dir="${exo.projects.directory.working}/exo-jonas/" token="@exo.deploy.profile@" value="${exo.deploy.profile}"/>
+                  <move file="${exo.projects.directory.working}/exo-jonas/bin/nt/jonas.bat" tofile="${exo.projects.directory.working}/exo-jonas/bin/nt/jonas-${exo.deploy.profile}.bat" />
+                  <move file="${exo.projects.directory.working}/exo-jonas/bin/unix/jonas" tofile="${exo.projects.directory.working}/exo-jonas/bin/unix/jonas-${exo.deploy.profile}" />
 
                   <!-- Coping wars, rar -->
                   <copy todir="${exo.projects.directory.working}/exo-jonas/apps/autoload/exoplatform.ear" verbose="true" overwrite="true">
@@ -177,6 +180,8 @@
                         <include name="**/hsqldb*.jar" />
                      </fileset>
                   </copy>
+
+                  <delete file="${exo.projects.directory.working}/exo-jonas/lib/commons/jonas/carol/jgroups-all.jar" />
                </tasks>
             </configuration>
             <dependencies>

Modified: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml	2012-02-15 14:32:39 UTC (rev 5643)
+++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml	2012-02-15 15:05:38 UTC (rev 5644)
@@ -123,7 +123,7 @@
                      <fileset dir="${basedir}/../product-patches/as/tomcat/" />
                   </copy>
                   <replace dir="${exo.projects.directory.working}/exo-tomcat/bin" token="@exo.deploy.profile@" value="${exo.deploy.profile}"/>
-                  <move todir="${exo.projects.directory.working}/exo-tomcat/bin//">
+                  <move todir="${exo.projects.directory.working}/exo-tomcat/bin/">
                     <fileset dir="${exo.projects.directory.working}/exo-tomcat/bin/">
                       <include name="**/eXo.*" />
                     </fileset>

Modified: jcr/trunk/applications/product-patches/as/jonas/bin/nt/jonas.bat
===================================================================
--- jcr/trunk/applications/product-patches/as/jonas/bin/nt/jonas.bat	2012-02-15 14:32:39 UTC (rev 5643)
+++ jcr/trunk/applications/product-patches/as/jonas/bin/nt/jonas.bat	2012-02-15 15:05:38 UTC (rev 5644)
@@ -80,10 +80,8 @@
 
 Rem ----------------------- Begin eXo configuration ----------------------------
 cd %JONAS_ROOT%/bin
-set JONAS_OPTS=%JONAS_OPTS% -Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog -Djava.awt.headless=true -Dexo.profiles=%1 -Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=../..
+set JONAS_OPTS=%JONAS_OPTS% -Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog -Djava.awt.headless=true -Dexo.profiles=@exo.deploy.profile@ -Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=../..
 set JAVA_OPTS=%JAVA_OPTS% -Xmx512M
-if ""%1"" == ""jbc"" shift
-if ""%1"" == ""ispn"" shift
 
 Rem ------------------------ End eXo configuration -----------------------------
 

Modified: jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas
===================================================================
--- jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas	2012-02-15 14:32:39 UTC (rev 5643)
+++ jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas	2012-02-15 15:05:38 UTC (rev 5644)
@@ -79,11 +79,8 @@
 
 # ------------------------- Begin eXo configuration ----------------------------
 cd $JONAS_ROOT/bin
-JONAS_OPTS="$JONAS_OPTS -Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog -Djava.awt.headless=true -Dexo.profiles=$1 -Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=.."
+JONAS_OPTS="$JONAS_OPTS -Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog -Djava.awt.headless=true -Dexo.profiles=@exo.deploy.profile@ -Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=.."
 JAVA_OPTS="$JAVA_OPTS -Xmx512M"
-if [ "$1" = "jbc" ] || [ "$1" = "ispn" ]; then
-    shift
-fi
 
 # -------------------------- End eXo configuration -----------------------------
 

Modified: jcr/trunk/applications/product-patches/as/jonas/exo-readme.txt
===================================================================
--- jcr/trunk/applications/product-patches/as/jonas/exo-readme.txt	2012-02-15 14:32:39 UTC (rev 5643)
+++ jcr/trunk/applications/product-patches/as/jonas/exo-readme.txt	2012-02-15 15:05:38 UTC (rev 5644)
@@ -2,12 +2,10 @@
 
 In Unix environment, go in the directory bin/unix then execute the following command:
 
-* "./jonas start" to launch eXo JCR with the default configuration
-* "./jonas ispn start" to launch eXo JCR with the configuration for Infinispan
-* "./jonas jbc start" to launch eXo JCR with the configuration for JBoss Cache
+* "./jonas-ispn start" to launch eXo JCR with the configuration for Infinispan
+* "./jonas-jbc start" to launch eXo JCR with the configuration for JBoss Cache
 
 In Windows environment, go in the directory bin\nt then execute the following command:
 
-* "jonas.bat start" to launch eXo JCR with the default configuration
-* "jonas.bat ispn start" to launch eXo JCR with the configuration for Infinispan
-* "jonas.bat jbc start" to launch eXo JCR with the configuration for JBoss Cache
+* "jonas-ispn.bat start" to launch eXo JCR with the configuration for Infinispan
+* "jonas-jbc.bat start" to launch eXo JCR with the configuration for JBoss Cache