r1204 - in trunk/main: . station station/exec/src/main/net/dpml

mcconnell at BerliOS mcconnell at mail.berlios.de
Fri Mar 17 02:05:17 EST 2006


Author: mcconnell
Date: 2006-03-17 08:05:05 +0100 (Fri, 17 Mar 2006)
New Revision: 1204

Added:
   trunk/main/station/exec/src/main/net/dpml/station/
   trunk/main/station/module.xml
Removed:
   trunk/main/station/exec/src/main/net/dpml/metro/
Modified:
   trunk/main/build.xml
Log:
up0date state/exec package names

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml	2006-03-17 07:01:57 UTC (rev 1203)
+++ trunk/main/build.xml	2006-03-17 07:05:05 UTC (rev 1204)
@@ -178,7 +178,7 @@
     <property name="prefs.metro" location="${prefs}/dpml/metro"/>
     <mkdir dir="${prefs.metro}"/>
     <copy todir="${prefs.metro}" filtering="false">
-      <fileset dir="metro/exec/target/prefs">
+      <fileset dir="station/exec/target/prefs">
         <include name="**/*"/>
       </fileset>
       <fileset dir="metro/tools/target/prefs">
@@ -208,9 +208,9 @@
       <fileset dir="transit/console/target/bin"/>
       <fileset dir="depot/core/target/bin"/>
       <fileset dir="depot/build/target/bin"/>
-      <fileset dir="metro/station/console/target/bin"/>
-      <fileset dir="metro/station/server/target/bin"/>
-      <fileset dir="metro/exec/target/bin"/>
+      <fileset dir="station/console/target/bin"/>
+      <fileset dir="station/server/target/bin"/>
+      <fileset dir="station/exec/target/bin"/>
     </copy>
   </target>
 
@@ -226,12 +226,13 @@
         <package name="net.dpml.http.*"/>
       </group>
       <group title="Metro">
+        <package name="net.dpml.component"/>
         <package name="net.dpml.metro"/>
         <package name="net.dpml.metro.*"/>
-        <package name="net.dpml.component"/>
-        <package name="net.dpml.part.*"/>
         <package name="net.dpml.state"/>
         <package name="net.dpml.state.*"/>
+      </group>
+      <group title="Station">
         <package name="net.dpml.station"/>
         <package name="net.dpml.station.*"/>
       </group>

Copied: trunk/main/station/exec/src/main/net/dpml/station (from rev 1203, trunk/main/station/exec/src/main/net/dpml/metro)

Added: trunk/main/station/module.xml
===================================================================
--- trunk/main/station/module.xml	2006-03-17 07:01:57 UTC (rev 1203)
+++ trunk/main/station/module.xml	2006-03-17 07:05:05 UTC (rev 1204)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<module name="station"
+    xmlns="artifact:xsd:dpml/lang/dpml-module#1.0" 
+    xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">
+
+  <project name="dpml-station-api" basedir="station/api">
+    <types>
+      <type id="jar"/>
+    </types>
+    <dependencies>
+      <include ref="dpml/transit/dpml-transit-main"/>
+      <include ref="dpml/metro/dpml-metro-component"/>
+    </dependencies>
+    <dependencies scope="test">
+      <include ref="junit/junit"/>
+    </dependencies>
+  </project>
+
+  <project name="dpml-station-exec" basedir="exec">
+    <types>
+      <type id="jar"/>
+      <part:plugin class="net.dpml.station.exec.ApplicationHandler"/>
+    </types>
+    <dependencies scope="build">
+      <include ref="dpml/metro/dpml-metro-runtime"/>
+    </dependencies>
+    <dependencies>
+      <include ref="dpml/util/dpml-util-cli"/>
+      <include ref="dpml/util/dpml-configuration-api"/>
+      <include ref="dpml/util/dpml-configuration-impl"/>
+      <include ref="dpml/transit/dpml-transit-main"/>
+      <include ref="dpml/metro/dpml-metro-component"/>
+      <include ref="dpml/metro/dpml-station-api"/>
+      <include ref="dpml/metro/dpml-metro-model"/>
+    </dependencies>
+  </project>
+
+  <project name="dpml-station-builder" basedir="station/builder">
+    <types>
+      <type id="jar"/>
+    </types>
+    <dependencies>
+      <include key="dpml-station-api" tag="public"/>
+    </dependencies>
+    <dependencies scope="test">
+      <include ref="junit/junit"/>
+    </dependencies>
+  </project>
+   
+  <project name="dpml-station-server" basedir="station/server">
+    <properties>
+      <property name="project.test.fork" value="true"/>
+    </properties>
+    <types>
+      <type id="jar"/>
+      <part:plugin class="net.dpml.station.server.StationServerPlugin"/>
+    </types>
+    <dependencies>
+      <include ref="dpml/metro/dpml-metro-component" tag="public"/>
+      <include key="dpml-station-api" tag="public"/>
+      <include ref="dpml/transit/dpml-transit-main" tag="public"/>
+      <include ref="dpml/metro/dpml-station-builder" tag="protected"/>
+      <include ref="dpml/util/dpml-util-cli"/>
+    </dependencies>
+    <dependencies scope="test">
+      <include ref="ant/ant-junit"/>
+    </dependencies>
+  </project>
+
+  <project name="dpml-station-console" basedir="station/console">
+    <types>
+      <type id="jar"/>
+      <part:plugin alias="true" class="net.dpml.station.console.StationPlugin"/>
+    </types>
+    <dependencies>
+      <include ref="dpml/util/dpml-util-cli"/>
+      <include key="dpml-station-api" tag="public"/>
+      <include key="dpml-station-server"/>
+    </dependencies>
+  </project>
+   
+</module>




More information about the notify-dpml mailing list