[exo-jcr-commits] exo-jcr SVN: r5642 - in jcr/trunk/applications: exo.jcr.applications.tomcat and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Feb 15 08:33:47 EST 2012
Author: tolusha
Date: 2012-02-15 08:33:46 -0500 (Wed, 15 Feb 2012)
New Revision: 5642
Added:
jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.bat
jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.sh
jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.bat
jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.sh
jcr/trunk/applications/product-patches/as/tomcat/bin/eXo_debug.sh
Removed:
jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.bat
jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.sh
Modified:
jcr/trunk/applications/exo.jcr.applications.config/pom.xml
jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
jcr/trunk/applications/product-patches/as/tomcat/bin/eXo_debug.bat
jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt
Log:
EXOJCR-1764: Tomcat deployment cleanup
Modified: jcr/trunk/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.config/pom.xml 2012-02-15 12:36:12 UTC (rev 5641)
+++ jcr/trunk/applications/exo.jcr.applications.config/pom.xml 2012-02-15 13:33:46 UTC (rev 5642)
@@ -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/trunk/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2012-02-15 12:36:12 UTC (rev 5641)
+++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2012-02-15 13:33:46 UTC (rev 5642)
@@ -120,8 +120,17 @@
<fileset dir="${basedir}/target/lib-binary.dir/" includes="**/*.jar" />
</copy>
<copy todir="${exo.projects.directory.working}/exo-tomcat/" verbose="true" overwrite="true">
- <fileset dir="${basedir}/../product-patches/as/tomcat/" />
+ <fileset dir="${basedir}/../product-patches/as/tomcat/">
+ <exclude name="**/*-jbc.*" />
+ <exclude name="**/*-ispn.*" />
+ </fileset>
</copy>
+ <copy todir="${exo.projects.directory.working}/exo-tomcat/bin" verbose="true" overwrite="true">
+ <fileset dir="${basedir}/../product-patches/as/tomcat/bin">
+ <include name="**/eXo-${exo.deploy.profile}.*" />
+ </fileset>
+ </copy>
+
<chmod dir="${exo.projects.directory.working}/exo-tomcat/bin" perm="+x" includes="*.sh" />
<move todir="${basedir}/target/lib-binary.dir/">
Added: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.bat
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.bat (rev 0)
+++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.bat 2012-02-15 13:33:46 UTC (rev 5642)
@@ -0,0 +1,16 @@
+ at echo off
+
+rem Computes the absolute path of eXo
+setlocal ENABLEDELAYEDEXPANSION
+for %%i in ( !%~f0! ) do set BIN_DIR=%%~dpi
+for %%i in ( !%BIN_DIR%\..! ) do set TOMCAT_HOME=%%~fi
+
+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=ispn -Djava.net.preferIPv4Stack=true
+set JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%
+
+rem Launches the server
+cd %BIN_DIR%
+call catalina.bat %1 %2 %3
Added: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.sh
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.sh (rev 0)
+++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.sh 2012-02-15 13:33:46 UTC (rev 5642)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+PRG="$0"
+
+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=ispn -Djava.net.preferIPv4Stack=true"
+
+JAVA_OPTS="$JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $JPDA_OPTS"
+export JAVA_OPTS
+exec "$PRGDIR"/catalina.sh "$@"
Added: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.bat
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.bat (rev 0)
+++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.bat 2012-02-15 13:33:46 UTC (rev 5642)
@@ -0,0 +1,16 @@
+ at echo off
+
+rem Computes the absolute path of eXo
+setlocal ENABLEDELAYEDEXPANSION
+for %%i in ( !%~f0! ) do set BIN_DIR=%%~dpi
+for %%i in ( !%BIN_DIR%\..! ) do set TOMCAT_HOME=%%~fi
+
+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=jbc -Djava.net.preferIPv4Stack=true
+set JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%
+
+rem Launches the server
+cd %BIN_DIR%
+call catalina.bat %1 %2 %3
Added: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.sh
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.sh (rev 0)
+++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.sh 2012-02-15 13:33:46 UTC (rev 5642)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+PRG="$0"
+
+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=jbc -Djava.net.preferIPv4Stack=true"
+
+JAVA_OPTS="$JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $JPDA_OPTS"
+export JAVA_OPTS
+exec "$PRGDIR"/catalina.sh "$@"
Deleted: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.bat
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.bat 2012-02-15 12:36:12 UTC (rev 5641)
+++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.bat 2012-02-15 13:33:46 UTC (rev 5642)
@@ -1,18 +0,0 @@
- at echo off
-
-rem Computes the absolute path of eXo
-setlocal ENABLEDELAYEDEXPANSION
-for %%i in ( !%~f0! ) do set BIN_DIR=%%~dpi
-for %%i in ( !%BIN_DIR%\..! ) do set TOMCAT_HOME=%%~fi
-
-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 JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%
-if ""%1"" == ""jbc"" shift
-if ""%1"" == ""ispn"" shift
-
-rem Launches the server
-cd %BIN_DIR%
-call catalina.bat %1 %2 %3
Deleted: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.sh
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.sh 2012-02-15 12:36:12 UTC (rev 5641)
+++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.sh 2012-02-15 13:33:46 UTC (rev 5642)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-PRG="$0"
-
-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" = "jbc" ] || [ "$1" = "ispn" ]; then
- shift
-fi
-
-JAVA_OPTS="$JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS"
-export JAVA_OPTS
-exec "$PRGDIR"/catalina.sh "$@"
Modified: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo_debug.bat
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo_debug.bat 2012-02-15 12:36:12 UTC (rev 5641)
+++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo_debug.bat 2012-02-15 13:33:46 UTC (rev 5642)
@@ -7,4 +7,5 @@
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
+if EXIST eXo-jbc.bat @ eXo-jbc.bat jpda start
+if EXIST eXo-ispn.bat @ eXo-ispn.bat jpda start
Added: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo_debug.sh
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo_debug.sh (rev 0)
+++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo_debug.sh 2012-02-15 13:33:46 UTC (rev 5642)
@@ -0,0 +1,12 @@
+#!/bin/sh
+export JPDA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=18000,server=y,suspend=y"
+
+PRGDIR=`dirname "$PRG"`
+
+if [ -f eXo-jbc.sh ]; then
+ exec "$PRGDIR"/eXo-jbc.sh "$@"
+else if [ -f eXo-ispn.sh ]; then
+ exec "$PRGDIR"/eXo-ispn.sh "$@"
+ fi
+fi
+
Modified: jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt 2012-02-15 12:36:12 UTC (rev 5641)
+++ jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt 2012-02-15 13:33:46 UTC (rev 5642)
@@ -4,15 +4,13 @@
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 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
Notice!
JCR Bundles for Infinispan and JBoss Cache differs by their dependencies.
More information about the exo-jcr-commits
mailing list