Return-Path: 
 <axis-cvs-return-15069-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 80844 invoked from network); 8 May 2006 10:36:13 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 8 May 2006 10:36:11 -0000
Received: (qmail 98455 invoked by uid 500); 8 May 2006 10:36:08 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 98267 invoked by uid 500); 8 May 2006 10:36:06 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:axis-cvs@ws.apache.org>
List-Id: <axis-cvs.ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 98256 invoked by uid 500); 8 May 2006 10:36:06 -0000
Delivered-To: apmail-ws-axis2-cvs@ws.apache.org
Received: (qmail 98253 invoked by uid 99); 8 May 2006 10:36:06 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 May 2006 03:36:06 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 08 May 2006 03:36:05 -0700
Received: (qmail 80717 invoked by uid 65534); 8 May 2006 10:35:44 -0000
Message-ID: <20060508103544.80715.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r405006 - in /webservices/axis2/trunk/java:
 etc/project.properties maven.xml
Date: Mon, 08 May 2006 10:35:44 -0000
To: axis2-cvs@ws.apache.org
From: dims@apache.org
X-Mailer: svnmailer-1.0.8
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: dims
Date: Mon May  8 03:35:40 2006
New Revision: 405006

URL: http://svn.apache.org/viewcvs?rev=405006&view=rev
Log:
Fix for   AXIS2-689 - Conditional build support for modules based on JDK version

Modified:
    webservices/axis2/trunk/java/etc/project.properties
    webservices/axis2/trunk/java/maven.xml

Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=405006&r1=405005&r2=405006&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Mon May  8 03:35:40 2006
@@ -64,10 +64,12 @@
 modules/integration/project.xml,\
 modules/saaj/project.xml,\
 modules/jibx/project.xml,\
-# modules/jaxbri/project.xml,\
 ${optional.includes}
 
 #maven.multiproject.excludes=modules/tool/project.xml
+
+maven.multiproject.includes.requiresJDK15=\
+modules/jaxbri/project.xml
 
 # -------------------------------------------------------------------
 #                JUnit

Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/maven.xml?rev=405006&r1=405005&r2=405006&view=diff
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Mon May  8 03:35:40 2006
@@ -57,6 +57,17 @@
         <format property="release_date" pattern="MMMM d, yyyy" locale="en"/>
     </tstamp>
 
+    <!-- Test for JDK 1.5 to determine whether to include modules that require it -->
+    <j:set var="java.specification.version" value="${systemScope.getProperty('java.specification.version')}"/>
+    <j:if test="${java.specification.version == '1.5'}">
+        <ant:echo>
+            JDK 1.5.x detected, including the following modules:
+             ${maven.multiproject.includes.requiresJDK15}
+        </ant:echo>
+        <j:set var="maven.multiproject.includes"
+            value="${maven.multiproject.includes},${maven.multiproject.includes.requiresJDK15}"/>
+    </j:if>
+
     <j:set var="modules" value="*"/>
 
     <preGoal name="modules:reactor:init">
@@ -157,6 +168,7 @@
             <j:set var="directory"
                    value="${file.parentFile.parentFile.name}/${file.parentFile.name}"/>
             <j:set var="filename" value="${directory}/${file.name}"/>
+            <ant:echo>Adding to modules.reactor.includes: ${filename}</ant:echo>
             <j:choose>
                 <j:when test="${context.getVariable('modules.reactor.includes') == null}">
                     <j:set var="modules.directories" value="${directory}"/>