river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtra...@apache.org
Subject svn commit: r1725173 - in /river/jtsk/trunk: build.xml common.xml dep-libs/ ivy.xml src/manifest/jsk-platform.mf src/manifest/tools.mf
Date Mon, 18 Jan 2016 05:51:55 GMT
Author: gtrasuk
Date: Mon Jan 18 05:51:55 2016
New Revision: 1725173

URL: http://svn.apache.org/viewvc?rev=1725173&view=rev
Log:

dep-libs has been removed.  In its place we download the required
dependencies using Apache Ivy.

System compiles as-is, but the integration test hasn't been tried yet.


Removed:
    river/jtsk/trunk/dep-libs/
Modified:
    river/jtsk/trunk/build.xml
    river/jtsk/trunk/common.xml
    river/jtsk/trunk/ivy.xml
    river/jtsk/trunk/src/manifest/jsk-platform.mf
    river/jtsk/trunk/src/manifest/tools.mf

Modified: river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/build.xml?rev=1725173&r1=1725172&r2=1725173&view=diff
==============================================================================
--- river/jtsk/trunk/build.xml (original)
+++ river/jtsk/trunk/build.xml Mon Jan 18 05:51:55 2016
@@ -27,7 +27,8 @@
 <!-- ##                                                                 -->
 <!-- ################################################################## -->
 <project name="river" basedir="." default="all.build"
-        xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+    xmlns:artifact="antlib:org.apache.maven.artifact.ant"
+    xmlns:ivy="antlib:org.apache.ivy.ant">
 
     <description>Apache River is a project furthering the development and advancement
of Jini technology.</description>
         
@@ -553,8 +554,75 @@
             <classpath refid="compile.classpath" />
         </javac-cmd>
     </target>	
+
+    <property name="ivy.install.version" value="2.4.0"/>
+    <property name="ivy.jar.dir" value="${build}/lib"/>
+    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
+    <condition property="skip.ivy.download">
+        <available file="${ivy.jar.file}"/>
+    </condition>
+    
+    <target name="download-ivy" unless="skip.ivy.download">
+        <mkdir dir="${ivy.jar.dir}"/>
+        <!-- download Ivy from web site so that it can be used even without any special
installation -->
+        <echo message="installing ivy..."/>
+        <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+             dest="${ivy.jar.file}" usetimestamp="true"/>
+    </target>
+    
+    <!-- ================================= 
+     target: install-ivy         
+       this target is not necessary if you put ivy.jar in your ant lib directory
+       if you already have ivy in your ant lib, you can simply remove this
+       target and the dependency the 'go' target has on it
+    ================================= -->
+    <target name="install-ivy" depends="download-ivy" description="--> install ivy">
+        <!-- try to load ivy here from local ivy dir, in case the user has not already
dropped
+        it into ant's lib dir (note that the latter copy will always take precedence).
+        We will not fail as long as local lib dir exists (it may be empty) and
+        ivy is in at least one of ant's lib dir or the local lib dir. -->
+        <path id="ivy.lib.path">
+            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+        </path>
+        <taskdef resource="org/apache/ivy/ant/antlib.xml"
+                 uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+    </target>    
 	
-    <target name="copy-extlibs" >
+
+    <target name="get-dep-libs" depends="install-ivy">        
+        <!-- Let's use Ivy instead... -->
+        <mkdir dir="dep-libs"/>
+        <mkdir dir="dep-libs/animal-sniffer"/>
+        <mkdir dir="dep-libs/asm"/>
+        <mkdir dir="dep-libs/bouncy-castle"/>
+        <mkdir dir="dep-libs/dnsjava"/>
+        <mkdir dir="dep-libs/groovy"/>
+        <mkdir dir="dep-libs/high-scale-lib"/>
+        <mkdir dir="dep-libs/velocity"/>
+ 
+        <ivy:resolve conf="*, tools, asm, animal, bouncy, dnsjava, groovy, hslib, velocity"/>
+        <ivy:retrieve pattern="dep-libs/animal-sniffer/[artifact]-[revision].[ext]" 
+            conf="animal"/>
+        <ivy:retrieve pattern="dep-libs/asm/[artifact]-[revision].[ext]" 
+            conf="asm"/>
+        <ivy:retrieve pattern="dep-libs/bouncy-castle/[artifact]-[revision].[ext]" 
+            conf="bouncy"/>
+        <ivy:retrieve pattern="dep-libs/dnsjava/[artifact]-[revision].[ext]" 
+            conf="dnsjava"/>
+        <ivy:retrieve pattern="dep-libs/groovy/[artifact]-[revision].[ext]" 
+            conf="groovy"/>
+        <ivy:retrieve pattern="dep-libs/high-scale-lib/[artifact]-[revision].[ext]" 
+            conf="hslib"/>
+        <ivy:retrieve pattern="dep-libs/velocity/[artifact]-[revision].[ext]" 
+            conf="velocity"/>
+        <ivy:retrieve pattern="test/${lib}/[artifact]-[revision].[ext]" 
+            conf="tests"/>
+        
+
+    </target>
+
+        	
+    <target name="copy-extlibs" depends="get-dep-libs">
         <copy todir="lib">
             <fileset refid="asm.jars"/>
             <fileset refid="high-scale-lib.jars"/>
@@ -582,10 +650,12 @@
             reggie.stubs, sdm.stubs, start.stubs">-->
     </target>
 
-    <target name="clean" depends="clean-dist, clean-jars, doc-clean"
+    <target name="clean" depends="clean-dist, clean-jars, doc-clean, qa.clean"
 		description="Removes all files and dirs created by the build">
         <delete dir="${build.dir}" quiet="true"/>
         <delete dir="${configentry.dir}" quiet="true"/>
+        <delete dir="dep-libs" quiet="true"/>
+        <delete dir="test/lib" quiet="true"/>
     </target>
 
     <target name="clean-dist"
@@ -720,7 +790,11 @@
         </jar>
     </target>
 
-    <target name="groovy-config.jar">  
+    <target name="groovy-config.jar" depends="get-dep-libs">  
+	<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc">
+	    <classpath refid="groovy.jars"/>
+	</taskdef>
+	
 		 <delete file="${lib.dir}/groovy-config.jar" quiet="true"/>      
 		<groovyc srcdir="src" destdir="${build.classes.dir}" listfiles="yes"> 
 		    <classpath refid="river.classes"/>
@@ -2149,6 +2223,11 @@
             <property name="harness.generateHtml" value="${harness.generateHtml}" />
         </ant>
     </target>
+    <target name="qa.clean"  description="Clean QA tests">
+        <!-- Call qa subcomponent build -->
+        <ant dir="qa" target="clean" inheritall="false">
+        </ant>
+    </target>
     
     <target name="qa.run-tests" depends="" description="Run Specific QA tests">
         <!-- Call qa subcomponent build -->
@@ -2187,60 +2266,16 @@
         <ant dir="qa" target="jars" inheritall="false" />
     </target>
 
-    <!-- TODO: cleanup and find out where exactly to publish to -->
-    <!-- Note that you need the Maven Ant tasks (http://maven.apache.org/ant-tasks/)
-        installed to use this task -->
-    <target name="deploy-artifacts" depends="jars">
-        <!--<artifact:install-provider artifactId="wagon-file" version="1.0-beta-2"/>
-        <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/>
-        <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>-->
-        <!-- Override this in <river src distr. home>/build.properties to try out
-->
-        <property name="m2.repository" value="file:///home/jonathan/maven" />
-        <macrodef name="deploy">
-            <attribute name="file" />
-            <attribute name="pom" />
-            <sequential>
-                <artifact:deploy file="@{file}" >
-                    <remoteRepository url="${m2.repository}"/>
-                    <pom refid="@{pom}"/>
-                </artifact:deploy>
-            </sequential>
-        </macrodef>
-        <artifact:pom id="parent" file="${poms.dir}/pom.xml" />
-        <artifact:pom id="jini-core" file="${poms.dir}/jini-core/pom.xml" />
-        <artifact:pom id="jini-ext" file="${poms.dir}/jini-ext/pom.xml" />
-        <artifact:pom id="jsk-lib" file="${poms.dir}/jsk-lib/pom.xml" />
-        <artifact:pom id="jsk-dl" file="${poms.dir}/jsk-dl/pom.xml" />
-        <artifact:pom id="jsk-resources" file="${poms.dir}/jsk-resources/pom.xml" />
-        <artifact:pom id="jsk-platform" file="${poms.dir}/jsk-platform/pom.xml" />
-        <artifact:pom id="jsk-policy" file="${poms.dir}/jsk-policy/pom.xml" />
-        <artifact:pom id="serviceui" file="${poms.dir}/serviceui/pom.xml" />
-        <artifact:pom id="sun-util" file="${poms.dir}/sun-util/pom.xml" />
-        <artifact:pom id="start" file="${poms.dir}/start/pom.xml" />
-        <artifact:pom id="tools" file="${poms.dir}/tools/pom.xml" />
-        <deploy file="${lib.dir}/jini-core.jar" pom="jini-core" />
-        <deploy file="${lib.dir}/jini-ext.jar" pom="jini-ext" />
-        <deploy file="${lib.dir}/jsk-lib.jar" pom="jsk-lib" />
-        <deploy file="${lib-dl.dir}/jsk-dl.jar" pom="jsk-dl" />
-        <deploy file="${lib.dir}/jsk-resources.jar" pom="jsk-resources" />
-        <deploy file="${lib.dir}/jsk-platform.jar" pom="jsk-platform" />
-        <deploy file="${lib-ext.dir}/jsk-policy.jar" pom="jsk-policy" />
-        <deploy file="${lib.dir}/serviceui.jar" pom="serviceui" />
-        <deploy file="${lib.dir}/sun-util.jar" pom="sun-util" />
-        <deploy file="${lib.dir}/start.jar" pom="start" />
-        <deploy file="${lib.dir}/tools.jar" pom="tools" />
-    </target>
-
     <target name="prep-tests" depends="">
         <mkdir dir="${test.classes.dir}"/>
         <mkdir dir="${test.results.dir}"/>
-        <copy file="dep-libs/high-scale-lib/high-scale-lib.jar" todir="test/lib"/>
+        <copy file="dep-libs/high-scale-lib/*.jar" todir="test/lib"/>
     </target>
 
     <target name="clean-tests" depends="">
         <delete dir="${test.classes.dir}" quiet="true"/>
         <delete dir="${test.results.dir}" quiet="true"/>
-        <delete file="test/lib/high-scale-lib.jar" quiet="true"/>
+        <delete file="test/lib/*.jar" quiet="true"/>
     </target> 
     
     <target name="compile-tests" depends="compile,prep-tests">

Modified: river/jtsk/trunk/common.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/common.xml?rev=1725173&r1=1725172&r2=1725173&view=diff
==============================================================================
--- river/jtsk/trunk/common.xml (original)
+++ river/jtsk/trunk/common.xml Mon Jan 18 05:51:55 2016
@@ -138,28 +138,23 @@
     </path>
 
     <fileset id="asm.jars" dir="${root}/dep-libs/asm">
-        <include name="asm-5.0.1.jar" />
-        <include name="asm-commons-5.0.1.jar" />
+        <include name="*.jar" />
     </fileset>
 
     <path id="groovy.jars">
 		<fileset dir="${root}/dep-libs/groovy" includes="**/*.jar" />
     </path>
 	
-	<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc">
-	    <classpath refid="groovy.jars"/>
-	</taskdef>
-	
     <fileset id="velocity.jars" dir="${root}/dep-libs/velocity">
-        <include name="velocity-1.7.jar" />
+        <include name="*.jar" />
     </fileset>
     
     <fileset id="high-scale-lib.jars" dir="${root}/dep-libs/high-scale-lib">
-        <include name="high-scale-lib.jar" />
+        <include name="*.jar" />
     </fileset>
     
     <fileset id="dnsjava.jar" dir="${root}/dep-libs/dnsjava">
-        <include name="dnsjava-2.1.3.jar" />
+        <include name="*.jar" />
     </fileset>
     
 

Modified: river/jtsk/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/ivy.xml?rev=1725173&r1=1725172&r2=1725173&view=diff
==============================================================================
--- river/jtsk/trunk/ivy.xml (original)
+++ river/jtsk/trunk/ivy.xml Mon Jan 18 05:51:55 2016
@@ -1,50 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- ! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements.  See the NOTICE file
- ! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
- ! to you under the Apache License, Version 2.0 (the
- ! "License"); you may not use this file except in compliance
- ! with the License. You may obtain a copy of the License at
- !
- !      http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing, software
- ! distributed under the License is distributed on an "AS IS" BASIS,
- ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ! See the License for the specific language governing permissions and
- ! limitations under the License.
- !-->
+! Licensed to the Apache Software Foundation (ASF) under one
+! or more contributor license agreements.  See the NOTICE file
+! distributed with this work for additional information
+! regarding copyright ownership. The ASF licenses this file
+! to you under the Apache License, Version 2.0 (the
+! "License"); you may not use this file except in compliance
+! with the License. You may obtain a copy of the License at
+!
+!      http://www.apache.org/licenses/LICENSE-2.0
+!
+! Unless required by applicable law or agreed to in writing, software
+! distributed under the License is distributed on an "AS IS" BASIS,
+! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+! See the License for the specific language governing permissions and
+! limitations under the License.
+!-->
  
 <ivy-module
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
     xsi:noNamespaceSchemaLocation='http://ant.apache.org/ivy/schemas/ivy.xsd' version="2.0">
     <info organisation="org.apache.river"
           module="river"/>
-          <configurations>
-              <conf name="tools"/>
-              <conf name="tests"/>
-              <conf name="qa"/>
-          </configurations>
+    <configurations>
+        <conf name="tools"/>
+        <conf name="tests"/>
+        <conf name="asm"/>
+        <conf name="dnsjava"/>
+        <conf name="bouncy"/>
+        <conf name="animal"/>
+        <conf name="hslib"/>
+        <conf name="velocity"/>
+        <conf name="groovy"/>
+    </configurations>
     <dependencies>
-        <dependency org="org.ow2.asm" name="asm" rev="5.0.4" conf="tools->default"/>
-        <dependency org="org.ow2.asm" name="asm-commons" rev="5.0.4" conf="tools->default"/>
-        <dependency org="org.ow2.asm" name="asm-tree" rev="5.0.4" conf="tools->default"/>
+        <dependency org="org.ow2.asm" name="asm" rev="5.0.4" conf="asm->default"/>
+        <dependency org="org.ow2.asm" name="asm-commons" rev="5.0.4" conf="asm->default"/>
+        <dependency org="org.ow2.asm" name="asm-tree" rev="5.0.4" conf="asm->default"/>
         
-        <dependency org="org.apache.velocity" name="velocity" rev="1.7" conf="tools->default"/>
  
+        <dependency org="org.apache.velocity" name="velocity" rev="1.7" conf="velocity->default"/>
  
         
         <dependency org="junit" name="junit" rev="4.11" conf="tests->default"/>
         <dependency org="org.mockito" name="mockito-all" rev="1.9.5" conf="tests->default"/>
         
-        <dependency org="org.bouncycastle" name="bcmail-jdk15on" rev="1.54" conf="tools->default"/>
-        <dependency org="org.bouncycastle" name="bcprov-jdk15on" rev="1.54" conf="tools->default"/>
+        <dependency org="org.bouncycastle" name="bcmail-jdk15on" rev="1.54" conf="bouncy->default"/>
+        <dependency org="org.bouncycastle" name="bcprov-jdk15on" rev="1.54" conf="bouncy->default"/>
 
-        <dependency org="org.dnsjava" name="dnsjava" rev="2.1.7" conf="tools->default"/>
+        <dependency org="dnsjava" name="dnsjava" rev="2.1.7" conf="dnsjava->default"/>
 
-        <dependency org="org.codehaus.groovy" name="groovy" rev="2.4.5" />
+        <dependency org="org.codehaus.groovy" name="groovy-all" rev="2.4.5" conf="groovy->default"/>
        
-        <dependency org="com.boundary" name="high-scale-lib" rev="1.0.6" /> 
+        <dependency org="com.github.stephenc.high-scale-lib" name="high-scale-lib" rev="1.1.4"
conf="hslib->default"/> 
+        
+        <dependency org="org.codehaus.mojo" name="animal-sniffer" rev="1.14" conf="animal->default"/>
+        <dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.14"
conf="animal->default"/>
+        <dependency org="org.codehaus.mojo.signature" name="java14" rev="1.0" conf="animal->default"/>
+        <dependency org="org.codehaus.mojo.signature" name="java14-sun" rev="1.0" conf="animal->default"/>
+        <dependency org="org.codehaus.mojo.signature" name="java15" rev="1.0" conf="animal->default"/>
+        <dependency org="org.codehaus.mojo.signature" name="java15-sun" rev="1.0" conf="animal->default"/>
+        <dependency org="org.codehaus.mojo.signature" name="java15-ibm" rev="1.0" conf="animal->default"/>
     </dependencies>   
 
 </ivy-module>

Modified: river/jtsk/trunk/src/manifest/jsk-platform.mf
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/manifest/jsk-platform.mf?rev=1725173&r1=1725172&r2=1725173&view=diff
==============================================================================
--- river/jtsk/trunk/src/manifest/jsk-platform.mf (original)
+++ river/jtsk/trunk/src/manifest/jsk-platform.mf Mon Jan 18 05:51:55 2016
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
-Class-Path: jsk-resources.jar high-scale-lib.jar
+Class-Path: jsk-resources.jar high-scale-lib-1.1.4.jar
 Implementation-Vendor: Apache Software Foundation
 Implementation-Version: 3.0

Modified: river/jtsk/trunk/src/manifest/tools.mf
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/manifest/tools.mf?rev=1725173&r1=1725172&r2=1725173&view=diff
==============================================================================
--- river/jtsk/trunk/src/manifest/tools.mf (original)
+++ river/jtsk/trunk/src/manifest/tools.mf Mon Jan 18 05:51:55 2016
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: org.apache.river.tool.ClassServer
-Class-Path: jsk-platform.jar jsk-lib.jar asm-5.0.1.jar asm-commons-5.0.1.jar
+Class-Path: jsk-platform.jar jsk-lib.jar asm-5.0.4.jar asm-commons-5.0.4.jar



Mime
View raw message