Skip to Content.
Sympa Menu

notify-dpml - r2051 - in trunk: . etc/debian main/metro/appliance/src/main/net/dpml/station main/metro/main main/metro/station main/metro/station/src/main/dpml/station/console

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: davidoff at BerliOS <davidoff AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r2051 - in trunk: . etc/debian main/metro/appliance/src/main/net/dpml/station main/metro/main main/metro/station main/metro/station/src/main/dpml/station/console
  • Date: Wed, 19 Sep 2007 19:08:24 +0200

Author: davidoff
Date: 2007-09-19 19:08:23 +0200 (Wed, 19 Sep 2007)
New Revision: 2051

Modified:
trunk/build.xml
trunk/etc/debian/postinst
trunk/etc/debian/prerm
trunk/main/metro/appliance/src/main/net/dpml/station/Application.java
trunk/main/metro/main/build.xml
trunk/main/metro/station/build.xml
trunk/main/metro/station/src/main/dpml/station/console/Main.java
Log:
resolving issues with station preference references

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-09-18 14:44:59 UTC (rev 2050)
+++ trunk/build.xml 2007-09-19 17:08:23 UTC (rev 2051)
@@ -102,15 +102,18 @@
<include name="share/bin/metro"/>
</tarfileset>
<tarfileset dir="target/bundle"
prefix="opt/dpml-sdk-${project.version}">
+ <exclude name="share/config/dpml/tools"/>
+ <exclude name="share/config/dpml/tools/**"/>
<include name="share/bin/build.policy"/>
<include name="share/bin/station.policy"/>
<include name="share/bin/metro.policy"/>
<include name="share/config/**"/>
<include name="share/local/**"/>
<include name="share/lib/**"/>
- <include name="data/**"/>
- </tarfileset>
+ <include name="data/**"/>
+ </tarfileset>
</deb>
+ <checksum
file="${basedir}/target/dist/dpml-sdk_${project.version}-1_all.deb"
fileext=".md5"/>
</target>

<target name="zip" depends="bundle,replicate" description="Creates a
binary w32 distribution.">
@@ -151,6 +154,7 @@
<exclude name="share/bin/*.lap"/>
<exclude name="share/bin/*.exe"/>
<exclude name="share/bin/scm/**/*"/>
+ <exclude name="share/config/tools/**"/>
</tarfileset>
</tar>
<property name="dist" location="target/dist"/>
@@ -210,14 +214,21 @@
<include name="**/*"/>
</fileset>
</copy>
- <property name="station.config" location="${share.config}/dpml/metro"/>
+ <property name="station.config" location="${share.config}/dpml/station"/>
<x:property name="station.main.basedir"
ref="dpml/metro/dpml-metro-station" feature="basedir"/>
<mkdir dir="${station.config}"/>
<copy todir="${station.config}" filtering="false">
<fileset dir="${station.main.basedir}/target/config">
<include name="**/*"/>
</fileset>
- </copy>
+ </copy>
<property name="metro.config" location="${share.config}/dpml/metro"/>
+ <x:property name="metro.main.basedir" ref="dpml/metro/dpml-metro-main"
feature="basedir"/>
+ <mkdir dir="${metro.config}"/>
+ <copy todir="${metro.config}" filtering="false">
+ <fileset dir="${metro.main.basedir}/target/config">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
</target>

<target name="bin" depends="prepare">

Modified: trunk/etc/debian/postinst
===================================================================
--- trunk/etc/debian/postinst 2007-09-18 14:44:59 UTC (rev 2050)
+++ trunk/etc/debian/postinst 2007-09-19 17:08:23 UTC (rev 2051)
@@ -6,5 +6,6 @@
sudo ln -s /opt/dpml/share/bin/metro /usr/bin/metro
sudo ln -s /opt/dpml/share/bin/station /usr/bin/station
sudo ln -s /opt/dpml/share/config/dpml/transit /etc/transit
-
-
+sudo ln -s /opt/dpml/share/config/dpml/depot /etc/depot
+sudo ln -s /opt/dpml/share/config/dpml/metro /etc/metro
+sudo ln -s /opt/dpml/share/config/dpml/station /etc/station

Modified: trunk/etc/debian/prerm
===================================================================
--- trunk/etc/debian/prerm 2007-09-18 14:44:59 UTC (rev 2050)
+++ trunk/etc/debian/prerm 2007-09-19 17:08:23 UTC (rev 2051)
@@ -6,5 +6,9 @@
sudo rm -f /usr/bin/build

sudo rm -f /opt/dpml
+
sudo rm -f /etc/transit
+sudo rm -f /etc/depot
+sudo rm -f /etc/metro
+sudo rm -f /etc/station


Modified:
trunk/main/metro/appliance/src/main/net/dpml/station/Application.java
===================================================================
--- trunk/main/metro/appliance/src/main/net/dpml/station/Application.java
2007-09-18 14:44:59 UTC (rev 2050)
+++ trunk/main/metro/appliance/src/main/net/dpml/station/Application.java
2007-09-19 17:08:23 UTC (rev 2051)
@@ -338,7 +338,6 @@
//

list.add(
"-Djava.util.logging.config.class=dpml.util.DepotLoggingConfiguration" );
- //list.add(
"-Ddpml.logging.config=local:properties:dpml/station/application" );

//
// add declared system properties
@@ -348,7 +347,7 @@
Set<String> names = properties.stringPropertyNames();
for( String name : names )
{
- String value = properties.getProperty( name ); // expand symbols?
+ String value = properties.getProperty( name );
list.add( "-D" + name + "=" + value );
}


Modified: trunk/main/metro/main/build.xml
===================================================================
--- trunk/main/metro/main/build.xml 2007-09-18 14:44:59 UTC (rev 2050)
+++ trunk/main/metro/main/build.xml 2007-09-19 17:08:23 UTC (rev 2051)
@@ -20,6 +20,12 @@
</target>

<target name="install" depends="bin,standard.install">
+ <mkdir dir="${dpml.config}/dpml/metro"/>
+ <copy toDir="${dpml.config}/dpml/metro">
+ <fileset dir="etc/config">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
<copy todir="${dpml.system}" preservelastmodified="true"
overwrite="true">
<fileset dir="target">
<include name="bin/metro.lap"/>

Modified: trunk/main/metro/station/build.xml
===================================================================
--- trunk/main/metro/station/build.xml 2007-09-18 14:44:59 UTC (rev 2050)
+++ trunk/main/metro/station/build.xml 2007-09-19 17:08:23 UTC (rev 2051)
@@ -8,8 +8,8 @@
<available property="station.exe.available"
file="${dpml.system}/bin/station.exe"/>

<target name="install" depends="bin,standard.install">
- <mkdir dir="${dpml.config}/${project.group}"/>
- <copy toDir="${dpml.config}/${project.group}">
+ <mkdir dir="${dpml.config}/dpml/station"/>
+ <copy toDir="${dpml.config}/dpml/station">
<fileset dir="etc/config">
<include name="**/*"/>
</fileset>

Modified: trunk/main/metro/station/src/main/dpml/station/console/Main.java
===================================================================
--- trunk/main/metro/station/src/main/dpml/station/console/Main.java
2007-09-18 14:44:59 UTC (rev 2050)
+++ trunk/main/metro/station/src/main/dpml/station/console/Main.java
2007-09-19 17:08:23 UTC (rev 2051)
@@ -93,7 +93,7 @@
// static

//------------------------------------------------------------------------------

- private static final String DEFAULT_PLAN_URI_VALUE =
"local:plan:dpml/metro/default";
+ private static final String DEFAULT_PLAN_URI_VALUE =
"local:plan:dpml/station/default";
private static final String STATION_CONNECTOR_VALUE = "dpml/station";


//------------------------------------------------------------------------------




  • r2051 - in trunk: . etc/debian main/metro/appliance/src/main/net/dpml/station main/metro/main main/metro/station main/metro/station/src/main/dpml/station/console, davidoff at BerliOS, 09/19/2007

Archive powered by MHonArc 2.6.24.

Top of Page