Thrift-1194: Java lib does not install artifacts to local dir correctly

Client: java
Patch: Jake Farrell

Fixes broken java lib install target to work properly and cleans up build.properties.

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1130626 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/lib/java/build.properties b/lib/java/build.properties
index c097cc1..03015ef 100644 (file)
--- a/lib/java/build.properties
+++ b/lib/java/build.properties
@@ -25,102 +25,3 @@ thrift.groupid=org.apache.thrift
 # Jar Versions 
 mvn.ant.task.version=2.1.3
 
-# Local Install paths
-install.path=/usr/local/lib
-install.javadoc.path=${install.path}
-
-# Maven dependency download locations
-mvn.repo=http://repo1.maven.org/maven2
-apache.repo=https://repository.apache.org/content/repositories/releases
-mvn.ant.task.url=${mvn.repo}/org/apache/maven/maven-ant-tasks/${mvn.ant.task.version}
-mvn.ant.task.jar=maven-ant-tasks-${mvn.ant.task.version}.jar
-
-# Apache Maven publish 
-license=http://www.apache.org/licenses/LICENSE-2.0.txt"
-maven-repository-url=https://repository.apache.org/service/local/staging/deploy/maven2
-maven-repository-id=apache.releases.https
-
-thrift.version=0.7.0
-thrift.groupid=org.apache.thrift
-
-# Jar Versions 
-mvn.ant.task.version=2.1.3
-
-# Local Install paths
-install.path=/usr/local/lib
-install.javadoc.path=${install.path}
-
-# Maven dependency download locations
-mvn.repo=http://repo1.maven.org/maven2
-apache.repo=https://repository.apache.org/content/repositories/releases
-mvn.ant.task.url=${mvn.repo}/org/apache/maven/maven-ant-tasks/${mvn.ant.task.version}
-mvn.ant.task.jar=maven-ant-tasks-${mvn.ant.task.version}.jar
-
-# Apache Maven publish 
-license=http://www.apache.org/licenses/LICENSE-2.0.txt"
-maven-repository-url=https://repository.apache.org/service/local/staging/deploy/maven2
-maven-repository-id=apache.releases.https
-
-thrift.version=0.7.0
-thrift.groupid=org.apache.thrift
-
-# Jar Versions 
-mvn.ant.task.version=2.1.3
-
-# Local Install paths
-install.path=/usr/local/lib
-install.javadoc.path=${install.path}
-
-# Maven dependency download locations
-mvn.repo=http://repo1.maven.org/maven2
-apache.repo=https://repository.apache.org/content/repositories/releases
-mvn.ant.task.url=${mvn.repo}/org/apache/maven/maven-ant-tasks/${mvn.ant.task.version}
-mvn.ant.task.jar=maven-ant-tasks-${mvn.ant.task.version}.jar
-
-# Apache Maven publish 
-license=http://www.apache.org/licenses/LICENSE-2.0.txt"
-maven-repository-url=https://repository.apache.org/service/local/staging/deploy/maven2
-maven-repository-id=apache.releases.https
-
-thrift.version=0.7.0
-thrift.groupid=org.apache.thrift
-
-# Jar Versions 
-mvn.ant.task.version=2.1.3
-
-# Local Install paths
-install.path=/usr/local/lib
-install.javadoc.path=${install.path}
-
-# Maven dependency download locations
-mvn.repo=http://repo1.maven.org/maven2
-apache.repo=https://repository.apache.org/content/repositories/releases
-mvn.ant.task.url=${mvn.repo}/org/apache/maven/maven-ant-tasks/${mvn.ant.task.version}
-mvn.ant.task.jar=maven-ant-tasks-${mvn.ant.task.version}.jar
-
-# Apache Maven publish 
-license=http://www.apache.org/licenses/LICENSE-2.0.txt"
-maven-repository-url=https://repository.apache.org/service/local/staging/deploy/maven2
-maven-repository-id=apache.releases.https
-
-thrift.version=0.7.0
-thrift.groupid=org.apache.thrift
-
-# Jar Versions 
-mvn.ant.task.version=2.1.3
-
-# Local Install paths
-install.path=/usr/local/lib
-install.javadoc.path=${install.path}
-
-# Maven dependency download locations
-mvn.repo=http://repo1.maven.org/maven2
-apache.repo=https://repository.apache.org/content/repositories/releases
-mvn.ant.task.url=${mvn.repo}/org/apache/maven/maven-ant-tasks/${mvn.ant.task.version}
-mvn.ant.task.jar=maven-ant-tasks-${mvn.ant.task.version}.jar
-
-# Apache Maven publish 
-license=http://www.apache.org/licenses/LICENSE-2.0.txt"
-maven-repository-url=https://repository.apache.org/service/local/staging/deploy/maven2
-maven-repository-id=apache.releases.https
-

diff --git a/lib/java/build.xml b/lib/java/build.xml
index 7ad5a49..923da2b 100644 (file)
--- a/lib/java/build.xml
+++ b/lib/java/build.xml
@@ -131,12 +131,11 @@
 
   <target name="install" depends="dist,javadoc">
     <copy todir="${install.path}">
-      <fileset dir="."><include name="*.jar"/></fileset>
+      <fileset dir="${build.dir}" includes="*.jar"/>
+      <fileset dir="${build.lib.dir}" includes="*.jar"/>
     </copy>
     <copy todir="${install.javadoc.path}">
-      <fileset dir="${javadoc.dir}">
-        <include name="**/*"/>
-      </fileset>
+      <fileset dir="${javadoc.dir}" includes="**/*"/>
     </copy>
   </target>