abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r477906 - in /incubator/abdera/java/branches/0.2.0-incubating: build/build.xml dependencies/ dependencies/deps.properties dependencies/json/pom.xml dependencies/json/src/main/
Date Tue, 21 Nov 2006 21:37:12 GMT
Author: jmsnell
Date: Tue Nov 21 13:37:11 2006
New Revision: 477906

URL: http://svn.apache.org/viewvc?view=rev&rev=477906
Log:
Remove json source from the svn
Download and build json on the fly (ant and maven)
Don't ship the json source in the source zip

Removed:
    incubator/abdera/java/branches/0.2.0-incubating/dependencies/json/src/main/
Modified:
    incubator/abdera/java/branches/0.2.0-incubating/build/build.xml
    incubator/abdera/java/branches/0.2.0-incubating/dependencies/   (props changed)
    incubator/abdera/java/branches/0.2.0-incubating/dependencies/deps.properties
    incubator/abdera/java/branches/0.2.0-incubating/dependencies/json/pom.xml

Modified: incubator/abdera/java/branches/0.2.0-incubating/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/0.2.0-incubating/build/build.xml?view=diff&rev=477906&r1=477905&r2=477906
==============================================================================
--- incubator/abdera/java/branches/0.2.0-incubating/build/build.xml (original)
+++ incubator/abdera/java/branches/0.2.0-incubating/build/build.xml Tue Nov 21 13:37:11 2006
@@ -150,6 +150,7 @@
           <available file="${dependencies}/${wstx.jar}" />
           <available file="${dependencies}/${jetty.jar}" />
           <available file="${dependencies}/${jetty-util.jar}" />
+          <available file="${dependencies}/${json.zip}" />
         </and>
       </not>
     </condition>
@@ -517,6 +518,7 @@
         <exclude name="**/*.md5" />
         <exclude name="**/.project" />
         <exclude name="**/feedvalidator.org/**/*" />
+        <exclude name="**/json/**/*" />
       </fileset>
     </copy>
     <zip destfile="${basedir}/${ant.project.name}.${version}.src.zip"
@@ -583,7 +585,17 @@
       <get src="${jetty-util.dir}/${jetty-util.jar}"
            dest="${dependencies}/${jetty-util.jar}"
            usetimestamp="true" />
+      <get src="${json.dir}/${json.zip}"
+           dest="${dependencies}/${json.zip}"
+           usetimestamp="true" />
     </parallel>
+    <mkdir dir="${json.src}/main/java/org/json" />
+    <unzip src="${dependencies}/${json.zip}" 
+           dest="${json.src}" overwrite="true" />
+    <copy todir="${json.src}/main/java/org/json" overwrite="true">
+      <fileset dir="${json.src}/apache/json" />
+    </copy>
+    <delete dir="${json.src}/apache" />
   </target>
   
   <target name="clean-downloads" depends="init">

Propchange: incubator/abdera/java/branches/0.2.0-incubating/dependencies/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 21 13:37:11 2006
@@ -5,3 +5,4 @@
 bin
 .settings
 bcprov-jdk14-134.jar 
+apache.zip

Modified: incubator/abdera/java/branches/0.2.0-incubating/dependencies/deps.properties
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/0.2.0-incubating/dependencies/deps.properties?view=diff&rev=477906&r1=477905&r2=477906
==============================================================================
--- incubator/abdera/java/branches/0.2.0-incubating/dependencies/deps.properties (original)
+++ incubator/abdera/java/branches/0.2.0-incubating/dependencies/deps.properties Tue Nov 21
13:37:11 2006
@@ -78,3 +78,6 @@
 
 jetty-util.dir=http://www.ibiblio.org/maven2/jetty/jetty-util/6.0.0rc0
 jetty-util.jar=jetty-util-6.0.0rc0.jar
+
+json.dir=http://json.org/java
+json.zip=apache.zip
\ No newline at end of file

Modified: incubator/abdera/java/branches/0.2.0-incubating/dependencies/json/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/0.2.0-incubating/dependencies/json/pom.xml?view=diff&rev=477906&r1=477905&r2=477906
==============================================================================
--- incubator/abdera/java/branches/0.2.0-incubating/dependencies/json/pom.xml (original)
+++ incubator/abdera/java/branches/0.2.0-incubating/dependencies/json/pom.xml Tue Nov 21 13:37:11
2006
@@ -34,4 +34,29 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/abdera/java/trunk/dependencies/json/</developerConnection>
     <url>http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/dependencies/json/</url>
   </scm>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <configuration>
+              <tasks>
+                <mkdir dir="${basedir}/target" />
+                <get src="http://json.org/java/apache.zip" dest="${basedir}/target/apache.zip"
usetimestamp="true"/>
+                <unzip src="${basedir}/target/apache.zip" dest="${basedir}/target/generated-sources/main/java"
/>
+                <move file="${basedir}/target/generated-sources/main/java/apache" tofile="${basedir}/target/generated-sources/main/java/json"
/>
+              </tasks>
+              <sourceRoot>${project.build.directory}/generated-sources/main/java</sourceRoot>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>



Mime
View raw message