abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r617748 - in /incubator/abdera/java/trunk: build/build.xml dependencies/deps.properties dependencies/json/
Date Sat, 02 Feb 2008 04:43:33 GMT
Author: jmsnell
Date: Fri Feb  1 20:43:32 2008
New Revision: 617748

URL: http://svn.apache.org/viewvc?rev=617748&view=rev
Log:
Remove the third party json jar from the build and distribution since we're no longer using
it

Removed:
    incubator/abdera/java/trunk/dependencies/json/
Modified:
    incubator/abdera/java/trunk/build/build.xml
    incubator/abdera/java/trunk/dependencies/deps.properties

Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=617748&r1=617747&r2=617748&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Fri Feb  1 20:43:32 2008
@@ -103,10 +103,6 @@
 
   <property name="dependencies" value="${basedir}/dependencies" />
   <property name="dependencies.work" value="${dependencies}/work" />
-  <property name="json.src" value="${dependencies}/json/src" />
-  <property name="json.src.java" value="${json.src}/main/java" />
-  <property name="json.version" value="1.0" />
-  <property name="json.jar" value="${dependencies}/json-${json.version}.jar" />
 
   <property name="i18n.src" value="${dependencies}/i18n/src" />
   <property name="i18n.src.java" value="${i18n.src}/main/java" />
@@ -119,18 +115,9 @@
   <path id="jar.dependencies">
     <fileset dir="${dependencies}" includes="**/*.jar" />
     <fileset file="${i18n.jar}" />
-    <fileset file="${json.jar}" />
   </path>
 
   <target name="compile.dependencies">
-    <mkdir dir="${dependencies.work}/json" />
-
-    <!-- build json -->
-    <javac srcdir="${json.src.java}" destdir="${dependencies.work}/json" debug="${debug}"
/>
-
-    <jar destfile="${json.jar}" basedir="${dependencies.work}/json" includes="org/json/*.class"
/>
-
-
     <mkdir dir="${dependencies.work}/i18n" />
     
     <javac srcdir="${i18n.src.java}" classpathref="jar.dependencies" destdir="${dependencies.work}/i18n"
debug="${debug}" />
@@ -189,7 +176,6 @@
           <available file="${dependencies}/${jetty-util.jar}" />
           <available file="${dependencies}/${htmlparser.jar}" />
           <available file="${dependencies}/${htmlserializer.jar}" />
-          <available file="${dependencies}/${json.zip}" />
         </and>
       </not>
     </condition>
@@ -421,7 +407,6 @@
     <delete dir="${test}" />
     <delete dir="${dist}" />
     <delete dir="${dependencies.work}" />
-    <delete file="${json.jar}" />
     <delete file="${i18n.jar}" />
     <delete>
       <fileset dir="${basedir}" includes="*.zip" />
@@ -463,7 +448,6 @@
         <include name="**/*.jar" />
         <include name="**/legal/*" />
         <exclude name="**/legal/retroweaver-LICENSE.txt" />
-        <exclude name="**/json/*" />
         <exclude name="**/*.retro.jar" />
         <exclude name="**/${bouncycastle.jar}" />
         <exclude name="**/${geronimo.servlet.jar}" />
@@ -496,7 +480,6 @@
       <fileset dir="${dist}">
         <include name="**/*.jar" />
         <include name="**/legal/*" />
-        <exclude name="**/json/*" />
         <exclude name="**/*.${version}.jar" />
         <exclude name="**/abdera-i18n-${i18n.version}.jar" />
         <exclude name="**/${bouncycastle.jar}" />
@@ -536,7 +519,6 @@
         <exclude name="**/*.md5" />
         <exclude name="**/.project" />
         <exclude name="**/feedvalidator.org/**/*" />
-        <exclude name="dependencies/json/src/**/*" />
         <exclude name="dependencies/work/**/*" />
       </fileset>
     </copy>
@@ -577,14 +559,7 @@
       <get src="${jetty-util.dir}/${jetty-util.jar}" dest="${dependencies}/${jetty-util.jar}"
usetimestamp="true" />
       <get src="${htmlparser.dir}/${htmlparser.jar}" dest="${dependencies}/${htmlparser.jar}"
usetimestamp="true" />
       <get src="${htmlparser.dir}/${htmlserializer.jar}" dest="${dependencies}/${htmlserializer.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">

Modified: incubator/abdera/java/trunk/dependencies/deps.properties
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/deps.properties?rev=617748&r1=617747&r2=617748&view=diff
==============================================================================
--- incubator/abdera/java/trunk/dependencies/deps.properties (original)
+++ incubator/abdera/java/trunk/dependencies/deps.properties Fri Feb  1 20:43:32 2008
@@ -52,10 +52,6 @@
 jetty-util.dir=http://people.apache.org/~jmsnell
 jetty-util.jar=jetty-util-6.1.3.jar
 
-#### Deprecated ####
-json.dir=http://json.org/java
-json.zip=apache.zip
-
 #### Optional for Spring integration ####
 spring.dir=http://downloads.sourceforge.net/springframework
 spring.zip=spring-framework-2.0.6.zip



Mime
View raw message