Initial fixes to get the par generation working so the webserver repo can have a new test app
diff --git a/build-formtags/build.xml b/build-formtags/build.xml
index c2be132..ee966dd 100644
--- a/build-formtags/build.xml
+++ b/build-formtags/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="s2ap-formtags-sample" default="precommit">
+<project name="virgo-formtags-sample" default="precommit">
<path id="bundles">
<pathelement location="${basedir}/../war/formtags-war" />
diff --git a/build-formtags/publish-top-level.xml b/build-formtags/publish-top-level.xml
index 2709349..9964630 100644
--- a/build-formtags/publish-top-level.xml
+++ b/build-formtags/publish-top-level.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="publish-top-level">
- <target name="publish" depends="publish-package" description="Publish package"/>
+ <target name="publish" depends="publish-package-build, publish-package-download" description="Publish package"/>
</project>
diff --git a/build.properties b/build.properties
index 5c34a39..0a1112e 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=2.0.1
+version=3.0.0
release.type=integration
natural.name=formtags
project.name=Virgo Server Samples
diff --git a/par/org.springframework.showcase.formtags.domain/src/main/resources/META-INF/MANIFEST.MF b/par/org.springframework.showcase.formtags.domain/src/main/resources/META-INF/MANIFEST.MF
index 0e37306..e5cb524 100644
--- a/par/org.springframework.showcase.formtags.domain/src/main/resources/META-INF/MANIFEST.MF
+++ b/par/org.springframework.showcase.formtags.domain/src/main/resources/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Version: 2.0.1
+Bundle-Version: 3.0.0
Bundle-Name: FormTags Domain Model
Bundle-SymbolicName: org.springframework.showcase.formtags.domain_par
Export-Package: org.springframework.showcase.formtags.domain
diff --git a/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/MANIFEST.MF b/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/MANIFEST.MF
index 74e0b70..987d6a7 100644
--- a/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/MANIFEST.MF
+++ b/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Bundle-Version: 2.0.1
+Bundle-Version: 3.0.0
Bundle-ManifestVersion: 2
Bundle-Name: FormTags Service (and implementation)
Bundle-SymbolicName: org.springframework.showcase.formtags.service_par
diff --git a/par/org.springframework.showcase.formtags.web/src/main/webapp/META-INF/MANIFEST.MF b/par/org.springframework.showcase.formtags.web/src/main/webapp/META-INF/MANIFEST.MF
index 91ac071..348c0cc 100644
--- a/par/org.springframework.showcase.formtags.web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/par/org.springframework.showcase.formtags.web/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Version: 2.0.1
+Bundle-Version: 3.0.0
Bundle-Name: FormTags Web Bundle
Bundle-SymbolicName: org.springframework.showcase.formtags.web_par
Import-Package: org.springframework.showcase.formtags.domain,
org.springframework.showcase.formtags.service,
- org.eclipse.virgo.web.dm;version="[1.0,3.0)",
+ org.eclipse.virgo.web.dm;version="[3.0,5.0)",
javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.0)",
javax.servlet.http
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="1.1.2"
-Import-Library: org.springframework.spring;version="[2.5.6.A,4.0.0)"
+Import-Library: org.springframework.spring;version="[2.5.6.A,5.0.0)"
Web-ContextPath: formtags-par
diff --git a/par/org.springframework.showcase.formtags/META-INF/MANIFEST.MF b/par/org.springframework.showcase.formtags/META-INF/MANIFEST.MF
index 5769d63..3b5c5a2 100644
--- a/par/org.springframework.showcase.formtags/META-INF/MANIFEST.MF
+++ b/par/org.springframework.showcase.formtags/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Application-SymbolicName: org.springframework.showcase.formtags_par
-Application-Version: 2.0.1
+Application-Version: 3.0.0
Application-Name: FormTags Showcase Application (PAR)
diff --git a/shared-libs/formtags-shared-libs/src/main/webapp/META-INF/MANIFEST.MF b/shared-libs/formtags-shared-libs/src/main/webapp/META-INF/MANIFEST.MF
index b767eda..dc6cef2 100644
--- a/shared-libs/formtags-shared-libs/src/main/webapp/META-INF/MANIFEST.MF
+++ b/shared-libs/formtags-shared-libs/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Version: 2.0.1
+Bundle-Version: 3.0.0
Bundle-Name: FormTags Shared Library War
Bundle-SymbolicName: org.springframework.showcase.formtags_shared_libs
Import-Package: javax.servlet.http,
javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.0)"
-Import-Library: org.springframework.spring;version="[2.5.6.A,4.0.0)"
+Import-Library: org.springframework.spring;version="[2.5.6.A,5.0.0)"
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="1.1.2"
diff --git a/shared-services/formtags-shared-services-service/src/main/resources/META-INF/MANIFEST.MF b/shared-services/formtags-shared-services-service/src/main/resources/META-INF/MANIFEST.MF
index d4462ba..331fe96 100644
--- a/shared-services/formtags-shared-services-service/src/main/resources/META-INF/MANIFEST.MF
+++ b/shared-services/formtags-shared-services-service/src/main/resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: FormTags Service (and implementation)
Bundle-SymbolicName: org.springframework.showcase.formtags.service_shared_services
-Bundle-Version: 2.0.1
+Bundle-Version: 3.0.0
Import-Library: org.springframework.spring;version="[2.5.6.A,4.0.0)"
Export-Package: org.springframework.showcase.formtags.domain,
org.springframework.showcase.formtags.service
diff --git a/shared-services/formtags-shared-services-war/src/main/webapp/META-INF/MANIFEST.MF b/shared-services/formtags-shared-services-war/src/main/webapp/META-INF/MANIFEST.MF
index 9287ba7..91f71e3 100644
--- a/shared-services/formtags-shared-services-war/src/main/webapp/META-INF/MANIFEST.MF
+++ b/shared-services/formtags-shared-services-war/src/main/webapp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: FormTags Shared Services WAR
Bundle-SymbolicName: org.springframework.showcase.formtags.web_shared_services
-Bundle-Version: 2.0.1
+Bundle-Version: 3.0.0
Import-Package: javax.servlet.http,
org.springframework.showcase.formtags.domain,
org.springframework.showcase.formtags.service,
diff --git a/war/formtags-war/build.properties b/war/formtags-war/build.properties
index d9c5710..8dfb276 100644
--- a/war/formtags-war/build.properties
+++ b/war/formtags-war/build.properties
@@ -9,8 +9,6 @@
main.java.dir=${basedir}/src/main/java
war.classes.dir=${war.staging.dir}/WEB-INF/classes
main.resources.dir=${basedir}/src/main/resources
-source.version=1.5
-target.version=${source.version}
compile.debug=true
compile.debug.level=lines,vars,source
package.dist.dir=${package.output.dir}/dist
diff --git a/war/formtags-war/build.xml b/war/formtags-war/build.xml
index 6b4afb9..2a369af 100644
--- a/war/formtags-war/build.xml
+++ b/war/formtags-war/build.xml
@@ -5,6 +5,9 @@
<property file="${basedir}/../../build.versions"/>
<property file="${basedir}/build.properties"/>
+
+ <import file="${basedir}/../../virgo-build/common/common.xml"/>
+
<tstamp>
<format property="timestamp" pattern="yyyyMMddHHmmss" timezone="GMT"/>
</tstamp>
