Return-Path: 
 <scm-return-10633-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 3923 invoked from network); 27 Feb 2006 01:13:45 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 27 Feb 2006 01:13:45 -0000
Received: (qmail 10676 invoked by uid 500); 27 Feb 2006 01:13:44 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 10530 invoked by uid 500); 27 Feb 2006 01:13:43 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 10519 invoked by uid 99); 27 Feb 2006 01:13:43 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Feb 2006 17:13:43 -0800
X-ASF-Spam-Status: No, hits=-8.2 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME,WEIRD_QUOTING
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sun, 26 Feb 2006 17:13:40 -0800
Received: (qmail 3743 invoked by uid 65534); 27 Feb 2006 01:13:19 -0000
Message-ID: <20060227011319.3740.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r381214 [1/2] - in /geronimo/branches/configid:
 assemblies/j2ee-installer/ assemblies/j2ee-installer/src/izpack/
 assemblies/j2ee-installer/src/var/config/ assemblies/j2ee-jetty-server/
 assemblies/j2ee-jetty-server/src/var/config/ assemblies...
Date: Mon, 27 Feb 2006 01:13:01 -0000
To: scm@geronimo.apache.org
From: dain@apache.org
X-Mailer: svnmailer-1.0.7
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: dain
Date: Sun Feb 26 17:12:56 2006
New Revision: 381214

URL: http://svn.apache.org/viewcvs?rev=381214&view=rev
Log:
Merged changes from branch/1.0 since the configid branch was cut
    svn merge -r374818:HEAD  https://svn.apache.org/repos/asf/geronimo/branches/1.0

Changed plugin version numbers to new format:
    geronimo_packaging_plugin_version=1.1.0-2
    geronimo_assembly_plugin_version=1.1.0-8
    geronimo_deployment_plugin_version=1.1.0-1
    geronimo_dependency_plugin_version=1.1.0-1

Added:
    geronimo/branches/configid/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/mdb-ejb-jar-20-GERONIMO-1649.xml   (props changed)
      - copied unchanged from r381130, geronimo/branches/1.0/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/mdb-ejb-jar-20-GERONIMO-1649.xml
    geronimo/branches/configid/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/mdb-ejb-jar-21-GERONIMO-1649.xml   (props changed)
      - copied unchanged from r381130, geronimo/branches/1.0/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/mdb-ejb-jar-21-GERONIMO-1649.xml
Modified:
    geronimo/branches/configid/assemblies/j2ee-installer/project.properties
    geronimo/branches/configid/assemblies/j2ee-installer/project.xml
    geronimo/branches/configid/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml
    geronimo/branches/configid/assemblies/j2ee-installer/src/var/config/config.xml
    geronimo/branches/configid/assemblies/j2ee-jetty-server/project.properties
    geronimo/branches/configid/assemblies/j2ee-jetty-server/project.xml
    geronimo/branches/configid/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/branches/configid/assemblies/j2ee-tomcat-server/project.properties
    geronimo/branches/configid/assemblies/j2ee-tomcat-server/project.xml
    geronimo/branches/configid/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/branches/configid/configs/client/src/plan/plan.xml
    geronimo/branches/configid/configs/j2ee-server/src/plan/plan.xml
    geronimo/branches/configid/etc/project.properties
    geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
    geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java
    geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java
    geronimo/branches/configid/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
    geronimo/branches/configid/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
    geronimo/branches/configid/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java
    geronimo/branches/configid/modules/mail/src/java/org/apache/geronimo/mail/NullTransport.java
    geronimo/branches/configid/modules/scripts/src/resources/bin/deploy.bat
    geronimo/branches/configid/modules/scripts/src/resources/bin/deploy.sh
    geronimo/branches/configid/modules/scripts/src/resources/bin/geronimo.bat
    geronimo/branches/configid/modules/scripts/src/resources/bin/geronimo.sh
    geronimo/branches/configid/modules/scripts/src/resources/bin/setjavaenv.bat
    geronimo/branches/configid/modules/scripts/src/resources/bin/setjavaenv.sh
    geronimo/branches/configid/modules/scripts/src/resources/bin/shutdown.bat
    geronimo/branches/configid/modules/scripts/src/resources/bin/shutdown.sh
    geronimo/branches/configid/modules/scripts/src/resources/bin/startup.bat
    geronimo/branches/configid/modules/scripts/src/resources/bin/startup.sh
    geronimo/branches/configid/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java
    geronimo/branches/configid/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java
    geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
    geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
    geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
    geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java
    geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java
    geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
    geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java
    geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java
    geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java
    geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java
    geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java
    geronimo/branches/configid/plugins/geronimo-assembly-plugin/plugin.jelly
    geronimo/branches/configid/plugins/geronimo-assembly-plugin/project.xml
    geronimo/branches/configid/plugins/geronimo-dependency-plugin/project.xml
    geronimo/branches/configid/plugins/geronimo-deployment-plugin/project.xml
    geronimo/branches/configid/plugins/geronimo-packaging-plugin/project.xml

Modified: geronimo/branches/configid/assemblies/j2ee-installer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/assemblies/j2ee-installer/project.properties?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/assemblies/j2ee-installer/project.properties (original)
+++ geronimo/branches/configid/assemblies/j2ee-installer/project.properties Sun Feb 26 17:12:56 2006
@@ -42,3 +42,4 @@
 PlanHTTPPortSecondary=8090
 PlanHTTPSPortSecondary=8453
 PlanAJPPortSecondary=8019
+PlanJMXPort=9999

Modified: geronimo/branches/configid/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/assemblies/j2ee-installer/project.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/branches/configid/assemblies/j2ee-installer/project.xml Sun Feb 26 17:12:56 2006
@@ -467,6 +467,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>unpack</geronimo.assemble>
+                <geronimo.assemble.unpack.exclude.manifest>true</geronimo.assemble.unpack.exclude.manifest>
             </properties>
         </dependency>
 

Modified: geronimo/branches/configid/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml (original)
+++ geronimo/branches/configid/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml Sun Feb 26 17:12:56 2006
@@ -31,6 +31,12 @@
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
             <createForPack name="J2EE Features"/>
         </field>
+        <field type="rule" variable="PlanJMXPort">
+            <description txt="The network port that should be used for remote JMX management"/>
+            <spec txt="Remote Mgmt Port [9999]:" layout="N:5:5" set="0:9999"/>
+            <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
+            <createForPack name="J2EE Features"/>
+        </field>
         <field type="check" variable="J2EE.Features.enable">
             <description txt="Active at runtime"/>
             <!--description align="left" txt="Enable J2EE features"

Modified: geronimo/branches/configid/assemblies/j2ee-installer/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/assemblies/j2ee-installer/src/var/config/config.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/assemblies/j2ee-installer/src/var/config/config.xml (original)
+++ geronimo/branches/configid/assemblies/j2ee-installer/src/var/config/config.xml Sun Feb 26 17:12:56 2006
@@ -27,8 +27,8 @@
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
         </gbean>
-        <gbean name="JMXConnector">
-            <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
+        <gbean name="JMXService">
+            <attribute name="url">service:jmx:rmi://${PlanServerHostname}:${PlanJMXPort}/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </configuration>
     <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="${CORBA.Features.enable}">

Modified: geronimo/branches/configid/assemblies/j2ee-jetty-server/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/assemblies/j2ee-jetty-server/project.properties?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/assemblies/j2ee-jetty-server/project.properties (original)
+++ geronimo/branches/configid/assemblies/j2ee-jetty-server/project.properties Sun Feb 26 17:12:56 2006
@@ -42,3 +42,4 @@
 PlanHTTPPortSecondary=8090
 PlanHTTPSPortSecondary=8453
 PlanAJPPortSecondary=8019
+PlanJMXPort=9999

Modified: geronimo/branches/configid/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/assemblies/j2ee-jetty-server/project.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/branches/configid/assemblies/j2ee-jetty-server/project.xml Sun Feb 26 17:12:56 2006
@@ -344,6 +344,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>unpack</geronimo.assemble>
+                <geronimo.assemble.unpack.exclude.manifest>true</geronimo.assemble.unpack.exclude.manifest>
             </properties>
         </dependency>
 

Modified: geronimo/branches/configid/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/configid/assemblies/j2ee-jetty-server/src/var/config/config.xml Sun Feb 26 17:12:56 2006
@@ -28,7 +28,7 @@
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
         </gbean>
         <gbean name="JMXService">
-            <attribute name="url">service:jmx:rmi:///jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
+            <attribute name="url">service:jmx:rmi://${PlanServerHostname}:${PlanJMXPort}/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </configuration>
     <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">

Modified: geronimo/branches/configid/assemblies/j2ee-tomcat-server/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/assemblies/j2ee-tomcat-server/project.properties?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/assemblies/j2ee-tomcat-server/project.properties (original)
+++ geronimo/branches/configid/assemblies/j2ee-tomcat-server/project.properties Sun Feb 26 17:12:56 2006
@@ -42,3 +42,4 @@
 PlanHTTPPortSecondary=8090
 PlanHTTPSPortSecondary=8453
 PlanAJPPortSecondary=8019
+PlanJMXPort=9999

Modified: geronimo/branches/configid/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/assemblies/j2ee-tomcat-server/project.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/branches/configid/assemblies/j2ee-tomcat-server/project.xml Sun Feb 26 17:12:56 2006
@@ -317,6 +317,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>unpack</geronimo.assemble>
+                <geronimo.assemble.unpack.exclude.manifest>true</geronimo.assemble.unpack.exclude.manifest>
             </properties>
         </dependency>
 

Modified: geronimo/branches/configid/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/configid/assemblies/j2ee-tomcat-server/src/var/config/config.xml Sun Feb 26 17:12:56 2006
@@ -28,7 +28,7 @@
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
         </gbean>
         <gbean name="JMXService">
-            <attribute name="url">service:jmx:rmi:///jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
+            <attribute name="url">service:jmx:rmi://${PlanServerHostname}:${PlanJMXPort}/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </configuration>
     <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">

Modified: geronimo/branches/configid/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/client/src/plan/plan.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/configs/client/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/client/src/plan/plan.xml Sun Feb 26 17:12:56 2006
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<!-- $Rev$ $Date$ -->
+<!-- $Rev: 377921 $ $Date$ -->
 
 <!--
 Configuration for the main ring of a Geronimo app client.
@@ -56,9 +56,14 @@
         </reference>
     </gbean>
 
+    <gbean name="XidFactory" class="org.apache.geronimo.transaction.manager.XidFactoryImplGBean">
+        <attribute name="tmId">71,84,77,73,68</attribute>
+    </gbean>
+
     <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
         <!--no transaction log on the client-->
         <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
+        <reference name="XidFactory"><name>XidFactory</name></reference>
         <references name="ResourceManagers">
             <pattern>
                 <gbean-name>*:j2eeType=JCAManagedConnectionFactory,*</gbean-name>

Modified: geronimo/branches/configid/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/j2ee-server/src/plan/plan.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/j2ee-server/src/plan/plan.xml Sun Feb 26 17:12:56 2006
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<!-- $Rev$ $Date$ -->
+<!-- $Rev: 377921 $ $Date$ -->
 
 <!--
 Configuration for the main ring of a Geronimo server.
@@ -60,11 +60,17 @@
         <attribute name="maxLogFiles">2</attribute>
         <attribute name="minBuffers">4</attribute>
         <attribute name="threadsWaitingForceThreshold">-1</attribute>
+        <reference name="XidFactory"><name>XidFactory</name></reference>
         <reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
     </gbean>
+    
+    <gbean name="XidFactory" class="org.apache.geronimo.transaction.manager.XidFactoryImplGBean">
+        <attribute name="tmId">71,84,77,73,68</attribute>
+    </gbean>
 
     <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
         <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
+        <reference name="XidFactory"><name>XidFactory</name></reference>
         <reference name="TransactionLog"><name>HOWLTransactionLog</name></reference>
         <references name="ResourceManagers">
             <pattern><gbean-name>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</gbean-name></pattern>

Modified: geronimo/branches/configid/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/etc/project.properties?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/etc/project.properties (original)
+++ geronimo/branches/configid/etc/project.properties Sun Feb 26 17:12:56 2006
@@ -86,10 +86,10 @@
 tranql_vendors_version=1.1
 release_notes_version=1.0
 
-geronimo_packaging_plugin_version=1.0.2
-geronimo_assembly_plugin_version=1.0.7
-geronimo_deployment_plugin_version=1.0.1
-geronimo_dependency_plugin_version=1.0.1
+geronimo_packaging_plugin_version=1.1.0-2
+geronimo_assembly_plugin_version=1.1.0-8
+geronimo_deployment_plugin_version=1.1.0-1
+geronimo_dependency_plugin_version=1.1.0-1
 
 geronimo_spec_activation_version=1.0
 geronimo_spec_corba_version=1.1-SNAPSHOT

Modified: geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java (original)
+++ geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java Sun Feb 26 17:12:56 2006
@@ -39,6 +39,7 @@
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.geronimo.transaction.context.UserTransactionImpl;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
 
 /**
  *
@@ -90,7 +91,8 @@
 
     protected void setUp() throws Exception {
         connectionTrackingCoordinator = new ConnectionTrackingCoordinator();
-        TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, null, null);
+        TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000,
+                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
         transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
         mockManagedConnectionFactory = new MockManagedConnectionFactory();
         subject = new Subject();

Modified: geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java (original)
+++ geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java Sun Feb 26 17:12:56 2006
@@ -22,6 +22,7 @@
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.geronimo.transaction.context.TransactionContext;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
 
 /**
  *
@@ -37,7 +38,8 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        transactionManager = new TransactionManagerImpl(10 * 1000, null, null);
+        transactionManager = new TransactionManagerImpl(10 * 1000, 
+                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
         transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
         transactionCachingInterceptor = new TransactionCachingInterceptor(this, transactionContextManager);
     }

Modified: geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java (original)
+++ geronimo/branches/configid/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java Sun Feb 26 17:12:56 2006
@@ -26,6 +26,7 @@
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.geronimo.transaction.manager.NamedXAResource;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
 
 /**
  *
@@ -45,7 +46,8 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, null, null);
+        TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, 
+                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
         transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
         transactionEnlistingInterceptor = new TransactionEnlistingInterceptor(this, transactionContextManager);
     }

Modified: geronimo/branches/configid/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java (original)
+++ geronimo/branches/configid/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java Sun Feb 26 17:12:56 2006
@@ -216,6 +216,7 @@
         }
         XmlCursor cursor = xmlObject.newCursor();
         XmlCursor moveable = xmlObject.newCursor();
+        //cursor is intially located before the logical STARTDOC token
         try {
             cursor.toFirstChild();
             if ("http://java.sun.com/xml/ns/j2ee".equals(cursor.getName().getNamespaceURI())) {
@@ -223,6 +224,7 @@
                 validateDD(result);
                 return (EjbJarDocument) result;
             }
+            // deployment descriptor is probably in EJB 1.1 or 2.0 format
             XmlDocumentProperties xmlDocumentProperties = cursor.documentProperties();
             String publicId = xmlDocumentProperties.getDoctypePublicId();
             String cmpVersion;
@@ -495,14 +497,15 @@
                         cursor.toNextSibling(J2EE_NAMESPACE, "transaction-type");
                     } else {
                         cursor.toNextSibling(J2EE_NAMESPACE, "transaction-type");
-                        //add messaging-type
+                        //insert messaging-type (introduced in EJB 2.1 spec) before transaction-type
                         cursor.insertElementWithText("messaging-type", J2EE_NAMESPACE, "javax.jms.MessageListener");
+                        //cursor still on transaction-type
                     }
                     if (!cursor.toNextSibling(J2EE_NAMESPACE, "activation-config")) {
                         boolean hasProperties = false;
                         //skip transaction-type
                         cursor.toNextSibling();
-                        //add activation-config-properties.
+                        //convert EJB 2.0 elements to activation-config-properties.
                         moveable.toCursor(cursor);
                         cursor.push();
                         cursor.beginElement("activation-config", J2EE_NAMESPACE);
@@ -519,11 +522,16 @@
                         }
                         cursor.pop();
                         if (!hasProperties) {
+                            //the activation-config element that we created is empty so delete it
                             cursor.toPrevSibling();
                             cursor.removeXml();
+                            //cursor should now be at first element in JNDIEnvironmentRefsGroup
                         }
+                    } else {
+                        //cursor pointing at activation-config
+                        cursor.toNextSibling();
+                        //cursor should now be at first element in JNDIEnvironmentRefsGroup
                     }
-                    cursor.toNextSibling();
                     convertToJNDIEnvironmentRefsGroup(cursor, moveable);
                 }
                 cursor.pop();

Propchange: geronimo/branches/configid/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/mdb-ejb-jar-20-GERONIMO-1649.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/configid/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/mdb-ejb-jar-20-GERONIMO-1649.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/configid/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/mdb-ejb-jar-20-GERONIMO-1649.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/configid/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/mdb-ejb-jar-21-GERONIMO-1649.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/configid/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/mdb-ejb-jar-21-GERONIMO-1649.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/configid/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/mdb-ejb-jar-21-GERONIMO-1649.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/branches/configid/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java (original)
+++ geronimo/branches/configid/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java Sun Feb 26 17:12:56 2006
@@ -17,7 +17,6 @@
 
 package org.apache.geronimo.schema;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.net.URL;
@@ -179,6 +178,35 @@
     public void testEJB20ToEJB21Transform() throws Exception {
         URL srcXml = classLoader.getResource("j2ee_1_3dtd/ejb-jar.xml");
         URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/ejb-jar-21.xml");
+        XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
+        XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
+        SchemaConversionUtils.validateDD(expected);
+        xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
+//        System.out.println(xmlObject.toString());
+//        System.out.println(expected.toString());
+        List problems = new ArrayList();
+        boolean ok = compareXmlObjects(xmlObject, expected, problems);
+        assertTrue("Differences: " + problems, ok);
+        //make sure trying to convert twice has no bad effects
+        XmlCursor cursor2 = xmlObject.newCursor();
+        try {
+            String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";
+            String version = "2.1";
+            assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version));
+        } finally {
+            cursor2.dispose();
+        }
+        boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
+        assertTrue("Differences after reconverting to schema: " + problems, ok2);
+        //do the whole transform twice...
+        xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
+        boolean ok3 = compareXmlObjects(xmlObject, expected, problems);
+        assertTrue("Differences after reconverting to ejb schema: " + problems, ok3);
+    }
+
+    public void testMDB20ToEJB21TransformBugGERONIMO_1649() throws Exception {
+        URL srcXml = classLoader.getResource("j2ee_1_3dtd/mdb-ejb-jar-20-GERONIMO-1649.xml");
+        URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/mdb-ejb-jar-21-GERONIMO-1649.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         SchemaConversionUtils.validateDD(expected);

Modified: geronimo/branches/configid/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java (original)
+++ geronimo/branches/configid/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java Sun Feb 26 17:12:56 2006
@@ -16,14 +16,16 @@
  */
 package org.apache.geronimo.jmxremoting;
 
+import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
 import java.util.HashMap;
 import java.util.Map;
 import javax.management.remote.JMXConnectorServer;
 import javax.management.remote.JMXConnectorServerFactory;
+import javax.management.remote.JMXConnectorServerMBean;
 import javax.management.remote.JMXServiceURL;
 import javax.management.remote.JMXConnectionNotification;
 import javax.management.MBeanServer;
-import javax.management.NotificationFilter;
 import javax.management.NotificationFilterSupport;
 
 import org.apache.commons.logging.Log;
@@ -48,7 +50,7 @@
     private Authenticator authenticator;
 
     private JMXConnectorServer server;
-
+    
     /**
      * Constructor for creating the connector. The ClassLoader must be
      * able to load all the LoginModules used in the JAAS login
@@ -86,6 +88,58 @@
     }
 
     /**
+     * Every connector must specify a property of type InetSocketAddress
+     * because we use that to identify the network services to print a list
+     * during startup.  However, this can be read-only since the host and port
+     * are set in the url attribute.
+     */
+    public InetSocketAddress getListenAddress() {
+        return new InetSocketAddress(getHost(), getPort());
+    }    
+    
+    /**
+     * Return the JMX host (extracted from the JMX URL) for this connector.
+     *
+     * @return the JMX host for this connector
+     */
+    public String getHost() {
+        if (server != null )
+            return server.getAddress().getHost();
+        else if (url != null && url.length() != 0) {
+            // server not started so get host from url attribute
+            try {
+                JMXServiceURL serviceURL = new JMXServiceURL(url);
+                return serviceURL.getHost();
+            }
+            catch (MalformedURLException e){
+                return "unknown-host";
+            }
+        } else
+            return "unknown-host";
+    }      
+    
+    /**
+     * Return the JMX port (extracted from the JMX URL) for this connector.
+     *
+     * @return the JMX port for this connector
+     */
+    public int getPort() {
+        if (server != null )
+            return server.getAddress().getPort();
+        else if (url != null && url.length() != 0) {
+            // server not started so get port from url attribute
+            try {
+                JMXServiceURL serviceURL = new JMXServiceURL(url);
+                return serviceURL.getPort();
+            }
+            catch (MalformedURLException e){
+                return 0;
+            }
+        } else
+            return 0;
+    }    
+    
+    /**
      * Return the JMX URL for this connector.
      *
      * @return the JMX URL for this connector
@@ -150,12 +204,13 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(JMXConnector.class); //TODO just  a gbean?
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("JMX Remoting Connector", JMXConnector.class); //TODO just  a gbean?
         infoFactory.addAttribute("url", String.class, true, true);
         infoFactory.addAttribute("applicationConfigName", String.class, true, true);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("objectName", String.class, false);
         infoFactory.addAttribute("classLoader", ClassLoader.class, false);
+        infoFactory.addAttribute("listenAddress", InetSocketAddress.class, false);
         infoFactory.setConstructor(new String[]{"kernel", "objectName", "classLoader"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/branches/configid/modules/mail/src/java/org/apache/geronimo/mail/NullTransport.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/mail/src/java/org/apache/geronimo/mail/NullTransport.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/mail/src/java/org/apache/geronimo/mail/NullTransport.java (original)
+++ geronimo/branches/configid/modules/mail/src/java/org/apache/geronimo/mail/NullTransport.java Sun Feb 26 17:12:56 2006
@@ -34,4 +34,9 @@
     public void sendMessage(Message message, Address[] addresses) throws MessagingException {
         // do nothing
     }
+
+    protected boolean protocolConnect(String host, int port, String user, String password) throws MessagingException {
+        return true; // always connect
+    }
+
 }

Modified: geronimo/branches/configid/modules/scripts/src/resources/bin/deploy.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/scripts/src/resources/bin/deploy.bat?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/scripts/src/resources/bin/deploy.bat (original)
+++ geronimo/branches/configid/modules/scripts/src/resources/bin/deploy.bat Sun Feb 26 17:12:56 2006
@@ -1,78 +1,175 @@
-@rem
-@rem  Copyright 2005 The Apache Software Foundation
-@rem
-@rem   Licensed under the Apache License, Version 2.0 (the "License");
-@rem   you may not use this file except in compliance with the License.
-@rem   You may obtain a copy of the License at
-@rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem   Unless required by applicable law or agreed to in writing, software
-@rem   distributed under the License is distributed on an "AS IS" BASIS,
-@rem   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem   See the License for the specific language governing permissions and
-@rem   limitations under the License.
-@rem
-@rem --------------------------------------------------------------------
-@rem $Rev$ $Date$
-@rem --------------------------------------------------------------------
-@echo off
+@REM
+@REM  Copyright 2005 The Apache Software Foundation
+@REM
+@REM   Licensed under the Apache License, Version 2.0 (the "License");
+@REM   you may not use this file except in compliance with the License.
+@REM   You may obtain a copy of the License at
+@REM
+@REM      http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM   Unless required by applicable law or agreed to in writing, software
+@REM   distributed under the License is distributed on an "AS IS" BASIS,
+@REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM   See the License for the specific language governing permissions and
+@REM   limitations under the License.
+
+@REM --------------------------------------------------------------------
+@REM $Rev$ $Date$
+@REM --------------------------------------------------------------------
+
+@REM ---------------------------------------------------------------------------
+@REM Deploy batch file for Geronimo
+@REM
+@REM You should not have to edit this file.  If you wish to have
+@REM environment variables set each time you run this batch file
+@REM refer to the information on the setenv.bat file below. 
+@REM
+@REM Invocation Syntax:
+@REM
+@REM   deploy [general options] command [command options] 
+@REM
+@REM   For detailed usage information, just run deploy without
+@REM   arguments.
+@REM
+@REM Environment Variable Prequisites
+@REM 
+@REM   GERONIMO_HOME   May point at your Geronimo top-level directory.
+@REM                   If not specified, this batch file will attempt to
+@REM                   discover it relative to the location of this file.
+@REM
+@REM   GERONIMO_BASE   (Optional) Base directory for resolving dynamic portions
+@REM                   of a Geronimo installation.  If not present, resolves to
+@REM                   the same directory that GERONIMO_HOME points to.
+@REM
+@REM   GERONIMO_OPTS   (Optional) Java runtime options (in addition to
+@REM                   those set in JAVA_OPTS).
+@REM
+@REM   GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
+@REM                   the JVM should use (java.io.tmpdir).  Defaults to
+@REM                   %GERONIMO_BASE%\var\temp.
+@REM
+@REM   JAVA_HOME       Points to your Java Development Kit installation.
+@REM                   JAVA_HOME doesn't need to be set if JRE_HOME is set.
+@REM                   It is mandatory either JAVA_HOME or JRE_HOME are set.
+@REM
+@REM   JRE_HOME        (Optional) Points to your Java Runtime Environment
+@REM                   Set this if you wish to run Geronimo using the JRE 
+@REM                   instead of the JDK.
+@REM                   Defaults to JAVA_HOME if empty.
+@REM                   It is mandatory either JAVA_HOME or JRE_HOME are set.
+@REM
+@REM   JAVA_OPTS       (Optional) Java runtime options used.
+@REM                   Also see the GERONIMO_OPTS environment variable.
+@REM
+@REM Troubleshooting execution of this batch file:
+@REM
+@REM   GERONIMO_BATCH_ECHO  (Optional) Environment variable that when set to
+@REM                        "on" results in batch commands being echoed.
+@REM
+@REM   GERONIMO_BATCH_PAUSE (Optional) Environment variable that when set to
+@REM                        "on" results in each batch file to pause at the
+@REM                        end of execution
+@REM
+@REM   GERONIMO_ENV_INFO    (Optional) Environment variable that when set to
+@REM                        "on" (the default) outputs the values of  
+@REM                        GERONIMO_HOME, GERONIMO_BASE, GERONIMO_TMPDIR,
+@REM                        JAVA_HOME and JRE_HOME before the command is
+@REM                        issued. Set to "off" if you do not want this
+@REM                        information displayed.
+@REM
+@REM Batch files called by this batch file:
+@REM 
+@REM   %GERONIMO_HOME%\bin\setenv.bat
+@REM                   (Optional) This batch file is called if it is present.
+@REM                   Its contents may set one or more of the above environment
+@REM                   variables. It is preferable (to simplify migration to
+@REM                   future Geronimo releases) to set environment variables
+@REM                   in this file rather than modifying Geronimo's batch files.
+@REM
+@REM   %GERONIMO_HOME%\bin\setjavaenv.bat
+@REM                   This batch file is called to set environment variables
+@REM                   relating to the java or jdb exe file to call.
+@REM                   This file should not need to be modified.
+@REM
+@REM Exit Codes:
+@REM
+@REM  0 - Success
+@REM  1 - Error
+@REM ---------------------------------------------------------------------------
+@if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
+@if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
 
-@rem Verify we are running on Windows XP or Server
-if not "%OS%"=="Windows_NT" goto FailOS
+if "%OS%" == "Windows_NT" goto okOsCheck
+echo Cannot process Geronimo command - you are running an unsupported operating system.
+set ERRORLEVEL=1
+goto end
+
+:okOsCheck
 setlocal
-goto Init
 
-:FailOS
-echo Error - Unrecognized OS type.
-echo.
+if not "%GERONIMO_HOME%" == "" goto resolveHome
+@REM %~dp0 is expanded pathname of the current script
+set GERONIMO_HOME=%~dp0..
+
+@REM resolve .. and remove any trailing slashes
+:resolveHome
+set CURRENT_DIR=%cd%
+cd %GERONIMO_HOME%
+set GERONIMO_HOME=%cd%
+cd %CURRENT_DIR%
+
+:gotHome
+if exist "%GERONIMO_HOME%\bin\deploy.bat" goto okHome
+echo The GERONIMO_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
 set ERRORLEVEL=1
-goto End
+goto end
+:okHome
 
-:Init
-@rem Capture any passed in arguments
-set ARGS=%*
-@rem Capture the current dir the script was started in
-set CUR_DIR="%cd%"
-for %%z in (%CUR_DIR%) do set CUR_DIR=%%~sz
-
-@rem Set the path to the deployer.jar
-set DEPLOYER_JAR="%~dp0deployer.jar"
-for %%z in (%DEPLOYER_JAR%) do set DEPLOYER_JAR=%%~sz
-
-:CheckDeployerJar
-@rem Verify the deployer.jar exists:
-if exist "%DEPLOYER_JAR%" goto CheckJavaHome
-echo Error - Unable to locate the deployer jar file.
-echo.
+@REM Get standard environment variables
+@REM Users can optionally create this file to set environment variables.
+if exist "%GERONIMO_HOME%\bin\setenv.bat" call "%GERONIMO_HOME%\bin\setenv.bat"
+if not %errorlevel% == 0 goto end
+
+@REM Get standard Java environment variables (based upon Tomcat's setclasspath.bat
+@REM but renamed since Deployer's classpath is set in the JAR manifest)
+if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
+echo Cannot find %GERONIMO_HOME%\bin\setjavaenv.bat
+echo This file is needed to run this program
 set ERRORLEVEL=1
-goto End
+goto end
+:okSetJavaEnv
+set BASEDIR=%GERONIMO_HOME%
+call "%GERONIMO_HOME%\bin\setJavaEnv.bat"
+if not %errorlevel% == 0 goto end
+
+if not "%GERONIMO_BASE%" == "" goto gotBase
+set GERONIMO_BASE=%GERONIMO_HOME%
+:gotBase
+
+if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
+set GERONIMO_TMPDIR=%GERONIMO_BASE%\var\temp
+:gotTmpdir
+
+@REM ----- Execute The Requested Command ---------------------------------------
+@if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
+echo Using GERONIMO_BASE:   %GERONIMO_BASE%
+echo Using GERONIMO_HOME:   %GERONIMO_HOME%
+echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
+if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME:       %JAVA_HOME%
+if "%_REQUIRE_JDK%" == "0" echo Using JRE_HOME:        %JRE_HOME%
 
-:CheckJavaHome
-for %%z in ("%JAVA_HOME%") do set JAVA_HOME=%%~sz
-if not "%JAVA_HOME%"=="" goto CheckJavaExe
-echo Error - The JAVA_HOME env variable MUST be set.
-echo.
-set ERRORLEVEL=1
-goto End
+:skipEnvInfo
 
-:CheckJavaExe
-if not exist "%JAVA_HOME%\bin" goto FailJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto FailJavaHome
-set JAVA="%JAVA_HOME%\bin\java.exe"
-goto StartDeployer
-
-:FailJavaHome
-echo Error - Unable to locate Java binary under the JAVA_HOME:
-echo   JAVA_HOME: [ %JAVA_HOME%\bin\java.exe ]
-echo.
-set ERRORLEVEL=1
-goto End
+@REM Capture any passed in arguments
+set ARGS=%*
+set _JARFILE="%GERONIMO_HOME%"\bin\deployer.jar
 
-:StartDeployer
-%JAVA% -jar %DEPLOYER_JAR% %ARGS%
+%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
+goto end
 
-:End
+:end
 echo.
+@REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
+if "%GERONIMO_BATCH_PAUSE%" == "on" pause
 @endlocal
-

Modified: geronimo/branches/configid/modules/scripts/src/resources/bin/deploy.sh
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/scripts/src/resources/bin/deploy.sh?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/scripts/src/resources/bin/deploy.sh (original)
+++ geronimo/branches/configid/modules/scripts/src/resources/bin/deploy.sh Sun Feb 26 17:12:56 2006
@@ -18,41 +18,180 @@
 # $Rev$ $Date$
 # --------------------------------------------------------------------
 
-ARGS=
+# -----------------------------------------------------------------------------
+# Deploy Script for the Geronimo Server
+#
+# You should not have to edit this file.  If you wish to have environment
+# variables set each time you run this script refer to the information
+# on the setenv.sh script that is called by this script below. 
+#
+# Invocation Syntax:
+#
+#   deploy.sh [general options] command [command options] 
+#
+#   For detailed command usage information, just run deploy.sh without any 
+#   arguments.
+#
+# Environment Variable Prequisites:
+#
+#   GERONIMO_HOME   (Optional) May point at your Geronimo top-level directory.
+#                   If not specified, it will default to the parent directory
+#                   of the location of this script.
+#
+#   GERONIMO_BASE   (Optional) Base directory for resolving dynamic portions
+#                   of a Geronimo installation.  If not present, resolves to
+#                   the same directory that GERONIMO_HOME points to.
+#
+#   GERONIMO_OPTS   (Optional) Java runtime options.
+#
+#   GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
+#                   the JVM should use (java.io.tmpdir).
+#                   Defaults to $GERONIMO_BASE/var/temp.
+#
+#   JAVA_HOME       Points to your Java Development Kit installation.
+#                   JAVA_HOME doesn't need to be set if JRE_HOME is set.
+#                   It is mandatory either JAVA_HOME or JRE_HOME are set.
+#
+#   JRE_HOME        Points to your Java Runtime Environment installation.
+#                   Set this if you wish to run Geronimo using the JRE 
+#                   instead of the JDK. Defaults to JAVA_HOME if empty.
+#                   It is mandatory either JAVA_HOME or JRE_HOME are set.
+#
+#   JAVA_OPTS       (Optional) Java runtime options.
+#
+# Troubleshooting execution of this script file:
+#
+#  GERONIMO_ENV_INFO    (Optional) Environment variable that when set to
+#                       "on" (the default) outputs the 
+#                       values of GERONIMO_HOME, GERONIMO_BASE, 
+#                       GERONIMO_TMPDIR, JAVA_HOME, JRE_HOME before
+#                       the command is issued. Set to "off" if you
+#                       do want to see this information.
+#
+# Scripts called by this script:
+# 
+#   $GERONIMO_HOME/bin/setenv.sh
+#                   (Optional) This script file is called if it is present.
+#                   Its contents may set one or more of the above environment
+#                   variables.  It is preferable (to simplify migration to
+#                   future Geronimo releases) to set environment variables
+#                   in this file rather than modifying Geronimo's script files.
+#
+#   $GERONIMO_HOME/bin/setjavaenv.sh
+#                   This batch file is called to set environment variables
+#                   relating to the java or jdb executable to invoke.
+#                   This file should not need to be modified.
+#
+# Exit Codes:
+#
+#  0 - Success
+#  1 - Error
+# -----------------------------------------------------------------------------
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+esac
 
-if [ -z "$JAVA_HOME" ]; then
-    JAVA=`which java`
-    if [ -z "$JAVA" ]; then
-        echo "Unable to locate Java binary. Please add it to the PATH."
-        exit 1
-    fi
-    JAVA_BIN=`dirname $JAVA`
-    JAVA_HOME=$JAVA_BIN/..
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '.*/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "$PRG"`/"$link"
+  fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set GERONIMO_HOME if not already set
+[ -z "$GERONIMO_HOME" ] && GERONIMO_HOME=`cd "$PRGDIR/.." ; pwd`
+
+if [ -r "$GERONIMO_HOME"/bin/setenv.sh ]; then
+  . "$GERONIMO_HOME"/bin/setenv.sh
 fi
 
-JAVA=$JAVA_HOME/bin/java
-if [ ! -f "$JAVA" ]; then 
-    echo "Unable to locate Java"
-    exit 1
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
+  [ -n "$GERONIMO_HOME" ] && GERONIMO_HOME=`cygpath --unix "$GERONIMO_HOME"`
+  [ -n "$GERONIMO_BASE" ] && GERONIMO_BASE=`cygpath --unix "$GERONIMO_BASE"`
 fi
 
-PRG="$0"
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '.*/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`/"$link"
-    fi
-done
+# For OS400
+if $os400; then
+  # Set job priority to standard for interactive (interactive - 6) by using
+  # the interactive priority - 6, the helper threads that respond to requests
+  # will be running at the same priority as interactive jobs.
+  COMMAND='chgjob job('$JOBNAME') runpty(6)'
+  system $COMMAND
 
-PRGDIR=`dirname "$PRG"`
-DEPLOYER_JAR=$PRGDIR/deployer.jar
+  # Enable multi threading
+  export QIBM_MULTI_THREADED=Y
+fi
 
-if [ ! -f "$DEPLOYER_JAR" ]; then 
-    echo "Unable to locate the $DEPLOYER_JAR jar"
+# Get standard Java environment variables
+# (based upon Tomcat's setclasspath.sh but renamed since Geronimo's classpath 
+# is set in the JAR manifest)
+if $os400; then
+  # -r will Only work on the os400 if the files are:
+  # 1. owned by the user
+  # 2. owned by the PRIMARY group of the user
+  # this will not work if the user belongs in secondary groups
+  BASEDIR="$GERONIMO_HOME"
+  . "$GERONIMO_HOME"/bin/setjavaenv.sh 
+else
+  if [ -r "$GERONIMO_HOME"/bin/setjavaenv.sh ]; then
+    BASEDIR="$GERONIMO_HOME"
+    . "$GERONIMO_HOME"/bin/setjavaenv.sh
+  else
+    echo "Cannot find $GERONIMO_HOME/bin/setjavaenv.sh"
+    echo "This file is needed to run this program"
     exit 1
+  fi
+fi
+
+if [ -z "$GERONIMO_BASE" ] ; then
+  GERONIMO_BASE="$GERONIMO_HOME"
+fi
+
+if [ -z "$GERONIMO_TMPDIR" ] ; then
+  # Define the java.io.tmpdir to use for Geronimo
+  GERONIMO_TMPDIR="$GERONIMO_BASE"/var/temp
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
+  JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
+  GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
+  GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
+  GERONIMO_TMPDIR=`cygpath --absolute --windows "$GERONIMO_TMPDIR"`
+fi
+
+# ----- Execute The Requested Command -----------------------------------------
+if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
+  echo "Using GERONIMO_BASE:   $GERONIMO_BASE"
+  echo "Using GERONIMO_HOME:   $GERONIMO_HOME"
+  echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
+  if [ "$1" = "debug" ] ; then
+    echo "Using JAVA_HOME:       $JAVA_HOME"
+    echo "Using JDB_SRCPATH:     $JDB_SRCPATH"
+  else
+    echo "Using JRE_HOME:        $JRE_HOME"
+  fi
 fi
 
-$JAVA $ARGS -jar $DEPLOYER_JAR "$@"
+exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
+  -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
+  -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
+  -jar "$GERONIMO_HOME"/bin/deployer.jar "$@" 

Modified: geronimo/branches/configid/modules/scripts/src/resources/bin/geronimo.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/scripts/src/resources/bin/geronimo.bat?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/scripts/src/resources/bin/geronimo.bat (original)
+++ geronimo/branches/configid/modules/scripts/src/resources/bin/geronimo.bat Sun Feb 26 17:12:56 2006
@@ -19,13 +19,25 @@
 
 @REM ---------------------------------------------------------------------------
 @REM Start/Stop Batch file for Geronimo
-@REM
-@REM For usage information, just run geronimo.bat without any arguments.
 @REM 
-@REM This script is based upon Tomcat's catalina.sh file to enable
+@REM This batch file is based upon Tomcat's catalina.bat file to enable
 @REM those familiar with Tomcat to quickly get started with Geronimo.
 @REM
-@REM Environment Variable Prequisites
+@REM This batch file can be used directly instead of startup.bat and 
+@REM shutdown.bat as they call this batch file anyway.
+@REM
+@REM You should not have to edit this file.  If you wish to have environment
+@REM variables set each time you run this batch file refer to the information
+@REM on the setenv.bat file below. 
+@REM
+@REM Invocation Syntax:
+@REM
+@REM   geronimo command [geronimo_args] 
+@REM
+@REM   For detailed usage information, just run geronimo.bat without any 
+@REM   arguments.
+@REM
+@REM Environment Variable Prequisites:
 @REM 
 @REM   GERONIMO_HOME   May point at your Geronimo top-level directory.
 @REM                   If not specified, this batch file will attempt to
@@ -43,6 +55,11 @@
 @REM                   the JVM should use (java.io.tmpdir).  Defaults to
 @REM                   %GERONIMO_BASE%\var\temp.
 @REM
+@REM   GERONIMO_WIN_START_ARGS  (Optional) additional arguments to the Windows
+@REM                            START command when the "start" command
+@REM                            is executed. E.G, you could set this to /MIN 
+@REM                            to start Geronimo in a minimized window.
+@REM
 @REM   JAVA_HOME       Points to your Java Development Kit installation.
 @REM                   JAVA_HOME doesn't need to be set if JRE_HOME is set
 @REM                   unless you use the "debug" command.
@@ -76,12 +93,21 @@
 @REM                        "on" results in each batch file to pause at the
 @REM                        end of execution
 @REM
+@REM   GERONIMO_ENV_INFO    (Optional) Environment variable that when set to
+@REM                        "on" (the default) outputs the values of  
+@REM                        GERONIMO_HOME, GERONIMO_BASE, GERONIMO_TMPDIR,
+@REM                        JAVA_HOME and JRE_HOME before the command is
+@REM                        issued. Set to "off" if you do not want this
+@REM                        information displayed.
+@REM
 @REM Batch files called by this batch file:
 @REM 
 @REM   %GERONIMO_HOME%\bin\setenv.bat
 @REM                   (Optional) This batch file is called if it is present.
 @REM                   Its contents may set one or more of the above environment
-@REM                   variables.
+@REM                   variables. It is preferable (to simplify migration to
+@REM                   future Geronimo releases) to set environment variables
+@REM                   in this file rather than modifying Geronimo's script files.
 @REM
 @REM   %GERONIMO_HOME%\bin\setjavaenv.bat
 @REM                   This batch file is called to set environment variables
@@ -132,7 +158,7 @@
 @REM Get standard Java environment variables (based upon Tomcat's setclasspath.bat
 @REM but renamed since Geronimo's classpath is set in the JAR manifest)
 if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
-echo Cannot find %GERONIMO_HOME%\bin\setclasspath.bat
+echo Cannot find %GERONIMO_HOME%\bin\setjavaenv.bat
 echo This file is needed to run this program
 set ERRORLEVEL=1
 goto end
@@ -150,12 +176,13 @@
 :gotTmpdir
 
 @REM ----- Execute The Requested Command ---------------------------------------
-
+@if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
 echo Using GERONIMO_BASE:   %GERONIMO_BASE%
 echo Using GERONIMO_HOME:   %GERONIMO_HOME%
 echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
 if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME:       %JAVA_HOME%
 if "%_REQUIRE_JDK%" == "0" echo Using JRE_HOME:        %JRE_HOME%
+:skipEnvInfo
 
 set _EXECJAVA=%_RUNJAVA%
 @REM MAINCLASS required for jdb debugger as it requires the mainclass
@@ -222,16 +249,18 @@
 goto execCmd
 
 :doStart
+echo.
+echo Starting Geronimo in a separate window...
 shift
 @REM use long format of startup progress to be consistent with 
 @REM the unix version of the start processing
 set _LONG_OPT=--long
 
 if not "%OS%" == "Windows_NT" goto noTitle
-set _EXECJAVA=start "Geronimo" %_RUNJAVA%
+set _EXECJAVA=start "Geronimo" %GERONIMO_WIN_START_ARGS% %_RUNJAVA%
 goto gotTitle
 :noTitle
-set _EXECJAVA=start %_RUNJAVA%
+set _EXECJAVA=start %GERONIMO_WIN_START_ARGS% %_RUNJAVA%
 :gotTitle
 goto execCmd
 

Modified: geronimo/branches/configid/modules/scripts/src/resources/bin/geronimo.sh
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/scripts/src/resources/bin/geronimo.sh?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/scripts/src/resources/bin/geronimo.sh (original)
+++ geronimo/branches/configid/modules/scripts/src/resources/bin/geronimo.sh Sun Feb 26 17:12:56 2006
@@ -24,11 +24,25 @@
 # This script is based upon Tomcat's catalina.sh file to enable
 # those familiar with Tomcat to quickly get started with Geronimo.
 #
-# For usage information, just run geronimo.sh without any arguments.
+# This script file can be used directly instead of startup.sh and 
+# shutdown.sh as they call this script file anyway.
 #
-# Environment Variable Prequisites
+# You should not have to edit this file.  If you wish to have environment
+# variables set each time you run this script refer to the information
+# on the setenv.sh script that is called by this script below. 
 #
-#   GERONIMO_HOME   May point at your Geronimo top-level directory.
+# Invocation Syntax:
+#
+#   geronimo.sh command [geronimo_args] 
+#
+#   For detailed command usage information, just run geronimo.sh without any 
+#   arguments.
+#
+# Environment Variable Prequisites:
+#
+#   GERONIMO_HOME   (Optional) May point at your Geronimo top-level directory.
+#                   If not specified, it will default to the parent directory
+#                   of the location of this script.
 #
 #   GERONIMO_BASE   (Optional) Base directory for resolving dynamic portions
 #                   of a Geronimo installation.  If not present, resolves to
@@ -79,12 +93,22 @@
 #                   the OS provides a command that allows you to start a process
 #                   with in a specified CPU or priority.
 #
+# Troubleshooting execution of this script file:
+#
+#  GERONIMO_ENV_INFO (Optional) Environment variable that when set to "on"
+#                    (the default) outputs the values of the GERONIMO_HOME,
+#                    GERONIMO_BASE, GERONIMO_TMPDIR, JAVA_HOME and
+#                    JRE_HOME before the command is issued. Set to "off"    
+#                    if you do not want this information displayed.
+#
 # Scripts called by this script:
 # 
 #   $GERONIMO_HOME/bin/setenv.sh
 #                   (Optional) This script file is called if it is present.
 #                   Its contents may set one or more of the above environment
-#                   variables.
+#                   variables.  It is preferable (to simplify migration to
+#                   future Geronimo releases) to set environment variables
+#                   in this file rather than modifying Geronimo's script files.
 #
 #   $GERONIMO_HOME/bin/setjavaenv.sh
 #                   This batch file is called to set environment variables
@@ -201,21 +225,24 @@
 fi
 
 # ----- Execute The Requested Command -----------------------------------------
-
-echo "Using GERONIMO_BASE:   $GERONIMO_BASE"
-echo "Using GERONIMO_HOME:   $GERONIMO_HOME"
-echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
-if [ "$1" = "debug" ] ; then
-  echo "Using JAVA_HOME:       $JAVA_HOME"
-  echo "Using JDB_SRCPATH:     $JDB_SRCPATH"
-else
-  echo "Using JRE_HOME:        $JRE_HOME"
+if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
+  echo "Using GERONIMO_BASE:   $GERONIMO_BASE"
+  echo "Using GERONIMO_HOME:   $GERONIMO_HOME"
+  echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
+  if [ "$1" = "debug" ] ; then
+    echo "Using JAVA_HOME:       $JAVA_HOME"
+    echo "Using JDB_SRCPATH:     $JDB_SRCPATH"
+  else
+    echo "Using JRE_HOME:        $JRE_HOME"
+  fi
 fi
 
 LONG_OPT=
 if [ "$1" = "start" ] ; then
   LONG_OPT=--long
-  echo "Using GERONIMO_OUT:    $GERONIMO_OUT"
+  if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
+    echo "Using GERONIMO_OUT:    $GERONIMO_OUT"
+  fi
 fi
 
 if [ "$1" = "jpda" ] ; then
@@ -255,7 +282,6 @@
 
   shift
   exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
-    -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \
     -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
     -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
     -jar "$GERONIMO_HOME"/bin/server.jar $LONG_OPT "$@" 
@@ -265,12 +291,12 @@
   shift
   touch "$GERONIMO_OUT"
   $START_OS_CMD "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
-    -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \
     -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
     -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
     -jar "$GERONIMO_HOME"/bin/server.jar $LONG_OPT "$@" \
     >> $GERONIMO_OUT 2>&1 &
-
+    echo ""
+    echo "Geronimo started in background. PID: $!"
     if [ ! -z "$GERONIMO_PID" ]; then
       echo $! > $GERONIMO_PID
     fi

Modified: geronimo/branches/configid/modules/scripts/src/resources/bin/setjavaenv.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/scripts/src/resources/bin/setjavaenv.bat?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/scripts/src/resources/bin/setjavaenv.bat (original)
+++ geronimo/branches/configid/modules/scripts/src/resources/bin/setjavaenv.bat Sun Feb 26 17:12:56 2006
@@ -14,15 +14,25 @@
 @REM   limitations under the License.
 @REM
 @REM --------------------------------------------------------------------
+@REM $Rev$ $Date$
+@REM --------------------------------------------------------------------
+
+@REM --------------------------------------------------------------------
 @REM Set environment variables relating to the execution of java commands
 @REM
-@REM This batch file is called by the geronimo.bat file.
+@REM This batch file is called by the geronimo.bat file (which is 
+@REM invoked by the startup.bat, shutdown.bat files).  This file is
+@REM also invoked by the deploy.bat file.
+@REM
+@REM It is preferable (to simplify migration to future Geronimo releases) 
+@REM to set any environment variables you need in the setenv.bat file
+@REM rather than modifying Geronimo's script files.  See the documentation
+@REM in the geronimo.bat file for further information.
 @REM
-@REM (based upon Apache Tomcat 5.5.12's setclasspath.bat although modified
+@REM (Based upon Apache Tomcat 5.5.12's setclasspath.bat although modified
 @REM to be more consistent with the shell script version's support of
 @REM JDK_HOME and JRE_HOME)
 @REM
-@REM $Rev$ $Date$
 @REM --------------------------------------------------------------------
 
 @REM Begin all @REM lines with '@' in case GERONIMO_BATCH_ECHO is 'on'

Modified: geronimo/branches/configid/modules/scripts/src/resources/bin/setjavaenv.sh
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/scripts/src/resources/bin/setjavaenv.sh?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/scripts/src/resources/bin/setjavaenv.sh (original)
+++ geronimo/branches/configid/modules/scripts/src/resources/bin/setjavaenv.sh Sun Feb 26 17:12:56 2006
@@ -15,13 +15,23 @@
 #   limitations under the License.
 
 # --------------------------------------------------------------------
-# Set environment variables relating to the execution of java commands
+# $Rev$ $Date$
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
+# Set environment variables relating to the execution of java commands.
 #
-# This script file is called by the geronimo.sh file.
+# This script file is called by the geronimo.sh file (which is invoked
+# by the startup.sh, shutdown.sh files).  This file is also invoked
+# by the deploy.sh file.
 #
-# (based upon Apache Tomcat 5.5.12's setclasspath.sh)
+# It is preferable (to simplify migration to future Geronimo releases) 
+# to set any environment variables you need in the setenv.sh file
+# rather than modifying Geronimo's script files.  See the documentation
+# in the geronimo.sh file for further information.
+#
+# (Based upon Apache Tomcat 5.5.12's setclasspath.sh)
 #
-# $Rev$ $Date$
 # --------------------------------------------------------------------
 
 # Make sure prerequisite environment variables are set

Modified: geronimo/branches/configid/modules/scripts/src/resources/bin/shutdown.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/scripts/src/resources/bin/shutdown.bat?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/scripts/src/resources/bin/shutdown.bat (original)
+++ geronimo/branches/configid/modules/scripts/src/resources/bin/shutdown.bat Sun Feb 26 17:12:56 2006
@@ -1,45 +1,61 @@
-@echo off
-rem
-rem  Copyright 2005 The Apache Software Foundation
-rem
-rem   Licensed under the Apache License, Version 2.0 (the "License");
-rem   you may not use this file except in compliance with the License.
-rem   You may obtain a copy of the License at
-rem
-rem      http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem   Unless required by applicable law or agreed to in writing, software
-rem   distributed under the License is distributed on an "AS IS" BASIS,
-rem   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem   See the License for the specific language governing permissions and
-rem   limitations under the License.
-rem
-rem --------------------------------------------------------------------
-rem $Rev$ $Date$
-rem --------------------------------------------------------------------
-rem
-rem --------------------------------------------------------------------
-rem Shutdown batch file for Geronimo.
-rem
-rem This batch file calls the geronimo.bat script passing "stop" as the
-rem first argument followed by the arguments supplied by the caller.
-rem
-rem Refer to the documentation in the geronimo.bat file for information
-rem on environment variables etc.
-rem
-rem This batch file is based upon Tomcat's shutdown.bat file to enable
-rem those familiar with Tomcat to easily stop Geronimo.
-rem 
-rem Alternatively you can use the more comprehensive geronimo.bat file 
-rem directly.
-rem
-rem Usage:  shutdown [geronimo_args ...]
-rem
-rem $Rev$ $Date$
-rem --------------------------------------------------------------------
-if "%OS%" == "Windows_NT" setlocal
+@REM
+@REM  Copyright 2005 The Apache Software Foundation
+@REM
+@REM   Licensed under the Apache License, Version 2.0 (the "License");
+@REM   you may not use this file except in compliance with the License.
+@REM   You may obtain a copy of the License at
+@REM
+@REM      http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM   Unless required by applicable law or agreed to in writing, software
+@REM   distributed under the License is distributed on an "AS IS" BASIS,
+@REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM   See the License for the specific language governing permissions and
+@REM   limitations under the License.
+
+@REM --------------------------------------------------------------------
+@REM $Rev$ $Date$
+@REM --------------------------------------------------------------------
+
+@REM --------------------------------------------------------------------
+@REM Shutdown batch file for Geronimo.
+@REM
+@REM This batch file calls the geronimo.bat script passing "stop" as the
+@REM first argument followed by the arguments supplied by the caller.
+@REM
+@REM This batch file is based upon Tomcat's shutdown.bat file to enable
+@REM those familiar with Tomcat to easily stop Geronimo.
+@REM 
+@REM Alternatively you can use the more comprehensive geronimo.bat file 
+@REM directly.
+@REM
+@REM Invocation Syntax:
+@REM
+@REM   shutdown [stop command args ...]
+@REM
+@REM   Invoke the shutdown.bat file without any arguments for information
+@REM   on arguments for the geronimo.bat stop command that is invoked by
+@REM   this batch file.
+@REM
+@REM Environment Variable Prequisites:
+@REM
+@REM   Refer to the documentation in the geronimo.bat file for information
+@REM   on environment variables etc.
+@REM
+@REM --------------------------------------------------------------------
+
+@if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
+@if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
+
+if "%OS%" == "Windows_NT" goto okOsCheck
+echo Cannot process Geronimo command - you are running an unsupported operating system.
+set ERRORLEVEL=1
+goto end
+
+:okOsCheck
+setlocal
 
-rem Guess GERONIMO_HOME if not defined
+@REM Guess GERONIMO_HOME if not defined
 set CURRENT_DIR=%cd%
 if not "%GERONIMO_HOME%" == "" goto gotHome
 set GERONIMO_HOME=%CURRENT_DIR%
@@ -51,19 +67,21 @@
 if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
 echo The GERONIMO_HOME environment variable is not defined correctly
 echo This environment variable is needed to run this program
+set ERRORLEVEL=1
 goto end
 :okHome
 
 set EXECUTABLE=%GERONIMO_HOME%\bin\geronimo.bat
 
-rem Check that target executable exists
+@REM Check that target executable exists
 if exist "%EXECUTABLE%" goto okExec
 echo Cannot find %EXECUTABLE%
 echo This file is needed to run this program
+set ERRORLEVEL=1
 goto end
 :okExec
 
-rem Get remaining unshifted command line arguments and save them in the
+@REM Get remaining unshifted command line arguments and save them in the
 set CMD_LINE_ARGS=
 :setArgs
 if ""%1""=="""" goto doneSetArgs
@@ -75,3 +93,6 @@
 call "%EXECUTABLE%" stop %CMD_LINE_ARGS%
 
 :end
+
+@REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
+if "%GERONIMO_BATCH_PAUSE%" == "on" pause

Modified: geronimo/branches/configid/modules/scripts/src/resources/bin/shutdown.sh
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/scripts/src/resources/bin/shutdown.sh?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/scripts/src/resources/bin/shutdown.sh (original)
+++ geronimo/branches/configid/modules/scripts/src/resources/bin/shutdown.sh Sun Feb 26 17:12:56 2006
@@ -15,23 +15,34 @@
 #   limitations under the License.
 
 # --------------------------------------------------------------------
+# $Rev$ $Date$
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
 # Shutdown script file for Geronimo.
 #
 # This script calls the geronimo.sh script passing "stop" as the
 # first argument followed by the arguments supplied by the caller.
 #
-# Refer to the documentation in the geronimo.sh file for information
-# on environment variables etc.
-#
 # This script is based upon Tomcat's shutdown.sh file to enable
 # those familiar with Tomcat to easily stop Geronimo.
 # 
 # Alternatively you can use the more comprehensive geronimo.sh file 
 # directly.
 #
-# Usage:  shutdown.sh [geronimo_args ...]
+# Invocation Syntax:
+#
+#   shutdown.sh [geronimo.sh stop command args] 
+#
+#   Invoke the shutdown.sh file without any arguments for information
+#   on arguments for the geronimo.sh stop command that is invoked
+#   by this script.
+#
+# Environment Variable Prequisites:
+#
+#   Refer to the documentation in the geronimo.sh file for information
+#   on environment variables etc.
 #
-# $Rev$ $Date$
 # --------------------------------------------------------------------
 
 # resolve links - $0 may be a softlink

Modified: geronimo/branches/configid/modules/scripts/src/resources/bin/startup.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/scripts/src/resources/bin/startup.bat?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/scripts/src/resources/bin/startup.bat (original)
+++ geronimo/branches/configid/modules/scripts/src/resources/bin/startup.bat Sun Feb 26 17:12:56 2006
@@ -14,23 +14,30 @@
 @REM   limitations under the License.
 @REM
 @REM --------------------------------------------------------------------
+@REM $Rev$ $Date$
+@REM --------------------------------------------------------------------
+
+@REM --------------------------------------------------------------------
 @REM Startup batch file for Geronimo that starts Geronimo in a new window.
 @REM
 @REM This batch file calls the geronimo.bat script passing "start" as the
 @REM first argument followed by the arguments supplied by the caller.
 @REM
-@REM Refer to the documentation in the geronimo.bat file for information
-@REM on environment variables etc.
-@REM
 @REM This batch file is based upon Tomcat's startup.bat file to enable
 @REM those familiar with Tomcat to quickly get started with Geronimo.
 @REM 
 @REM Alternatively you can use the more comprehensive geronimo.bat file 
 @REM directly.
 @REM
-@REM Usage:  startup [geronimo.bat_args] [geronimo_args ...]
+@REM Invocation Syntax:
+@REM
+@REM   startup [geronimo_args ...]
+@REM
+@REM Environment Variable Prequisites:
+@REM
+@REM   Refer to the documentation in the geronimo.bat file for information
+@REM   on environment variables etc.
 @REM
-@REM $Rev$ $Date$
 @REM --------------------------------------------------------------------
 
 @if "%GERONIMO_BATCH_ECHO%" == "on"  echo on

Modified: geronimo/branches/configid/modules/scripts/src/resources/bin/startup.sh
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/scripts/src/resources/bin/startup.sh?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/scripts/src/resources/bin/startup.sh (original)
+++ geronimo/branches/configid/modules/scripts/src/resources/bin/startup.sh Sun Feb 26 17:12:56 2006
@@ -15,23 +15,30 @@
 #   limitations under the License.
 
 # --------------------------------------------------------------------
+# $Rev$ $Date$
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
 # Startup script file for Geronimo that starts Geronimo in the background.
 #
 # This script calls the geronimo.sh script passing "start" as the
 # first argument followed by the arguments supplied by the caller.
 #
-# Refer to the documentation in the geronimo.sh file for information
-# on environment variables etc.
-#
 # This script is based upon Tomcat's startup.sh file to enable
 # those familiar with Tomcat to quickly get started with Geronimo.
 # 
 # Alternatively you can use the more comprehensive geronimo.sh file 
 # directly.
 #
-# Usage:  startup.sh [geronimo.sh_args] [geronimo_args ...]
+# Invocation Syntax:
+#
+#   startup.sh [geronimo_args ...]
+#
+# Environment Variable Prequisites:
+#
+#   Refer to the documentation in the geronimo.sh file for information
+#   on environment variables etc.
 #
-# $Rev$ $Date$
 # --------------------------------------------------------------------
 
 os400=false

Modified: geronimo/branches/configid/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java (original)
+++ geronimo/branches/configid/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java Sun Feb 26 17:12:56 2006
@@ -19,6 +19,7 @@
 
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
 
 /**
  *
@@ -29,7 +30,8 @@
 public class NontransactionalThreadPooledTimerTest extends AbstractThreadPooledTimerTest {
 
     protected void setUp() throws Exception {
-        TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, null, null);
+        TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, 
+                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
         transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
         executableWorkFactory = new NontransactionalExecutorTaskFactory(transactionContextManager);
         super.setUp();

Modified: geronimo/branches/configid/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java (original)
+++ geronimo/branches/configid/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java Sun Feb 26 17:12:56 2006
@@ -19,6 +19,7 @@
 
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
 
 /**
  *
@@ -29,7 +30,8 @@
 public class TransactionalThreadPooledTimerTest extends AbstractThreadPooledTimerTest {
 
     protected void setUp() throws Exception {
-        TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, null, null);
+        TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, 
+                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
         transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
         executableWorkFactory = new TransactionalExecutorTaskFactory(transactionContextManager, 1);
         super.setUp();

Modified: geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java (original)
+++ geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java Sun Feb 26 17:12:56 2006
@@ -309,6 +309,11 @@
     }
 
     public Collection recover(XidFactory xidFactory) throws LogException {
+        log.debug("Initiating transaction manager recovery");
+        Map recovered = new HashMap();
+        ReplayListener replayListener = new GeronimoReplayListener(xidFactory, recovered);
+        logger.replayActiveTx(replayListener);
+        log.debug("In doubt transactions recovered from log");
         return recovered.values();
     }
 

Modified: geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java (original)
+++ geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java Sun Feb 26 17:12:56 2006
@@ -46,14 +46,14 @@
     /**
      * TODO NOTE!!! this should be called in an unspecified transaction context, but we cannot enforce this restriction!
      */
-    public TransactionManagerImpl(int defaultTransactionTimeoutSeconds, TransactionLog transactionLog, Collection resourceManagers) throws XAException {
+    public TransactionManagerImpl(int defaultTransactionTimeoutSeconds, XidFactory xidFactory, TransactionLog transactionLog, Collection resourceManagers) throws XAException {
         if (defaultTransactionTimeoutSeconds <= 0) {
             throw new IllegalArgumentException("defaultTransactionTimeoutSeconds must be positive: attempted value: " + defaultTransactionTimeoutSeconds);
         }
 
         this.defaultTransactionTimeoutMilliseconds = defaultTransactionTimeoutSeconds * 1000;
         this.transactionLog = transactionLog == null ? new UnrecoverableLog() : transactionLog;
-        this.xidFactory = new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes());
+        this.xidFactory = xidFactory;
         this.resourceManagers = resourceManagers;
         recovery = new RecoveryImpl(this.transactionLog, this.xidFactory);
 

Modified: geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java (original)
+++ geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java Sun Feb 26 17:12:56 2006
@@ -36,10 +36,11 @@
     /**
      * TODO NOTE!!! this should be called in an unspecified transaction context, but we cannot enforce this restriction!
      */
-    public TransactionManagerImplGBean(int defaultTransactionTimeoutSeconds, TransactionLog transactionLog, Collection resourceManagers) throws XAException {
-        super(defaultTransactionTimeoutSeconds, transactionLog, resourceManagers);
+    public TransactionManagerImplGBean(int defaultTransactionTimeoutSeconds, XidFactory xidFactory, TransactionLog transactionLog, Collection resourceManagers) throws XAException {
+        super(defaultTransactionTimeoutSeconds, xidFactory, transactionLog, resourceManagers);
     }
 
+    
     /**
      * We can track as resources are added into the geronimo kernel.
      *
@@ -74,13 +75,18 @@
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(TransactionManagerImplGBean.class, NameFactory.TRANSACTION_MANAGER);
 
         infoBuilder.addAttribute("defaultTransactionTimeoutSeconds", int.class, true);
+        infoBuilder.addReference("XidFactory", XidFactory.class, NameFactory.XID_FACTORY);
         infoBuilder.addReference("TransactionLog", TransactionLog.class, NameFactory.TRANSACTION_LOG);
         infoBuilder.addReference("ResourceManagers", ResourceManager.class);//two kinds of things, so specify the type in each pattern.
 
         infoBuilder.addInterface(ExtendedTransactionManager.class);
         infoBuilder.addInterface(XidImporter.class);
 
-        infoBuilder.setConstructor(new String[]{"defaultTransactionTimeoutSeconds", "TransactionLog", "ResourceManagers"});
+        infoBuilder.setConstructor(new String[]{
+                "defaultTransactionTimeoutSeconds",
+                "XidFactory",
+                "TransactionLog",
+                "ResourceManagers"});
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }

Modified: geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java (original)
+++ geronimo/branches/configid/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java Sun Feb 26 17:12:56 2006
@@ -29,8 +29,13 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(XidFactoryImplGBean.class, NameFactory.XID_FACTORY);
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(XidFactoryImpl.class, NameFactory.XID_FACTORY);
+        
+        infoFactory.addAttribute("tmId", byte[].class, true);
         infoFactory.addInterface(XidFactory.class);
+
+        infoFactory.setConstructor(new String[]{"tmId"});
+        
         GBEAN_INFO = infoFactory.getBeanInfo();
     }