Fixing up to work on Virgo 3.0
diff --git a/build.properties b/build.properties
index cde1333..a4951a4 100644
--- a/build.properties
+++ b/build.properties
@@ -1,5 +1,6 @@
version=2.4.0
-release.type=integration
+release.type=release
+build.stamp=RELEASE
natural.name=greenpages
project.name=Virgo Greenpages Sample
project.key=VWSS
diff --git a/solution/greenpages.jpa/.~/greenpages-db/greenpages.10.log.db b/solution/greenpages.jpa/.~/greenpages-db/greenpages.10.log.db
deleted file mode 100644
index de9e2a0..0000000
--- a/solution/greenpages.jpa/.~/greenpages-db/greenpages.10.log.db
+++ /dev/null
Binary files differ
diff --git a/solution/greenpages.jpa/template.mf b/solution/greenpages.jpa/template.mf
index 89ef91b..2b9a1e8 100644
--- a/solution/greenpages.jpa/template.mf
+++ b/solution/greenpages.jpa/template.mf
@@ -6,7 +6,7 @@
Bundle-Version: 2.4.0
Import-Template:
org.springframework.*;version="[3.0, 3.1)",
- greenpages;version="[2.3, 2.4)",
+ greenpages;version="[2.4, 2.5)",
javax.persistence;version="[1.0.0, 1.0.0]",
org.apache.commons.dbcp.*;version="[1.2.2.osgi, 1.2.2.osgi]",
javax.sql;version="0"
diff --git a/solution/greenpages.web/.~/greenpages-db/greenpages.10.log.db b/solution/greenpages.web/.~/greenpages-db/greenpages.10.log.db
deleted file mode 100644
index de9e2a0..0000000
--- a/solution/greenpages.web/.~/greenpages-db/greenpages.10.log.db
+++ /dev/null
Binary files differ
diff --git a/solution/greenpages.web/pom.xml b/solution/greenpages.web/pom.xml
index 60af4d3..a61912f 100644
--- a/solution/greenpages.web/pom.xml
+++ b/solution/greenpages.web/pom.xml
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>com.springsource.javax.servlet</artifactId>
+ <artifactId>javax.servlet</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/solution/greenpages.web/template.mf b/solution/greenpages.web/template.mf
index ad46c19..8086064 100644
--- a/solution/greenpages.web/template.mf
+++ b/solution/greenpages.web/template.mf
@@ -3,14 +3,16 @@
Bundle-Name: GreenPages Web
Bundle-SymbolicName: greenpages.web
Bundle-Version: 2.4.0
+Bundle-ClassPath: .,WEB-INF/classes
Web-ContextPath: greenpages
Import-Template:
org.springframework.*;version="[3.0, 3.1)",
- greenpages.*;version="[2.3, 2.4)"
+ greenpages.*;version="[2.4, 2.5)"
Import-Package:
- javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.0)",
- org.eclipse.virgo.web.dm;version="[2.0.0, 3.0.0)",
- freemarker.cache;version="[2.3.15,2.3.15]"
+ javax.servlet.jsp.jstl.core;version="[1.2.0, 2.0.0)",
+ javax.servlet;version="[3.0.0, 3.1.0)",
+ org.eclipse.virgo.web.dm;version="[3.0.0, 4.0.0)",
+ freemarker.cache;version="[2.3.18,2.3.18]"
Import-Bundle:
com.springsource.org.apache.taglibs.standard;version="[1.1.2,1.3)"
Import-Library:
diff --git a/solution/parent/pom.xml b/solution/parent/pom.xml
index 920a0a7..c12ac7d 100644
--- a/solution/parent/pom.xml
+++ b/solution/parent/pom.xml
@@ -17,7 +17,7 @@
<groupId>org.springframework</groupId>
<artifactId>org.springframework.spring-library</artifactId>
<type>libd</type>
- <version>3.0.0.M3</version>
+ <version>3.0.5.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -36,7 +36,7 @@
<groupId>javax.persistence</groupId>
<artifactId>com.springsource.javax.persistence</artifactId>
<version>1.0.0</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>com.springsource.freemarker</artifactId>
- <version>2.3.15</version>
+ <version>2.3.18</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -72,25 +72,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.test</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.5.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.instrument</artifactId>
- <version>3.0.0.M3</version>
+ <version>3.0.5.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.aspects</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.5.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>com.springsource.javax.servlet</artifactId>
- <version>2.5.0</version>
+ <artifactId>javax.servlet</artifactId>
+ <version>3.0.0.v201103241009</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/start/greenpages.jpa/template.mf b/start/greenpages.jpa/template.mf
index 359ec87..22e2b6a 100644
--- a/start/greenpages.jpa/template.mf
+++ b/start/greenpages.jpa/template.mf
@@ -6,7 +6,7 @@
Bundle-Version: 2.4.0
Import-Template:
org.springframework.*;version="[3.0, 3.1)",
- greenpages;version="[2.3, 2.4)",
+ greenpages;version="[2.4, 2.5)",
javax.persistence;version="[1.0.0, 1.0.0]",
org.apache.commons.dbcp.*;version="[1.2.2.osgi, 1.2.2.osgi]",
javax.sql;version="0"
diff --git a/start/greenpages.web/pom.xml b/start/greenpages.web/pom.xml
index fdb34c2..ba50b76 100644
--- a/start/greenpages.web/pom.xml
+++ b/start/greenpages.web/pom.xml
@@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>com.springsource.javax.servlet</artifactId>
+ <artifactId>javax.servlet</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/start/greenpages.web/template.mf b/start/greenpages.web/template.mf
index 4131b0d..80c0f7c 100644
--- a/start/greenpages.web/template.mf
+++ b/start/greenpages.web/template.mf
@@ -4,9 +4,9 @@
Bundle-SymbolicName: greenpages.web
Bundle-Version: 2.4.0
Import-Package:
- javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.0)",
- org.eclipse.virgo.web.dm;version="[2.0.0, 3.0.0)",
- freemarker.cache;version="[2.3.15,2.3.15]"
+ javax.servlet.jsp.jstl.core;version="[1.2.0, 2.0.0)",
+ org.eclipse.virgo.web.dm;version="[3.0.0, 4.0.0)",
+ freemarker.cache;version="[2.3.18,2.3.18]"
Import-Bundle:
com.springsource.org.apache.taglibs.standard;version="[1.1.2,1.3)"
Import-Library:
diff --git a/start/parent/pom.xml b/start/parent/pom.xml
index 2be683b..8da5a37 100644
--- a/start/parent/pom.xml
+++ b/start/parent/pom.xml
@@ -17,7 +17,7 @@
<groupId>org.springframework</groupId>
<artifactId>org.springframework.spring-library</artifactId>
<type>libd</type>
- <version>3.0.0</version>
+ <version>3.0.5.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -36,7 +36,7 @@
<groupId>javax.persistence</groupId>
<artifactId>com.springsource.javax.persistence</artifactId>
<version>1.0.0</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>com.springsource.freemarker</artifactId>
- <version>2.3.15</version>
+ <version>2.3.18</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -72,25 +72,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.test</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.5.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.instrument</artifactId>
- <version>3.0.0</version>
+ <version>3.0.5.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.aspects</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.5.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>com.springsource.javax.servlet</artifactId>
- <version>2.5.0</version>
+ <artifactId>javax.servlet</artifactId>
+ <version>3.0.0.v201103241009</version>
<scope>provided</scope>
</dependency>
</dependencies>
