Skip to Content.
Sympa Menu

notify-dpml - r1872 - in trunk/main: depot/build/etc/bin metro/main/etc/bin metro/part/etc/bin metro/part/etc/xsds metro/station/etc/bin

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1872 - in trunk/main: depot/build/etc/bin metro/main/etc/bin metro/part/etc/bin metro/part/etc/xsds metro/station/etc/bin
  • Date: Thu, 15 Feb 2007 09:05:51 +0100

Author: mcconnell
Date: 2007-02-15 09:05:51 +0100 (Thu, 15 Feb 2007)
New Revision: 1872

Modified:
trunk/main/depot/build/etc/bin/build.lap
trunk/main/metro/main/etc/bin/metro.lap
trunk/main/metro/part/etc/bin/depot
trunk/main/metro/part/etc/bin/depot-cygwin.sh
trunk/main/metro/part/etc/xsds/component.xsd
trunk/main/metro/station/etc/bin/station.lap
Log:
update all scripts to include JAVA_HOME/lib/ext in java.ext.dirs as SE6
requires SSL providers bundled in this directory

Modified: trunk/main/depot/build/etc/bin/build.lap
===================================================================
--- trunk/main/depot/build/etc/bin/build.lap 2007-02-11 02:48:55 UTC (rev
1871)
+++ trunk/main/depot/build/etc/bin/build.lap 2007-02-15 08:05:51 UTC (rev
1872)
@@ -7,7 +7,7 @@
janel.main.class=dpml.util.Main
janel.min.java.version=1.6.0
janel.sysprop.process.id=true
--Djava.ext.dirs=${env.DPML_HOME}\share\lib\ext
+-Djava.ext.dirs=${FOUND_JAVA_HOME}\lib\ext;${env.DPML_HOME}\share\lib\ext
-Djava.endorsed.dirs=${env.DPML_HOME}\share\lib\endorsed
-Djava.system.class.loader=dpml.util.SystemClassLoader
-Djava.security.policy=${env.DPML_HOME}\share\bin\build.policy

Modified: trunk/main/metro/main/etc/bin/metro.lap
===================================================================
--- trunk/main/metro/main/etc/bin/metro.lap 2007-02-11 02:48:55 UTC (rev
1871)
+++ trunk/main/metro/main/etc/bin/metro.lap 2007-02-15 08:05:51 UTC (rev
1872)
@@ -2,7 +2,7 @@
# This file contains the runtime configuration of the Janel java launcher
application.
#

--Djava.ext.dirs=${env.DPML_HOME}\share\lib\ext
+-Djava.ext.dirs=${FOUND_JAVA_HOME}\lib\ext;${env.DPML_HOME}\share\lib\ext
-Djava.endorsed.dirs=${env.DPML_HOME}\share\lib\endorsed
-Djava.system.class.loader=dpml.util.SystemClassLoader
-Djava.security.policy=${env.DPML_HOME}\share\bin\metro.policy

Modified: trunk/main/metro/part/etc/bin/depot
===================================================================
--- trunk/main/metro/part/etc/bin/depot 2007-02-11 02:48:55 UTC (rev 1871)
+++ trunk/main/metro/part/etc/bin/depot 2007-02-15 08:05:51 UTC (rev 1872)
@@ -63,7 +63,7 @@
fi
export DEPOT_ENDORSED_DIRECTORY

-DEPOT_BASE_JVM_OPTS="-Djava.ext.dirs=$DPML_SYSTEM/lib/ext
-Djava.system.class.loader=@DEPOT-CLASSLOADER-CLASS@
-Djava.rmi.server.randomIDs=true
-Djava.rmi.server.RMIClassLoaderSpi=dpml.util.RemotingClassLoader
-Djava.protocol.handler.pkgs=dpml.transit"
+DEPOT_BASE_JVM_OPTS="-Djava.ext.dirs=$DPML_SYSTEM/lib/ext:$JAVA_HOME/lib/ext
-Djava.system.class.loader=@DEPOT-CLASSLOADER-CLASS@
-Djava.rmi.server.randomIDs=true
-Djava.rmi.server.RMIClassLoaderSpi=dpml.util.RemotingClassLoader
-Djava.protocol.handler.pkgs=dpml.transit"

if [ "$DEPOT_JVM_OPTS" = "" ] ; then
DEPOT_JVM_OPTS=$DEPOT_BASE_JVM_OPTS
@@ -71,14 +71,6 @@
DEPOT_JVM_OPTS="$DEPOT_BASE_JVM_OPTS $DEPOT_JVM_OPTS"
fi
export DEPOT_JVM_OPTS
-
-#DEPOT_BASE_CLASSPATH=$DPML_SYSTEM/bin/@DEPOT-PATH@:$DPML_SYSTEM/lib/@TRANSIT-PATH@:$DPML_SYSTEM/lib/@PART-PATH@
-
-#if [ "$DEPOT_CLASSPATH" = "" ] ; then
-# DEPOT_CLASSPATH=$DEPOT_BASE_CLASSPATH
-#else
-# DEPOT_CLASSPATH="$DEPOT_BASE_CLASSPATH $DEPOT_CLASSPATH"
-#fi
export DEPOT_CLASSPATH

DEPOT_ARGS=$@

Modified: trunk/main/metro/part/etc/bin/depot-cygwin.sh
===================================================================
--- trunk/main/metro/part/etc/bin/depot-cygwin.sh 2007-02-11 02:48:55
UTC (rev 1871)
+++ trunk/main/metro/part/etc/bin/depot-cygwin.sh 2007-02-15 08:05:51
UTC (rev 1872)
@@ -41,7 +41,6 @@
echo " DPML System: $DPML_SYSTEM"
echo " DPML Home: $DPML_HOME"
echo " Security Policy: $DEPOT_SECURITY_POLICY"
- echo " Security Policy: $DEPOT_SECURITY_POLICY"
echo " JVM Options: $DEPOT_JVM_OPTS"
echo " Classpath: $DEPOT_CLASSPATH"
echo " Depot Arguments: $DEPOT_ARGS"

Modified: trunk/main/metro/part/etc/xsds/component.xsd
===================================================================
--- trunk/main/metro/part/etc/xsds/component.xsd 2007-02-11 02:48:55
UTC (rev 1871)
+++ trunk/main/metro/part/etc/xsds/component.xsd 2007-02-15 08:05:51
UTC (rev 1872)
@@ -15,6 +15,7 @@
<element name="context" type="this:ContextEntryType"
substitutionGroup="this:entry"/>
<element name="param" type="part:ValueType"
substitutionGroup="part:param"/>
<element name="profile" type="this:ProfileType"/>
+ <element name="parts" type="this:PartsType"/>

<complexType name="component">
<complexContent>
@@ -22,7 +23,7 @@
<sequence>
<element name="categories" type="this:CategoriesType"
minOccurs="0" maxOccurs="1"/>
<element name="context" type="this:ContextType" minOccurs="0"
maxOccurs="1"/>
- <element name="parts" type="this:PartsType" minOccurs="0"
maxOccurs="1"/>
+ <element ref="this:parts" minOccurs="0" maxOccurs="1"/>
</sequence>
<attribute name="key" type="string"/>
<attribute name="name" type="string"/>

Modified: trunk/main/metro/station/etc/bin/station.lap
===================================================================
--- trunk/main/metro/station/etc/bin/station.lap 2007-02-11 02:48:55
UTC (rev 1871)
+++ trunk/main/metro/station/etc/bin/station.lap 2007-02-15 08:05:51
UTC (rev 1872)
@@ -2,7 +2,7 @@
# This file contains the runtime configuration of the Janel java launcher
application.
#

--Djava.ext.dirs=${env.DPML_HOME}\share\lib\ext
+-Djava.ext.dirs=${FOUND_JAVA_HOME}\lib\ext;${env.DPML_HOME}\share\lib\ext
-Djava.endorsed.dirs=${env.DPML_HOME}\share\lib\endorsed
-Djava.system.class.loader=dpml.util.SystemClassLoader
-Djava.security.policy=${env.DPML_HOME}\share\bin\station.policy




  • r1872 - in trunk/main: depot/build/etc/bin metro/main/etc/bin metro/part/etc/bin metro/part/etc/xsds metro/station/etc/bin, mcconnell at BerliOS, 02/15/2007

Archive powered by MHonArc 2.6.24.

Top of Page