Return-Path: 
 <commits-return-31479-apmail-tuscany-commits-archive=tuscany.apache.org@tuscany.apache.org>
Delivered-To: apmail-tuscany-commits-archive@www.apache.org
Received: (qmail 96463 invoked from network); 3 Nov 2010 20:17:07 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 3 Nov 2010 20:17:07 -0000
Received: (qmail 56848 invoked by uid 500); 3 Nov 2010 20:17:38 -0000
Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org
Received: (qmail 56797 invoked by uid 500); 3 Nov 2010 20:17:37 -0000
Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@tuscany.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@tuscany.apache.org>
List-Post: <mailto:commits@tuscany.apache.org>
List-Id: <commits.tuscany.apache.org>
Reply-To: dev@tuscany.apache.org
Delivered-To: mailing list commits@tuscany.apache.org
Received: (qmail 56790 invoked by uid 99); 3 Nov 2010 20:17:37 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Nov 2010 20:17:37 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Nov 2010 20:17:36 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 30A4F23889DE; Wed,  3 Nov 2010 20:16:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1030643 - in
 /tuscany/sca-java-1.x/branches/sca-java-1.6.1:
 distribution/src/main/release/CHANGES itest/wsdlgen/pom.xml
Date: Wed, 03 Nov 2010 20:16:23 -0000
To: commits@tuscany.apache.org
From: nash@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101103201623.30A4F23889DE@eris.apache.org>

Author: nash
Date: Wed Nov  3 20:16:22 2010
New Revision: 1030643

URL: http://svn.apache.org/viewvc?rev=1030643&view=rev
Log:
TUSCANY-3765: Ensure all classes produced by the build are compatible with JDK 5

Modified:
    tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/release/CHANGES
    tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml

Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/release/CHANGES
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/release/CHANGES?rev=1030643&r1=1030642&r2=1030643&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/release/CHANGES (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/release/CHANGES Wed Nov  3 20:16:22 2010
@@ -2,6 +2,7 @@ Changes With Apache Tuscany SCA 1.6.1 No
 ===================================================
 
 Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):
+TUSCANY-3765 itest/wsdlgen creates classes that don't run on JDK 5
 TUSCANY-3764 Some LICENSE/NOTICE files in individual module jars aren't consistent with the LICENSE/NOTICE files in the binary distribution
 TUSCANY-3762 Tuscany SCA Eclipse plugin doesn't install correctly
 TUSCANY-3761 Using node-launcher to launch the domain manager doesn't work

Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml?rev=1030643&r1=1030642&r2=1030643&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml Wed Nov  3 20:16:22 2010
@@ -206,8 +206,74 @@
                     <sei>helloworld.HelloWorldImpl</sei>
                     <genWsdl>true</genWsdl>           
                     <keep>true</keep>
+                    <!-- TUSCANY-3765: avoid using class files that run only on JDK 6 -->
+                    <destDir>${basedir}/target/unused-wsgen-classes</destDir>
+                    <sourceDestDir>${basedir}/target/jaxws-source</sourceDestDir>
                 </configuration>
-            </plugin>           
+            </plugin>
+            <!-- TUSCANY-3765: produce JDK 5-compatible JAX-WS class files -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${basedir}/target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- TUSCANY-3765: copy JDK 5-compatible JAX-WS class files to the correct location -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-jaxws-classes</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/classes/helloworld</outputDirectory>
+                            <resources>          
+                                <resource>
+                                    <directory>${basedir}/target/test-classes/helloworld</directory>
+                                    <includes>
+                                        <include>jaxws/**</include>
+                                    </includes>
+                                </resource>
+                            </resources>              
+                        </configuration>            
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- TUSCANY-3765: delete directories containing unused class files -->
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>cleanup-jaxws-classes</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <delete dir="${basedir}/target/unused-wsgen-classes" includeemptydirs="true"/>
+                                <delete dir="${basedir}/target/test-classes/helloworld/jaxws" includeemptydirs="true"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>