[exo-jcr-commits] exo-jcr SVN: r5442 - in jcr/branches/1.15.x/applications/product-patches/as: jboss/bin and 6 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Jan 12 02:12:38 EST 2012
Author: tolusha
Date: 2012-01-12 02:12:27 -0500 (Thu, 12 Jan 2012)
New Revision: 5442
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.bat
jcr/branches/1.15.x/applications/product-patches/as/jboss/exo-configuration.xml
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-configuration.xml
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-configuration.xml
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/exo-configuration.xml
jcr/branches/1.15.x/applications/product-patches/as/tomcat/exo-readme.txt
Log:
EXOJCR-1706: fix using profiles, the default profile will be jbc
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-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/jboss/bin/run.conf 2012-01-12 07:12:27 UTC (rev 5442)
@@ -52,7 +52,11 @@
#JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"
# Add the eXo variables
-JAVA_OPTS="$JAVA_OPTS -Dexo.profiles=$1 -Dexo.jcr.parent.dir=../server/default/data"
-if [ "$1" = "ispn" ]; then
- shift
-fi
\ No newline at end of file
+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"
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-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/jboss/bin/run.conf.bat 2012-01-12 07:12:27 UTC (rev 5442)
@@ -55,8 +55,22 @@
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=%1 -Dexo.jcr.parent.dir=../server/default/data"
-if ""%1"" == ""ispn"" shift
+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-configuration.xml
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/jboss/exo-configuration.xml 2012-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/jboss/exo-configuration.xml 2012-01-12 07:12:27 UTC (rev 5442)
@@ -55,15 +55,15 @@
<key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
<type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
<init-params>
- <value-param>
+ <value-param profiles="ispn">
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>jar:/conf/portal/exo-jcr-jbc-config.xml</value>
+ <value>jar:/conf/portal/exo-jcr-ispn-config.xml</value>
</value-param>
- <value-param profiles="ispn">
+ <value-param profiles="jbc">
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>jar:/conf/portal/exo-jcr-ispn-config.xml</value>
+ <value>jar:/conf/portal/exo-jcr-jbc-config.xml</value>
</value-param>
</init-params>
</component>
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-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/jboss/exo-readme.txt 2012-01-12 07:12:27 UTC (rev 5442)
@@ -4,10 +4,12 @@
In Unix environment
-* "./run.sh" to launch eXo JCR with the configuration for JBoss Cache
+* "./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
In Windows environment
-* "run.bat" to launch eXo JCR with the configuration for JBoss Cache
+* "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
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-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/jetty/eXo.bat 2012-01-12 07:12:27 UTC (rev 5442)
@@ -1 +1,17 @@
-java -Djava.security.auth.login.config=jaas.conf -Dexo.profiles=%1 -Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=. -jar start.jar
+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
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-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/jetty/eXo.sh 2012-01-12 07:12:27 UTC (rev 5442)
@@ -1 +1,10 @@
-java -Djava.security.auth.login.config=jaas.conf -Dexo.profiles=$1 -Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=. -jar start.jar
+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
Modified: jcr/branches/1.15.x/applications/product-patches/as/jetty/exo-configuration.xml
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/jetty/exo-configuration.xml 2012-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/jetty/exo-configuration.xml 2012-01-12 07:12:27 UTC (rev 5442)
@@ -55,15 +55,15 @@
<key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
<type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
<init-params>
- <value-param>
+ <value-param profiles="ispn">
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>jar:/conf/portal/exo-jcr-jbc-config.xml</value>
+ <value>jar:/conf/portal/exo-jcr-ispn-config.xml</value>
</value-param>
- <value-param profiles="ispn">
+ <value-param profiles="jbc">
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>jar:/conf/portal/exo-jcr-ispn-config.xml</value>
+ <value>jar:/conf/portal/exo-jcr-jbc-config.xml</value>
</value-param>
</init-params>
</component>
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-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/jetty/exo-readme.txt 2012-01-12 07:12:27 UTC (rev 5442)
@@ -1,13 +1,15 @@
Thank you for your interest in eXo JCR
-To launch it, go to the bin directory and execute the following command:
+To launch it, execute the following command:
In Unix environment
-* "./run.sh" to launch eXo JCR with the configuration for JBoss Cache
-* "./run.sh ispn" to launch eXo JCR with the configuration for Infinispan
+* "./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
In Windows environment
-* "run.bat" to launch eXo JCR with the configuration for JBoss Cache
-* "run.bat ispn" to launch eXo JCR with the configuration for Infinispan
+* "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
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-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/jonas/bin/nt/jonas.bat 2012-01-12 07:12:27 UTC (rev 5442)
@@ -80,9 +80,25 @@
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 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=../..
set JAVA_OPTS=%JAVA_OPTS% -Xmx512M
-if ""%1"" == ""ispn"" shift
+
Rem ------------------------ End eXo configuration -----------------------------
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-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/jonas/bin/unix/jonas 2012-01-12 07:12:27 UTC (rev 5442)
@@ -79,11 +79,18 @@
# ------------------------- 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=.."
-JAVA_OPTS="$JAVA_OPTS -Xmx512M"
-if [ "$1" = "ispn" ]; then
- shift
-fi
+
+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=.."
+
# -------------------------- End eXo configuration -----------------------------
Modified: jcr/branches/1.15.x/applications/product-patches/as/jonas/exo-configuration.xml
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/jonas/exo-configuration.xml 2012-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/jonas/exo-configuration.xml 2012-01-12 07:12:27 UTC (rev 5442)
@@ -55,15 +55,15 @@
<key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
<type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
<init-params>
- <value-param>
+ <value-param profiles="ispn">
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>jar:/conf/portal/exo-jcr-jbc-config.xml</value>
+ <value>jar:/conf/portal/exo-jcr-ispn-config.xml</value>
</value-param>
- <value-param profiles="ispn">
+ <value-param profiles="jbc">
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>jar:/conf/portal/exo-jcr-ispn-config.xml</value>
+ <value>jar:/conf/portal/exo-jcr-jbc-config.xml</value>
</value-param>
</init-params>
</component>
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-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/jonas/exo-readme.txt 2012-01-12 07:12:27 UTC (rev 5442)
@@ -2,10 +2,12 @@
In Unix environment, go in the directory bin/unix then execute the following command:
-* "./jonas start" to launch eXo JCR with the configuration for JBoss Cache
+* "./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
In Windows environment, go in the directory bin\nt then execute the following command:
-* "jonas.bat start" to launch eXo JCR with the configuration for JBoss Cache
+* "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
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-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo.bat 2012-01-12 07:12:27 UTC (rev 5442)
@@ -8,9 +8,24 @@
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_OPTS=-Dexo.product.developing=true -Dexo.profiles=%1 -Djava.net.preferIPv4Stack=true
+
+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 JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%
-if ""%1"" == ""ispn"" shift
rem Launches the server
cd %BIN_DIR%
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-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/tomcat/bin/eXo.sh 2012-01-12 07:12:27 UTC (rev 5442)
@@ -5,11 +5,15 @@
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_OPTS="-Dexo.product.developing=true -Dexo.profiles=$1 -Djava.net.preferIPv4Stack=true"
-if [ "$1" = "ispn" ]; then
+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"
-JAVA_OPTS="$JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS"
+JAVA_OPTS="$JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $JPDA_OPTS"
export JAVA_OPTS
exec "$PRGDIR"/catalina.sh "$@"
Modified: jcr/branches/1.15.x/applications/product-patches/as/tomcat/exo-configuration.xml
===================================================================
--- jcr/branches/1.15.x/applications/product-patches/as/tomcat/exo-configuration.xml 2012-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/tomcat/exo-configuration.xml 2012-01-12 07:12:27 UTC (rev 5442)
@@ -55,15 +55,15 @@
<key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
<type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
<init-params>
- <value-param>
+ <value-param profiles="ispn">
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>jar:/conf/portal/exo-jcr-jbc-config.xml</value>
+ <value>jar:/conf/portal/exo-jcr-ispn-config.xml</value>
</value-param>
- <value-param profiles="ispn">
+ <value-param profiles="jbc">
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>jar:/conf/portal/exo-jcr-ispn-config.xml</value>
+ <value>jar:/conf/portal/exo-jcr-jbc-config.xml</value>
</value-param>
</init-params>
</component>
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-01-11 11:22:23 UTC (rev 5441)
+++ jcr/branches/1.15.x/applications/product-patches/as/tomcat/exo-readme.txt 2012-01-12 07:12:27 UTC (rev 5442)
@@ -4,10 +4,12 @@
In Unix environment
-* "./run.sh" to launch eXo JCR with the configuration for JBoss Cache
-* "./run.sh ispn" to launch eXo JCR with the configuration for Infinispan
+* "./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
In Windows environment
-* "run.bat" to launch eXo JCR with the configuration for JBoss Cache
-* "run.bat ispn" to launch eXo JCR with the configuration for Infinispan
+* "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
More information about the exo-jcr-commits
mailing list