Author: tolusha
Date: 2012-02-15 10:58:24 -0500 (Wed, 15 Feb 2012)
New Revision: 5647
Modified:
jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml
jcr/trunk/applications/exo.jcr.ear/pom.xml
jcr/trunk/applications/product-patches/as/jboss/bin/run.conf
jcr/trunk/applications/product-patches/as/jboss/bin/run.conf.bat
jcr/trunk/applications/product-patches/as/jboss/exo-readme.txt
Log:
EXOJCR-1764: AS deployment cleanup
Modified: jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2012-02-15 15:57:06 UTC (rev
5646)
+++ jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2012-02-15 15:58:24 UTC (rev
5647)
@@ -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/trunk/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.ear/pom.xml 2012-02-15 15:57:06 UTC (rev 5646)
+++ jcr/trunk/applications/exo.jcr.ear/pom.xml 2012-02-15 15:58:24 UTC (rev 5647)
@@ -31,7 +31,9 @@
<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 +130,10 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
+ <properties>
+ <exo.deploy.profile>jbc</exo.deploy.profile>
+ </properties>
</profile>
</profiles>
<build>
Modified: jcr/trunk/applications/product-patches/as/jboss/bin/run.conf
===================================================================
--- jcr/trunk/applications/product-patches/as/jboss/bin/run.conf 2012-02-15 15:57:06 UTC
(rev 5646)
+++ jcr/trunk/applications/product-patches/as/jboss/bin/run.conf 2012-02-15 15:58:24 UTC
(rev 5647)
@@ -52,7 +52,4 @@
#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" = "jbc" ] || [ "$1" = "ispn" ]; then
- shift
-fi
\ No newline at end of file
+JAVA_OPTS="$JAVA_OPTS -Dexo.profiles=jbc
-Dexo.jcr.parent.dir=../server/default/data"
Modified: jcr/trunk/applications/product-patches/as/jboss/bin/run.conf.bat
===================================================================
--- jcr/trunk/applications/product-patches/as/jboss/bin/run.conf.bat 2012-02-15 15:57:06
UTC (rev 5646)
+++ jcr/trunk/applications/product-patches/as/jboss/bin/run.conf.bat 2012-02-15 15:58:24
UTC (rev 5647)
@@ -55,9 +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=%1
-Dexo.jcr.parent.dir=../server/default/data"
+set "JAVA_OPTS=%JAVA_OPTS% -Dexo.profiles=jbc
-Dexo.jcr.parent.dir=../server/default/data"
-if ""%1"" == ""jbc"" shift
-if ""%1"" == ""ispn"" shift
-
:JAVA_OPTS_SET
Modified: jcr/trunk/applications/product-patches/as/jboss/exo-readme.txt
===================================================================
--- jcr/trunk/applications/product-patches/as/jboss/exo-readme.txt 2012-02-15 15:57:06 UTC
(rev 5646)
+++ jcr/trunk/applications/product-patches/as/jboss/exo-readme.txt 2012-02-15 15:58:24 UTC
(rev 5647)
@@ -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