cmlenz 2003/06/30 08:05:29
Modified: integration/eclipse/org.apache.cactus.eclipse.webapp
build.xml plugin.xml
integration/eclipse/org.apache.cactus.eclipse.runner
build.xml plugin.xml
Log:
Set the plugin version numbers by replacing the static string 0.0.0 in the plugin
descriptor with the actual version.
Revision Changes Path
1.15 +6 -7
jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 30 Jun 2003 14:11:15 -0000 1.14
+++ build.xml 30 Jun 2003 15:05:29 -0000 1.15
@@ -182,13 +182,12 @@
<fileset file="${base.dir}/plugin.properties"/>
<fileset file="${basedir}/LICENSE.cactus"/>
</copy>
- <copy todir="${dist.bin.dir}"
- file="${base.dir}/plugin.xml" filtering="on">
- <filterset begintoken="<!--@" endtoken="@-->">
- <filter token="cactus.begin" value="<!--"/>
- <filter token="cactus.end" value="-->"/>
- <filter token="cactus.replace"
- value="<plugin id="org.apache.cactus.eclipse.webapp"
name="%pluginName" version="${project.version.plugin}"
provider-name="%providerName"
class="org.apache.cactus.eclipse.webapp.internal.ui.WebappPlugin">"/>
+ <!-- Eclipse requires the version specified in the plugin descriptor to be
+ a legal version in the format major.minor.service, so we set it to
+ 0.0.0 and replace that with the actual plugin version here -->
+ <copy todir="${dist.bin.dir}" file="${base.dir}/plugin.xml">
+ <filterset begintoken='"' endtoken='"'>
+ <filter token='0.0.0' value='"${project.version.plugin}"'/>
</filterset>
</copy>
1.8 +1 -4
jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/plugin.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.xml 15 Jun 2003 20:44:17 -0000 1.7
+++ plugin.xml 30 Jun 2003 15:05:29 -0000 1.8
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<[EMAIL PROTECTED]@-->
<plugin
id="org.apache.cactus.eclipse.webapp"
name="%pluginName"
- version="1.5.0"
+ version="0.0.0"
provider-name="%providerName"
class="org.apache.cactus.eclipse.webapp.internal.ui.WebappPlugin">
-<[EMAIL PROTECTED]@-->
-<[EMAIL PROTECTED]@-->
<runtime>
<library name="webapp.jar">
1.27 +8 -1
jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 30 Jun 2003 14:10:33 -0000 1.26
+++ build.xml 30 Jun 2003 15:05:29 -0000 1.27
@@ -247,10 +247,17 @@
<fileset dir="${basedir}" includes="LICENSE.*"/>
<fileset dir="${base.dir}">
<include name="plugin.properties"/>
- <include name="plugin.xml"/>
<include name="README.txt"/>
<include name="icons/*.*"/>
</fileset>
+ </copy>
+ <!-- Eclipse requires the version specified in the plugin descriptor to
+ be a legal version in the format major.minor.service, so we set it
+ to 0.0.0 and replace that with the actual plugin version here -->
+ <copy todir="${dist.bin.dir}" file="${base.dir}/plugin.xml">
+ <filterset begintoken='"' endtoken='"'>
+ <filter token='0.0.0' value='"${project.version.plugin}"'/>
+ </filterset>
</copy>
<!-- Copy the configuration files -->
1.6 +1 -1
jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/plugin.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.xml 29 Apr 2003 10:43:39 -0000 1.5
+++ plugin.xml 30 Jun 2003 15:05:29 -0000 1.6
@@ -2,7 +2,7 @@
<plugin
id="org.apache.cactus.eclipse.runner"
name="%pluginName"
- version="1.5.0"
+ version="0.0.0"
provider-name="%providerName"
class="org.apache.cactus.eclipse.runner.ui.CactusPlugin">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]