abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r415090 - in /incubator/abdera/java/trunk: build/build.xml dependencies/deps.properties parser/pom.xml pom.xml
Date Sun, 18 Jun 2006 04:53:13 GMT
Author: jmsnell
Date: Sat Jun 17 21:53:13 2006
New Revision: 415090

URL: http://svn.apache.org/viewvc?rev=415090&view=rev
Log:
Various build patches from Stephen and Garrett

Added:
    incubator/abdera/java/trunk/dependencies/deps.properties
Modified:
    incubator/abdera/java/trunk/build/build.xml
    incubator/abdera/java/trunk/parser/pom.xml
    incubator/abdera/java/trunk/pom.xml

Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=415090&r1=415089&r2=415090&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Sat Jun 17 21:53:13 2006
@@ -27,7 +27,10 @@
   <property name="parser.test" value="${parser}/src/test/java" />
   <property name="parser.work" value="${work}/parser" />
   <property name="parser.jar" value="${dist}/${ant.project.name}.parser.${version}.jar"
/>
+
   <property name="dependencies" value="${basedir}/dependencies" />
+  <property file="${dependencies}/deps.properties" />
+
   <path id="jar.dependencies">
     <fileset dir="${dependencies}" includes="**/*.jar" />
   </path>
@@ -45,7 +48,29 @@
 Working directory: ${work}
 =====================================================
     </echo>
-  	<mkdir dir="${test}" />
+
+    <mkdir dir="${test}" />
+
+    <condition property="do.download">
+      <not>
+        <and>
+          <available file="${dependencies}/${geronimo.activation.jar}" />
+          <available file="${dependencies}/${geronimo.javamail.jar}" />
+          <available file="${dependencies}/${axiom.api.jar}" />
+          <available file="${dependencies}/${axiom.impl.jar}" />
+          <available file="${dependencies}/${jaxen.jar}" />
+          <available file="${dependencies}/${log4j.jar}" />
+          <available file="${dependencies}/${stax.jar}" />
+          <available file="${dependencies}/${stax.api.jar}" />
+          <available file="${dependencies}/${commons.logging.jar}" />
+          <available file="${dependencies}/${commons.codec.jar}" />
+          <available file="${dependencies}/${commons.httpclient.jar}" />
+          <available file="${dependencies}/${junit.jar}" />
+          <available file="${dependencies}/${wstx.jar}" />
+        </and>
+      </not>
+    </condition>
+    <antcall target="download"/>
   </target>
   
   <target name="compile.core" depends="init">
@@ -121,35 +146,48 @@
     </zip>
   </target>
 
-  <target name="download" depends="init">
-    <echo>Downloading project dependencies.. this may take a moment</echo>
+  <target name="download" if="do.download">
+    <echo>Downloading project dependencies.  This may take a moment</echo>
     <parallel>
-    <get src="http://www.apache.org/dist/java-repository/org.apache.geronimo.specs/jars/geronimo-activation_1.0.2_spec-1.0.jar"
-         dest="${dependencies}/geronimo-activation_1.0.2_spec-1.0.jar" usetimestamp="true"
/>
-    <get src="http://www.apache.org/dist/java-repository/org.apache.geronimo.specs/jars/geronimo-javamail_1.3.1_spec-1.0.jar"
-         dest="${dependencies}/geronimo-javamail_1.3.1_spec-1.0.jar" usetimestamp="true"
/>
-    <get src="http://www.apache.org/dist/java-repository/ws-commons/jars/axiom-api-1.0.jar"
-         dest="${dependencies}/axiom-api-1.0.jar" usetimestamp="true" />
-    <get src="http://www.apache.org/dist/java-repository/ws-commons/jars/axiom-impl-1.0.jar"
-         dest="${dependencies}/axiom-impl-1.0.jar" usetimestamp="true" />
-    <get src="http://dist.codehaus.org/jaxen/jars/jaxen-1.1-beta-7.jar"
-         dest="${dependencies}/jaxen-1.1-beta-7.jar" usetimestamp="true" />
-    <get src="http://www.apache.org/dist/java-repository/log4j/jars/log4j-1.2.12.jar"
-         dest="${dependencies}/log4j-1.2.12.jar" usetimestamp="true" />
-    <get src="http://dist.codehaus.org/stax/jars/stax-1.1.2-dev.jar"
-         dest="${dependencies}/stax-1.1.2-dev.jar" usetimestamp="true" />
-    <get src="http://dist.codehaus.org/stax/jars/stax-api-1.0.jar"
-         dest="${dependencies}/stax-api-1.0.jar" usetimestamp="true" />
-    <get src="http://www.apache.org/dist/java-repository/commons-logging/jars/commons-logging-1.0.4.jar"
-         dest="${dependencies}/commons-logging-1.0.4.jar" usetimestamp="true" />
-    <get src="http://www.apache.org/dist/java-repository/commons-codec/jars/commons-codec-1.3.jar"
-         dest="${dependencies}/commons-codec-1.3.jar" usetimestamp="true" />
-    <get src="http://www.apache.org/dist/java-repository/commons-httpclient/jars/commons-httpclient-3.0.1.jar"
-         dest="${dependencies}/commons-httpclient-3.0.1.jar" usetimestamp="true" />
-    <get src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"
-         dest="${dependencies}/junit-3.8.1.jar" usetimestamp="true" />
-    <get src="http://woodstox.codehaus.org/2.0.5/wstx-asl-2.0.5.jar"
-         dest="${dependencies}/wstx-asl-2.0.5.jar" usetimestamp="true" />
+      <get src="${geronimo.activation.dir}/${geronimo.activation.jar}"
+           dest="${dependencies}/${geronimo.activation.jar}"
+           usetimestamp="true" />
+      <get src="${geronimo.javamail.dir}/${geronimo.javamail.jar}"
+           dest="${dependencies}/${geronimo.javamail.jar}"
+           usetimestamp="true" />
+      <get src="${axiom.dir}/${axiom.api.jar}"
+           dest="${dependencies}/${axiom.api.jar}"
+           usetimestamp="true" />
+      <get src="${axiom.dir}/${axiom.impl.jar}"
+           dest="${dependencies}/${axiom.impl.jar}"
+           usetimestamp="true" />
+      <get src="${jaxen.dir}/${jaxen.jar}"
+           dest="${dependencies}/${jaxen.jar}"
+           usetimestamp="true" />
+      <get src="${log4j.dir}/${log4j.jar}"
+           dest="${dependencies}/${log4j.jar}"
+           usetimestamp="true" />
+      <get src="${stax.dir}/${stax.jar}"
+           dest="${dependencies}/${stax.jar}"
+           usetimestamp="true" />
+      <get src="${stax.dir}/${stax.api.jar}"
+           dest="${dependencies}/${stax.api.jar}"
+           usetimestamp="true" />
+      <get src="${commons.logging.dir}/${commons.logging.jar}"
+           dest="${dependencies}/${commons.logging.jar}"
+           usetimestamp="true" />
+      <get src="${commons.codec.dir}/${commons.codec.jar}"
+           dest="${dependencies}/${commons.codec.jar}"
+           usetimestamp="true" />
+      <get src="${commons.httpclient.dir}/${commons.httpclient.jar}"
+           dest="${dependencies}/${commons.httpclient.jar}"
+           usetimestamp="true" />
+      <get src="${junit.dir}/${junit.jar}"
+           dest="${dependencies}/${junit.jar}"
+           usetimestamp="true" />
+      <get src="${wstx.dir}/${wstx.jar}"
+           dest="${dependencies}/${wstx.jar}"
+           usetimestamp="true" />
     </parallel>
   </target>
   

Added: incubator/abdera/java/trunk/dependencies/deps.properties
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/deps.properties?rev=415090&view=auto
==============================================================================
--- incubator/abdera/java/trunk/dependencies/deps.properties (added)
+++ incubator/abdera/java/trunk/dependencies/deps.properties Sat Jun 17 21:53:13 2006
@@ -0,0 +1,68 @@
+geronimo.activation.dir=http://www.apache.org/dist/java-repository/org.apache.geronimo.specs/jars
+geronimo.activation.dir=http://www.apache.org/dist/java-repository/org.apache.geronimo.specs/jars
+geronimo.activation.jar=geronimo-activation_1.0.2_spec-1.0.jar
+
+geronimo.javamail.dir=http://www.apache.org/dist/java-repository/org.apache.geronimo.specs/jars
+geronimo.javamail.jar=geronimo-javamail_1.3.1_spec-1.0.jar
+
+axiom.dir=http://www.apache.org/dist/java-repository/ws-commons/jars
+axiom.api.jar=axiom-api-1.0.jar
+axiom.impl.jar=axiom-impl-1.0.jar
+
+jaxen.dir=http://dist.codehaus.org/jaxen/jars
+jaxen.jar=jaxen-1.1-beta-7.jar
+
+log4j.dir=http://www.apache.org/dist/java-repository/log4j/jars
+log4j.jar=log4j-1.2.12.jar
+
+stax.dir=http://dist.codehaus.org/stax/jars
+stax.jar=stax-1.1.2-dev.jar
+stax.api.jar=stax-api-1.0.jar
+
+commons.logging.dir=http://www.apache.org/dist/java-repository/commons-logging/jars
+commons.logging.jar=commons-logging-1.0.4.jar
+
+commons.codec.dir=http://www.apache.org/dist/java-repository/commons-codec/jars
+commons.codec.jar=commons-codec-1.3.jar
+
+commons.httpclient.dir=http://www.apache.org/dist/java-repository/commons-httpclient/jars
+commons.httpclient.jar=commons-httpclient-3.0.1.jar
+
+junit.dir=http://www.ibiblio.org/maven/junit/jars
+junit.jar=junit-3.8.1.jar
+
+wstx.dir=http://woodstox.codehaus.org/2.0.5
+wstx.jar=wstx-asl-2.0.5.jar
+geronimo.activation.jar=geronimo-activation_1.0.2_spec-1.0.jar
+
+geronimo.javamail.dir=http://www.apache.org/dist/java-repository/org.apache.geronimo.specs/jars
+geronimo.javamail.jar=geronimo-javamail_1.3.1_spec-1.0.jar
+
+axiom.dir=http://www.apache.org/dist/java-repository/ws-commons/jars
+axiom.api.jar=axiom-api-1.0.jar
+axiom.impl.jar=axiom-impl-1.0.jar
+
+jaxen.dir=http://dist.codehaus.org/jaxen/jars
+jaxen.jar=jaxen-1.1-beta-7.jar
+
+log4j.dir=http://www.apache.org/dist/java-repository/log4j/jars
+log4j.jar=log4j-1.2.12.jar
+
+stax.dir=http://dist.codehaus.org/stax/jars
+stax.jar=stax-1.1.2-dev.jar
+stax.api.jar=stax-api-1.0.jar
+
+commons.logging.dir=http://www.apache.org/dist/java-repository/commons-logging/jars
+commons.logging.jar=commons-logging-1.0.4.jar
+
+commons.codec.dir=http://www.apache.org/dist/java-repository/commons-codec/jars
+commons.codec.jar=commons-codec-1.3.jar
+
+commons.httpclient.dir=http://www.apache.org/dist/java-repository/commons-httpclient/jars
+commons.httpclient.jar=commons-httpclient-3.0.1.jar
+
+junit.dir=http://www.ibiblio.org/maven/junit/jars
+junit.jar=junit-3.8.1.jar
+
+wstx.dir=http://woodstox.codehaus.org/2.0.5
+wstx.jar=wstx-asl-2.0.5.jar

Modified: incubator/abdera/java/trunk/parser/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/pom.xml?rev=415090&r1=415089&r2=415090&view=diff
==============================================================================
--- incubator/abdera/java/trunk/parser/pom.xml (original)
+++ incubator/abdera/java/trunk/parser/pom.xml Sat Jun 17 21:53:13 2006
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <scope>test</scope>
+      <scope>runtime</scope>
     </dependency>
   </dependencies>
 </project>

Modified: incubator/abdera/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/pom.xml?rev=415090&r1=415089&r2=415090&view=diff
==============================================================================
--- incubator/abdera/java/trunk/pom.xml (original)
+++ incubator/abdera/java/trunk/pom.xml Sat Jun 17 21:53:13 2006
@@ -127,4 +127,12 @@
     <module>security</module>
     <module>examples</module>
   </modules>
+  
+  <distributionManagement>
+    <repository>
+      <id>apache-maven-test-builds</id>
+      <name>Apache Maven Repository (Test Builds)</name>
+      <url>scp://people.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+    </repository>
+  </distributionManagement>
 </project>



Mime
View raw message