Skip to Content.
Sympa Menu

notify-dpml - r875 - in trunk/main: depot/core/console/etc/bin depot/library/console/etc/bin metro/exec/etc/bin metro/station/console/etc/bin transit/console/etc/bin

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: carelparadis AT mail.berlios.de
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r875 - in trunk/main: depot/core/console/etc/bin depot/library/console/etc/bin metro/exec/etc/bin metro/station/console/etc/bin transit/console/etc/bin
  • Date: Sun, 8 Jan 2006 08:11:15 +0100

Author: carelparadis
Date: 2006-01-08 08:10:35 +0100 (Sun, 08 Jan 2006)
New Revision: 875

Modified:
trunk/main/depot/core/console/etc/bin/depot
trunk/main/depot/core/console/etc/bin/depot-cygwin.sh
trunk/main/depot/core/console/etc/bin/depot-unix.sh
trunk/main/depot/library/console/etc/bin/build
trunk/main/metro/exec/etc/bin/metro
trunk/main/metro/station/console/etc/bin/station
trunk/main/transit/console/etc/bin/transit
Log:
Ensure system properties in unix scripts are passed directly to the JVM as on
Windows.

Modified: trunk/main/depot/core/console/etc/bin/depot
===================================================================
--- trunk/main/depot/core/console/etc/bin/depot 2006-01-08 05:51:57 UTC (rev
874)
+++ trunk/main/depot/core/console/etc/bin/depot 2006-01-08 07:10:35 UTC (rev
875)
@@ -16,12 +16,12 @@
#
# See the License for the specific language governing permissions and
# limitations under the License
-if [ ! "$DPML_HOME" ]; then
+if [ "$DPML_HOME" = "" ]; then
DPML_HOME="$HOME/.dpml"
export DPML_HOME
fi

-if [ ! "$DPML_SYSTEM" ]; then
+if [ "$DPML_SYSTEM" = "" ]; then
CWD=`pwd`
BIN_DIR=`dirname "$0"`
cd "$BIN_DIR"
@@ -39,7 +39,7 @@
echo "ERROR: JAVA_HOME not found in your environment."
echo
echo "Please, set the JAVA_HOME variable in your environment to match the
location"
- echo " of the Java Virtual Machine you want to use."
+ echo "of the Java Virtual Machine you want to use."
echo
echo "This requirement is in place to avoid accidental execution of
pre-installed"
echo "Java virtual machines on your system, such as kaffe or any outdated
Sun or"
@@ -53,17 +53,41 @@
DEPOT_VERSION="@BUILD-ID@"
export DEPOT_VERSION

-SECURITY_POLICY=$DPML_SYSTEM/bin/security.policy
-export SECURITY_POLICY
+if [ "$DEPOT_SECURITY_POLICY" = "" ] ; then
+ DEPOT_SECURITY_POLICY=$DPML_SYSTEM/bin/security.policy
+fi
+export DEPOT_SECURITY_POLICY

-DEPOT_CLASSPATH=$DPML_SYSTEM/lib/@DEPOT-PATH@:$DPML_SYSTEM/lib/@TRANSIT-PATH@
+DEPOT_BASE_JVM_OPTS="-Djava.system.class.loader=@DEPOT-CLASSLOADER-CLASS@
\"-Djava.security.policy=$DEPOT_SECURITY_POLICY\"
-Djava.rmi.server.randomIDs=true
-Djava.rmi.server.RMIClassLoaderSpi=net.dpml.depot.DepotRMIClassLoaderSpi
-Djava.protocol.handler.pkgs=net.dpml.transit"
+
+if [ "$DEPOT_JVM_OPTS" = "" ] ; then
+ DEPOT_JVM_OPTS=$DEPOT_BASE_JVM_OPTS
+else
+ DEPOT_JVM_OPTS="$DEPOT_BASE_JVM_OPTS $DEPOT_JVM_OPTS"
+fi
+export DEPOT_JVM_OPTS
+
+DEPOT_BASE_CLASSPATH=$DPML_SYSTEM/lib/@DEPOT-PATH@:$DPML_SYSTEM/lib/@TRANSIT-PATH@
+
+if [ "$DEPOT_CLASSPATH" = "" ] ; then
+ DEPOT_CLASSPATH=$DEPOT_BASE_CLASSPATH
+else
+ DEPOT_CLASSPATH="$DEPOT_BASE_CLASSPATH $DEPOT_CLASSPATH"
+fi
export DEPOT_CLASSPATH

+if [ "$DEPOT_ARGS" = "" ] ; then
+ DEPOT_ARGS=$@
+else
+ DEPOT_ARGS="$DEPOT_ARGS $@"
+fi
+export DEPOT_ARGS
+
if [ `echo $PLATFORM | grep "CYGWIN"` ] ; then
- exec "$DPML_SYSTEM/bin/depot-cygwin.sh" "$@"
+ exec "$DPML_SYSTEM/bin/depot-cygwin.sh"
elif [ `echo $PLATFORM | grep "Linux"` ] ; then
- exec "$DPML_SYSTEM/bin/depot-unix.sh" "$@"
+ exec "$DPML_SYSTEM/bin/depot-unix.sh"
else
- echo "Starting Default Unix script"
- exec "$DPML_SYSTEM/bin/depot-unix.sh" "$@"
+ echo "Starting default Unix script"
+ exec "$DPML_SYSTEM/bin/depot-unix.sh"
fi

Modified: trunk/main/depot/core/console/etc/bin/depot-cygwin.sh
===================================================================
--- trunk/main/depot/core/console/etc/bin/depot-cygwin.sh 2006-01-08
05:51:57 UTC (rev 874)
+++ trunk/main/depot/core/console/etc/bin/depot-cygwin.sh 2006-01-08
07:10:35 UTC (rev 875)
@@ -16,13 +16,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

-
# For Cygwin, ensure paths are in UNIX format before anything is touched
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`

-JAVA="$JAVA_HOME/bin/java"
-
# switch necessary paths to Windows format before running java
JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
DPML_HOME=`cygpath --windows "$DPML_HOME"`
@@ -37,12 +34,14 @@
echo " Java Home: $JAVA_HOME"
echo " DPML System: $DPML_SYSTEM"
echo " DPML Home: $DPML_HOME"
-echo " Security policy: $SECURITY_POLICY"
+echo " Security Policy: $DEPOT_SECURITY_POLICY"
echo " JVM Options: $DEPOT_JVM_OPTS"
-echo " Depot Classpath: $DEPOT_CLASSPATH"
-echo " Depot Arguments: $DEPOT_ARGS $@"
+echo " Classpath: $DEPOT_CLASSPATH"
+echo " Depot Arguments: $DEPOT_ARGS"
echo ""

-ARGS="$DEPOT_JVM_OPTS -Djava.system.class.loader=@DEPOT-CLASSLOADER-CLASS@
\"-Djava.security.policy=$SECURITY_POLICY\" -Djava.rmi.server.randomIDs=true
-Djava.rmi.server.RMIClassLoaderSpi=net.dpml.depot.DepotRMIClassLoaderSpi
-Djava.protocol.handler.pkgs=net.dpml.transit -classpath \"$DEPOT_CLASSPATH\"
@DEPOT-MAIN-CLASS@ $DEPOT_ARGS $@"
+JAVA="$JAVA_HOME/bin/java"

+ARGS="$DEPOT_JVM_OPTS -classpath \"$DEPOT_CLASSPATH\" @DEPOT-MAIN-CLASS@
$DEPOT_ARGS"
+
echo $ARGS | xargs "$JAVA"

Modified: trunk/main/depot/core/console/etc/bin/depot-unix.sh
===================================================================
--- trunk/main/depot/core/console/etc/bin/depot-unix.sh 2006-01-08 05:51:57
UTC (rev 874)
+++ trunk/main/depot/core/console/etc/bin/depot-unix.sh 2006-01-08 07:10:35
UTC (rev 875)
@@ -24,14 +24,14 @@
echo " Java Home: $JAVA_HOME"
echo " DPML System: $DPML_SYSTEM"
echo " DPML Home: $DPML_HOME"
-echo " Security policy: $SECURITY_POLICY"
+echo " Security Policy: $DEPOT_SECURITY_POLICY"
echo " JVM Options: $DEPOT_JVM_OPTS"
-echo " Depot Classpath: $DEPOT_CLASSPATH"
-echo " Depot Arguments: $DEPOT_ARGS $@"
+echo " Classpath: $DEPOT_CLASSPATH"
+echo " Depot Arguments: $DEPOT_ARGS"
echo ""

JAVA="$JAVA_HOME/bin/java"

-ARGS="$DEPOT_JVM_OPTS -Djava.system.class.loader=@DEPOT-CLASSLOADER-CLASS@
\"-Djava.security.policy=$SECURITY_POLICY\" -Djava.rmi.server.randomIDs=true
-Djava.rmi.server.RMIClassLoaderSpi=net.dpml.depot.DepotRMIClassLoaderSpi
-Djava.protocol.handler.pkgs=net.dpml.transit -classpath \"$DEPOT_CLASSPATH\"
@DEPOT-MAIN-CLASS@ $DEPOT_ARGS $@"
+ARGS="$DEPOT_JVM_OPTS -classpath \"$DEPOT_CLASSPATH\" @DEPOT-MAIN-CLASS@
$DEPOT_ARGS"

echo $ARGS | xargs "$JAVA"

Modified: trunk/main/depot/library/console/etc/bin/build
===================================================================
--- trunk/main/depot/library/console/etc/bin/build 2006-01-08 05:51:57
UTC (rev 874)
+++ trunk/main/depot/library/console/etc/bin/build 2006-01-08 07:10:35
UTC (rev 875)
@@ -1,7 +1,13 @@
#!/bin/sh
#

-DEPOT_JVM_OPTS=-Ddpml.transit.include.tools=true
+BUILD_JVM_OPTS="-Ddpml.transit.include.tools=true
-Ddpml.depot.application=dpml.builder"
+
+if [ "$DEPOT_JVM_OPTS" = "" ] ; then
+ DEPOT_JVM_OPTS=$BUILD_JVM_OPTS
+else
+ DEPOT_JVM_OPTS="$BUILD_JVM_OPTS $DEPOT_JVM_OPTS"
+fi
export DEPOT_JVM_OPTS

-depot -Ddpml.depot.application=dpml.builder $*
+depot $*

Modified: trunk/main/metro/exec/etc/bin/metro
===================================================================
--- trunk/main/metro/exec/etc/bin/metro 2006-01-08 05:51:57 UTC (rev 874)
+++ trunk/main/metro/exec/etc/bin/metro 2006-01-08 07:10:35 UTC (rev 875)
@@ -1,4 +1,13 @@
#!/bin/sh
#

-depot -Ddpml.depot.application=dpml.metro
-Ddpml.logging.config=local:properties:dpml/metro/logging $*
+METRO_JVM_OPTS="-Ddpml.depot.application=dpml.metro
-Ddpml.logging.config=local:properties:dpml/metro/logging"
+
+if [ "$DEPOT_JVM_OPTS" = "" ] ; then
+ DEPOT_JVM_OPTS=$METRO_JVM_OPTS
+else
+ DEPOT_JVM_OPTS="$METRO_JVM_OPTS $DEPOT_JVM_OPTS"
+fi
+export DEPOT_JVM_OPTS
+
+depot $*

Modified: trunk/main/metro/station/console/etc/bin/station
===================================================================
--- trunk/main/metro/station/console/etc/bin/station 2006-01-08 05:51:57
UTC (rev 874)
+++ trunk/main/metro/station/console/etc/bin/station 2006-01-08 07:10:35
UTC (rev 875)
@@ -1,4 +1,13 @@
#!/bin/sh
#

-depot -Ddpml.depot.application=dpml.station $*
+STATION_JVM_OPTS="-Ddpml.depot.application=dpml.station"
+
+if [ "$DEPOT_JVM_OPTS" = "" ] ; then
+ DEPOT_JVM_OPTS=$STATION_JVM_OPTS
+else
+ DEPOT_JVM_OPTS="$STATION_JVM_OPTS $DEPOT_JVM_OPTS"
+fi
+export DEPOT_JVM_OPTS
+
+depot $*

Modified: trunk/main/transit/console/etc/bin/transit
===================================================================
--- trunk/main/transit/console/etc/bin/transit 2006-01-08 05:51:57 UTC (rev
874)
+++ trunk/main/transit/console/etc/bin/transit 2006-01-08 07:10:35 UTC (rev
875)
@@ -1,4 +1,13 @@
#!/bin/sh
#

-depot -Ddpml.depot.application=dpml.transit $*
+TRANSIT_JVM_OPTS="-Ddpml.depot.application=dpml.transit"
+
+if [ "$DEPOT_JVM_OPTS" = "" ] ; then
+ DEPOT_JVM_OPTS=$TRANSIT_JVM_OPTS
+else
+ DEPOT_JVM_OPTS="$TRANSIT_JVM_OPTS $DEPOT_JVM_OPTS"
+fi
+export DEPOT_JVM_OPTS
+
+depot $*




  • r875 - in trunk/main: depot/core/console/etc/bin depot/library/console/etc/bin metro/exec/etc/bin metro/station/console/etc/bin transit/console/etc/bin, carelparadis, 01/08/2006

Archive powered by MHonArc 2.6.24.

Top of Page