You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2004/06/01 23:42:19 UTC
cvs commit: jakarta-jetspeed/plugin plugin.jelly
taylor 2004/06/01 14:42:19
Modified: plugin plugin.jelly
Log:
added space to valid delimiters ", " on merge properties
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.13 +4 -4 jakarta-jetspeed/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/plugin/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 28 May 2004 23:36:51 -0000 1.12
+++ plugin.jelly 1 Jun 2004 21:42:19 -0000 1.13
@@ -137,7 +137,7 @@
<!-- set proper environment property files -->
<echo>Targeting ${maven.env.name} environment ...</echo>
<j:set var="props.dir" value="${maven.war.src}/WEB-INF/conf"/>
- <u:tokenize var="merge.prop.files" delim=",">${maven.merge.properties}</u:tokenize>
+ <u:tokenize var="merge.prop.files" delim=", ">${maven.merge.properties}</u:tokenize>
<j:forEach items="${merge.prop.files}" var="prop.file">
<j:if test="${maven.jetspeed.debug == 'true'}">
<echo>[DEBUG] Merging ${prop.file}</echo>
@@ -152,7 +152,7 @@
</j:forEach>
<!-- environment specific local registries -->
<j:if test="${maven.env.name == null}">
- <u:tokenize var="local.xreg.files" delim=",">${maven.copy.env.xreg}</u:tokenize>
+ <u:tokenize var="local.xreg.files" delim=", ">${maven.copy.env.xreg}</u:tokenize>
<j:forEach items="${local.xreg.files}" var="xreg.file">
<j:if test="${maven.jetspeed.debug == 'true'}">
<echo>[DEBUG] Copying local-${xreg.file} for ${maven.env.name}</echo>
@@ -347,7 +347,7 @@
<filter token="PACKAGE" value="${maven.jetspeed.genapp.template.package}"/>
<!-- split the list of dirs that need repackaged -->
- <u:tokenize var="maven.jetspeed.genapp.repackage.split" delim=",">${maven.jetspeed.genapp.repackage}</u:tokenize>
+ <u:tokenize var="maven.jetspeed.genapp.repackage.split" delim=", ">${maven.jetspeed.genapp.repackage}</u:tokenize>
<!-- copy resources that need repackaged, eg java files -->
<j:forEach var="res" items="${maven.jetspeed.genapp.repackage.split}">
@@ -357,7 +357,7 @@
</ant:copy>
</j:forEach>
- <u:tokenize var="maven.jetspeed.genapp.properties.split" delim=",">${maven.jetspeed.genapp.properties}</u:tokenize>
+ <u:tokenize var="maven.jetspeed.genapp.properties.split" delim=", ">${maven.jetspeed.genapp.properties}</u:tokenize>
<!-- copy resources that need repackaged, eg java files -->
<j:forEach var="res" items="${maven.jetspeed.genapp.properties.split}">
<ant:copy todir="${basedir}/src/${res}"
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org