You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by le...@apache.org on 2003/08/23 01:47:45 UTC
cvs commit: jakarta-commons-sandbox/attributes/unittest/src/java dummy.txt
leosutic 2003/08/22 16:47:45
Modified: attributes/unittest maven.xml project.xml
Added: attributes/unittest/src/java dummy.txt
Log:
Renamed all maven id's from "jakarta-commons-attributes" to
"commons-attributes".
Revision Changes Path
1.2 +52 -25 jakarta-commons-sandbox/attributes/unittest/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/attributes/unittest/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 20 Aug 2003 23:16:16 -0000 1.1
+++ maven.xml 22 Aug 2003 23:47:45 -0000 1.2
@@ -1,4 +1,4 @@
-<project default="do-install" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
+<project default="do-install" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:util="jelly:util">
<property file="${basedir}/../build.properties"/>
<property file="${basedir}/../project.properties"/>
@@ -8,22 +8,64 @@
<property name="pom.organization.identifier" value="ASF"/>
<property name="pom.specificationVersion" value="1.0"/>
+ <postGoal name="jar:jar">
+ <ant:taskdef resource="org/apache/commons/attributes/anttasks.properties">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ </classpath>
+ </ant:taskdef>
+
+ <!--
+ For the life of me I can't figure out how to get the
+ filename of the snapshot jar that jar:jar has just created.
+
+ The maven.final.name variable is only set locally by the jar:snapshot
+ goal, and thus all I see here is the projectname-version.jar name.
+ -->
+ <ant:attribute-indexer jarFile="${maven.build.dir}/${maven.final.name}.jar">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ </classpath>
+ </ant:attribute-indexer>
+ </postGoal>
+
+ <preGoal name="test:compile">
+ <j:if test="${unitTestSourcesPresent == 'true'}">
+ <ant:taskdef resource="org/apache/commons/attributes/anttasks.properties">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ </classpath>
+ </ant:taskdef>
+
+ <ant:attribute-compiler
+ inMaven="true"
+ sourcepathref="maven.test.compile.src.set"
+ destdir="${maven.build.dir}/commons-attributes-unitttest"/>
+
+ <ant:path
+ id="jakarta.commons.attributes.generated.dir.test"
+ location="${maven.build.dir}/commons-attributes-unittest"/>
+
+ <maven:addPath
+ id="maven.test.compile.src.set"
+ refid="jakarta.commons.attributes.generated.dir"/>
+ </j:if>
+ </preGoal>
+
<goal name="wrapper">
- <echo message="${maven.build.dest}"/>
- <taskdef name="attributes"
- classname="org.apache.commons.attributes.compiler.AttributeCompiler">
+ <taskdef resource="org/apache/commons/attributes/anttasks.properties">
<classpath>
<path refid="maven.dependency.classpath"/>
</classpath>
</taskdef>
<!-- Set up the classloader tests -->
- <attributes destDir="target/cl1/">
+ <attribute-compiler destDir="target/cl1/">
<fileset dir="src/cl1/" includes="**/*.java"/>
- </attributes>
- <attributes destDir="target/cl2/">
+ </attribute-compiler>
+ <attribute-compiler destDir="target/cl2/">
<fileset dir="src/cl2/" includes="**/*.java"/>
- </attributes>
+ </attribute-compiler>
<javac destdir="target/cl1/"
debug="true"
deprecation="true">
@@ -52,31 +94,16 @@
</classpath>
</javac>
- <taskdef name="attributes-index"
- classname="org.apache.commons.attributes.compiler.AttributeIndexer">
- <classpath>
- <path refid="maven.dependency.classpath"/>
- </classpath>
- </taskdef>
-
<jar jarfile="target/cl2/cl2.jar">
<fileset dir="target/cl2/" includes="**/*.class"/>
<fileset dir="target/cl2/" includes="META-INF/**/*"/>
</jar>
- <attributes-index jarFile="target/cl2/cl2.jar">
+ <attribute-indexer jarFile="target/cl2/cl2.jar">
<classpath>
<path refid="maven.dependency.classpath"/>
</classpath>
- </attributes-index>
-
- <!-- Create the Attribute Repository Classes. -->
- <attributes destDir="target/temp/">
- <fileset dir="src/test/" includes="**/*.java"/>
- </attributes>
- <copy todir="target/temp/">
- <fileset dir="src/test/" includes="**/*.java"/>
- </copy>
+ </attribute-indexer>
<attainGoal name="jar:install-snapshot"/>
</goal>
1.2 +6 -7 jakarta-commons-sandbox/attributes/unittest/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/attributes/unittest/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 20 Aug 2003 23:16:16 -0000 1.1
+++ project.xml 22 Aug 2003 23:47:45 -0000 1.2
@@ -2,11 +2,10 @@
<project>
<extend>${basedir}/../project.xml</extend>
- <id>jakarta-commons-attributes-unittest</id>
+ <id>commons-attributes-unittest</id>
<name>Jakarta Commons Attribute Compiler Unit Tests</name>
<package>org.apache.commons.attributes</package>
- <currentVersion>0.1</currentVersion>
<inceptionYear>2003</inceptionYear>
<shortDescription>Compiler for Jakarta Commons Attributes in Java.</shortDescription>
@@ -15,7 +14,7 @@
</description>
<build>
- <unitTestSourceDirectory>${basedir}/target/temp</unitTestSourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
</build>
<dependencies>
@@ -37,14 +36,14 @@
<dependency>
- <groupId>jakarta-commons-attributes</groupId>
- <artifactId>jakarta-commons-attributes-compiler</artifactId>
+ <groupId>commons-attributes</groupId>
+ <artifactId>commons-attributes-compiler</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>jakarta-commons-attributes</groupId>
- <artifactId>jakarta-commons-attributes-api</artifactId>
+ <groupId>commons-attributes</groupId>
+ <artifactId>commons-attributes-api</artifactId>
<version>SNAPSHOT</version>
</dependency>
</dependencies>
1.1 jakarta-commons-sandbox/attributes/unittest/src/java/dummy.txt
Index: dummy.txt
===================================================================
Maven requires a src/java/ directory, and CVS keeps deleting empty directories.
So this file is here just to keep this directory from being pruned.