Skip to Content.
Sympa Menu

notify-dpml - r1785 - in trunk: central/apis/src/docs central/apis/src/docs/api/dpml central/site/src/docs/depot/tutorials main/depot/core/etc/bin main/depot/tools/src/main/net/dpml/tools/tasks main/station/console/etc/bin

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1785 - in trunk: central/apis/src/docs central/apis/src/docs/api/dpml central/site/src/docs/depot/tutorials main/depot/core/etc/bin main/depot/tools/src/main/net/dpml/tools/tasks main/station/console/etc/bin

Chronological Thread  
    < Chronological >       < Thread >
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1785 - in trunk: central/apis/src/docs central/apis/src/docs/api/dpml central/site/src/docs/depot/tutorials main/depot/core/etc/bin main/depot/tools/src/main/net/dpml/tools/tasks main/station/console/etc/bin
  • Date: Wed, 22 Nov 2006 13:24:56 +0100
Author: mcconnell
Date: 2006-11-22 13:24:55 +0100 (Wed, 22 Nov 2006)
New Revision: 1785

Modified:
trunk/central/apis/src/docs/api/dpml/index.xml
trunk/central/apis/src/docs/api/dpml/navigation.xml
trunk/central/apis/src/docs/navigation.xml
trunk/central/site/src/docs/depot/tutorials/properties.xml
trunk/main/depot/core/etc/bin/depot.lap
trunk/main/depot/tools/src/main/net/dpml/tools/tasks/JUnitTestTask.java
trunk/main/station/console/etc/bin/station
trunk/main/station/console/etc/bin/station.lap
Log:
1. add updates to document about test.properties usage
2. update depot and station launch scripts
3. update JUnitTest task to handle property value dereferencing

Modified: trunk/central/apis/src/docs/api/dpml/index.xml
===================================================================
--- trunk/central/apis/src/docs/api/dpml/index.xml 2006-11-18 17:46:43
UTC (rev 1784)
+++ trunk/central/apis/src/docs/api/dpml/index.xml 2006-11-22 12:24:55
UTC (rev 1785)
@@ -38,6 +38,10 @@
<td><a href="1.0.3/index.html">1.0.3</a></td>
<td>Minor update to the Transit URL connection handler.</td>
</tr>
+ <tr>
+ <td><a href="1.0.4/index.html">1.0.4</a></td>
+ <td>Maintence update supporting the SE6 runtime.</td>
+ </tr>
</table>

</section>

Modified: trunk/central/apis/src/docs/api/dpml/navigation.xml
===================================================================
--- trunk/central/apis/src/docs/api/dpml/navigation.xml 2006-11-18 17:46:43
UTC (rev 1784)
+++ trunk/central/apis/src/docs/api/dpml/navigation.xml 2006-11-22 12:24:55
UTC (rev 1785)
@@ -29,6 +29,7 @@
<item name="1.0.1" href="1.0.1/index.html"/>
<item name="1.0.2" href="1.0.2/index.html"/>
<item name="1.0.3" href="1.0.3/index.html"/>
+ <item name="1.0.4" href="1.0.4/index.html"/>
</menu>

</body>

Modified: trunk/central/apis/src/docs/navigation.xml
===================================================================
--- trunk/central/apis/src/docs/navigation.xml 2006-11-18 17:46:43 UTC (rev
1784)
+++ trunk/central/apis/src/docs/navigation.xml 2006-11-22 12:24:55 UTC (rev
1785)
@@ -25,7 +25,7 @@
<body>

<links>
- <item name="Modules" href="api/ant/index.html"/>
+ <item name="Modules" href="api/index.html"/>
</links>

<menu>

Modified: trunk/central/site/src/docs/depot/tutorials/properties.xml
===================================================================
--- trunk/central/site/src/docs/depot/tutorials/properties.xml 2006-11-18
17:46:43 UTC (rev 1784)
+++ trunk/central/site/src/docs/depot/tutorials/properties.xml 2006-11-22
12:24:55 UTC (rev 1785)
@@ -103,6 +103,23 @@

</subsection>

+ <subsection name="Supplimentary Test Properties">
+
+ <p>
+ Supplimentary property declarations used during testcase execution
may be
+ declared in a file name <tt>test.properties</tt> in the project base
directory.
+ Property values may include any of the following symbolic values
(since 1.0.4):
+ </p>
+
+ <ul>
+ <li>any system property .. e.g. <tt>${user.name}</tt></li>
+ <li>any of the standard DPML environment properties .. e.g.
<tt>${dpml.prefs}</tt></li>
+ <li>any property declared in the project definition e.g.
<tt>${project.name}</tt></li>
+ <li>the testcase base directory
<tt>${project.test.basedir}</tt></li>
+ </ul>
+
+ </subsection>
+
<subsection name="Summary">

<p>

Modified: trunk/main/depot/core/etc/bin/depot.lap
===================================================================
--- trunk/main/depot/core/etc/bin/depot.lap 2006-11-18 17:46:43 UTC (rev
1784)
+++ trunk/main/depot/core/etc/bin/depot.lap 2006-11-22 12:24:55 UTC (rev
1785)
@@ -24,7 +24,7 @@
-Djava.security.policy=${env.DPML_HOME}\share\bin\security.policy
-Djava.endorsed.dirs=${env.DPML_HOME}\share\lib\endorsed
-Djava.rmi.server.randomIDs=true
--Dcom.sun.management.jmxremote
+#-Dcom.sun.management.jmxremote
janel.main.class=@DEPOT-MAIN-CLASS@
janel.min.java.version=1.4.0
janel.classpath.jars.dir=${env.DPML_HOME}\share\lib

Modified:
trunk/main/depot/tools/src/main/net/dpml/tools/tasks/JUnitTestTask.java
===================================================================
--- trunk/main/depot/tools/src/main/net/dpml/tools/tasks/JUnitTestTask.java
2006-11-18 17:46:43 UTC (rev 1784)
+++ trunk/main/depot/tools/src/main/net/dpml/tools/tasks/JUnitTestTask.java
2006-11-22 12:24:55 UTC (rev 1785)
@@ -294,7 +294,7 @@
Commandline.Argument arg = junit.createJvmarg();
arg.setValue( "-verbose:" + verbose );
}
-
+
final File reports = getContext().getTargetReportsTestDirectory();
mkDir( reports );

@@ -433,7 +433,9 @@
String name = (String) enumeration.nextElement();
final Environment.Variable v = new
Environment.Variable();
v.setKey( name );
- v.setValue( props.getProperty( name ) );
+ String propertyValue = props.getProperty( name );
+ String parsedValue = getContext().getResource().resolve(
propertyValue );
+ v.setValue( parsedValue );
junit.addConfiguredSysproperty( v );
}
}

Modified: trunk/main/station/console/etc/bin/station
===================================================================
--- trunk/main/station/console/etc/bin/station 2006-11-18 17:46:43 UTC (rev
1784)
+++ trunk/main/station/console/etc/bin/station 2006-11-22 12:24:55 UTC (rev
1785)
@@ -1,7 +1,7 @@
#!/bin/sh
#

-STATION_JVM_OPTS="-Ddpml.depot.application=dpml.station"
+STATION_JVM_OPTS="-Ddpml.depot.application=dpml.station
-Ddpml.transit.jmx.enabled=true"

if [ "$DEPOT_JVM_OPTS" = "" ] ; then
DEPOT_JVM_OPTS=$STATION_JVM_OPTS

Modified: trunk/main/station/console/etc/bin/station.lap
===================================================================
--- trunk/main/station/console/etc/bin/station.lap 2006-11-18 17:46:43
UTC (rev 1784)
+++ trunk/main/station/console/etc/bin/station.lap 2006-11-22 12:24:55
UTC (rev 1785)
@@ -8,7 +8,7 @@
-Ddpml.depot.application=dpml.station
-Djava.protocol.handler.pkgs=net.dpml.transit
-Djava.rmi.server.RMIClassLoaderSpi=net.dpml.depot.DepotRMIClassLoaderSpi
--Dcom.sun.management.jmxremote
+#-Dcom.sun.management.jmxremote
-Ddpml.transit.jmx.enabled=true
janel.main.class=net.dpml.depot.Main
janel.min.java.version=1.4.0



  • r1785 - in trunk: central/apis/src/docs central/apis/src/docs/api/dpml central/site/src/docs/depot/tutorials main/depot/core/etc/bin main/depot/tools/src/main/net/dpml/tools/tasks main/station/console/etc/bin, mcconnell at BerliOS, 11/22/2006

Archive powered by MHonArc 2.6.24.

Top of Page