[jboss-svn-commits] JBL Code SVN: r37348 - in labs/jbosstm/trunk: ArjunaCore/arjunacore and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 3 12:51:25 EDT 2011
Author: tomjenkinson
Date: 2011-08-03 12:51:24 -0400 (Wed, 03 Aug 2011)
New Revision: 37348
Removed:
labs/jbosstm/trunk/ArjunaCore/scripts/run-tools.bat
labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.bat
labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.sh
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/services/config/recoveryservice.conf
labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
labs/jbosstm/trunk/ArjunaCore/scripts/start-recovery-manager.bat
labs/jbosstm/trunk/ArjunaCore/scripts/start-recovery-manager.sh
labs/jbosstm/trunk/ArjunaCore/scripts/start-transaction-service.bat
labs/jbosstm/trunk/ArjunaCore/scripts/start-transaction-service.sh
labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.bat
labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.sh
labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.bat
labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.sh
labs/jbosstm/trunk/ArjunaJTA/narayana-jta/pom.xml
labs/jbosstm/trunk/ArjunaJTS/jts/services/config/transactionservice.conf
labs/jbosstm/trunk/ArjunaJTS/narayana-jts/pom.xml
labs/jbosstm/trunk/dist/src/main/assembly/bin.xml
Log:
cleaned up the service deployment scripts
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/services/config/recoveryservice.conf
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/services/config/recoveryservice.conf 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/services/config/recoveryservice.conf 2011-08-03 16:51:24 UTC (rev 37348)
@@ -34,19 +34,17 @@
# needed starting from 1
wrapper.java.classpath.1=../../../lib/ext/wrapper.jar
-wrapper.java.classpath.2=../../../lib/jbossjts.jar
-wrapper.java.classpath.3=../../../lib/jbossjts-jacorb.jar
-wrapper.java.classpath.4=../../lib/jbossjts-services.jar
-wrapper.java.classpath.5=../../../lib/ext/jbossts-common.jar
-wrapper.java.classpath.6=../../../lib/ext/commons-logging.jar
-wrapper.java.classpath.7=../../../lib/ext/log4j-1.2.8.jar
-wrapper.java.classpath.8=../../../lib/ext/xercesImpl.jar
-wrapper.java.classpath.9=../../../lib/ext/xmlParserAPIs.jar
-wrapper.java.classpath.10=../../../lib/services/config
-wrapper.java.classpath.11=../../../lib/etc/
-wrapper.java.classpath.12=PUT_JACORB_HOME_HERE/lib/jacorb.jar
-wrapper.java.classpath.13=PUT_JACORB_HOME_HERE/lib/logkit-1.2.jar
-wrapper.java.classpath.14=PUT_JACORB_HOME_HERE/lib/avalon-framework-4.1.5.jar
+wrapper.java.classpath.2=../../../lib/narayana-jts.jar
+wrapper.java.classpath.3=../../lib/arjunacore-services.jar
+wrapper.java.classpath.4=../../../lib/ext/commons-logging.jar
+wrapper.java.classpath.5=../../../lib/ext/log4j-1.2.8.jar
+wrapper.java.classpath.6=../../../lib/ext/xercesImpl.jar
+wrapper.java.classpath.7=../../../lib/ext/xmlParserAPIs.jar
+wrapper.java.classpath.8=../../../lib/services/config
+wrapper.java.classpath.9=../../../lib/etc/
+wrapper.java.classpath.10=PUT_JACORB_HOME_HERE/lib/jacorb.jar
+wrapper.java.classpath.11=PUT_JACORB_HOME_HERE/lib/logkit-1.2.jar
+wrapper.java.classpath.12=PUT_JACORB_HOME_HERE/lib/avalon-framework-4.1.5.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=.
@@ -103,13 +101,13 @@
# service can then be reinstalled.
# Name of the service
-wrapper.ntservice.name=jbossrm
+wrapper.ntservice.name=narayana-rm
# Display name of the service
-wrapper.ntservice.displayname=JBoss Transaction Service - Recovery Manager
+wrapper.ntservice.displayname=Narayana - Recovery Manager
# Description of the service
-wrapper.ntservice.description=The recovery manager service for JBossTS
+wrapper.ntservice.description=The recovery manager service for Narayana
# Service dependencies. Add dependencies as needed starting from 1
wrapper.ntservice.dependency.1=
Modified: labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml 2011-08-03 16:51:24 UTC (rev 37348)
@@ -119,7 +119,7 @@
<goal>shade</goal>
</goals>
<configuration>
- <createDependencyReducedPom>true</createDependencyReducedPom>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<includes>
<include>org.jboss.narayana:common</include>
Deleted: labs/jbosstm/trunk/ArjunaCore/scripts/run-tools.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/run-tools.bat 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/run-tools.bat 2011-08-03 16:51:24 UTC (rev 37348)
@@ -1,39 +0,0 @@
-rem
-rem JBoss, Home of Professional Open Source
-rem Copyright 2006, Red Hat Middleware LLC, and individual contributors
-rem as indicated by the @author tags.
-rem See the copyright.txt in the distribution for a
-rem full listing of individual contributors.
-rem This copyrighted material is made available to anyone wishing to use,
-rem modify, copy, or redistribute it subject to the terms and conditions
-rem of the GNU Lesser General Public License, v. 2.1.
-rem This program is distributed in the hope that it will be useful, but WITHOUT A
-rem WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-rem PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-rem You should have received a copy of the GNU Lesser General Public License,
-rem v.2.1 along with this distribution; if not, write to the Free Software
-rem Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-rem MA 02110-1301, USA.
-rem
-rem (C) 2005-2006,
-rem @author JBoss Inc.
-rem
- at echo off
-
-if "%@HOME_DIRECTORY@%"=="" goto atserror
-
-rem Setup the environment for the JBoss Transaction Service
-call "%@HOME_DIRECTORY@%\bin\setup-env.bat"
-
-rem Add ext libraries required for tools
-set CLASSPATH=%CLASSPATH%;%@HOME_DIRECTORY@%\bin\tools\ext\jfreechart-1.0.2.jar
-set CLASSPATH=%CLASSPATH%;%@HOME_DIRECTORY@%\bin\tools\ext\jcommon-1.0.5.jar
-
-"%JAVA_HOME%\bin\java" "-Dcom.arjuna.mw.ArjunaToolsFramework.lib=%@HOME_DIRECTORY@%\bin\tools" com.arjuna.ats.tools.toolsframework.ArjunaToolsFramework
-goto finished
-
-:atserror
-echo The environment variable @HOME_DIRECTORY@ is not set
-goto finished
-
-:finished
Deleted: labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.bat 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.bat 2011-08-03 16:51:24 UTC (rev 37348)
@@ -1,80 +0,0 @@
-rem
-rem JBoss, Home of Professional Open Source
-rem Copyright 2006, Red Hat Middleware LLC, and individual contributors
-rem as indicated by the @author tags.
-rem See the copyright.txt in the distribution for a
-rem full listing of individual contributors.
-rem This copyrighted material is made available to anyone wishing to use,
-rem modify, copy, or redistribute it subject to the terms and conditions
-rem of the GNU Lesser General Public License, v. 2.1.
-rem This program is distributed in the hope that it will be useful, but WITHOUT A
-rem WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-rem PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-rem You should have received a copy of the GNU Lesser General Public License,
-rem v.2.1 along with this distribution; if not, write to the Free Software
-rem Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-rem MA 02110-1301, USA.
-rem
-rem (C) 2005-2006,
-rem @author JBoss Inc.
-rem
- at echo off
-
-rem
-rem Arjuna Transaction Service (now JBoss Transaction Service)
-rem
-rem Arjuna Technologies Ltd.
-rem Copyright 2004
-rem
-
-if "%JAVA_HOME%"=="" goto java_home_error
-
-echo Environment variable JAVA_HOME set to "%JAVA_HOME%"
-
-if "%JBOSSTS_HOME%"=="" goto jts_home_error
-
-echo Environment variable JBOSSTS_HOME set to "%JBOSSTS_HOME%"
-
-rem Setup EXT classpath
-
-echo Setting up environment
-
-set PRODUCT_CLASSPATH=%JBOSSTS_HOME%\lib\@PRODUCT_NAME at .jar
-set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%JBOSSTS_HOME%\lib\@PRODUCT_NAME at -jacorb.jar
-set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%JBOSSTS_HOME%\bin\tsmx-tools.jar
-set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%JBOSSTS_HOME%\etc\
-
-set EXT_CLASSPATH=%JBOSSTS_HOME%\lib\ext\jbossts-common.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\commons-logging-1.1.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\connector-api.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\jmxri.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\jndi.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\jta-1_1-classes.zip
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\log4j-1.2.14.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\xercesImpl.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\xmlParserAPIs.jar
-
-rem
-rem Caution: JBossTS needs a specially patched version of JacORB.
-rem Use %JBOSSTS_HOME%\jacorb here unless you have a good reason not to.
-rem
-set JACORB_HOME=PUT_JACORB_HOME_HERE
-set JACORB_CLASSPATH=%JACORB_HOME%\lib\jacorb.jar
-set JACORB_CLASSPATH=%JACORB_CLASSPATH%;%JACORB_HOME%\lib\idl.jar
-set JACORB_CLASSPATH=%JACORB_CLASSPATH%;%JACORB_HOME%\lib\logkit-1.2.jar
-set JACORB_CLASSPATH=%JACORB_CLASSPATH%;%JACORB_HOME%\lib\avalon-framework-4.1.5.jar
-set JACORB_CLASSPATH=%JACORB_CLASSPATH%;%JACORB_HOME%\etc
-
-set CLASSPATH=.;%PRODUCT_CLASSPATH%;%EXT_CLASSPATH%;%JACORB_CLASSPATH%
-
-goto end
-
-:java_home_error
-echo Environment variable JAVA_HOME not set
-goto end
-
-:jts_home_error
-echo Environment variable JBOSSTS_HOME not set
-goto end
-
-:end
Deleted: labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.sh 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.sh 2011-08-03 16:51:24 UTC (rev 37348)
@@ -1,93 +0,0 @@
-#
-# JBoss, Home of Professional Open Source
-# Copyright 2006, Red Hat Middleware LLC, and individual contributors
-# as indicated by the @author tags.
-# See the copyright.txt in the distribution for a
-# full listing of individual contributors.
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU Lesser General Public License, v. 2.1.
-# This program is distributed in the hope that it will be useful, but WITHOUT A
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-# You should have received a copy of the GNU Lesser General Public License,
-# v.2.1 along with this distribution; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-# (C) 2005-2006,
-# @author JBoss Inc.
-#
-#
-# Arjuna Transaction Service (now JBoss Transaction Service)
-#
-# Arjuna Technologies Ltd.
-# Copyright 2004
-#
-
-CONTINUE_SETUP=true
-
-if test "x$JAVA_HOME" = "x"
-then
-
- echo Please ensure the JAVA_HOME environment variable is set
- CONTINUE_SETUP=false
-
-else
-
- if test "x$JBOSSTS_HOME" = "x"
- then
-
- echo Please ensure the JBOSSTS_HOME environment variable is set
- CONTINUE_SETUP=false
-
- fi
-
-fi
-
-if test "$CONTINUE_SETUP" = "true"
-then
-
-# Full JacORB installation location
-# Caution: JBossTS needs a specially patched version of JacORB.
-# Use $JBOSSTS_HOME/jacorb here unless you have a good reason not to.
-JACORB_HOME=$JBOSSTS_HOME/jacorb
-
-# Find classpath separator
-
-CPS=":"
-
-case `uname -a` in
- CYGWIN_* | Windows* )
- CPS=";"
- JACORB_HOME=`echo $JACORB_HOME | sed -e 's;\\\;/;g'`
- JBOSSTS_HOME=`echo $JBOSSTS_HOME | sed -e 's;\\\;/;g'`
- ;;
-esac
-
-
-# Setup EXT classpath
-
-echo Setting up environment
-
-PRODUCT_CLASSPATH="$JBOSSTS_HOME/lib/@PRODUCT_NAME at .jar"
-PRODUCT_CLASSPATH="$PRODUCT_CLASSPATH$CPS$JBOSSTS_HOME/bin/tsmx-tools.jar"
-PRODUCT_CLASSPATH="$PRODUCT_CLASSPATH$CPS$JBOSSTS_HOME/etc/"
-
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$JBOSSTS_HOME/lib/ext/commons-logging-1.1.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$JBOSSTS_HOME/lib/ext/connector-api.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$JBOSSTS_HOME/lib/ext/jmxri.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$JBOSSTS_HOME/lib/ext/jndi.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$JBOSSTS_HOME/lib/ext/jta-1_1-classes.zip"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$JBOSSTS_HOME/lib/ext/log4j-1.2.14.jar"
-
-JACORB_CLASSPATH="$JACORB_HOME/lib/jacorb.jar"
-JACORB_CLASSPATH="$JACORB_CLASSPATH$CPS$JACORB_HOME/lib/idl.jar"
-JACORB_CLASSPATH="$JACORB_CLASSPATH$CPS$JACORB_HOME/lib/logkit-1.2.jar"
-JACORB_CLASSPATH="$JACORB_CLASSPATH$CPS$JACORB_HOME/lib/avalon-framework-4.1.5.jar"
-JACORB_CLASSPATH="$JACORB_CLASSPATH$CPS$JACORB_HOME/etc"
-
-CLASSPATH=".$CPS$PRODUCT_CLASSPATH$CPS$EXT_CLASSPATH$CPS$JACORB_CLASSPATH"
-export CLASSPATH
-
-fi
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/start-recovery-manager.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/start-recovery-manager.bat 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/start-recovery-manager.bat 2011-08-03 16:51:24 UTC (rev 37348)
@@ -20,6 +20,4 @@
rem
@echo off
-call "%@HOME_DIRECTORY@%\bin\setup-env.bat"
-
"%JAVA_HOME%\bin\java" com.arjuna.ats.arjuna.recovery.RecoveryManager -test
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/start-recovery-manager.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/start-recovery-manager.sh 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/start-recovery-manager.sh 2011-08-03 16:51:24 UTC (rev 37348)
@@ -21,6 +21,5 @@
#
# Setup the environment for the JBoss Transaction Service
-. "$@HOME_DIRECTORY@/bin/setup-env.sh"
"$JAVA_HOME/bin/java" com.arjuna.ats.arjuna.recovery.RecoveryManager -test
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/start-transaction-service.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/start-transaction-service.bat 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/start-transaction-service.bat 2011-08-03 16:51:24 UTC (rev 37348)
@@ -20,6 +20,4 @@
rem
@echo off
-call "%@HOME_DIRECTORY@%\bin\setup-env.bat"
-
"%JAVA_HOME%\bin\java" com.arjuna.ats.jts.TransactionServer -test
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/start-transaction-service.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/start-transaction-service.sh 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/start-transaction-service.sh 2011-08-03 16:51:24 UTC (rev 37348)
@@ -21,6 +21,5 @@
#
# Setup the environment for the JBoss Transaction Service
-. "$@HOME_DIRECTORY@/bin/setup-env.sh"
"$JAVA_HOME/bin/java" com.arjuna.ats.jts.TransactionServer -test
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.bat 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.bat 2011-08-03 16:51:24 UTC (rev 37348)
@@ -28,28 +28,25 @@
echo Environment variable JAVA_HOME set to "%JAVA_HOME%"
-if "%@HOME_DIRECTORY@%"=="" goto home_error
+if "%NARAYANA_HOME%"=="" goto home_error
-echo Environment variable @HOME_DIRECTORY@ set to "%@HOME_DIRECTORY@%"
+echo Environment variable NARAYANA_HOME set to "%NARAYANA_HOME%"
rem Setup EXT classpath
echo Setting up environment
-set PRODUCT_CLASSPATH=%@HOME_DIRECTORY@%\lib\@PRODUCT_NAME at .jar
-set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\@PRODUCT_NAME at -jacorb.jar
-set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%@HOME_DIRECTORY@%\bin\tsmx-tools.jar
-set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%@HOME_DIRECTORY@%\etc\
+set PRODUCT_CLASSPATH=%NARAYANA_HOME%\lib\narayana-jts.jar
+set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%NARAYANA_HOME%\etc\
-set EXT_CLASSPATH=%@HOME_DIRECTORY@%\lib\ext\jbossts-common.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\commons-logging-1.1.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\connector-api.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\jmxri.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\jndi.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\jta-1_1-classes.zip
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\log4j-1.2.14.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\xercesImpl.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\xmlParserAPIs.jar
+set EXT_CLASSPATH=%NARAYANA_HOME%\lib\ext\commons-logging-1.1.jar
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\connector-api.jar
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\jmxri.jar
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\jndi.jar
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\jta-1_1-classes.zip
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\log4j-1.2.14.jar
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\xercesImpl.jar
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\xmlParserAPIs.jar
rem
rem Caution: JBossTS needs a specially patched version of JacORB.
@@ -71,7 +68,7 @@
goto end
:home_error
-echo Environment variable @HOME_DIRECTORY@ not set
+echo Environment variable NARAYANA_HOME not set
goto end
:end
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.sh 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.sh 2011-08-03 16:51:24 UTC (rev 37348)
@@ -32,10 +32,10 @@
else
- if test "x$@HOME_DIRECTORY@" = "x"
+ if test "x$NARAYANA_HOME" = "x"
then
- echo Please ensure the @HOME_DIRECTORY@ environment variable is set
+ echo Please ensure the NARAYANA_HOME environment variable is set
CONTINUE_SETUP=false
fi
@@ -49,7 +49,7 @@
# Caution: JBossTS needs a specially patched version of JacORB.
# Use $JBOSSTS_HOME/jacorb here unless you have a good reason not to.
#
-JACORB_HOME=$@HOME_DIRECTORY@/jacorb
+JACORB_HOME=$NARAYANA_HOME/jacorb
# Find classpath separator
@@ -59,7 +59,7 @@
CYGWIN_* | Windows* )
CPS=";"
JACORB_HOME=`echo $JACORB_HOME | sed -e 's;\\\;/;g'`
- @HOME_DIRECTORY@=`echo $@HOME_DIRECTORY@ | sed -e 's;\\\;/;g'`
+ NARAYANA_HOME=`echo $NARAYANA_HOME | sed -e 's;\\\;/;g'`
;;
esac
@@ -68,16 +68,15 @@
echo Setting up environment
-PRODUCT_CLASSPATH="$@HOME_DIRECTORY@/lib/@PRODUCT_NAME at .jar"
-PRODUCT_CLASSPATH="$PRODUCT_CLASSPATH$CPS$@HOME_DIRECTORY@/bin/tsmx-tools.jar"
-PRODUCT_CLASSPATH="$PRODUCT_CLASSPATH$CPS$@HOME_DIRECTORY@/etc/"
+PRODUCT_CLASSPATH="$NARAYANA_HOME/lib/narayana-jts.jar"
+PRODUCT_CLASSPATH="$PRODUCT_CLASSPATH$CPS$NARAYANA_HOME/etc/"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/commons-logging-1.1.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/connector-api.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/jmxri.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/jndi.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/jta-1_1-classes.zip"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/log4j-1.2.14.jar"
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/commons-logging-1.1.jar"
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/connector-api.jar"
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/jmxri.jar"
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/jndi.jar"
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/jta-1_1-classes.zip"
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/log4j-1.2.14.jar"
JACORB_CLASSPATH="$JACORB_HOME/lib/jacorb.jar"
JACORB_CLASSPATH="$JACORB_CLASSPATH$CPS$JACORB_HOME/lib/idl.jar"
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.bat 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.bat 2011-08-03 16:51:24 UTC (rev 37348)
@@ -28,27 +28,25 @@
echo Environment variable JAVA_HOME set to "%JAVA_HOME%"
-if "%@HOME_DIRECTORY@%"=="" goto home_error
+if "%NARAYANA_HOME%"=="" goto home_error
-echo Environment variable @HOME_DIRECTORY@ set to "%@HOME_DIRECTORY@%"
+echo Environment variable NARAYANA_HOME set to "%NARAYANA_HOME%"
rem Setup EXT classpath
echo Setting up environment
-set PRODUCT_CLASSPATH=%@HOME_DIRECTORY@%\lib\@PRODUCT_NAME at .jar
-set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%@HOME_DIRECTORY@%\bin\tsmx-tools.jar
-set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%@HOME_DIRECTORY@%\etc\
+set PRODUCT_CLASSPATH=%NARAYANA_HOME%\lib\narayana-jta.jar
+set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%NARAYANA_HOME%\etc\
-set EXT_CLASSPATH=%@HOME_DIRECTORY@%\lib\ext\jbossts-common.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\commons-logging-1.1.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\connector-api.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\jmxri.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\jndi.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\jta-1_1-classes.zip
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\log4j-1.2.14.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\xercesImpl.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\xmlParserAPIs.jar
+set EXT_CLASSPATH=%NARAYANA_HOME%\lib\ext\commons-logging-1.1.jar
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\connector-api.jar
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\jmxri.jar
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\jndi.jar
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\jta-1_1-classes.zip
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\log4j-1.2.14.jar
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\xercesImpl.jar
+set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\xmlParserAPIs.jar
set CLASSPATH=.;%PRODUCT_CLASSPATH%;%EXT_CLASSPATH%
@@ -59,7 +57,7 @@
goto end
:home_error
-echo Environment variable @HOME_DIRECTORY@ not set
+echo Environment variable NARAYANA_HOME not set
goto end
:end
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.sh 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.sh 2011-08-03 16:51:24 UTC (rev 37348)
@@ -32,10 +32,10 @@
else
- if test "x$@HOME_DIRECTORY@" = "x"
+ if test "x$NARAYANA_HOME" = "x"
then
- echo Please ensure the @HOME_DIRECTORY@ environment variable is set
+ echo Please ensure the NARAYANA_HOME environment variable is set
CONTINUE_SETUP=false
fi
@@ -52,7 +52,7 @@
case `uname -a` in
CYGWIN_* | Windows* )
CPS=";"
- @HOME_DIRECTORY@=`echo $@HOME_DIRECTORY@ | sed -e 's;\\\;/;g'`
+ NARAYANA_HOME=`echo $NARAYANA_HOME | sed -e 's;\\\;/;g'`
;;
esac
@@ -61,16 +61,15 @@
echo Setting up environment
-PRODUCT_CLASSPATH="$@HOME_DIRECTORY@/lib/@PRODUCT_NAME at .jar"
-PRODUCT_CLASSPATH="$PRODUCT_CLASSPATH$CPS$@HOME_DIRECTORY@/bin/tsmx-tools.jar"
-PRODUCT_CLASSPATH="$PRODUCT_CLASSPATH$CPS$@HOME_DIRECTORY@/etc/"
+PRODUCT_CLASSPATH="$NARAYANA_HOME/lib/narayana-jta.jar"
+PRODUCT_CLASSPATH="$PRODUCT_CLASSPATH$CPS$NARAYANA_HOME/etc/"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/commons-logging-1.1.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/connector-api.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/jmxri.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/jndi.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/jta-1_1-classes.zip"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/log4j-1.2.14.jar"
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/commons-logging-1.1.jar"
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/connector-api.jar"
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/jmxri.jar"
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/jndi.jar"
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/jta-1_1-classes.zip"
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/log4j-1.2.14.jar"
CLASSPATH=".$CPS$PRODUCT_CLASSPATH$CPS$EXT_CLASSPATH"
export CLASSPATH
Modified: labs/jbosstm/trunk/ArjunaJTA/narayana-jta/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/narayana-jta/pom.xml 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaJTA/narayana-jta/pom.xml 2011-08-03 16:51:24 UTC (rev 37348)
@@ -121,7 +121,7 @@
<goal>shade</goal>
</goals>
<configuration>
- <createDependencyReducedPom>true</createDependencyReducedPom>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<includes>
<include>org.jboss.narayana:common</include>
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/services/config/transactionservice.conf
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/services/config/transactionservice.conf 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/services/config/transactionservice.conf 2011-08-03 16:51:24 UTC (rev 37348)
@@ -33,19 +33,17 @@
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=../../../lib/ext/wrapper.jar
-wrapper.java.classpath.2=../../../lib/jbossjts.jar
-wrapper.java.classpath.3=../../../lib/jbossjts-jacorb.jar
-wrapper.java.classpath.4=../../lib/jbossjts-services.jar
-wrapper.java.classpath.5=../../../lib/ext/jbossts-common.jar
-wrapper.java.classpath.6=../../../lib/ext/commons-logging.jar
-wrapper.java.classpath.7=../../../lib/ext/log4j-1.2.8.jar
-wrapper.java.classpath.8=../../../lib/ext/xercesImpl.jar
-wrapper.java.classpath.9=../../../lib/ext/xmlParserAPIs.jar
-wrapper.java.classpath.10=../../../lib/services/config
-wrapper.java.classpath.11=../../../lib/etc/
-wrapper.java.classpath.12=PUT_JACORB_HOME_HERE/lib/jacorb.jar
-wrapper.java.classpath.13=PUT_JACORB_HOME_HERE/lib/logkit-1.2.jar
-wrapper.java.classpath.14=PUT_JACORB_HOME_HERE/lib/avalon-framework-4.1.5.jar
+wrapper.java.classpath.2=../../../lib/narayana-jts.jar
+wrapper.java.classpath.3=../../lib/arjunacore-services.jar
+wrapper.java.classpath.4=../../../lib/ext/commons-logging.jar
+wrapper.java.classpath.5=../../../lib/ext/log4j-1.2.8.jar
+wrapper.java.classpath.6=../../../lib/ext/xercesImpl.jar
+wrapper.java.classpath.7=../../../lib/ext/xmlParserAPIs.jar
+wrapper.java.classpath.8=../../../lib/services/config
+wrapper.java.classpath.9=../../../lib/etc/
+wrapper.java.classpath.10=PUT_JACORB_HOME_HERE/lib/jacorb.jar
+wrapper.java.classpath.11=PUT_JACORB_HOME_HERE/lib/logkit-1.2.jar
+wrapper.java.classpath.12=PUT_JACORB_HOME_HERE/lib/avalon-framework-4.1.5.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=.
@@ -102,13 +100,13 @@
# service can then be reinstalled.
# Name of the service
-wrapper.ntservice.name=jbossts
+wrapper.ntservice.name=narayana-jts
# Display name of the service
-wrapper.ntservice.displayname=JBoss Transaction Service - Transaction Server
+wrapper.ntservice.displayname=Narayana - Transaction Server
# Description of the service
-wrapper.ntservice.description=The transaction server service for JBossTS
+wrapper.ntservice.description=The transaction server service for Narayana
# Service dependencies. Add dependencies as needed starting from 1
wrapper.ntservice.dependency.1=
Modified: labs/jbosstm/trunk/ArjunaJTS/narayana-jts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/narayana-jts/pom.xml 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/ArjunaJTS/narayana-jts/pom.xml 2011-08-03 16:51:24 UTC (rev 37348)
@@ -137,7 +137,7 @@
<goal>shade</goal>
</goals>
<configuration>
- <createDependencyReducedPom>true</createDependencyReducedPom>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<includes>
<include>org.jboss.narayana:common</include>
Modified: labs/jbosstm/trunk/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/dist/src/main/assembly/bin.xml 2011-08-03 16:42:26 UTC (rev 37347)
+++ labs/jbosstm/trunk/dist/src/main/assembly/bin.xml 2011-08-03 16:51:24 UTC (rev 37348)
@@ -260,7 +260,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<excludes>
- <exclude>org.jboss.narayana.*</exclude>
+ <exclude>org.jboss.narayana*</exclude>
</excludes>
<outputDirectory>lib/ext</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
More information about the jboss-svn-commits
mailing list