(Path Qpid-337 submitted by Rupert Smith)

Does 1.4 retrotranslation as part of the maven build.

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

4 files changed, 190 insertions, 42 deletions

diff --git a/java/client/distribution/pom.xml b/java/client/distribution/pom.xml
index dfbe8b83c2..3e9c0e493f 100644
--- a/java/client/distribution/pom.xml
+++ b/java/client/distribution/pom.xml
@@ -46,6 +46,21 @@
             <groupId>org.apache.qpid</groupId>
             <artifactId>qpid-client</artifactId>
             <type>jar</type>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.qpid</groupId>
+            <artifactId>qpid-client</artifactId>
+            <type>jar</type>
+            <version>${pom.version}</version>
+	    <classifier>java1.4</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.qpid</groupId>
+            <artifactId>qpid-common</artifactId>
+            <type>jar</type>
+            <version>${pom.version}</version>
+	    <classifier>java1.4</classifier>
         </dependency>
     </dependencies>
 
@@ -104,6 +119,7 @@
                         <configuration>
                             <descriptors>
                                 <descriptor>src/main/assembly/client-bin.xml</descriptor>
+                                <descriptor>src/main/assembly/client-java1.4-bin.xml</descriptor>
                                 <descriptor>src/main/assembly/client-src.xml</descriptor>
                             </descriptors>
                             <finalName>qpid-${pom.version}</finalName>
diff --git a/java/client/distribution/src/main/assembly/client-bin.xml b/java/client/distribution/src/main/assembly/client-bin.xml
index 962f084995..0bea282f73 100644
--- a/java/client/distribution/src/main/assembly/client-bin.xml
+++ b/java/client/distribution/src/main/assembly/client-bin.xml
@@ -69,6 +69,8 @@
           <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
           <unpack>false</unpack>
           <excludes>
+             <exclude>org.apache.qpid:qpid-client:jar:java1.4</exclude>
+             <exclude>org.apache.qpid:qpid-common:jar:java1.4</exclude>
              <exclude>org.apache.qpid:qpid-client-distribution</exclude>
           </excludes>
       </dependencySet>
diff --git a/java/client/distribution/src/main/assembly/client-java1.4-bin.xml b/java/client/distribution/src/main/assembly/client-java1.4-bin.xml
new file mode 100644
index 0000000000..6a2dd17c5c
--- /dev/null
+++ b/java/client/distribution/src/main/assembly/client-java1.4-bin.xml
@@ -0,0 +1,74 @@
+<?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.

+-->

+<!-- Assembly instructions for a client that runs on Java 1.4 -->

+<assembly>

+  <id>java-client-java1.4-bin</id>

+  <includeBaseDirectory>false</includeBaseDirectory>

+  <formats>

+    <format>tar.gz</format>

+    <format>zip</format>

+  </formats>

+

+  <fileSets>

+      <fileSet>

+          <!-- Apache license files -->

+          <directory>../../resources</directory>

+          <outputDirectory>qpid-${qpid.version}</outputDirectory>

+          <includes>

+              <include>DISCLAIMER</include>

+              <include>LICENSE.txt</include>

+              <include>NOTICE.txt</include>

+              <include>README.txt</include>

+          </includes>

+      </fileSet>

+

+      <fileSet>

+          <directory>../../release-docs</directory>

+          <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>

+          <includes>

+              <include>RELEASE_NOTES.txt</include>

+          </includes>

+      </fileSet>

+

+      <fileSet>

+          <directory>target</directory>

+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>

+          <includes>

+              <include>qpid-incubating.jar</include>

+          </includes>

+      </fileSet>

+  </fileSets>

+

+  <dependencySets>

+      <dependencySet>

+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>

+          <unpack>false</unpack>

+          <excludes>

+             <exclude>org.apache.qpid:qpid-client:jar</exclude>

+             <exclude>org.apache.qpid:qpid-common:jar</exclude>

+             <exclude>org.apache.qpid:qpid-client-distribution</exclude>

+             <exclude>org.apache.mina:mina-java5</exclude>

+             <exclude>org.apache.mina:mina-filter-ssl</exclude>

+          </excludes>

+      </dependencySet>

+  </dependencySets>

+</assembly>

+

+

diff --git a/java/client/pom.xml b/java/client/pom.xml
index 854428fb39..303aa108c6 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -38,6 +38,11 @@
         <java.source.version>1.5</java.source.version>
         <qpid.version>${pom.version}</qpid.version>
         <qpid.targetDir>${project.build.directory}</qpid.targetDir>
+
+	<!-- Override these in local settings.xml to perform verification. Cannot make assumptions about 1.4 Jdk location to turn this on by default. -->
+	<retrotranslator.verify>false</retrotranslator.verify>
+	<retrotranslator.1.4-rt-path/>
+
     </properties>
 
     <dependencies>
@@ -67,7 +72,7 @@
             <artifactId>mina-filter-ssl</artifactId>
         </dependency>
 
-	<!-- Test Dependencies -->
+        <!-- Test Dependencies -->
         <dependency> <!-- for inVm Broker -->
             <groupId>org.apache.qpid</groupId>
             <artifactId>qpid-broker</artifactId>
@@ -98,6 +103,14 @@
             <artifactId>easymockclassextension</artifactId>
             <scope>test</scope>
         </dependency>
+
+	<!-- This needs to be included at compile time, for the retrotranslator verification to find it. -->
+	<dependency>
+	    <groupId>net.sf.retrotranslator</groupId>
+	    <artifactId>retrotranslator-runtime</artifactId>
+	    <scope>provided</scope>
+	</dependency>
+
     </dependencies>
 
     <build>
@@ -141,48 +154,91 @@
                 </executions>
             </plugin>
 
-        </plugins>
+            <!-- Backports the module to Java 1.4. This is done during the packaging phase as a transformation of the Jar. -->
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>retrotranslator-maven-plugin</artifactId>
+               <executions>
+                   <execution>
+                       <phase>package</phase>
+                       <goals>
+                           <goal>translate</goal>
+                       </goals>
+                       <configuration>
+                           <destjar>${project.build.directory}/${project.build.finalName}-java1.4.jar</destjar>
+			   <verify>${retrotranslator.verify}</verify>
+			   <verifyClasspath>
+			       <element>${retrotranslator.1.4-rt-path}</element>
+			       <element>${retrotranslator.1.4-jce-path}</element>
+			       <element>${retrotranslator.1.4-jsse-path}</element>
+			   </verifyClasspath>
+                           <includes>
+                               <include>
+                                   <directory>${project.build.directory}</directory>
+                                   <pattern>${project.build.finalName}.jar</pattern>
+                               </include>
+                           </includes>
+                       </configuration>
+                   </execution>
+
+               </executions>
+            </plugin>
+	    
+	    <!-- This identifies the backported java 1.4 jar and attaches it as a jar (classified as java1.4) build artifact. -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/${project.build.finalName}-java1.4.jar</file>
+                                    <type>jar</type>
+                                    <classifier>java1.4</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
-<!-- The inclusion of this resource causes the build to hang. -->
-    <!--resources>
-        <resource>
-            <targetPath>META-INF/</targetPath>
-            <filtering>false</filtering>
-            <directory>../resources/META-INF</directory>
-            <includes>
-                <include>**</include>
-            </includes>
-        </resource>
-    </resources-->
-
-    <testResources>
-        <testResource>
-            <targetPath>META-INF/</targetPath>
-            <filtering>false</filtering>
-            <directory>../resources/META-INF</directory>
-            <includes>
-                <include>**</include>
-            </includes>
-        </testResource>
-        <testResource>
-            <targetPath>src/</targetPath>
-            <filtering>false</filtering>
-            <directory>src/test/java</directory>
-            <includes>
-                <include>**/*.java</include>
-            </includes>
-        </testResource>
-
-        <testResource>
-            <targetPath></targetPath>
-            <filtering>false</filtering>
-            <directory>src/main/java</directory>
-            <includes>
-                <include>client.log4j</include>
-            </includes>
-        </testResource>
-    </testResources>
+        </plugins>
 
+        <testResources>
+            <testResource>
+                <targetPath>META-INF/</targetPath>
+                <filtering>false</filtering>
+                <directory>../resources/META-INF</directory>
+                <includes>
+                    <include>**</include>
+                </includes>
+            </testResource>
+            <testResource>
+                <targetPath>src/</targetPath>
+                <filtering>false</filtering>
+                <directory>src/test/java</directory>
+                <includes>
+                    <include>**/*.java</include>
+                </includes>
+            </testResource>
+    
+            <testResource>
+                <targetPath></targetPath>
+                <filtering>false</filtering>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>client.log4j</include>
+                </includes>
+            </testResource>
+        </testResources>
+    
     </build>
-
+    
 </project>
+    
\ No newline at end of file