[exo-jcr-commits] exo-jcr SVN: r5645 - in jcr/trunk/applications: product-patches/as/jetty and 1 other directory.

Author: tolusha Date: 2012-02-15 10:12:49 -0500 (Wed, 15 Feb 2012) New Revision: 5645 Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml jcr/trunk/applications/product-patches/as/jetty/eXo.bat jcr/trunk/applications/product-patches/as/jetty/eXo.sh jcr/trunk/applications/product-patches/as/jetty/exo-readme.txt Log: EXOJCR-1764: AS deployment cleanup Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2012-02-15 15:05:38 UTC (rev 5644) +++ jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2012-02-15 15:12:49 UTC (rev 5645) @@ -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=&quot;@exo.deploy.profile(a)&quot; 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/trunk/applications/product-patches/as/jetty/eXo.bat =================================================================== --- jcr/trunk/applications/product-patches/as/jetty/eXo.bat 2012-02-15 15:05:38 UTC (rev 5644) +++ jcr/trunk/applications/product-patches/as/jetty/eXo.bat 2012-02-15 15:12:49 UTC (rev 5645) @@ -1 +1 @@ -java -Djava.security.auth.login.config=jaas.conf -Dexo.profiles=%1 -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/trunk/applications/product-patches/as/jetty/eXo.sh =================================================================== --- jcr/trunk/applications/product-patches/as/jetty/eXo.sh 2012-02-15 15:05:38 UTC (rev 5644) +++ jcr/trunk/applications/product-patches/as/jetty/eXo.sh 2012-02-15 15:12:49 UTC (rev 5645) @@ -1 +1 @@ -java -Djava.security.auth.login.config=jaas.conf -Dexo.profiles=$1 -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/trunk/applications/product-patches/as/jetty/exo-readme.txt =================================================================== --- jcr/trunk/applications/product-patches/as/jetty/exo-readme.txt 2012-02-15 15:05:38 UTC (rev 5644) +++ jcr/trunk/applications/product-patches/as/jetty/exo-readme.txt 2012-02-15 15:12:49 UTC (rev 5645) @@ -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