DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Mon Jun 13 04:35:35 2005
New Revision: 2838

Added:
   development/main/util/build.xml
   development/main/util/index.xml
   development/main/util/module.properties
   development/main/util/module.xml
Removed:
   development/main/transit/util/
   development/main/util/i18n/build.properties
   development/main/util/i18n/util-i18n.iml
Modified:
   development/main/metro/index.xml
   development/main/transit/build.xml
   development/main/util/i18n/build.xml
Log:
Complete move of i18n out of transit and into main/util.

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml    (original)
+++ development/main/metro/index.xml    Mon Jun 13 04:35:35 2005
@@ -215,4 +215,13 @@
     </info>
   </resource>
 
+  <resource key="commons-cli">
+    <info>
+      <group>commons-cli</group>
+      <name>commons-cli</name>
+      <version>1.0</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
 </index>

Modified: development/main/transit/build.xml
==============================================================================
--- development/main/transit/build.xml  (original)
+++ development/main/transit/build.xml  Mon Jun 13 04:35:35 2005
@@ -34,8 +34,6 @@
   <target name="prepare" depends="standard.prepare">
     <ant dir="core/handler" inheritall="false"/>
     <ant dir="core/tools" inheritall="false"/>
-    <ant dir="util/i18n" inheritall="false"/>
-    <ant dir="util" inheritall="false"/>
     <ant dir="core" inheritall="false"/>
   </target>
 
@@ -83,11 +81,6 @@
     <property name="share" value="${bundle}/share"/>
     <property name="local" value="${share}/local"/>
     <echo>Creating local repository ${local}</echo>
-    <mkdir dir="${local}/dpml/util"/>
-    <mkdir dir="${local}/${commons-cli.parent}"/>
-    <copy todir="${local}/${commons-cli.parent}">
-      <fileset dir="${dpml.cache}/${commons-cli.parent}"/>
-    </copy>
 
     <!-- build the library -->
     <mkdir dir="${local}/ant/jars"/>
@@ -98,10 +91,6 @@
     <get xmlns="antlib:net.dpml.transit" property="localAntPath" 
uri="${ant.uri}"/>
     <copy file="${localAntPath}" 
tofile="${local}/ant/jars/${transit-ant.filename}"/>
     <mkdir dir="${local}/junit/jars"/>
-    <copy todir="${local}/dpml/util">
-      <fileset dir="${basedir}/util/target/deliverables"/>
-      <fileset dir="${basedir}/util/i18n/target/deliverables"/>
-    </copy>
     <mkdir dir="${local}/dpml/transit"/>
     <copy todir="${local}/dpml/transit">
       <fileset dir="${basedir}/core/target/deliverables"/>
@@ -112,10 +101,6 @@
     <!-- create the api doc directory -->
     <property name="api" value="${share}/docs/api"/>
     <echo>Adding api documentation to ${api}</echo>
-    <mkdir dir="${api}/dpml/util/${project.version}"/>
-    <copy todir="${api}/dpml/util/${project.version}">
-      <fileset dir="${basedir}/util/target/api"/>
-    </copy>
     <mkdir dir="${api}/dpml/transit/${project.version}"/>
     <copy todir="${api}/dpml/transit/${project.version}">
       <fileset dir="${basedir}/core/target/api"/>
@@ -237,11 +222,6 @@
 
   <target name="clean">
     <delete dir="target"/>
-    <delete dir="util/target"/>
-    <delete dir="util/cli/target"/>
-    <delete dir="util/criteria/target"/>
-    <delete dir="util/exception/target"/>
-    <delete dir="util/i18n/target"/>
     <delete dir="core/target"/>
     <delete dir="core/handler/target"/>
     <delete dir="core/tools/target"/>

Added: development/main/util/build.xml
==============================================================================
--- (empty file)
+++ development/main/util/build.xml     Mon Jun 13 04:35:35 2005
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- 
+  Copyright 2005 Stephen J McConnell
+  
+  Licensed  under the  Apache License,  Version 2.0  (the "License");
+  you may not use  this file  except in  compliance with the License.
+  You may obtain a copy of the License at 
+  
+    http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed  under the  License is distributed on an "AS IS" BASIS,
+  WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+  implied.
+  
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project name="dpml-util" default="default" basedir="." 
+    xmlns:transit="antlib:net.dpml.transit">
+
+  <transit:import uri="artifact:template:dpml/magic/reactor"/>
+
+</project>

Modified: development/main/util/i18n/build.xml
==============================================================================
--- development/main/util/i18n/build.xml        (original)
+++ development/main/util/i18n/build.xml        Mon Jun 13 04:35:35 2005
@@ -1,26 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-  Copyright 2004 Stephen J McConnell
-  Copyright 2004 Niclas Hedhman
-  
-  Licensed  under the  Apache License,  Version 2.0  (the "License");
-  you may not use  this file  except in  compliance with the License.
-  You may obtain a copy of the License at 
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed  under the  License is distributed on an "AS IS" BASIS,
-  WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-  implied.
-  
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
 
-<project name="dpml-util-i18n" default="install" basedir=".">
+<project name="dpml-util-i18n" default="install" basedir="." 
+    xmlns:transit="antlib:net.dpml.transit" 
+    xmlns:x="plugin:dpml/magic/dpml-magic-core" >
 
-  <property file="${basedir}/build.properties"/>
-  <import file="${home}/standard.xml"/>
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
 
 </project>

Added: development/main/util/index.xml
==============================================================================
--- (empty file)
+++ development/main/util/index.xml     Mon Jun 13 04:35:35 2005
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<index key="dpml-util">
+
+  <!--
+  Depot Modules
+  -->
+
+  <project file="module.xml">
+    <info>
+      <group>dpml/util</group>
+      <name>dpml-util</name>
+      <types>
+        <type>module</type>
+      </types>
+    </info>
+  </project>
+
+  <!-- I18N -->
+
+  <project basedir="i18n">
+    <info>
+      <group>dpml/util</group>
+      <name>dpml-util-i18n</name>
+      <types>
+        <type>jar</type>
+      </types>
+    </info>
+  </project>
+
+</index>

Added: development/main/util/module.properties
==============================================================================
--- (empty file)
+++ development/main/util/module.properties     Mon Jun 13 04:35:35 2005
@@ -0,0 +1 @@
+

Added: development/main/util/module.xml
==============================================================================
--- (empty file)
+++ development/main/util/module.xml    Mon Jun 13 04:35:35 2005
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Copyright 2005 Stephen J McConnell
+
+  Licensed  under the  Apache License,  Version 2.0  (the "License");
+  you may not use  this file  except in  compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed  under the  License is distributed on an "AS IS" BASIS,
+  WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+  implied.
+
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project name="dpml-util" default="install" basedir="."
+    xmlns:transit="antlib:net.dpml.transit"
+    xmlns:x="plugin:dpml/magic/dpml-magic-core">
+
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
+
+  <target name="init" depends="standard.init">
+    <filter token="PROJECT-NAME" value="${project.name}"/>
+    <filter token="PROJECT-VERSION" value="${project.version}"/>
+    <property name="bundle" value="${basedir}/target/bundle"/>
+  </target>
+
+  <target name="build" depends="standard.build">
+    <x:module index="index.xml">
+      <header>
+        <svn href="http://scm.dpml.net/repos/dpml/development/main/util"/>
+        <home href="http://www.dpml.net/central/products/"/>
+      </header>
+    </x:module>
+    <x:javadoc>
+      <link href="http://java.sun.com/j2se/1.4/docs/api"/>
+    </x:javadoc>
+  </target>
+
+  <target name="test" depends="standard.test">
+    <mkdir dir="target/reports/junit"/>
+    <junitreport todir="target/reports/junit">
+      <fileset dir=".">
+        <include name="**/target/test-reports/TEST-*.xml"/>
+      </fileset>
+      <report format="frames" todir="target/reports/junit"/>
+    </junitreport>
+  </target>
+
+</project>