Author: tolusha
Date: 2012-02-16 02:31:26 -0500 (Thu, 16 Feb 2012)
New Revision: 5648
Modified:
jcr/branches/1.15.x/applications/exo.jcr.applications.config/pom.xml
jcr/branches/1.15.x/applications/exo.jcr.applications.jboss/pom.xml
jcr/branches/1.15.x/applications/exo.jcr.applications.jetty/pom.xml
jcr/branches/1.15.x/applications/exo.jcr.applications.jonas/pom.xml
jcr/branches/1.15.x/applications/exo.jcr.applications.tomcat/pom.xml
jcr/branches/1.15.x/applications/exo.jcr.ear/pom.xml
jcr/branches/1.15.x/applications/product-patches/as/jboss/bin/run.conf
jcr/branches/1.15.x/applications/product-patches/as/jboss/bin/run.conf.bat
jcr/branches/1.15.x/applications/product-patches/as/jboss/exo-readme.txt
jcr/branches/1.15.x/applications/product-patches/as/jetty/eXo.bat
jcr/branches/1.15.x/applications/product-patches/as/jetty/eXo.sh
jcr/branches/1.15.x/applications/product-patches/as/jetty/exo-readme.txt
jcr/branches/1.15.x/applications/product-patches/as/jonas/bin/nt/jonas.bat
jcr/branches/1.15.x/applications/product-patches/as/jonas/bin/unix/jonas
jcr/branches/1.15.x/applications/product-patches/as/jonas/exo-readme.txt
jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo.bat
jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo.sh
jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo_debug.bat
jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo_debug.sh
jcr/branches/1.15.x/applications/product-patches/as/tomcat/exo-readme.txt
Log:
EXOJCR-1764: AS deployment cleanup
Modified: jcr/branches/1.15.x/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/branches/1.15.x/applications/exo.jcr.applications.config/pom.xml 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/exo.jcr.applications.config/pom.xml 2012-02-16
07:31:26 UTC (rev 5648)
@@ -29,6 +29,11 @@
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
<name>eXo JCR :: Applications :: Config</name>
+
+ <properties>
+ <exo.deploy.profile>jbc</exo.deploy.profile>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
@@ -100,6 +105,10 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
+ <properties>
+ <exo.deploy.profile>ispn</exo.deploy.profile>
+ </properties>
</profile>
</profiles>
</project>
Modified: jcr/branches/1.15.x/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/branches/1.15.x/applications/exo.jcr.applications.jboss/pom.xml 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/exo.jcr.applications.jboss/pom.xml 2012-02-16
07:31:26 UTC (rev 5648)
@@ -127,6 +127,10 @@
<copy
todir="${exo.projects.directory.working}/exo-jboss/bin/"
verbose="true" overwrite="true">
<fileset
dir="${basedir}/../product-patches/as/jboss/bin/" includes="*.*"
/>
</copy>
+
+ <replace
dir="${exo.projects.directory.working}/exo-jboss/bin"
token="-Dexo.profiles=jbc"
value="-Dexo.profiles=${exo.deploy.profile}"/>
+ <move
file="${exo.projects.directory.working}/exo-jboss/bin/run.bat"
tofile="${exo.projects.directory.working}/exo-jboss/bin/run-${exo.deploy.profile}.bat"
/>
+ <move
file="${exo.projects.directory.working}/exo-jboss/bin/run.sh"
tofile="${exo.projects.directory.working}/exo-jboss/bin/run-${exo.deploy.profile}.sh"
/>
</tasks>
</configuration>
</plugin>
Modified: jcr/branches/1.15.x/applications/exo.jcr.applications.jetty/pom.xml
===================================================================
--- jcr/branches/1.15.x/applications/exo.jcr.applications.jetty/pom.xml 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/exo.jcr.applications.jetty/pom.xml 2012-02-16
07:31:26 UTC (rev 5648)
@@ -121,6 +121,13 @@
<copy todir="${exo.projects.directory.working}/exo-jetty/"
verbose="true" overwrite="true">
<fileset dir="${basedir}/../product-patches/as/jetty/"
/>
</copy>
+ <replace dir="${exo.projects.directory.working}/exo-jetty"
token="@exo.deploy.profile(a)" value="${exo.deploy.profile}"/>
+ <move
todir="${exo.projects.directory.working}/exo-jetty/">
+ <fileset
dir="${exo.projects.directory.working}/exo-jetty/">
+ <include name="**/eXo.*" />
+ </fileset>
+ <globmapper from="eXo.*"
to="eXo-${exo.deploy.profile}.*" />
+ </move>
<chmod dir="${exo.projects.directory.working}/exo-jetty"
perm="+x" includes="*.sh" />
<move todir="${basedir}/target/lib-binary.dir/">
<fileset dir="${basedir}/target/lib-binary.dir/">
Modified: jcr/branches/1.15.x/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/branches/1.15.x/applications/exo.jcr.applications.jonas/pom.xml 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/exo.jcr.applications.jonas/pom.xml 2012-02-16
07:31:26 UTC (rev 5648)
@@ -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(a)" 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">
Modified: jcr/branches/1.15.x/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/branches/1.15.x/applications/exo.jcr.applications.tomcat/pom.xml 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/exo.jcr.applications.tomcat/pom.xml 2012-02-16
07:31:26 UTC (rev 5648)
@@ -122,6 +122,14 @@
<copy
todir="${exo.projects.directory.working}/exo-tomcat/" verbose="true"
overwrite="true">
<fileset dir="${basedir}/../product-patches/as/tomcat/"
/>
</copy>
+ <replace
dir="${exo.projects.directory.working}/exo-tomcat/bin"
token="@exo.deploy.profile(a)" value="${exo.deploy.profile}"/>
+ <move
todir="${exo.projects.directory.working}/exo-tomcat/bin/">
+ <fileset
dir="${exo.projects.directory.working}/exo-tomcat/bin/">
+ <include name="**/eXo.*" />
+ </fileset>
+ <globmapper from="eXo.*"
to="eXo-${exo.deploy.profile}.*" />
+ </move>
+
<chmod
dir="${exo.projects.directory.working}/exo-tomcat/bin" perm="+x"
includes="*.sh" />
<move todir="${basedir}/target/lib-binary.dir/">
Modified: jcr/branches/1.15.x/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/branches/1.15.x/applications/exo.jcr.ear/pom.xml 2012-02-15 15:58:24 UTC (rev
5647)
+++ jcr/branches/1.15.x/applications/exo.jcr.ear/pom.xml 2012-02-16 07:31:26 UTC (rev
5648)
@@ -29,9 +29,13 @@
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
<name>eXo JCR :: EAR</name>
+
<properties>
<enforcer.skip>true</enforcer.skip>
+ <exo.deploy.profile>jbc</exo.deploy.profile>
</properties>
+
+
<dependencies>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
@@ -128,6 +132,10 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
+ <properties>
+ <exo.deploy.profile>jbc</exo.deploy.profile>
+ </properties>
</profile>
</profiles>
<build>
Modified: jcr/branches/1.15.x/applications/product-patches/as/jboss/bin/run.conf
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/jboss/bin/run.conf 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/jboss/bin/run.conf 2012-02-16
07:31:26 UTC (rev 5648)
@@ -52,11 +52,4 @@
#JAVA_OPTS="$JAVA_OPTS
-Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"
# Add the eXo variables
-EXO_PROFILES="-Dexo.profiles="
-if [ "$1" = "jbc" ] || [ "$1" = "ispn" ]; then
- EXO_PROFILES="$EXO_PROFILES,$1"
- shift 1
-else
- EXO_PROFILES="$EXO_PROFILES,jbc"
-fi
-JAVA_OPTS="$JAVA_OPTS $EXO_PROFILES
-Dexo.jcr.parent.dir=../server/default/data"
+JAVA_OPTS="$JAVA_OPTS -Dexo.profiles=jbc
-Dexo.jcr.parent.dir=../server/default/data"
Modified: jcr/branches/1.15.x/applications/product-patches/as/jboss/bin/run.conf.bat
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/jboss/bin/run.conf.bat 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/jboss/bin/run.conf.bat 2012-02-16
07:31:26 UTC (rev 5648)
@@ -55,22 +55,6 @@
rem set "JAVA_OPTS=%JAVA_OPTS%
-Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"
rem # Add the eXo variables
+set "JAVA_OPTS=%JAVA_OPTS% -Dexo.profiles=jbc
-Dexo.jcr.parent.dir=../server/default/data"
-set EXO_PROFILES=-Dexo.profiles=
-if ""%1"" == ""jbc"" goto profile
-if ""%1"" == ""ispn"" goto profile
-goto default_profile
-
-:profile
-set EXO_PROFILES=%EXO_PROFILES%,%1
-shift
-goto endif
-
-:default_profile
-set EXO_PROFILES=%EXO_PROFILES%,jbc
-goto endif
-
-:endif
-set "JAVA_OPTS=%JAVA_OPTS% %EXO_PROFILES%
-Dexo.jcr.parent.dir=../server/default/data"
-
:JAVA_OPTS_SET
Modified: jcr/branches/1.15.x/applications/product-patches/as/jboss/exo-readme.txt
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/jboss/exo-readme.txt 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/jboss/exo-readme.txt 2012-02-16
07:31:26 UTC (rev 5648)
@@ -4,12 +4,10 @@
In Unix environment
-* "./run.sh" to launch eXo JCR with the default configuration
-* "./run.sh ispn" to launch eXo JCR with the configuration for Infinispan
-* "./run.sh jbc" to launch eXo JCR with the configuration for JBoss Cache
+* "./run-ispn.sh" to launch eXo JCR with the configuration for Infinispan
+* "./run-jbc.sh" to launch eXo JCR with the configuration for JBoss Cache
In Windows environment
-* "run.bat" to launch eXo JCR with the default configuration
-* "run.bat ispn" to launch eXo JCR with the configuration for Infinispan
-* "run.bat jbc" to launch eXo JCR with the configuration for JBoss Cache
+* "run-ispn.bat" to launch eXo JCR with the configuration for Infinispan
+* "run-jbc.bat" to launch eXo JCR with the configuration for JBoss Cache
Modified: jcr/branches/1.15.x/applications/product-patches/as/jetty/eXo.bat
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/jetty/eXo.bat 2012-02-15 15:58:24
UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/jetty/eXo.bat 2012-02-16 07:31:26
UTC (rev 5648)
@@ -1,17 +1 @@
-set EXO_PROFILES=-Dexo.profiles=
-if ""%1"" == ""jbc"" goto profile
-if ""%1"" == ""ispn"" goto profile
-goto default_profile
-
-:profile
-set EXO_PROFILES=%EXO_PROFILES%,%1
-shift
-goto endif
-
-:default_profile
-set EXO_PROFILES=%EXO_PROFILES%,jbc
-goto endif
-
-:endif
-
-java -Djava.security.auth.login.config=jaas.conf %EXO_PROFILES%
-Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=. -jar start.jar
+java -Djava.security.auth.login.config=jaas.conf -Dexo.profiles=(a)exo.deploy.profile@
-Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=. -jar start.jar
Modified: jcr/branches/1.15.x/applications/product-patches/as/jetty/eXo.sh
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/jetty/eXo.sh 2012-02-15 15:58:24
UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/jetty/eXo.sh 2012-02-16 07:31:26
UTC (rev 5648)
@@ -1,10 +1 @@
-EXO_PROFILES="-Dexo.profiles="
-if [ "$1" = "jbc" ] || [ "$1" = "ispn" ]; then
- EXO_PROFILES="$EXO_PROFILES,$1"
- shift 1
-else
- EXO_PROFILES="$EXO_PROFILES,jbc"
-fi
-EXO_OPTS="-Dexo.product.developing=true $EXO_PROFILES
-Djava.net.preferIPv4Stack=true"
-
-java -Djava.security.auth.login.config=jaas.conf $EXO_PROFILES
-Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=. -jar start.jar
+java -Djava.security.auth.login.config=jaas.conf -Dexo.profiles=(a)exo.deploy.profile@
-Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=. -jar start.jar
Modified: jcr/branches/1.15.x/applications/product-patches/as/jetty/exo-readme.txt
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/jetty/exo-readme.txt 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/jetty/exo-readme.txt 2012-02-16
07:31:26 UTC (rev 5648)
@@ -4,12 +4,10 @@
In Unix environment
-* "./eXo.sh" to launch eXo JCR with the default configuration
-* "./eXo.sh ispn" to launch eXo JCR with the configuration for Infinispan
-* "./eXo.sh jbc" to launch eXo JCR with the configuration for JBoss Cache
+* "./eXo-ispn.sh" to launch eXo JCR with the configuration for Infinispan
+* "./eXo-jbc.sh" to launch eXo JCR with the configuration for JBoss Cache
In Windows environment
-* "eXo.bat" to launch eXo JCR with the default configuration
-* "eXo.bat ispn" to launch eXo JCR with the configuration for Infinispan
-* "eXo.bat jbc" to launch eXo JCR with the configuration for JBoss Cache
+* "eXo-ispn.bat" to launch eXo JCR with the configuration for Infinispan
+* "eXo-jbc.bat" to launch eXo JCR with the configuration for JBoss Cache
Modified: jcr/branches/1.15.x/applications/product-patches/as/jonas/bin/nt/jonas.bat
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/jonas/bin/nt/jonas.bat 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/jonas/bin/nt/jonas.bat 2012-02-16
07:31:26 UTC (rev 5648)
@@ -80,25 +80,9 @@
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=(a)exo.deploy.profile@
-Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=../..
+set JAVA_OPTS=%JAVA_OPTS% -Xmx512M
-set EXO_PROFILES=-Dexo.profiles=
-if ""%1"" == ""jbc"" goto profile
-if ""%1"" == ""ispn"" goto profile
-goto default_profile
-
-:profile
-set EXO_PROFILES=%EXO_PROFILES%,%1
-shift
-goto endif
-
-:default_profile
-set EXO_PROFILES=%EXO_PROFILES%,jbc
-goto endif
-
-:endif
-set JONAS_OPTS=%JONAS_OPTS%
-Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog
-Djava.awt.headless=true %EXO_PROFILES% -Djava.net.preferIPv4Stack=true
-Dexo.jcr.parent.dir=../..
-
-
Rem ------------------------ End eXo configuration -----------------------------
Rem ---------------------------------------------
Modified: jcr/branches/1.15.x/applications/product-patches/as/jonas/bin/unix/jonas
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/jonas/bin/unix/jonas 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/jonas/bin/unix/jonas 2012-02-16
07:31:26 UTC (rev 5648)
@@ -79,18 +79,8 @@
# ------------------------- Begin eXo configuration ----------------------------
cd $JONAS_ROOT/bin
-
-EXO_PROFILES="-Dexo.profiles="
-if [ "$1" = "jbc" ] || [ "$1" = "ispn" ]; then
- EXO_PROFILES="$EXO_PROFILES,$1"
- shift
-else
- EXO_PROFILES="$EXO_PROFILES,jbc"
-fi
-EXO_OPTS="-Dexo.product.developing=true $EXO_PROFILES
-Djava.net.preferIPv4Stack=true"
-
-JONAS_OPTS="$JONAS_OPTS
-Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog
-Djava.awt.headless=true $EXO_PROFILES -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=(a)exo.deploy.profile@
-Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=.."
+JAVA_OPTS="$JAVA_OPTS -Xmx512M"
# -------------------------- End eXo configuration -----------------------------
Modified: jcr/branches/1.15.x/applications/product-patches/as/jonas/exo-readme.txt
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/jonas/exo-readme.txt 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/jonas/exo-readme.txt 2012-02-16
07:31:26 UTC (rev 5648)
@@ -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
Modified: jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo.bat
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo.bat 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo.bat 2012-02-16
07:31:26 UTC (rev 5648)
@@ -8,23 +8,7 @@
rem Sets some variables
set
LOG_OPTS="-Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog"
set
SECURITY_OPTS="-Djava.security.auth.login.config=%TOMCAT_HOME%\conf\jaas.conf"
-
-set EXO_PROFILES=-Dexo.profiles=
-if ""%1"" == ""jbc"" goto profile
-if ""%1"" == ""ispn"" goto profile
-goto default_profile
-
-:profile
-set EXO_PROFILES=%EXO_PROFILES%,%1
-shift
-goto endif
-
-:default_profile
-set EXO_PROFILES=%EXO_PROFILES%,jbc
-goto endif
-
-:endif
-set EXO_OPTS=-Dexo.product.developing=true %EXO_PROFILES%
-Djava.net.preferIPv4Stack=true
+set EXO_OPTS=-Dexo.product.developing=true -Dexo.profiles=(a)exo.deploy.profile@
-Djava.net.preferIPv4Stack=true
set JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%
rem Launches the server
Modified: jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo.sh
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo.sh 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo.sh 2012-02-16
07:31:26 UTC (rev 5648)
@@ -5,14 +5,7 @@
PRGDIR=`dirname "$PRG"`
LOG_OPTS="-Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog"
SECURITY_OPTS="-Djava.security.auth.login.config=$PRGDIR/../conf/jaas.conf"
-EXO_PROFILES="-Dexo.profiles="
-if [ "$1" = "jbc" ] || [ "$1" = "ispn" ]; then
- EXO_PROFILES="$EXO_PROFILES,$1"
- shift
-else
- EXO_PROFILES="$EXO_PROFILES,jbc"
-fi
-EXO_OPTS="-Dexo.product.developing=true $EXO_PROFILES
-Djava.net.preferIPv4Stack=true"
+EXO_OPTS="-Dexo.product.developing=true -Dexo.profiles=(a)exo.deploy.profile@
-Djava.net.preferIPv4Stack=true"
JAVA_OPTS="$JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $JPDA_OPTS"
export JAVA_OPTS
Modified: jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo_debug.bat
===================================================================
---
jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo_debug.bat 2012-02-15
15:58:24 UTC (rev 5647)
+++
jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo_debug.bat 2012-02-16
07:31:26 UTC (rev 5648)
@@ -7,4 +7,4 @@
rem -Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,
rem address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
@SET JPDA_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=18000,server=y,suspend=y
-@ eXo.bat jpda start
+@ eXo-@exo.deploy.profile@.bat jpda start
Modified: jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo_debug.sh
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo_debug.sh 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo_debug.sh 2012-02-16
07:31:26 UTC (rev 5648)
@@ -2,4 +2,5 @@
export JPDA_OPTS="-Xdebug
-Xrunjdwp:transport=dt_socket,address=18000,server=y,suspend=y"
PRGDIR=`dirname "$PRG"`
-exec "$PRGDIR"/eXo.sh "$@"
+exec "$PRGDIR"/eXo-@exo.deploy.profile@.sh "$@"
+
Modified: jcr/branches/1.15.x/applications/product-patches/as/tomcat/exo-readme.txt
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/tomcat/exo-readme.txt 2012-02-15
15:58:24 UTC (rev 5647)
+++ jcr/branches/1.15.x/applications/product-patches/as/tomcat/exo-readme.txt 2012-02-16
07:31:26 UTC (rev 5648)
@@ -4,12 +4,10 @@
In Unix environment
-* "./eXo.sh run" to launch eXo JCR with the default configuration
-* "./eXo.sh ispn run" to launch eXo JCR with the configuration for Infinispan
-* "./eXo.sh jbc run" to launch eXo JCR with the configuration for JBoss Cache
+* "./eXo-ispn.sh run" to launch eXo JCR with the configuration for Infinispan
+* "./eXo-jbc.sh jbc run" to launch eXo JCR with the configuration for JBoss
Cache
In Windows environment
-* "eXo.bat run" to launch eXo JCR with the default configuration
-* "eXo.bat ispn run" to launch eXo JCR with the configuration for Infinispan
-* "eXo.bat jbc run" to launch eXo JCR with the configuration for JBoss Cache
+* "eXo-ispn.bat run" to launch eXo JCR with the configuration for Infinispan
+* "eXo-jbc.bat run" to launch eXo JCR with the configuration for JBoss Cache