svn commit: r306897 - in /geronimo/trunk/sandbox/daytrader: bin/depderbyresources.sh dayTrader-plan.xml

[ho...@apache.org]

Author: hogstrom
Date: Thu Oct  6 14:22:23 2005
New Revision: 306897

URL: http://svn.apache.org/viewcvs?rev=306897&view=rev
Log:
syncing build changes

Modified:
    geronimo/trunk/sandbox/daytrader/bin/depderbyresources.sh
    geronimo/trunk/sandbox/daytrader/dayTrader-plan.xml

Modified: geronimo/trunk/sandbox/daytrader/bin/depderbyresources.sh
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/bin/depderbyresources.sh?rev=306897&r1=306896&r2=306897&view=diff
==============================================================================
--- geronimo/trunk/sandbox/daytrader/bin/depderbyresources.sh (original)
+++ geronimo/trunk/sandbox/daytrader/bin/depderbyresources.sh Thu Oct  6 14:22:23 2005
@@ -1,7 +1,57 @@
-#!/bin/bash
+#!/bin/sh
+#
+#  Copyright 2005 The Apache Software Foundation
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
 
-export GERONIMO_HOME=/home/hogstrom/geronimo/geronimo/modules/assembly/target/geronimo-1.0-SNAPSHOT
+# --------------------------------------------------------------------
+# $Rev$ $Date$
+# --------------------------------------------------------------------
 
+ARGS=
+
+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/..
+fi
+
+JAVA=$JAVA_HOME/bin/java
+if [ ! -f "$JAVA" ]; then
+    echo "Unable to locate Java"
+    exit 1
+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
+
+PRGDIR=`dirname "$PRG"`
+SERVER_JAR=$PRGDIR/server.jar
+
+GERONIMO_HOME=$PRGDIR/../../../modules/assembly/target/geronimo-1.0-SNAPSHOT
+echo $GERONIMO_HOME
 #java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy ${GERONIMO_HOME}/repository/tranql/rars/tranql-connector-derby-embed-xa-1.0-SNAPSHOT.rar derby-plan.xml
 #java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy ${GERONIMO_HOME}/repository/tranql/rars/tranql-connector-1.0-20050716.rar mydb2-plan.xml
 #java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy ${GERONIMO_HOME}/repository/activemq/rars/activemq-ra-3.2-SNAPSHOT.rar jms-resource-plan.xml

Modified: geronimo/trunk/sandbox/daytrader/dayTrader-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/dayTrader-plan.xml?rev=306897&r1=306896&r2=306897&view=diff
==============================================================================
--- geronimo/trunk/sandbox/daytrader/dayTrader-plan.xml (original)
+++ geronimo/trunk/sandbox/daytrader/dayTrader-plan.xml Thu Oct  6 14:22:23 2005
@@ -510,7 +510,7 @@
             configId="foo"
             clientConfigId="tradeStreamerAppclient">
             <resource>
-                <external-rar>activemq/rars/activemq-ra-3.2-SNAPSHOT.rar</external-rar>
+                <external-rar>activemq/rars/activemq-ra-3.2-M1.rar</external-rar>
                 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
            configId="org/apache/geronimo/SystemJMS"
            parentId="org/apache/geronimo/ActiveMQServer">
@@ -563,7 +563,7 @@
     </module>
     <ext-module>
         <connector>TradeDataSource</connector>
-        <external-path>tranql/rars/tranql-connector-derby-embed-xa-1.0-SNAPSHOT.rar</external-path>
+        <external-path>tranql/rars/tranql-connector-derby-embed-xa-1.0.rar</external-path>
         <connector
             xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
             configId="TradeDataSource"
@@ -609,7 +609,7 @@
 
     <ext-module>
         <connector>TradeJMS</connector>
-        <external-path>activemq/rars/activemq-ra-3.2-SNAPSHOT.rar</external-path>
+        <external-path>activemq/rars/activemq-ra-3.2-M1.rar</external-path>
         <connector
             xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
             xmlns:naming="http://geronimo.apache.org/xml/ns/naming"