Update Solution build versions and Eclipse project settings.
diff --git a/solution/greenpages.app/.classpath b/solution/greenpages.app/.classpath
index 9094453..ca4ab4d 100644
--- a/solution/greenpages.app/.classpath
+++ b/solution/greenpages.app/.classpath
@@ -7,15 +7,6 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.springsource.server.ide.server.core.runtime.classpath/Virgo Web Server (Runtime) v2.1">
- <attributes>
- <attribute name="owner.project.facets" value="jst.utility"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6">
- <attributes>
- <attribute name="owner.project.facets" value="jst.java"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/solution/greenpages.app/.settings/org.eclipse.wst.common.project.facet.core.xml b/solution/greenpages.app/.settings/org.eclipse.wst.common.project.facet.core.xml
index aa6952e..cb17327 100644
--- a/solution/greenpages.app/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/solution/greenpages.app/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="Virgo Web Server (Runtime) v2.1"/>
<installed facet="jst.java" version="6.0"/>
<installed facet="com.springsource.server.bundle" version="1.0"/>
<installed facet="jst.utility" version="1.0"/>
diff --git a/solution/greenpages.app/pom.xml b/solution/greenpages.app/pom.xml
index 354124d..88d60a8 100644
--- a/solution/greenpages.app/pom.xml
+++ b/solution/greenpages.app/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.springsource.dmserver</groupId>
<artifactId>greenpages.parent-solution</artifactId>
- <version>2.0.1.SNAPSHOT</version>
+ <version>2.3.0.RELEASE</version>
<relativePath>../parent</relativePath>
</parent>
diff --git a/solution/greenpages.app/src/main/resources/META-INF/MANIFEST.MF b/solution/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
index fc4d7c9..f4deb17 100644
--- a/solution/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
+++ b/solution/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
@@ -1,11 +1,10 @@
Manifest-Version: 1.0
-Bundle-Name: GreenPages Service
-Bundle-Classpath: .
-Import-Package: org.springframework.stereotype;version="[3.0, 3.1)"
-Bundle-ManifestVersion: 2
+Export-Package: greenpages;version="2.3.0"
Bundle-Vendor: SpringSource Inc.
+Bundle-Version: 2.3.0
+Tool: Bundlor 1.0.0.RELEASE
+Bundle-Name: GreenPages Service
+Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages
-Tool: Bundlor 1.0.0.M6
-Export-Package: greenpages;version="2.0"
-Bundle-Version: 2.0
+Import-Package: org.springframework.stereotype;version="[3.0, 3.1)"
diff --git a/solution/greenpages.app/template.mf b/solution/greenpages.app/template.mf
index e138d7e..94c4bf2 100644
--- a/solution/greenpages.app/template.mf
+++ b/solution/greenpages.app/template.mf
@@ -3,7 +3,7 @@
Bundle-Name: GreenPages Service
Bundle-SymbolicName: greenpages
Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.0
+Bundle-Version: 2.3.0
Import-Template:
org.springframework.*;version="[3.0, 3.1)"
Excluded-Exports:
diff --git a/solution/greenpages.db/.classpath b/solution/greenpages.db/.classpath
index c89be4a..e45ada0 100644
--- a/solution/greenpages.db/.classpath
+++ b/solution/greenpages.db/.classpath
@@ -2,6 +2,6 @@
<classpath>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/solution/greenpages.db/.settings/org.eclipse.wst.common.project.facet.core.xml b/solution/greenpages.db/.settings/org.eclipse.wst.common.project.facet.core.xml
index 2f2469c..3f55428 100644
--- a/solution/greenpages.db/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/solution/greenpages.db/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="Virgo Web Server (Runtime) v2.1"/>
<installed facet="jst.java" version="6.0"/>
<installed facet="com.springsource.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/solution/greenpages.db/pom.xml b/solution/greenpages.db/pom.xml
index 26458b1..20cbe5a 100644
--- a/solution/greenpages.db/pom.xml
+++ b/solution/greenpages.db/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.springsource.dmserver</groupId>
<artifactId>greenpages.parent-solution</artifactId>
- <version>2.0.1.SNAPSHOT</version>
+ <version>2.3.0.RELEASE</version>
<relativePath>../parent</relativePath>
</parent>
diff --git a/solution/greenpages.db/src/main/resources/META-INF/MANIFEST.MF b/solution/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
index f6d6de8..44b620d 100644
--- a/solution/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
+++ b/solution/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
Manifest-Version: 1.0
-Bundle-Name: GreenPages DataSource
+Bundle-Vendor: SpringSource Inc.
Bundle-Classpath: .
+Bundle-Version: 2.3.0
+Tool: Bundlor 1.0.0.RELEASE
+Bundle-Name: GreenPages DataSource
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: greenpages.db
Import-Package: javax.sql;version="0",org.apache.commons.dbcp;version=
"[1.2.2.osgi, 1.2.2.osgi]",org.h2;version="[1.0.71, 1.0.71]"
-Bundle-ManifestVersion: 2
-Bundle-Vendor: SpringSource Inc.
-Bundle-SymbolicName: greenpages.db
-Tool: Bundlor 1.0.0.M6
-Bundle-Version: 2.0
diff --git a/solution/greenpages.db/template.mf b/solution/greenpages.db/template.mf
index a7cdb91..5ec6409 100644
--- a/solution/greenpages.db/template.mf
+++ b/solution/greenpages.db/template.mf
@@ -3,7 +3,7 @@
Bundle-Name: GreenPages DataSource
Bundle-SymbolicName: greenpages.db
Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.0
+Bundle-Version: 2.3.0
Import-Package:
org.h2;version="[1.0.71, 1.0.71]"
Import-Template:
diff --git a/solution/greenpages.jpa/.classpath b/solution/greenpages.jpa/.classpath
index edcdd6b..ff1a8fa 100644
--- a/solution/greenpages.jpa/.classpath
+++ b/solution/greenpages.jpa/.classpath
@@ -5,6 +5,6 @@
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/solution/greenpages.jpa/pom.xml b/solution/greenpages.jpa/pom.xml
index 5e0df37..9e59068 100644
--- a/solution/greenpages.jpa/pom.xml
+++ b/solution/greenpages.jpa/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.springsource.dmserver</groupId>
<artifactId>greenpages.parent-solution</artifactId>
- <version>2.0.1.SNAPSHOT</version>
+ <version>2.3.0.RELEASE</version>
<relativePath>../parent</relativePath>
</parent>
diff --git a/solution/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF b/solution/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
index bf77d36..4cff74c 100644
--- a/solution/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
+++ b/solution/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
@@ -1,9 +1,14 @@
Manifest-Version: 1.0
-Bundle-Name: GreenPages JPA
Import-Bundle: com.springsource.org.eclipse.persistence;version="[1.0.
0, 1.0.0]",com.springsource.org.eclipse.persistence.jpa;version="[1.0
.0, 1.0.0]"
-Import-Package: greenpages;version="[2.0, 2.1)",javax.persistence;vers
+Bundle-Vendor: SpringSource Inc.
+Bundle-Version: 2.3.0
+Tool: Bundlor 1.0.0.RELEASE
+Bundle-Name: GreenPages JPA
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: greenpages.jpa
+Import-Package: greenpages;version="[2.3, 2.4)",javax.persistence;vers
ion="[1.0.0, 1.0.0]",javax.sql;version="0",org.apache.commons.dbcp;ve
rsion="[1.2.2.osgi, 1.2.2.osgi]",org.springframework.beans.factory.an
notation;version="[3.0, 3.1)",org.springframework.context.weaving;ver
@@ -13,9 +18,4 @@
version="[3.0, 3.1)",org.springframework.stereotype;version="[3.0, 3.
1)",org.springframework.transaction.annotation;version="[3.0, 3.1)",o
rg.springframework.transaction.aspectj;version="[3.0, 3.1)"
-Bundle-ManifestVersion: 2
-Bundle-Vendor: SpringSource Inc.
-Bundle-SymbolicName: greenpages.jpa
-Tool: Bundlor 1.0.0.M6
-Bundle-Version: 2.0
diff --git a/solution/greenpages.jpa/template.mf b/solution/greenpages.jpa/template.mf
index 8b3286e..9e141d3 100644
--- a/solution/greenpages.jpa/template.mf
+++ b/solution/greenpages.jpa/template.mf
@@ -3,10 +3,10 @@
Bundle-Name: GreenPages JPA
Bundle-SymbolicName: greenpages.jpa
Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.0
+Bundle-Version: 2.3.0
Import-Template:
org.springframework.*;version="[3.0, 3.1)",
- greenpages;version="[2.0, 2.1)",
+ greenpages;version="[2.3, 2.4)",
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/.classpath b/solution/greenpages.web/.classpath
index 679c7f5..ec54346 100644
--- a/solution/greenpages.web/.classpath
+++ b/solution/greenpages.web/.classpath
@@ -10,6 +10,6 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/solution/greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch b/solution/greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch
index 237e9ce..0a971fd 100644
--- a/solution/greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch
+++ b/solution/greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/greenpages.web-solution/src/test/java/greenpages/web/GreenPagesSpringContextTests.java"/>
diff --git a/solution/greenpages.web/.settings/org.eclipse.wst.common.component b/solution/greenpages.web/.settings/org.eclipse.wst.common.component
index 3bf0ff1..4c0dd48 100644
--- a/solution/greenpages.web/.settings/org.eclipse.wst.common.component
+++ b/solution/greenpages.web/.settings/org.eclipse.wst.common.component
@@ -5,9 +5,9 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/greenpages.app-solution/greenpages.app-solution">
-<dependency-type>uses</dependency-type>
-</dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/greenpages.app-solution/greenpages.app-solution">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
<property name="context-root" value="greenpages"/>
<property name="java-output-path"/>
</wb-module>
diff --git a/solution/greenpages.web/pom.xml b/solution/greenpages.web/pom.xml
index aea771d..299a2d1 100644
--- a/solution/greenpages.web/pom.xml
+++ b/solution/greenpages.web/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.springsource.dmserver</groupId>
<artifactId>greenpages.parent-solution</artifactId>
- <version>2.0.1.SNAPSHOT</version>
+ <version>2.3.0.RELEASE</version>
<relativePath>../parent</relativePath>
</parent>
diff --git a/solution/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF b/solution/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
index 465b7ac..800858b 100644
--- a/solution/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/solution/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,21 +1,22 @@
Manifest-Version: 1.0
-Bundle-Name: GreenPages Web
-Import-Library: org.springframework.spring;version="[3.0, 3.1)"
-Bundle-Classpath: .
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
1.1.2,1.3)"
-Web-ContextPath: greenpages
-Import-Package: org.eclipse.virgo.web.dm;version="[2.0.0, 3.0.0)
- ",freemarker.cache;version="[2.3.15,2.3.15]",greenpages;version="[2.0
- , 2.1)",javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.0)",javax.sql
- ,org.apache.commons.dbcp,org.springframework.beans.factory.annotation
- ;version="[3.0, 3.1)",org.springframework.core.io;version="[3.0, 3.1)
- ",org.springframework.stereotype;version="[3.0, 3.1)",org.springframe
- work.web.bind.annotation;version="[3.0, 3.1)",org.springframework.web
- .context;version="[3.0, 3.1)",org.springframework.web.servlet;version
- ="[3.0, 3.1)"
+Bundle-Version: 2.3.0
+Tool: Bundlor 1.0.0.RELEASE
+Bundle-Name: GreenPages Web
+Import-Library: org.springframework.spring;version="[3.0, 3.1)"
Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages.web
-Tool: Bundlor 1.0.0.M6
-Bundle-Version: 2.0
+Web-ContextPath: greenpages
+Import-Package: freemarker.cache;version="[2.3.15,2.3.15]",greenpages;
+ version="[2.3, 2.4)",javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.
+ 0)",javax.sql,org.apache.commons.dbcp,org.eclipse.virgo.web.dm;versio
+ n="[2.0.0, 3.0.0)",org.springframework.beans.factory.annotation;versi
+ on="[3.0, 3.1)",org.springframework.core.io;version="[3.0, 3.1)",org.
+ springframework.stereotype;version="[3.0, 3.1)",org.springframework.w
+ eb.bind.annotation;version="[3.0, 3.1)",org.springframework.web.conte
+ xt;version="[3.0, 3.1)",org.springframework.web.servlet;version="[3.0
+ , 3.1)",org.springframework.web.servlet.mvc.annotation;version="[3.0,
+ 3.1)",org.springframework.web.servlet.view.freemarker;version="[3.0,
+ 3.1)"
diff --git a/solution/greenpages.web/template.mf b/solution/greenpages.web/template.mf
index b63162c..992ec55 100644
--- a/solution/greenpages.web/template.mf
+++ b/solution/greenpages.web/template.mf
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: GreenPages Web
Bundle-SymbolicName: greenpages.web
-Bundle-Version: 2.0
+Bundle-Version: 2.3.0
Web-ContextPath: greenpages
Import-Template:
org.springframework.*;version="[3.0, 3.1)",
- greenpages.*;version="[2.0, 2.1)"
+ greenpages.*;version="[2.3, 2.4)"
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)",
@@ -18,7 +18,9 @@
org.springframework.spring;version="[3.0, 3.1)"
Excluded-Exports:
greenpages.tests,
- greenpages.web
+ greenpages.web,
+ images,
+ styles
Excluded-Imports:
org.springframework.test.*,
org.junit.*
diff --git a/solution/greenpages/.classpath b/solution/greenpages/.classpath
index a225f00..5b3f131 100644
--- a/solution/greenpages/.classpath
+++ b/solution/greenpages/.classpath
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/solution/greenpages/.project b/solution/greenpages/.project
index c04b5ad..9f4cf8b 100644
--- a/solution/greenpages/.project
+++ b/solution/greenpages/.project
@@ -16,21 +16,21 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.springframework.ide.eclipse.core.springbuilder</name>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
+ <name>org.springframework.ide.eclipse.core.springbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>com.springsource.server.ide.facet.core.parnature</nature>
- <nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
diff --git a/solution/greenpages/.springBeans b/solution/greenpages/.springBeans
deleted file mode 100644
index 5d8d5a5..0000000
--- a/solution/greenpages/.springBeans
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
- <version>1</version>
- <pluginVersion><![CDATA[2.2.0.v200809261800]]></pluginVersion>
- <configSuffixes>
- <configSuffix><![CDATA[xml]]></configSuffix>
- </configSuffixes>
- <enableImports><![CDATA[false]]></enableImports>
- <configs>
- </configs>
- <configSets>
- </configSets>
-</beansProjectDescription>
diff --git a/solution/greenpages/META-INF/MANIFEST.MF b/solution/greenpages/META-INF/MANIFEST.MF
index fbecfba..1466c15 100644
--- a/solution/greenpages/META-INF/MANIFEST.MF
+++ b/solution/greenpages/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Application-SymbolicName: greenpages
-Application-Version: 2.0.1
+Application-Version: 2.3.0.RELEASE
Application-Name: Greenpages PAR
diff --git a/solution/greenpages/pom.xml b/solution/greenpages/pom.xml
index 134a0f5..b7d3ee6 100644
--- a/solution/greenpages/pom.xml
+++ b/solution/greenpages/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.springsource.dmserver</groupId>
<artifactId>greenpages.parent-solution</artifactId>
- <version>2.0.1.SNAPSHOT</version>
+ <version>2.3.0.RELEASE</version>
<relativePath>../parent</relativePath>
</parent>
diff --git a/solution/parent/.classpath b/solution/parent/.classpath
index 473e0cf..b8a2888 100644
--- a/solution/parent/.classpath
+++ b/solution/parent/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
-<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/solution/parent/pom.xml b/solution/parent/pom.xml
index a018b20..9d74b9d 100644
--- a/solution/parent/pom.xml
+++ b/solution/parent/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.springsource.dmserver</groupId>
<artifactId>greenpages.parent-solution</artifactId>
- <version>2.0.1.SNAPSHOT</version>
+ <version>2.3.0.RELEASE</version>
<name>greenpages.parent</name>
<packaging>pom</packaging>
