335988 Updates to fix the build with the latest version of virgo-build
diff --git a/.gitignore b/.gitignore
index 5f193ca..3b84b50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
target
integration-repo
ivy-cache
diff --git a/build-formtags/build.xml b/build-formtags/build.xml
index ee966dd..73cf235 100644
--- a/build-formtags/build.xml
+++ b/build-formtags/build.xml
@@ -4,7 +4,10 @@
<path id="bundles">
<pathelement location="${basedir}/../war/formtags-war" />
<pathelement location="${basedir}/../shared-libs/formtags-shared-libs"/>
- <pathelement location="${basedir}/../shared-services/build-shared-services" />
+
+ <pathelement location="${basedir}/../shared-services/formtags-shared-services-service"/>
+ <pathelement location="${basedir}/../shared-services/formtags-shared-services-war"/>
+
<pathelement location="${basedir}/../par/org.springframework.showcase.formtags"/>
</path>
diff --git a/shared-services/README.TXT b/shared-services/README.TXT
index 9d26fc2..22e783f 100644
--- a/shared-services/README.TXT
+++ b/shared-services/README.TXT
@@ -18,7 +18,6 @@
PROJECTS
- - build-shared-services: the build directory for the application
- formtags-shared-services-service: the service bundle
- formtags-shared-services-war: the WAR
diff --git a/shared-services/build-shared-services/build.xml b/shared-services/build-shared-services/build.xml
deleted file mode 100644
index ffb0918..0000000
--- a/shared-services/build-shared-services/build.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="build-shared-services" default="precommit">
-
- <path id="bundles">
- <pathelement location="${basedir}/../formtags-shared-services-service"/>
- <pathelement location="${basedir}/../formtags-shared-services-war"/>
- </path>
-
- <property file="${basedir}/../../build.properties"/>
- <import file="${basedir}/../../virgo-build/multi-bundle/default.xml"/>
-
- <target name="precommit" depends="clean, clean-integration, jar"/>
-
-</project>
diff --git a/war/formtags-war/build.properties b/war/formtags-war/build.properties
deleted file mode 100644
index 8dfb276..0000000
--- a/war/formtags-war/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-target.dir=${basedir}/target
-artifacts.dir=${target.dir}/artifacts
-war.output.file=${war.output.dir}/${ant.project.name}.war
-war.output.dir=${artifacts.dir}
-source-jar.output.file=${source-jar.output.dir}/${ant.project.name}-sources.jar
-source-jar.output.dir=${artifacts.dir}
-war.staging.dir=${target.dir}/war-expanded
-main.webapp.dir=${basedir}/src/main/webapp
-main.java.dir=${basedir}/src/main/java
-war.classes.dir=${war.staging.dir}/WEB-INF/classes
-main.resources.dir=${basedir}/src/main/resources
-compile.debug=true
-compile.debug.level=lines,vars,source
-package.dist.dir=${package.output.dir}/dist
-package.war.output.file=${ant.project.name}-${bundle.version}.war
-bundle.version=${version}.${build.stamp}
-build.stamp=BUILD-${timestamp}
\ No newline at end of file
diff --git a/war/formtags-war/build.xml b/war/formtags-war/build.xml
index 2a369af..582765a 100644
--- a/war/formtags-war/build.xml
+++ b/war/formtags-war/build.xml
@@ -3,80 +3,8 @@
<property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
- <property file="${basedir}/build.properties"/>
+ <import file="${basedir}/../../build-formtags/package-bundle.xml" />
-
- <import file="${basedir}/../../virgo-build/common/common.xml"/>
+ <import file="${basedir}/../../virgo-build/war/default.xml"/>
- <tstamp>
- <format property="timestamp" pattern="yyyyMMddHHmmss" timezone="GMT"/>
- </tstamp>
-
- <target name="clean"
- description="Removes the target directory.">
- <delete quiet="true" dir="${target.dir}"/>
- </target>
-
- <target name="clean-integration"
- description="Removes the integration repository directory.">
- <fail message="The 'integration.repo.dir' property must be set on this project.">
- <condition>
- <not>
- <isset property="integration.repo.dir"/>
- </not>
- </condition>
- </fail>
- <delete quiet="true" dir="${integration.repo.dir}"/>
- </target>
-
- <target name="jar"
- description="Creates a WAR file containing the output of a compilation of the source tree.">
- <delete quiet="true" file="${war.output.file}"/>
- <mkdir dir="${war.output.dir}"/>
- <delete quiet="true" file="${source-jar.output.file}"/>
- <mkdir dir="${source-jar.output.dir}"/>
-
- <copy todir="${war.staging.dir}">
- <fileset dir="${main.webapp.dir}"/>
- </copy>
-
- <path id="compile.classpath">
- <fileset dir="${main.webapp.dir}/WEB-INF/lib"/>
- </path>
-
- <delete quiet="true" dir="${war.classes.dir}"/>
- <mkdir dir="${war.classes.dir}"/>
- <javac destdir="${war.classes.dir}" source="${source.version}" target="${target.version}"
- debug="${compile.debug}" debugLevel="${compile.debug.level}">
- <src path="${main.java.dir}"/>
- <include name="**/*.java"/>
- <include name="*.java"/>
- <classpath refid="compile.classpath"/>
- </javac>
- <copy todir="${war.classes.dir}">
- <fileset dir="${main.java.dir}">
- <exclude name="**/*.java"/>
- <exclude name="*.java"/>
- </fileset>
- </copy>
- <copy todir="${war.classes.dir}">
- <fileset dir="${main.resources.dir}"/>
- </copy>
-
- <jar destfile="${war.output.file}" basedir="${war.staging.dir}" index="true" filesetmanifest="merge"/>
- <jar destfile="${source-jar.output.file}" basedir="${main.java.dir}" index="true"/>
- </target>
-
- <target name="package">
- <mkdir dir="${package.dist.dir}"/>
- <copy file="${war.output.file}" tofile="${package.dist.dir}/${package.war.output.file}"/>
- </target>
-
- <target name="report" description="Does nothing."/>
-
- <target name="test.do" description="Does nothing."/>
-
- <target name="clover.do" description="Does nothing."/>
-
- <target name="findbugs.do" description="Does nothing."/>
</project>
diff --git a/war/formtags-war/ivy.xml b/war/formtags-war/ivy.xml
new file mode 100644
index 0000000..9a9fc87
--- /dev/null
+++ b/war/formtags-war/ivy.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+ version="1.3">
+
+ <info organisation="org.eclipse.virgo.samples" module="${ant.project.name}" />
+
+ <configurations>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <artifact name="${ant.project.name}" ext="war"/>
+ <artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+ </publications>
+
+ <dependencies>
+ <dependency org="org.springframework" name="org.springframework.spring-library" rev="${org.springframework.spring}" conf="provided->compile"/>
+ <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
+ <dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="provided->compile"/>
+ </dependencies>
+
+</ivy-module>
\ No newline at end of file
