vmassol 2003/06/15 13:44:17
Modified: integration/eclipse/org.apache.cactus.eclipse.webapp
build.xml plugin.xml
Log:
- Reformatted to 2 chars (What do you think about having all our XML files formatted
with 2 chars)
- Exclude html files from the runtime jar
- Added support for unique plugin versions for dev builds so that users can use the
Eclipse update feature
Revision Changes Path
1.13 +240 -236
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 11 Jun 2003 14:15:10 -0000 1.12
+++ build.xml 15 Jun 2003 20:44:17 -0000 1.13
@@ -5,7 +5,7 @@
<!--
=============================================================================
- Build file for the Webapp Eclipse Integration.
+ Build file for the Webapp Eclipse plugin.
This script should be started with the following command line :
@@ -20,262 +20,266 @@
-->
<project name="Cactus Eclipse Webapp Plugin" default="dist" basedir="../../..">
- <!-- Base directory for all file related operations -->
- <property name="base.dir"
value="integration/eclipse/org.apache.cactus.eclipse.webapp"/>
+ <!-- Base directory for all file related operations -->
+ <property name="base.dir"
+ value="integration/eclipse/org.apache.cactus.eclipse.webapp"/>
+
+ <!-- Include properties and targets common to the different subprojects -->
+ &common;
+
+ <!-- Global project properties -->
+ <property name="project.name.text" value="Cactus Eclipse Webapp plugin"/>
+ <property name="project.name.file" value="cactus-integration-eclipse-webapp"/>
+
+ <!--
+ ========================================================================
+ Initialize source, target and dist properties
+ ========================================================================
+ -->
+ <target name="properties">
+
+ <!-- Version by which the plugin will be identified -->
+ <property name="project.version.plugin"
+ value="${project.version.release}.${DSTAMP}"/>
+
+ <!-- Set the properties related to the source tree -->
+ <property name="src.dir" value="${base.dir}/src"/>
+ <property name="src.java.dir" value="${src.dir}/java"/>
+
+ <!-- Set the properties related to the target area -->
+ <property name="target.classes.dir" value="${target.dir}/classes"/>
+
+ <!-- Set the properties related to the dist area -->
+ <property name="dist.bin.integration.dir"
+ value="${dist.bin.dir}/${project.name.file}"/>
+
+ <!-- Set the properties related to the jar names -->
+ <property name="cactus.webappintegration.jar.name" value="webapp.jar"/>
+
+ <property name="cactus.webappintegration.src.jar.name"
+ value="webappsrc.jar"/>
+
+ </target>
+
+ <!--
+ ========================================================================
+ Initialize the build. Must be called by all targets
+ ========================================================================
+ -->
+ <target name="init" depends="init.common, properties">
+
+ <echo>***** Needs Eclipse 2.1 or later *****</echo>
+ <echo/>
+ <echo>Dependencies:</echo>
+ <echo> eclipse.core.boot.jar = [${eclipse.core.boot.jar}]</echo>
+ <echo> eclipse.core.resources.jar = [${eclipse.core.resources.jar}]</echo>
+ <echo> eclipse.core.runtime.jar = [${eclipse.core.runtime.jar}]</echo>
+ <echo> eclipse.jdt.core.jar = [${eclipse.jdt.core.jar}]</echo>
+ <echo> eclipse.jdt.ui.jar = [${eclipse.jdt.ui.jar}]</echo>
+ <echo> eclipse.swt.jar = [${eclipse.swt.jar}]</echo>
+ <echo> eclipse.jface.jar = [${eclipse.jface.jar}]</echo>
+ <echo> eclipse.ui.workbench.jar = [${eclipse.ui.workbench.jar}]</echo>
+
+ <condition property="properties.ok">
+ <and>
+ <available file="${eclipse.core.boot.jar}"/>
+ <available file="${eclipse.core.resources.jar}"/>
+ <available file="${eclipse.core.runtime.jar}"/>
+ <available file="${eclipse.jdt.core.jar}"/>
+ <available file="${eclipse.jdt.ui.jar}"/>
+ <available file="${eclipse.swt.jar}"/>
+ <available file="${eclipse.jface.jar}"/>
+ <available file="${eclipse.ui.workbench.jar}"/>
+ </and>
+ </condition>
- <!-- Include properties and targets common to the different subprojects -->
- &common;
-
- <!-- Global project properties -->
- <property name="project.name.text" value="Cactus Eclipse Webapp Integration"/>
- <property name="project.name.file" value="cactus-integration-eclipse-webapp"/>
-
- <!--
- ========================================================================
- Initialize source, target and dist properties
- ========================================================================
- -->
- <target name="properties">
-
- <!-- Set the properties related to the source tree -->
- <property name="src.dir" value="${base.dir}/src"/>
- <property name="src.java.dir" value="${src.dir}/java"/>
- <property name="src.scripts.dir" value="${src.dir}/scripts"/>
-
- <!-- Set the properties related to the target area -->
- <property name="target.classes.dir" value="${target.dir}/classes"/>
-
- <!-- Set the properties related to the dist area -->
- <property name="dist.bin.integration.dir"
- value="${dist.bin.dir}/${project.name.file}"/>
-
- <!-- Set the properties related to the jar names -->
- <property name="cactus.webappintegration.jar.name"
- value="webapp.jar"/>
-
- <property name="cactus.webappintegration.src.jar.name"
- value="webappsrc.jar"/>
-
- </target>
-
- <!--
- ========================================================================
- Initialize the build. Must be called by all targets
- ========================================================================
- -->
- <target name="init" depends="init.common, properties">
-
- <echo>***** Needs Eclipse 2.1 or later *****</echo>
- <echo/>
- <echo>Dependencies:</echo>
- <echo> eclipse.core.boot.jar = [${eclipse.core.boot.jar}]</echo>
- <echo> eclipse.core.resources.jar = [${eclipse.core.resources.jar}]</echo>
- <echo> eclipse.core.runtime.jar = [${eclipse.core.runtime.jar}]</echo>
- <echo> eclipse.jdt.core.jar = [${eclipse.jdt.core.jar}]</echo>
- <echo> eclipse.jdt.ui.jar = [${eclipse.jdt.ui.jar}]</echo>
- <echo> eclipse.swt.jar = [${eclipse.swt.jar}]</echo>
- <echo> eclipse.jface.jar = [${eclipse.jface.jar}]</echo>
- <echo> eclipse.ui.workbench.jar = [${eclipse.ui.workbench.jar}]</echo>
-
- <condition property="properties.ok">
- <and>
- <available file="${eclipse.core.boot.jar}"/>
- <available file="${eclipse.core.resources.jar}"/>
- <available file="${eclipse.core.runtime.jar}"/>
- <available file="${eclipse.jdt.core.jar}"/>
- <available file="${eclipse.jdt.ui.jar}"/>
- <available file="${eclipse.swt.jar}"/>
- <available file="${eclipse.jface.jar}"/>
- <available file="${eclipse.ui.workbench.jar}"/>
- </and>
- </condition>
-
- <fail unless="properties.ok">One or more required dependancies could not
+ <fail unless="properties.ok">One or more required dependancies could not
be resolved. Please check you build.properties file, and run Ant with the
-verbose option for more details</fail>
- </target>
+ </target>
- <!--
- ========================================================================
- Compile the plugin
- ========================================================================
- -->
- <target name="compile" depends="init">
+ <!--
+ ========================================================================
+ Compile the plugin
+ ========================================================================
+ -->
+ <target name="compile" depends="init">
- <mkdir dir="${target.classes.dir}"/>
+ <mkdir dir="${target.classes.dir}"/>
- <javac destdir="${target.classes.dir}" deprecation="${deprecation}"
- optimize="${optimize}" debug="${debug}">
+ <javac destdir="${target.classes.dir}" deprecation="${deprecation}"
+ optimize="${optimize}" debug="${debug}">
- <src path="${src.java.dir}"/>
- <classpath>
- <pathelement location="${eclipse.core.boot.jar}"/>
- <pathelement location="${eclipse.core.resources.jar}"/>
- <pathelement location="${eclipse.core.runtime.jar}"/>
- <pathelement location="${eclipse.jdt.core.jar}"/>
- <pathelement location="${eclipse.jdt.ui.jar}"/>
- <pathelement location="${eclipse.swt.jar}"/>
- <pathelement location="${eclipse.jface.jar}"/>
- <pathelement location="${eclipse.ui.workbench.jar}"/>
+ <src path="${src.java.dir}"/>
+ <classpath>
+ <pathelement location="${eclipse.core.boot.jar}"/>
+ <pathelement location="${eclipse.core.resources.jar}"/>
+ <pathelement location="${eclipse.core.runtime.jar}"/>
+ <pathelement location="${eclipse.jdt.core.jar}"/>
+ <pathelement location="${eclipse.jdt.ui.jar}"/>
+ <pathelement location="${eclipse.swt.jar}"/>
+ <pathelement location="${eclipse.jface.jar}"/>
+ <pathelement location="${eclipse.ui.workbench.jar}"/>
- <!-- Needed for Gump -->
- <pathelement location="${java.class.path}"/>
+ <!-- Needed for Gump -->
+ <pathelement location="${java.class.path}"/>
- </classpath>
- </javac>
+ </classpath>
+ </javac>
- <copy todir="${target.classes.dir}">
- <fileset dir="${src.java.dir}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
+ <copy todir="${target.classes.dir}">
+ <fileset dir="${src.java.dir}">
+ <exclude name="**/*.java"/>
+ <exclude name="**/*.html"/>
+ </fileset>
+ </copy>
- </target>
+ </target>
- <!--
- ========================================================================
- Generate the jars
- ========================================================================
- -->
- <target name="jar" depends="compile" description="Generates the jars">
+ <!--
+ ========================================================================
+ Generate the jars
+ ========================================================================
+ -->
+ <target name="jar" depends="compile" description="Generates the jars">
- <mkdir dir="${target.dir}"/>
+ <mkdir dir="${target.dir}"/>
- <jar jarfile="${target.dir}/${cactus.webappintegration.jar.name}">
- <manifest>
- <section name="org/apache/cactus/eclipse/webapp/">
- <attribute name="Specification-Title"
- value="${project.name.text}"/>
- <attribute name="Specification-Version"
- value="${project.version}"/>
- <attribute name="Specification-Vendor"
- value="Apache Software Foundation"/>
- <attribute name="Implementation-Title"
- value="${project.name.file}"/>
- <attribute name="Implementation-Version"
- value="${project.version} ${TODAY}"/>
- <attribute name="Implementation-Vendor"
- value="Apache Software Foundation"/>
- </section>
- </manifest>
- <metainf dir=".">
- <include name="LICENSE.cactus"/>
- </metainf>
- <fileset dir="${target.classes.dir}"/>
- </jar>
+ <jar jarfile="${target.dir}/${cactus.webappintegration.jar.name}">
+ <manifest>
+ <section name="org/apache/cactus/eclipse/webapp/">
+ <attribute name="Specification-Title"
+ value="${project.name.text}"/>
+ <attribute name="Specification-Version"
+ value="${project.version}"/>
+ <attribute name="Specification-Vendor"
+ value="Apache Software Foundation"/>
+ <attribute name="Implementation-Title"
+ value="${project.name.file}"/>
+ <attribute name="Implementation-Version"
+ value="${project.version} ${TODAY}"/>
+ <attribute name="Implementation-Vendor"
+ value="Apache Software Foundation"/>
+ </section>
+ </manifest>
+ <metainf dir=".">
+ <include name="LICENSE.cactus"/>
+ </metainf>
+ <fileset dir="${target.classes.dir}"/>
+ </jar>
- <jar jarfile="${target.dir}/${cactus.webappintegration.src.jar.name}">
- <manifest>
- <section name="org/apache/cactus/eclipse/webapp/">
- <attribute name="Specification-Title"
- value="${project.name.text}"/>
- <attribute name="Specification-Version"
- value="${project.version}"/>
- <attribute name="Specification-Vendor"
- value="Apache Software Foundation"/>
- <attribute name="Implementation-Title"
- value="${project.name.file}"/>
- <attribute name="Implementation-Version"
- value="${project.version} ${TODAY}"/>
- <attribute name="Implementation-Vendor"
- value="Apache Software Foundation"/>
- </section>
- </manifest>
- <metainf dir=".">
- <include name="LICENSE.cactus"/>
- </metainf>
- <fileset dir="${src.java.dir}"/>
- </jar>
-
- </target>
-
- <!--
- ========================================================================
- Generate the distributables for this project, i.e the unzipped
- plugin structure.
- ========================================================================
- -->
- <target name="dist" depends="checkstyle,jar"
- description="Generate the distributable files">
+ <jar jarfile="${target.dir}/${cactus.webappintegration.src.jar.name}">
+ <manifest>
+ <section name="org/apache/cactus/eclipse/webapp/">
+ <attribute name="Specification-Title"
+ value="${project.name.text}"/>
+ <attribute name="Specification-Version"
+ value="${project.version}"/>
+ <attribute name="Specification-Vendor"
+ value="Apache Software Foundation"/>
+ <attribute name="Implementation-Title"
+ value="${project.name.file}"/>
+ <attribute name="Implementation-Version"
+ value="${project.version} ${TODAY}"/>
+ <attribute name="Implementation-Vendor"
+ value="Apache Software Foundation"/>
+ </section>
+ </manifest>
+ <metainf dir=".">
+ <include name="LICENSE.cactus"/>
+ </metainf>
+ <fileset dir="${src.java.dir}"/>
+ </jar>
+
+ </target>
+
+ <!--
+ ========================================================================
+ Generate the distributables for this project, i.e the unzipped
+ plugin structure.
+ ========================================================================
+ -->
+ <target name="dist" depends="checkstyle,jar"
+ description="Generate the distributable files">
- <mkdir dir="${dist.bin.integration.dir}"/>
+ <mkdir dir="${dist.bin.integration.dir}"/>
- <copy todir="${dist.bin.integration.dir}"
- file="${target.dir}/${cactus.webappintegration.jar.name}"/>
- <copy todir="${dist.bin.integration.dir}"
- file="${target.dir}/${cactus.webappintegration.src.jar.name}"/>
+ <copy todir="${dist.bin.integration.dir}"
+ file="${target.dir}/${cactus.webappintegration.jar.name}"/>
+ <copy todir="${dist.bin.integration.dir}"
+ file="${target.dir}/${cactus.webappintegration.src.jar.name}"/>
- <copy todir="${dist.bin.integration.dir}"
file="${base.dir}/plugin.xml"/>
- <copy todir="${dist.bin.integration.dir}"
- file="${base.dir}/plugin.properties"/>
-
- <copy todir="${dist.bin.integration.dir}">
- <fileset dir=".">
- <include name="LICENSE.cactus"/>
- </fileset>
- </copy>
-
- </target>
-
- <!--
- ========================================================================
- Perform a code audit using CheckStyle. Only performs the audit if
- the checkstyle jar is in the Ant classpasth.
- ========================================================================
- -->
- <target name="checkstyle" depends="init,init.checkstyle"
- if="checkstyle.available"
- description="Perform a code audit using Checkstyle">
-
- <mkdir dir="${target.dir}"/>
-
- <checkstyle config="./checkstyle.xml" failOnViolation="true">
-
- <fileset dir="${src.java.dir}">
- <include name="**/*.java"/>
- </fileset>
-
- <formatter type="plain"/>
- <formatter type="xml"
- toFile="${target.dir}/checkstyle_results.xml"/>
-
- <property key="checkstyle.header.file" file="./LICENSE.cactus"/>
-
- </checkstyle>
-
- </target>
-
- <!--
- ========================================================================
- Generate the release
- ========================================================================
- -->
- <target name="release" depends="clean,dist"
- description="Generate the release files">
-
- <mkdir dir="${release.dir}"/>
-
- <zip destfile="${release.dir}/${main.release.name}.zip">
- <zipfileset dir="${dist.bin.integration.dir}"
-
prefix="org.apache.cactus.integration.eclipse.webapp_${project.version}">
- </zipfileset>
- </zip>
+ <copy todir="${dist.bin.integration.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">"/>
+ </filterset>
+ </copy>
+
+ <copy todir="${dist.bin.integration.dir}"
+ file="${base.dir}/plugin.properties"/>
+
+ <copy todir="${dist.bin.integration.dir}" file="LICENSE.cactus"/>
+
+ </target>
+
+ <!--
+ ========================================================================
+ Perform a code audit using CheckStyle. Only performs the audit if
+ the checkstyle jar is in the Ant classpasth.
+ ========================================================================
+ -->
+ <target name="checkstyle" depends="init,init.checkstyle"
+ if="checkstyle.available"
+ description="Perform a code audit using Checkstyle">
+
+ <mkdir dir="${target.dir}"/>
+
+ <checkstyle config="./checkstyle.xml" failOnViolation="true">
+ <fileset dir="${src.java.dir}">
+ <include name="**/*.java"/>
+ </fileset>
+ <formatter type="plain"/>
+ <formatter type="xml" toFile="${target.dir}/checkstyle_results.xml"/>
+ <property key="checkstyle.header.file" file="./LICENSE.cactus"/>
+ </checkstyle>
+
+ </target>
+
+ <!--
+ ========================================================================
+ Generate the release
+ ========================================================================
+ -->
+ <target name="release" depends="clean,dist"
+ description="Generate the release files">
+
+ <mkdir dir="${release.dir}"/>
+
+ <zip destfile="${release.dir}/${main.release.name}.zip">
+ <zipfileset dir="${dist.bin.integration.dir}"
+ prefix="org.apache.cactus.integration.eclipse.webapp_${project.version}">
+ </zipfileset>
+ </zip>
- </target>
+ </target>
- <!--
- ========================================================================
- Clean generated files (including distributables)
- ========================================================================
- -->
- <target name="clean" depends="init.display,init.properties"
- description="Clean all generated files">
-
- <delete dir="${target.dir}"/>
- <delete dir="${dist.dir}"/>
- <delete dir="${release.dir}"/>
+ <!--
+ ========================================================================
+ Clean generated files (including distributables)
+ ========================================================================
+ -->
+ <target name="clean" depends="init.display,init.properties"
+ description="Clean all generated files">
+
+ <delete dir="${target.dir}"/>
+ <delete dir="${dist.dir}"/>
+ <delete dir="${release.dir}"/>
- </target>
+ </target>
</project>
1.7 +3 -0
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.xml 11 Jun 2003 14:48:38 -0000 1.6
+++ plugin.xml 15 Jun 2003 20:44:17 -0000 1.7
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
+<[EMAIL PROTECTED]@-->
<plugin
id="org.apache.cactus.eclipse.webapp"
name="%pluginName"
version="1.5.0"
provider-name="%providerName"
class="org.apache.cactus.eclipse.webapp.internal.ui.WebappPlugin">
+<[EMAIL PROTECTED]@-->
+<[EMAIL PROTECTED]@-->
<runtime>
<library name="webapp.jar">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
