Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1404 - in development/laboratory/maven/magic-migrate: . src/main/net/dpml/magic/maven/migrate

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mraad23 AT earthlink.net
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1404 - in development/laboratory/maven/magic-migrate: . src/main/net/dpml/magic/maven/migrate
  • Date: Fri, 07 Jan 2005 15:51:41 +0100

Author: mraad23 AT earthlink.net
Date: Fri Jan 7 15:51:41 2005
New Revision: 1404

Modified:
development/laboratory/maven/magic-migrate/maven.xml
development/laboratory/maven/magic-migrate/project.xml

development/laboratory/maven/magic-migrate/src/main/net/dpml/magic/maven/migrate/FileExistsException.java

development/laboratory/maven/magic-migrate/src/main/net/dpml/magic/maven/migrate/Migrate.java
Log:
Added javadoc
Adjusted depedencies children from dependency to include tags

Modified: development/laboratory/maven/magic-migrate/maven.xml
==============================================================================
--- development/laboratory/maven/magic-migrate/maven.xml (original)
+++ development/laboratory/maven/magic-migrate/maven.xml Fri Jan 7
15:51:41 2005
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 Stephen J McConnell
Copyright 2004 Niclas Hedhman
@@ -16,11 +17,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<project default="plugin:install" xmlns:ant="jelly:ant">

- <preGoal name="test:test">
- <delete file="build.xml"/>
- </preGoal>
+ <!-- Delete existing build.xml before testing -->
+ <preGoal name="test:test">
+ <delete file="build.xml"/>
+ </preGoal>

</project>

Modified: development/laboratory/maven/magic-migrate/project.xml
==============================================================================
--- development/laboratory/maven/magic-migrate/project.xml (original)
+++ development/laboratory/maven/magic-migrate/project.xml Fri Jan 7
15:51:41 2005
@@ -18,420 +18,420 @@
limitations under the License.
-->
<project>
- <pomVersion>3</pomVersion>
- <id>magic-migrate</id>
- <name>Magic Migration Plugin</name>
- <groupId>dpml/magic/maven</groupId>
- <currentVersion>1.0</currentVersion>
- <organization>
- <name>Digital Product Meta Library</name>
- </organization>
- <inceptionYear>2004</inceptionYear>
- <description>
+ <pomVersion>3</pomVersion>
+ <id>magic-migrate</id>
+ <name>Magic Migration Plugin</name>
+ <groupId>dpml/magic/maven</groupId>
+ <currentVersion>1.0</currentVersion>
+ <organization>
+ <name>Digital Product Meta Library</name>
+ </organization>
+ <inceptionYear>2004</inceptionYear>
+ <description>
This Plugin will liberate your projects from using Maven to the more
sophisticated, flexible and powerful Magic build system from Digital
Product Meta Library.
- </description>
- <shortDescription>Migration from Maven to Magic.</shortDescription>
- <developers>
- <developer>
- <name>Niclas Hedhman</name>
- <id>niclas</id>
- <email>niclas AT hedhman.org</email>
- <organization>Digital Product Meta Library</organization>
- <roles>
- <role>Developer</role>
- <role>Architect</role>
- <role>Visionary</role>
- <role>Janitor</role>
- </roles>
- </developer>
- </developers>
- <contributors>
- <contributor>
- <name>Mansour Raad</name>
- <email>mraad23 AT earthlink.net</email>
- </contributor>
- </contributors>
- <dependencies>
+ </description>
+ <shortDescription>Migration from Maven to Magic.</shortDescription>
+ <developers>
+ <developer>
+ <name>Niclas Hedhman</name>
+ <id>niclas</id>
+ <email>niclas AT hedhman.org</email>
+ <organization>Digital Product Meta Library</organization>
+ <roles>
+ <role>Developer</role>
+ <role>Architect</role>
+ <role>Visionary</role>
+ <role>Janitor</role>
+ </roles>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Mansour Raad</name>
+ <email>mraad23 AT earthlink.net</email>
+ </contributor>
+ </contributors>
+ <dependencies>

- <dependency>
- <groupId>dpml/magic</groupId>
- <artifactId>dpml-magic</artifactId>
- <version>LATEST</version>
- </dependency>
- <dependency>
- <groupId>dpml/transit</groupId>
- <artifactId>dpml-transit</artifactId>
- <version>LATEST</version>
- </dependency>
+ <dependency>
+ <groupId>dpml/magic</groupId>
+ <artifactId>dpml-magic</artifactId>
+ <version>LATEST</version>
+ </dependency>
+ <dependency>
+ <groupId>dpml/transit</groupId>
+ <artifactId>dpml-transit</artifactId>
+ <version>LATEST</version>
+ </dependency>

- <dependency>
- <id>dom4j</id>
- <version>1.4-dev-8</version>
- <url>http://www.dom4j.org/</url>
- <properties>
- <description>ouch</description>
- </properties>
- </dependency>
- <dependency>
- <id>ant</id>
- <version>1.5.3-1</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5.3-1</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <!-- ant 1.6 deps - Ant 1.6 messes up any use of the "root" classloader
for taskdefs
- <dependency>
- <id>ant</id>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-antlr</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-apache-bsf</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-apache-resolver</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-commons-logging</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-commons-net</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-icontract</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jai</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jakarta-bcel</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jakarta-log4j</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jakarta-oro</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jakarta-regexp</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-javamail</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jdepend</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jmf</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jsch</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-starteam</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-swing</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-weblogic</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-xalan2</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- ant-netrexx.jar
- ant-stylebook.jar
- ant-vaj.jar
- ant-xalan1.jar
- ant-xslp.jar
- -->
- <dependency>
- <id>commons-betwixt</id>
- <version>1.0-beta-1.20030111.103454</version>
- <url>http://jakarta.apache.org/commons/betwixt/</url>
- </dependency>
- <!-- TODO: can be removed? -->
- <dependency>
- <id>commons-digester</id>
- <version>1.4.1</version>
- <url>http://jakarta.apache.org/commons/digester/</url>
- </dependency>
- <dependency>
- <id>commons-jelly</id>
- <version>1.0-beta-4</version>
- <url>http://jakarta.apache.org/commons/jelly/</url>
- </dependency>
- <dependency>
- <groupId>commons-jelly</groupId>
- <artifactId>commons-jelly-tags-ant</artifactId>
- <version>1.0</version>
- <url>http://jakarta.apache.org/commons/jelly/tags/ant/</url>
- </dependency>
- <dependency>
- <groupId>commons-jelly</groupId>
- <artifactId>commons-jelly-tags-define</artifactId>
- <version>1.0</version>
- <url>http://jakarta.apache.org/commons/jelly/tags/define/</url>
- </dependency>
- <dependency>
- <groupId>commons-jelly</groupId>
- <artifactId>commons-jelly-tags-util</artifactId>
- <version>1.0</version>
- <url>http://jakarta.apache.org/commons/jelly/tags/util/</url>
- </dependency>
- <dependency>
- <groupId>commons-jelly</groupId>
- <artifactId>commons-jelly-tags-xml</artifactId>
- <version>1.0</version>
- <url>http://jakarta.apache.org/commons/jelly/tags/xml/</url>
- </dependency>
- <!-- TODO: can be removed? -->
- <dependency>
- <id>commons-graph</id>
- <version>0.8.1</version>
- <url>http://jakarta.apache.org/commons/sandbox/graph/</url>
- </dependency>
- <dependency>
- <id>commons-jexl</id>
- <version>1.0</version>
- <url>http://jakarta.apache.org/commons/jexl/</url>
- </dependency>
- <dependency>
- <id>commons-logging</id>
- <version>1.0.3</version>
- <url>http://jakarta.apache.org/commons/logging/</url>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <id>werkz</id>
- <version>20040426.222000</version>
- <url>http://werkz.codehaus.org/</url>
- </dependency>
- <!-- Runtime dependencies -->
- <dependency>
- <id>commons-beanutils</id>
- <version>1.6.1</version>
- <url>http://jakarta.apache.org/commons/</url>
- </dependency>
- <dependency>
- <id>commons-cli</id>
- <version>1.0-beta-2</version>
- <url>http://jakarta.apache.org/commons/cli/</url>
- </dependency>
- <dependency>
- <id>commons-collections</id>
- <version>2.1</version>
- <url>http://jakarta.apache.org/commons/</url>
- </dependency>
- <dependency>
- <id>commons-grant</id>
- <version>1.0-beta-4</version>
- <url>http://jakarta.apache.org/commons/sandbox/grant/</url>
- </dependency>
- <dependency>
- <id>commons-io</id>
- <version>1.0</version>
- <url>http://jakarta.apache.org/commons/</url>
- </dependency>
- <dependency>
- <id>commons-lang</id>
- <version>2.0</version>
- <url>http://jakarta.apache.org/commons/lang/</url>
- </dependency>
- <dependency>
- <id>forehead</id>
- <version>1.0-beta-5</version>
- </dependency>
- <dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- <url>http://logging.apache.org/log4j/</url>
- </dependency>
- <!-- TODO: can be removed? -->
- <dependency>
- <id>which</id>
- <version>1.0</version>
- <url>http://xml.apache.org/commons/components/which/index.html</url>
- </dependency>
- <!-- this is a dependency, but as the classes ship with ant, bootstrap
will
- fail with linkage errors if it's included and the junit tests are not
- forked
- -->
- <dependency>
- <id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
- <properties>
- <endorsed>true</endorsed>
- </properties>
- </dependency>
- <dependency>
- <id>xerces</id>
- <version>2.4.0</version>
- <url>http://xml.apache.org/xerces2-j/</url>
- <properties>
- <endorsed>true</endorsed>
- </properties>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus</artifactId>
- <version>0.6</version>
- </dependency>
- <dependency>
- <groupId>maven</groupId>
- <artifactId>maven</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>maven</groupId>
- <artifactId>maven-jelly-tags</artifactId>
- <version>1.0.1</version>
- </dependency>
-<!--
- <dependency>
- <groupId>maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
--->
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.3</version>
- </dependency>
+ <dependency>
+ <id>dom4j</id>
+ <version>1.4-dev-8</version>
+ <url>http://www.dom4j.org/</url>
+ <properties>
+ <description>ouch</description>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>ant</id>
+ <version>1.5.3-1</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ <version>1.5.3-1</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <!-- ant 1.6 deps - Ant 1.6 messes up any use of the "root"
classloader for taskdefs
+ <dependency>
+ <id>ant</id>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-antlr</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-apache-resolver</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-commons-logging</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-commons-net</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-icontract</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-jai</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-jakarta-bcel</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-jakarta-log4j</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-jakarta-oro</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-jakarta-regexp</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-javamail</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-jdepend</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-jmf</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-jsch</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-starteam</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-swing</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-weblogic</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-xalan2</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ ant-netrexx.jar
+ ant-stylebook.jar
+ ant-vaj.jar
+ ant-xalan1.jar
+ ant-xslp.jar
+ -->
+ <dependency>
+ <id>commons-betwixt</id>
+ <version>1.0-beta-1.20030111.103454</version>
+ <url>http://jakarta.apache.org/commons/betwixt/</url>
+ </dependency>
+ <!-- TODO: can be removed? -->
+ <dependency>
+ <id>commons-digester</id>
+ <version>1.4.1</version>
+ <url>http://jakarta.apache.org/commons/digester/</url>
+ </dependency>
+ <dependency>
+ <id>commons-jelly</id>
+ <version>1.0-beta-4</version>
+ <url>http://jakarta.apache.org/commons/jelly/</url>
+ </dependency>
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-ant</artifactId>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/jelly/tags/ant/</url>
+ </dependency>
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-define</artifactId>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/jelly/tags/define/</url>
+ </dependency>
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-util</artifactId>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/jelly/tags/util/</url>
+ </dependency>
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-xml</artifactId>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/jelly/tags/xml/</url>
+ </dependency>
+ <!-- TODO: can be removed? -->
+ <dependency>
+ <id>commons-graph</id>
+ <version>0.8.1</version>
+ <url>http://jakarta.apache.org/commons/sandbox/graph/</url>
+ </dependency>
+ <dependency>
+ <id>commons-jexl</id>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/jexl/</url>
+ </dependency>
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.3</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <id>werkz</id>
+ <version>20040426.222000</version>
+ <url>http://werkz.codehaus.org/</url>
+ </dependency>
+ <!-- Runtime dependencies -->
+ <dependency>
+ <id>commons-beanutils</id>
+ <version>1.6.1</version>
+ <url>http://jakarta.apache.org/commons/</url>
+ </dependency>
+ <dependency>
+ <id>commons-cli</id>
+ <version>1.0-beta-2</version>
+ <url>http://jakarta.apache.org/commons/cli/</url>
+ </dependency>
+ <dependency>
+ <id>commons-collections</id>
+ <version>2.1</version>
+ <url>http://jakarta.apache.org/commons/</url>
+ </dependency>
+ <dependency>
+ <id>commons-grant</id>
+ <version>1.0-beta-4</version>
+ <url>http://jakarta.apache.org/commons/sandbox/grant/</url>
+ </dependency>
+ <dependency>
+ <id>commons-io</id>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/</url>
+ </dependency>
+ <dependency>
+ <id>commons-lang</id>
+ <version>2.0</version>
+ <url>http://jakarta.apache.org/commons/lang/</url>
+ </dependency>
+ <dependency>
+ <id>forehead</id>
+ <version>1.0-beta-5</version>
+ </dependency>
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.8</version>
+ <url>http://logging.apache.org/log4j/</url>
+ </dependency>
+ <!-- TODO: can be removed? -->
+ <dependency>
+ <id>which</id>
+ <version>1.0</version>
+
<url>http://xml.apache.org/commons/components/which/index.html</url>
+ </dependency>
+ <!-- this is a dependency, but as the classes ship with ant,
bootstrap will
+ fail with linkage errors if it's included and the junit tests are
not
+ forked
+ -->
+ <dependency>
+ <id>xml-apis</id>
+ <version>1.0.b2</version>
+ <url>http://xml.apache.org/xerces2-j/</url>
+ <properties>
+ <endorsed>true</endorsed>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>xerces</id>
+ <version>2.4.0</version>
+ <url>http://xml.apache.org/xerces2-j/</url>
+ <properties>
+ <endorsed>true</endorsed>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus</artifactId>
+ <version>0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-jelly-tags</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.3.3</version>
+ </dependency>

- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>

- </dependencies>
- <build>
- <!-- Useful if your plugin uses some beans -->
- <sourceDirectory>src/main</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </unitTest>
- <resources>
- <resource>
- <directory>${basedir}/src/plugin-resources</directory>
- <targetPath>plugin-resources</targetPath>
- </resource>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>plugin.jelly</include>
- <include>plugin.properties</include>
- <include>project.properties</include>
- <include>project.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/conf</directory>
- <includes>
- <include>*.properties</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
+ </dependencies>
+ <build>
+ <!-- Useful if your plugin uses some beans -->
+ <sourceDirectory>src/main</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </unitTest>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/plugin-resources</directory>
+ <targetPath>plugin-resources</targetPath>
+ </resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>plugin.jelly</include>
+ <include>plugin.properties</include>
+ <include>project.properties</include>
+ <include>project.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/conf</directory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
</project>

Modified:
development/laboratory/maven/magic-migrate/src/main/net/dpml/magic/maven/migrate/FileExistsException.java
==============================================================================
---
development/laboratory/maven/magic-migrate/src/main/net/dpml/magic/maven/migrate/FileExistsException.java
(original)
+++
development/laboratory/maven/magic-migrate/src/main/net/dpml/magic/maven/migrate/FileExistsException.java
Fri Jan 7 15:51:41 2005
@@ -30,7 +30,10 @@
public class FileExistsException
extends IOException
{
- private File m_file; // The existing file.
+ /**
+ * The existing file.
+ */
+ private File m_file;

/**
* Create a instance with a reference to the existing file.

Modified:
development/laboratory/maven/magic-migrate/src/main/net/dpml/magic/maven/migrate/Migrate.java
==============================================================================
---
development/laboratory/maven/magic-migrate/src/main/net/dpml/magic/maven/migrate/Migrate.java
(original)
+++
development/laboratory/maven/magic-migrate/src/main/net/dpml/magic/maven/migrate/Migrate.java
Fri Jan 7 15:51:41 2005
@@ -43,18 +43,18 @@

public class Migrate
{
+ /**
+ * Initial buffer size.
+ */
+ private static final int INITIAL_SIZE = 500;

- public void migrate(
- Project proj,
- String dpml
- )
+ public void migrate( Project proj,
+ String dpml )
{
}

- public void createDpml(
- Project proj,
- String dpml
- )
+ public void createDpml( Project proj,
+ String dpml )
{
System.out.println( "Project:" + proj.getName() );
System.out.println( "DPML_HOME=" + dpml );
@@ -63,19 +63,19 @@
dpml = System.getProperty( "user.home" + "/.dpml" );
}
System.out.println( "dpml = " + dpml );
- File dpml_home = new File( dpml );
- dpml_home.mkdirs();
+ File dpmlHome = new File( dpml );
+ dpmlHome.mkdirs();

- File bindir = new File( dpml_home, "bin" );
+ File bindir = new File( dpmlHome, "bin" );
bindir.mkdirs();

- File transitdir = new File( dpml_home, "transit/authority" );
+ File transitdir = new File( dpmlHome, "transit/authority" );
transitdir.mkdirs();

- File cachedir = new File( dpml_home, "main" );
+ File cachedir = new File( dpmlHome, "main" );
cachedir.mkdirs();

- File docsdir = new File( dpml_home, "docs" );
+ File docsdir = new File( dpmlHome, "docs" );
docsdir.mkdirs();

String magicPath = proj.getDependencyPath( "dpml-magic" );
@@ -87,10 +87,8 @@

}

- public void createBuilds(
- Project proj,
- String dpml
- )
+ public void createBuilds( Project proj,
+ String dpml )
throws IOException, MavenException
{
File cwd = new File( "." );
@@ -139,11 +137,10 @@
*
* @param basedir the base directory.
* @param project the maven project.
+ * @throws IOException if an IO error occured.
*/
- private void createStandardIndex(
- File basedir,
- Project project
- ) throws IOException
+ private void createStandardIndex( File basedir,
+ Project project ) throws IOException
{

Document document = DocumentHelper.createDocument();
@@ -153,9 +150,18 @@
writeIndexDotXml( basedir, document );
}

- private Project getMavenProject( File basedir ) throws MavenException
+ /**
+ * Read maven project.xml in the base directory.
+ *
+ * @param basedir the base directory.
+ * @return return a maven Project.
+ * @throws MavenException if cannot read the project.xml file.
+ */
+ private Project getMavenProject( File basedir ) throws MavenException,
IOException
{
- File mavenFile = new File( basedir, "project.xml" ); // Create file
with parent file, or NPE will be thrown.
+ System.out.println( "basedir = " + basedir );
+ File mavenFile = new File( basedir.getCanonicalFile(), "project.xml"
); // Create file with parent file, or NPE will be thrown.
+ System.out.println( "mavenFile = " + mavenFile );
return MavenUtils.getProject( mavenFile, null, false );
}

@@ -166,10 +172,8 @@
* @param document the document to write.
* @throws IOException if IO error occured.
*/
- private void writeIndexDotXml(
- File basedir,
- Document document
- ) throws IOException
+ private void writeIndexDotXml( File basedir,
+ Document document ) throws IOException
{
FileWriter fileWriter = new FileWriter( new File( basedir,
"index.xml" ) );
try
@@ -192,10 +196,8 @@
* @param index the index element.
* @param project the maven project.
*/
- private void createProject(
- Element index,
- Project project
- )
+ private void createProject( Element index,
+ Project project )
{
addResources( index, project );
Element projectElement = index.addElement( "project" );
@@ -213,18 +215,16 @@
* @param projectElement the project element.
* @param project the maven project.
*/
- private void addDependencies(
- Element projectElement,
- Project project
- )
+ private void addDependencies( Element projectElement,
+ Project project )
{
Element dependenciesElement = projectElement.addElement(
"dependencies" );
java.util.List list = project.getDependencies();
int size = list.size();
for( int i = 0; i < size; i++ )
{
- Dependency dependency = (Dependency) list.get( i );
- Element dependencyElement = dependenciesElement.addElement(
"dependency" );
+ Dependency dependency = ( Dependency ) list.get( i );
+ Element dependencyElement = dependenciesElement.addElement(
"include" );
dependencyElement.addAttribute( "key",
dependency.getArtifactId() );
// Handle special case if artifactId is junit
if( "junit".equals( dependency.getArtifactId() ) )
@@ -240,16 +240,14 @@
* @param index the index element.
* @param project the maven project.
*/
- private void addResources(
- Element index,
- Project project
- )
+ private void addResources( Element index,
+ Project project )
{
java.util.List list = project.getDependencies();
int size = list.size();
for( int i = 0; i < size; i++ )
{
- Dependency dependency = (Dependency) list.get( i );
+ Dependency dependency = ( Dependency ) list.get( i );
Element infoElement = index.addElement( "resource" ).addElement(
"info" );
infoElement.addElement( "group" ).addText(
dependency.getGroupId() );
infoElement.addElement( "name" ).addText(
dependency.getArtifactId() );
@@ -268,6 +266,13 @@
indexElement.addElement( "import" ).addAttribute( "uri",
"artifact:module:dpml/metro/dpml-metro#SNAPSHOT" );
}

+ /**
+ * Recurse over the the given array of files.
+ *
+ * @param entries the files to resurse throught.
+ * @throws IOException if an IO error occured.
+ * @throws MavenException if a maven error occured.
+ */
private void recurse( File[] entries ) throws IOException, MavenException
{
for( int i = 0; i < entries.length; i++ )
@@ -296,43 +301,37 @@
return foundSrc;
}

-
/**
- * <project name="dpml-tutorial-hello" default="install" basedir="."
- * xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
- * <p/>
- * <magic:import uri="artifact:template:dpml/magic/standard"/>
- * <p/>
- * <target name="build" depends="standard.build">
- * <x:block name="tutorial" embed="MAIN">
- * <x:component name="hello" class="tutorial.HelloComponent"/>
- * </x:block>
- * </target>
- * <p/>
- * </project>
- */
- private void createStandardBuild(
- File dir,
- Project mavenProject
- )
- throws IOException
+ * Create standard build.xml file.
+ *
+ * @param dir directory where to write the file.
+ * @param mavenProject the maven project.
+ * @throws IOException if an IO error occured.
+ */
+ private void createStandardBuild( File dir, Project mavenProject )
throws IOException
{
- StringBuffer content = new StringBuffer( 500 );
+ StringBuffer content = new StringBuffer( INITIAL_SIZE );
content.append( "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" );
content.append( "<project name=\"" + mavenProject.getName() + "\"
default=\"install\" basedir=\".\"\n" );
content.append( " xmlns:magic=\"antlib:net.dpml.magic\">\n" );
content.append( "\n" );
content.append( " <magic:import
uri=\"artifact:template:dpml/magic/standard\"/>\n" );
+ content.append( " <magic:import
uri=\"artifact:template:dpml/magic/checkstyle\"/>\n" );
content.append( "\n" );
content.append( "</project>\n" );
write( dir, content.toString() );
}

-
+ /**
+ * Create a reactor build.xml file.
+ *
+ * @param dir directory where to write the file.
+ * @throws IOException if an IO error occured.
+ */
private void createReactorBuild( File dir )
throws IOException
{
- StringBuffer content = new StringBuffer( 500 );
+ StringBuffer content = new StringBuffer( INITIAL_SIZE );
content.append( "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" );
content.append( "<project name=\"maven-migrate\" default=\"default\"
basedir=\".\"\n" );
content.append( " xmlns:magic=\"antlib:net.dpml.magic\">\n" );
@@ -346,23 +345,19 @@
/**
* Write the content of a string to a file.
*
- * @param dir where to write the file.
+ * @param dir directory where to write the file.
* @param content the content to write.
* @throws FileExistsException if the file already exists.
* @throws IOException if cannot write the file.
*/
- private void write(
- File dir,
- String content
- )
- throws FileExistsException, IOException
+ private void write( File dir, String content ) throws
FileExistsException, IOException
{
- File f = new File( dir, "build.xml" );
- if( f.exists() )
+ File buildDotXml = new File( dir, "build.xml" );
+ if( buildDotXml.exists() )
{
- throw new FileExistsException( f );
+ throw new FileExistsException( buildDotXml );
}
- FileOutputStream fos = new FileOutputStream( f );
+ FileOutputStream fos = new FileOutputStream( buildDotXml );
try
{
OutputStreamWriter osw = new OutputStreamWriter( fos, "UTF-8" );



  • svn commit: r1404 - in development/laboratory/maven/magic-migrate: . src/main/net/dpml/magic/maven/migrate, mraad23, 01/07/2005

Archive powered by MHonArc 2.6.24.

Top of Page