manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1327096 - in /incubator/lcf/branches/CONNECTORS-459: build.xml connectors/connector-build.xml framework/build.xml json/ tests/test-build.xml
Date Tue, 17 Apr 2012 13:40:02 GMT
Author: kwright
Date: Tue Apr 17 13:40:01 2012
New Revision: 1327096

URL: http://svn.apache.org/viewvc?rev=1327096&view=rev
Log:
Remove bundled json sources, since we can now download a compatible json from Maven.

Removed:
    incubator/lcf/branches/CONNECTORS-459/json/
Modified:
    incubator/lcf/branches/CONNECTORS-459/build.xml
    incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml
    incubator/lcf/branches/CONNECTORS-459/framework/build.xml
    incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml

Modified: incubator/lcf/branches/CONNECTORS-459/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/build.xml?rev=1327096&r1=1327095&r2=1327096&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/build.xml Tue Apr 17 13:40:01 2012
@@ -162,20 +162,7 @@
       <echo message="Site did not build.  Was FORREST_HOME set properly?"/>
     </target>
     
-    <target name="build-json">
-        <mkdir dir="build/json/classes"/>
-        <javac srcdir="json" destdir="build/json/classes" target="1.6" source="1.4" debug="true"
debuglevel="lines,vars,source">
-            <classpath>
-            </classpath>
-        </javac>
-    </target>
-    
-    <target name="jar-json" depends="build-json">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/json.jar" basedir="build/json/classes"/>
-    </target>
-    
-    <target name="setup-framework" depends="jar-json,downloaded-check" if="downloaded"/>
+    <target name="setup-framework" depends="downloaded-check" if="downloaded"/>
       
       <target name="build-framework" depends="setup-framework" if="downloaded">
         <ant dir="framework" target="build"/>
@@ -2589,9 +2576,6 @@ Use Apache Forrest version forrest-0.9-d
     <target name="rat-sources" depends="-taskdef"
       description="runs the tasks over src/java excluding the license directory">
       <rat:report xmlns:rat="antlib:org.apache.rat.anttasks">
-        <fileset dir="json/">
-          <exclude name="**/*.java"/>
-        </fileset>
         <fileset dir="mod-authz-annotate/">
         </fileset>
         <fileset dir="connectors/">
@@ -2669,6 +2653,17 @@ Use Apache Forrest version forrest-0.9-d
         </java>
     </target>
 
+    <target name="download-json">
+        <mkdir dir="lib"/>
+        <antcall target="download-via-maven">
+            <param name="project-path" value="org/json"/>
+            <param name="artifact-version" value="20090211"/>
+            <param name="target" value="lib"/>
+            <param name="artifact-name" value="json"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
+    
     <target name="download-derby">
         <mkdir dir="lib"/>
         <property name="derby-version" value="10.8.2.2"/>
@@ -3364,7 +3359,7 @@ Use Apache Forrest version forrest-0.9-d
         </copy>
     </target>
 
-    <target name="make-core-deps" depends="download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugin,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jsr181-api,download-jsr250-api,download-jaxws,download-jdbcpool,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
+    <target name="make-core-deps" depends="download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugin,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jsr181-api,download-jsr250-api,download-jaxws,download-jdbcpool,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
         <copy todir="lib">
             <fileset dir="lib-license" includes="*.txt"/>
         </copy>

Modified: incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml?rev=1327096&r1=1327095&r2=1327096&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml Tue Apr 17 13:40:01
2012
@@ -30,10 +30,8 @@
     </target>
 
     <path id="mcf-connector-build.connector-classpath">
-        <fileset dir="../../build/jar">
-            <include name="json.jar"/>
-        </fileset>
         <fileset dir="../../lib">
+            <include name="json*.jar"/>
             <include name="commons-codec*.jar"/>
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>

Modified: incubator/lcf/branches/CONNECTORS-459/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/framework/build.xml?rev=1327096&r1=1327095&r2=1327096&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/framework/build.xml Tue Apr 17 13:40:01 2012
@@ -31,10 +31,8 @@
     </target>
     
     <path id="framework-classpath">
-        <fileset dir="../build/jar">
-            <include name="json.jar"/>
-        </fileset>
         <fileset dir="../lib">
+            <include name="json*.jar"/>
             <include name="commons-codec*.jar"/>
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>
@@ -245,10 +243,8 @@
     <target name="webapp-authority-service" depends="jar-core,jar-agents,jar-pull-agent,compile-authority-servlet">
         <mkdir dir="build/webapp/authority-service/WEB-INF/lib"/>
         <copy todir="build/webapp/authority-service/WEB-INF/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -283,10 +279,8 @@
     <target name="webapp-authority-service-proprietary" depends="jar-core,jar-agents,jar-pull-agent,compile-authority-servlet">
         <mkdir dir="build/webapp/authority-service-proprietary/WEB-INF/lib"/>
         <copy todir="build/webapp/authority-service-proprietary/WEB-INF/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -326,10 +320,8 @@
     <target name="webapp-api-service" depends="jar-core,jar-ui-core,jar-agents,jar-pull-agent,compile-api-servlet">
         <mkdir dir="build/webapp/api-service/WEB-INF/lib"/>
         <copy todir="build/webapp/api-service/WEB-INF/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -365,10 +357,8 @@
     <target name="webapp-api-service-proprietary" depends="jar-core,jar-ui-core,jar-agents,jar-pull-agent,compile-api-servlet">
         <mkdir dir="build/webapp/api-service-proprietary/WEB-INF/lib"/>
         <copy todir="build/webapp/api-service-proprietary/WEB-INF/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -411,11 +401,7 @@
         <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
             <fileset dir="../lib">
                 <include name="jstl*.jar"/>
-            </fileset>
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
-            <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -460,11 +446,7 @@
         <copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/lib">
             <fileset dir="../lib">
                 <include name="jstl*.jar"/>
-            </fileset>
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
-            <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -566,10 +548,8 @@
     <target name="multi-processes" depends="jar-core,jar-agents,jar-pull-agent">
         <mkdir dir="dist/multiprocess-example/processes/lib"/>
         <copy todir="dist/multiprocess-example/processes/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -607,10 +587,8 @@
     <target name="multi-processes-proprietary" depends="jar-core,jar-agents,jar-pull-agent">
         <mkdir dir="dist/multiprocess-example-proprietary/processes/lib"/>
         <copy todir="dist/multiprocess-example-proprietary/processes/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -664,10 +642,8 @@
         </copy>
         <mkdir dir="dist/multiprocess-example/lib"/>
         <copy todir="dist/multiprocess-example/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="log4j*.jar"/>
             </fileset>
@@ -705,10 +681,8 @@
         </copy>
         <mkdir dir="dist/multiprocess-example-proprietary/lib"/>
         <copy todir="dist/multiprocess-example-proprietary/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="log4j*.jar"/>
             </fileset>
@@ -735,10 +709,8 @@
     <target name="script-engine" depends="jar-script-engine,jar-core">
         <mkdir dir="dist/script-engine/lib"/>
         <copy todir="dist/script-engine/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-httpclient*.jar"/>
@@ -763,10 +735,8 @@
     <target name="single-process-example" depends="jar-jetty-runner,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
         <mkdir dir="dist/example/lib"/>
         <copy todir="dist/example/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
@@ -882,10 +852,8 @@
     <target name="single-process-example-proprietary" depends="jar-jetty-runner,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
         <mkdir dir="dist/example-proprietary/lib"/>
         <copy todir="dist/example-proprietary/lib">
-            <fileset dir="../build/jar">
-                <include name="json.jar"/>
-            </fileset>
             <fileset dir="../lib">
+                <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml?rev=1327096&r1=1327095&r2=1327096&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml Tue Apr 17 13:40:01 2012
@@ -29,10 +29,8 @@
     </target>
 
     <path id="framework-classpath">
-        <fileset dir="../../build/jar">
-            <include name="json.jar"/>
-        </fileset>
         <fileset dir="../../lib">
+            <include name="json*.jar"/>
             <include name="commons-codec*.jar"/>
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>



Mime
View raw message