Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1272 - in development/main: magic/core/src/main/net/dpml/magic/model metro transit/handler transit/handler/etc/setup/authority transit/handler/etc/test/trusted/dpml/test/pngs

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1272 - in development/main: magic/core/src/main/net/dpml/magic/model metro transit/handler transit/handler/etc/setup/authority transit/handler/etc/test/trusted/dpml/test/pngs
  • Date: Thu, 23 Dec 2004 16:16:39 +0100

Author: mcconnell
Date: Thu Dec 23 16:16:39 2004
New Revision: 1272

Modified:
development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
development/main/metro/module.xml
development/main/transit/handler/build.xml
development/main/transit/handler/etc/setup/authority/hosts.xml
development/main/transit/handler/etc/test/trusted/dpml/test/pngs/ (props
changed)
Log:
(a) Add checks to path creation to not include themes (b) add a replication
to local cache target in the metro module, (c) properties updated

Modified:
development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
Thu Dec 23 16:16:39 2004
@@ -176,7 +176,8 @@
final Resource resource = getResource( project, ref );
Info info = resource.getInfo();
String type = info.getType();
- if( "*".equals( filter ) || filter.equals( type ) )
+ if( ( "*".equals( filter ) || filter.equals( type ) )
+ && !"".equals( type ) & !"theme".equals( type ) )
{
final File file = resource.getArtifact( project );
path.createPathElement().setLocation( file );

Modified: development/main/metro/module.xml
==============================================================================
--- development/main/metro/module.xml (original)
+++ development/main/metro/module.xml Thu Dec 23 16:16:39 2004
@@ -33,6 +33,10 @@
</x:module>
</target>

+ <target name="install" depends="standard.install">
+ <x:replicate toDir="${dpml.home}/local/${project.version}" />
+ </target>
+
<target name="docs" depends="install"> <!-- checkstyle causes fail on full
build -->
<x:javadoc>
<link href="http://java.sun.com/j2se/1.4/docs/api"/>

Modified: development/main/transit/handler/build.xml
==============================================================================
--- development/main/transit/handler/build.xml (original)
+++ development/main/transit/handler/build.xml Thu Dec 23 16:16:39 2004
@@ -18,7 +18,8 @@
<copy toFile="${user.home}/.ant/lib/${project.antlib}"
file="${basedir}/target/deliverables/jars/${project.filename}"
overwrite="true">
</copy>
- <copy toDir="${dpml.home}/transit" overwrite="true">
+ <filter token="PROJECT-VERSION" value="${project.version}"/>
+ <copy toDir="${dpml.home}/transit" overwrite="true" filtering="true">
<fileset dir="${target.dir}/setup"/>
</copy>
</target>

Modified: development/main/transit/handler/etc/setup/authority/hosts.xml
==============================================================================
--- development/main/transit/handler/etc/setup/authority/hosts.xml
(original)
+++ development/main/transit/handler/etc/setup/authority/hosts.xml Thu
Dec 23 16:16:39 2004
@@ -2,7 +2,7 @@

<hosts>

- <host dir="local">
+ <host dir="local/@PROJECT-VERSION@">
<priority>10</priority>
<trusted>true</trusted>
</host>



  • svn commit: r1272 - in development/main: magic/core/src/main/net/dpml/magic/model metro transit/handler transit/handler/etc/setup/authority transit/handler/etc/test/trusted/dpml/test/pngs, mcconnell, 12/23/2004

Archive powered by MHonArc 2.6.24.

Top of Page