[exo-jcr-commits] exo-jcr SVN: r5643 - in jcr/trunk/applications: product-patches/as/tomcat and 1 other directories.

Author: tolusha Date: 2012-02-15 09:32:39 -0500 (Wed, 15 Feb 2012) New Revision: 5643 Added: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.bat jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.sh Removed: 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 Modified: 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/bin/eXo_debug.sh jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt Log: EXOJCR-1764: AS deployment cleanup Modified: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2012-02-15 13:33:46 UTC (rev 5642) +++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2012-02-15 14:32:39 UTC (rev 5643) @@ -120,16 +120,15 @@ <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/"> - <exclude name="**/*-jbc.*" /> - <exclude name="**/*-ispn.*" /> - </fileset> + <fileset dir="${basedir}/../product-patches/as/tomcat/" /> </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> + <replace dir="${exo.projects.directory.working}/exo-tomcat/bin" token=&quot;@exo.deploy.profile(a)&quot; 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" /> Deleted: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.bat =================================================================== --- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.bat 2012-02-15 13:33:46 UTC (rev 5642) +++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.bat 2012-02-15 14:32:39 UTC (rev 5643) @@ -1,16 +0,0 @@ -@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 Deleted: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.sh =================================================================== --- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.sh 2012-02-15 13:33:46 UTC (rev 5642) +++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-ispn.sh 2012-02-15 14:32:39 UTC (rev 5643) @@ -1,12 +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=ispn -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-jbc.bat =================================================================== --- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.bat 2012-02-15 13:33:46 UTC (rev 5642) +++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.bat 2012-02-15 14:32:39 UTC (rev 5643) @@ -1,16 +0,0 @@ -@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 Deleted: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.sh =================================================================== --- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.sh 2012-02-15 13:33:46 UTC (rev 5642) +++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo-jbc.sh 2012-02-15 14:32:39 UTC (rev 5643) @@ -1,12 +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=jbc -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.bat =================================================================== --- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.bat (rev 0) +++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.bat 2012-02-15 14:32:39 UTC (rev 5643) @@ -0,0 +1,16 @@ +@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=(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 +cd %BIN_DIR% +call catalina.bat %1 %2 %3 Added: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.sh =================================================================== --- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.sh (rev 0) +++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.sh 2012-02-15 14:32:39 UTC (rev 5643) @@ -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=(a)exo.deploy.profile@ -Djava.net.preferIPv4Stack=true" + +JAVA_OPTS="$JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $JPDA_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 13:33:46 UTC (rev 5642) +++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo_debug.bat 2012-02-15 14:32:39 UTC (rev 5643) @@ -7,5 +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 -if EXIST eXo-jbc.bat @ eXo-jbc.bat jpda start -if EXIST eXo-ispn.bat @ eXo-ispn.bat jpda start +@ eXo-@exo.deploy.profile@.bat jpda start Modified: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo_debug.sh =================================================================== --- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo_debug.sh 2012-02-15 13:33:46 UTC (rev 5642) +++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo_debug.sh 2012-02-15 14:32:39 UTC (rev 5643) @@ -2,11 +2,5 @@ export JPDA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=18000,server=y,suspend=y" PRGDIR=`dirname "$PRG"` +exec "$PRGDIR"/eXo-@exo.deploy.profile@.sh "$@" -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 13:33:46 UTC (rev 5642) +++ jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt 2012-02-15 14:32:39 UTC (rev 5643) @@ -11,8 +11,3 @@ * "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. -In ordrer to run eXo JCR with Infinispan configuration it must be deployed -with "ispn" profile.