You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2006/05/08 12:35:44 UTC
svn commit: r405006 - in /webservices/axis2/trunk/java:
etc/project.properties maven.xml
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}"/>
Re: svn commit: r405006 - in /webservices/axis2/trunk/java: etc/project.properties maven.xml
Posted by Davanum Srinivas <da...@gmail.com>.
+1 Please go ahead and update it.
thanks,
dims
On 5/8/06, Dennis Sosnoski <dm...@sosnoski.com> wrote:
> Not to nitpick, but shouldn't that test be something like
> java.specification.version >= '1.5'? I don't know if that's legal
> Groovy, but people are already experimenting with 1.6 betas so we should
> probably support them.
>
> - Dennis
>
> dims@apache.org wrote:
>
> >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}"/>
> >
> >
> >
> >
>
--
Davanum Srinivas : http://wso2.com/blogs/
Re: svn commit: r405006 - in /webservices/axis2/trunk/java: etc/project.properties maven.xml
Posted by Davanum Srinivas <da...@gmail.com>.
+1 Please go ahead and update it.
thanks,
dims
On 5/8/06, Dennis Sosnoski <dm...@sosnoski.com> wrote:
> Not to nitpick, but shouldn't that test be something like
> java.specification.version >= '1.5'? I don't know if that's legal
> Groovy, but people are already experimenting with 1.6 betas so we should
> probably support them.
>
> - Dennis
>
> dims@apache.org wrote:
>
> >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}"/>
> >
> >
> >
> >
>
--
Davanum Srinivas : http://wso2.com/blogs/