Skip to Content.
Sympa Menu

notify-dpml - r1182 - in trunk/main: central central/src/docs/depot/library depot depot/core depot/core/src depot/library metro/station/server/etc/bin/scm/conf

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: r1182 - in trunk/main: central central/src/docs/depot/library depot depot/core depot/core/src depot/library metro/station/server/etc/bin/scm/conf
  • Date: Tue, 14 Mar 2006 20:36:47 +0100

Author: mcconnell
Date: 2006-03-14 20:36:40 +0100 (Tue, 14 Mar 2006)
New Revision: 1182

Added:
trunk/main/depot/core/build.xml
trunk/main/depot/core/etc/
trunk/main/depot/core/src/
Removed:
trunk/main/depot/core/console/
trunk/main/depot/core/src/main/
trunk/main/depot/core/src/test/
trunk/main/depot/library/common/
Modified:
trunk/main/central/build.xml
trunk/main/central/src/docs/depot/library/modules.xml
trunk/main/depot/module.xml
trunk/main/depot/module.xml.old
trunk/main/metro/station/server/etc/bin/scm/conf/wrapper.conf
Log:
package clean-up

Modified: trunk/main/central/build.xml
===================================================================
--- trunk/main/central/build.xml 2006-03-14 19:29:48 UTC (rev 1181)
+++ trunk/main/central/build.xml 2006-03-14 19:36:40 UTC (rev 1182)
@@ -14,7 +14,7 @@
<x:filter token="TRANSIT-MODULE-VERSION" ref="dpml/transit"
feature="version"/>
<x:filter token="TRANSIT-HANDLER-URI"
ref="dpml/transit/dpml-transit-main" feature="uri" type="jar" />
<x:filter token="DEPOT-MODULE-VERSION" feature="version"
ref="dpml/depot" />
- <x:filter token="DEPOT-CONSOLE-URI" feature="uri" type="jar"
ref="dpml/depot/dpml-depot-console" />
+ <x:filter token="DEPOT-CONSOLE-URI" feature="uri" type="jar"
ref="dpml/depot/dpml-depot-core" />
<x:filter token="DEPOT-TOOLS-ANT-URI" feature="uri" type="part"
ref="dpml/depot/dpml-tools-builder" />
<x:filter token="DEPOT-TOOLS-LIBRARY-URI" feature="uri" type="jar"
ref="dpml/depot/dpml-library" />
<x:filter token="METRO-RUNTIME-URI" feature="uri" type="part"
ref="dpml/metro/dpml-metro-runtime" />

Modified: trunk/main/central/src/docs/depot/library/modules.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/modules.xml 2006-03-14
19:29:48 UTC (rev 1181)
+++ trunk/main/central/src/docs/depot/library/modules.xml 2006-03-14
19:36:40 UTC (rev 1182)
@@ -279,7 +279,7 @@
</dependencies>
</project>

- <project name="dpml-depot-console" basedir="core/console">
+ <project name="dpml-depot-core" basedir="core/console">
<properties>
<property name="project.jar.main.class" value="net.dpml.depot.Main"/>
</properties>

Copied: trunk/main/depot/core/build.xml (from rev 1178,
trunk/main/depot/core/console/build.xml)
===================================================================
--- trunk/main/depot/core/console/build.xml 2006-03-14 16:13:48 UTC (rev
1178)
+++ trunk/main/depot/core/build.xml 2006-03-14 19:36:40 UTC (rev 1182)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-depot-core" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot" >
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+ <target name="init" depends="standard.init">
+ <property name="depot.short.filename" value="${project.name}.jar"/>
+ <property name="transit.short.filename" value="dpml-transit-main.jar"/>
+ <filter token="BUILD-ID" value="${project.version}" />
+ <filter token="DEPOT-PATH" value="${depot.short.filename}"/>
+ <filter token="TRANSIT-PATH" value="${transit.short.filename}"/>
+ <filter token="DEPOT-MAIN-CLASS" value="net.dpml.depot.Main" />
+ <filter token="DEPOT-CLASSLOADER-CLASS"
value="net.dpml.transit.SystemClassLoader" />
+ <x:filter token="TRANSIT-CORE-URI" ref="dpml/transit/dpml-transit-main"
feature="uri" type="jar"/>
+ <x:filter token="DEPOT-CONSOLE-URI" feature="uri" type="jar"/>
+ <x:filter token="DEPOT-EXEC-URI" ref="dpml/metro/dpml-metro-exec"
feature="uri" type="part"/>
+ <x:filter token="DEPOT-BUILDER-URI" ref="dpml/depot/dpml-library-build"
feature="uri" type="part"/>
+ <x:filter token="DEPOT-STATION-URI"
ref="dpml/metro/dpml-station-console" feature="uri" type="part"/>
+ <x:filter token="DEPOT-STATION-SERVER-URI"
ref="dpml/metro/dpml-station-server" feature="uri" type="part"/>
+ <x:filter token="TRANSIT-CONSOLE-URI"
ref="dpml/transit/dpml-transit-console" feature="uri" type="part"/>
+ </target>
+
+ <!--
+ BOOTSTRAP TARGETS
+ The following targets are used to handle the setup of the ${dpml.home}
environment
+ with the installation of Depot files in preparation for the deployment of
the
+ main build phase. The target is called called from boostrap.bat file
following
+ the build of transit and tools.
+ -->
+
+ <available property="depot.exe.available"
file="${dpml.system}/bin/depot.exe"/>
+
+ <target name="install" depends="standard.install,bin">
+ <property name="local" location="${dpml.system}/local"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating ${local}
+#----------------------------------------------------------------------------------
+ </echo>
+ <x:replicate self="true" verbose="false" layout="modern"
todir="${local}" >
+ <include ref="dpml/depot/dpml-tools-builder"/>
+ <include ref="dpml/depot/dpml-library"/>
+ <include ref="dpml/lang/dpml-common"/>
+ <include ref="dpml/lang/dpml-part"/>
+ </x:replicate>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating ${dpml.system}/lib
+#----------------------------------------------------------------------------------
+ </echo>
+ <property name="lib" location="${dpml.system}/lib"/>
+ <mkdir dir="${lib}"/>
+ <delete verbose="true" failonerror="false">
+ <fileset dir="${lib}">
+ <include name="${project.name}-*.*"/>
+ <exclude name="${depot.short.filename}"/>
+ </fileset>
+ </delete>
+ <property name="depot.long.filename"
value="${project.name}-${project.version}.jar"/>
+ <copy toFile="${lib}/${depot.short.filename}"
preservelastmodified="true" overwrite="true"
+ file="${basedir}/target/deliverables/jars/${depot.long.filename}"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating ${dpml.system}/lib/endorsed
+#----------------------------------------------------------------------------------
+ </echo>
+ <transit:get uri="artifact:jar:org/apache/xml/xerces#2.8.0"
property="xerces.path"/>
+ <transit:get uri="artifact:jar:org/apache/xml/xml-apis#2.8.0"
property="xml-apis.path"/>
+ <transit:get uri="artifact:jar:org/apache/xml/xalan#2.7.0"
property="xalan.path"/>
+ <transit:get uri="artifact:jar:org/apache/xml/xalan-serializer#2.7.0"
property="serializer.path"/>
+ <mkdir dir="${lib}/endorsed"/>
+ <copy toDir="${lib}/endorsed" file="${xml-apis.path}"/>
+ <copy toDir="${lib}/endorsed" file="${xerces.path}"/>
+ <copy toDir="${lib}/endorsed" file="${xalan.path}"/>
+ <copy toDir="${lib}/endorsed" file="${serializer.path}"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating ${dpml.system}/bin
+#----------------------------------------------------------------------------------
+ </echo>
+ <copy todir="${dpml.system}" preservelastmodified="true"
overwrite="true">
+ <fileset dir="target">
+ <include name="bin/**"/>
+ <exclude name="bin/depot.exe"/>
+ </fileset>
+ </copy>
+ <chmod perm="755">
+ <fileset dir="${dpml.system}/bin">
+ <include name="**/*.sh"/>
+ <include name="**/depot"/>
+ </fileset>
+ </chmod>
+ <property name="work" location="${dpml.data}/work"/>
+ <mkdir dir="${work}"/>
+ </target>
+
+ <target name="bin" depends="prepare" unless="depot.exe.available">
+ <copy todir="${dpml.system}" preservelastmodified="true">
+ <fileset dir="target">
+ <include name="bin/depot.exe"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>

Copied: trunk/main/depot/core/etc (from rev 1178,
trunk/main/depot/core/console/etc)

Copied: trunk/main/depot/core/src (from rev 1178,
trunk/main/depot/core/console/src)

Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-03-14 19:29:48 UTC (rev 1181)
+++ trunk/main/depot/module.xml 2006-03-14 19:36:40 UTC (rev 1182)
@@ -61,7 +61,7 @@
</dependencies>
</project>

- <project name="dpml-depot-console" basedir="core/console">
+ <project name="dpml-depot-core" basedir="core">
<properties>
<property name="project.jar.main.class" value="net.dpml.depot.Main"/>
</properties>

Modified: trunk/main/depot/module.xml.old
===================================================================
--- trunk/main/depot/module.xml.old 2006-03-14 19:29:48 UTC (rev 1181)
+++ trunk/main/depot/module.xml.old 2006-03-14 19:36:40 UTC (rev 1182)
@@ -85,11 +85,11 @@
<property name="lib" value="${data}/lib"/>
<mkdir dir="${lib}"/>
<x:property name="transit.main.version" key="dpml-transit-main"
feature="version"/>
- <x:property name="depot.console.version" key="dpml-depot-console"
feature="version"/>
+ <x:property name="depot.console.version" key="dpml-depot-core"
feature="version"/>
<copy
file="${dpml.cache}/dpml/transit/jars/dpml-transit-main-${transit.main.version}.jar"
toFile="${lib}/dpml-transit-main.jar"/>
- <copy
file="${dpml.cache}/dpml/depot/jars/dpml-depot-console-${depot.console.version}.jar"
- toFile="${lib}/dpml-depot-console.jar"/>
+ <copy
file="${dpml.cache}/dpml/depot/jars/dpml-depot-core-${depot.console.version}.jar"
+ toFile="${lib}/dpml-depot-core.jar"/>

<!-- build the local repository -->


Modified: trunk/main/metro/station/server/etc/bin/scm/conf/wrapper.conf
===================================================================
--- trunk/main/metro/station/server/etc/bin/scm/conf/wrapper.conf
2006-03-14 19:29:48 UTC (rev 1181)
+++ trunk/main/metro/station/server/etc/bin/scm/conf/wrapper.conf
2006-03-14 19:36:40 UTC (rev 1182)
@@ -23,7 +23,7 @@
# needed starting from 1
wrapper.java.classpath.1=../../share/bin/scm/lib/wrapper.jar
wrapper.java.classpath.2=../../share/lib/dpml-transit-main.jar
-wrapper.java.classpath.3=../../share/lib/dpml-depot-console.jar
+wrapper.java.classpath.3=../../share/lib/dpml-depot-core.jar

# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=../../share/bin/scm/lib




  • r1182 - in trunk/main: central central/src/docs/depot/library depot depot/core depot/core/src depot/library metro/station/server/etc/bin/scm/conf, mcconnell at BerliOS, 03/14/2006

Archive powered by MHonArc 2.6.24.

Top of Page