Merge trunk to QPID-2519 branch

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1186990 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 23 insertions, 4 deletions

diff --git a/java/common.xml b/java/common.xml
index 066859b29f..c6688ee2de 100644
--- a/java/common.xml
+++ b/java/common.xml
@@ -23,7 +23,9 @@
   <dirname property="project.root" file="${ant.file.common}"/>
 
   <property name="project.name"          value="qpid"/>
-  <property name="project.version"       value="0.9"/>
+  <property name="project.version"       value="0.13"/>
+  <property name="project.url"           value="http://qpid.apache.org"/>
+  <property name="project.groupid"       value="org.apache.qpid"/>
   <property name="project.namever"       value="${project.name}-${project.version}"/>
 
   <property name="resources"             location="${project.root}/resources"/>
@@ -40,7 +42,6 @@
   <property name="build.report"          location="${build}/report"/>
   <property name="build.release"         location="${build}/release"/>
   <property name="build.release.prepare" location="${build.release}/prepare"/>
-  <property name="build.data"            location="${build.scratch}/data"/>
   <property name="build.plugins"         location="${build}/lib/plugins"/>
   <property name="build.coveragereport"  location="${build}/coverage"/>
   <property name="build.findbugs"        location="${build}/findbugs"/>
@@ -63,6 +64,11 @@
   <property name="mllib.dir" value="${project.root}/../python" />
   <property name="findbugs.dir" value="${project.root}/lib/findbugs" />
 
+  <!-- properties used to control Ant Eclipse for Eclipse classpath/project files etc -->
+  <property name="eclipse.updatealways" value="false"/>
+  <property name="eclipse.compilercompliance" value="5.0"/>
+  <property name="eclipse.container" value="JVM 1.5"/>
+
   <path id="cobertura.classpath">
     <fileset dir="${cobertura.dir}">
         <include name="cobertura.jar" />
@@ -71,6 +77,7 @@
   </path>
 
   <property name="maven.local.repo"      value="${build.scratch}/maven-local-repo"/>
+  <property name="maven.settings.xml"    value="${project.root}/maven-settings.xml"/>
   <property name="maven.unique.version"  value="false"/>
   <property name="maven.snapshot"        value="true"/>
   <condition property="maven.version.suffix" value="" else="-SNAPSHOT">
@@ -124,8 +131,6 @@
  	</sequential>
   </macrodef>
 
-
-
   <macrodef name="jython">
     <attribute name="path"/>
     <element name="args"/>
@@ -322,6 +327,20 @@
     results directory:
 
       ${build.results}
+
+  ant eclipse
+
+    Generates project and classpath files for the Eclispe IDE.  Requires that
+    the Ant Eclipse task (http://ant-eclipse.sourceforge.net/) has been installed
+    in $ANT_HOME/lib.
+
+    The following system properties will be passed to the task. These can be usefully
+    overridden from the command line.
+
+    eclipse.updatealways - forces Eclipse files to be regenerated even if they are newer then the build.xml (default ${eclipse.updatealways}).
+    eclipse.container - controls the Eclipse container (default ${eclipse.container}).
+    eclipse.compilercompliance" - controls the Eclipse compiler compliance (default ${eclipse.compilercompliance}).
+
     </echo>
   </target>