diff --git a/guide/images/installing-greenpages/problem-warning.png b/guide/images/installing-greenpages/problem-warning.png
index bc3ea15..af65a1b 100644
--- a/guide/images/installing-greenpages/problem-warning.png
+++ b/guide/images/installing-greenpages/problem-warning.png
Binary files differ
diff --git a/guide/src/installing-greenpages.xml b/guide/src/installing-greenpages.xml
index bccadfd..8879c2a 100644
--- a/guide/src/installing-greenpages.xml
+++ b/guide/src/installing-greenpages.xml
@@ -401,7 +401,7 @@
 (This process is sometimes known as the <quote>Eclipse dance</quote>.)
 </para>
 <para>
-Despite the dance steps outlined, there will remain some <emphasis>Warnings</emphasis> like this:
+Despite the dance steps outlined, there will remain some <emphasis>Warnings/Errors</emphasis> like this:
 <mediaobject>
     <imageobject role="fo">
         <imagedata fileref="images/installing-greenpages/problem-warning.png" format="PNG" align="center" width="14cm"/>
diff --git a/guide/src/installing.xml b/guide/src/installing.xml
index 4bcd37e..1043830 100644
--- a/guide/src/installing.xml
+++ b/guide/src/installing.xml
@@ -39,16 +39,22 @@
 
 <section id="installation.virgotooling">
 
-<title>Installing the Eclipse @virgo@ Tooling</title>
+<title>Installing the Eclipse Tooling</title>
 
 <para>
 This is necessary only if you would like to run the sample under Eclipse.
 </para>
 <para>
-Please refer to the Virgo Programmer Guide for installation instructions.
+Please refer to the Virgo Programmer Guide for installation instructions of the @virgo@ tooling.
 See <link linkend="further.resources.documentation">Documentation</link>.
 </para>
 
+<para>
+This sample also uses Maven and to support the build in Eclipse you need to install the m2e plugin. 
+This is simple to do from the 'Help' -> 'Install New Software..' menu item. Add a new update site of 
+<literal>http://download.eclipse.org/technology/m2e/releases/</literal> and then use it to install the plugin.
+</para>
+
 </section>
 
 <section id="installation.maven">
diff --git a/solution/greenpages.app/.classpath b/solution/greenpages.app/.classpath
index ca4ab4d..adf2259 100644
--- a/solution/greenpages.app/.classpath
+++ b/solution/greenpages.app/.classpath
@@ -2,11 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/solution/greenpages.app/.project b/solution/greenpages.app/.project
index 736d5b3..6618467 100644
--- a/solution/greenpages.app/.project
+++ b/solution/greenpages.app/.project
@@ -35,8 +35,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.virgo.ide.bundlor.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>com.springsource.server.ide.facet.core.bundlenature</nature>
diff --git a/solution/greenpages.app/.settings/org.eclipse.jdt.core.prefs b/solution/greenpages.app/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..789255e
--- /dev/null
+++ b/solution/greenpages.app/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,3 @@
+#Thu Jan 12 14:41:53 GMT 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
diff --git a/solution/greenpages.app/.settings/org.eclipse.m2e.core.prefs b/solution/greenpages.app/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..742ce87
--- /dev/null
+++ b/solution/greenpages.app/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Thu Jan 12 14:27:52 GMT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
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 cb17327..5e484ba 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>
   <installed facet="jst.java" version="6.0"/>
-  <installed facet="com.springsource.server.bundle" version="1.0"/>
-  <installed facet="jst.utility" version="1.0"/>
+  <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
 </faceted-project>
diff --git a/solution/greenpages.app/pom.xml b/solution/greenpages.app/pom.xml
index 163e819..b93a569 100644
--- a/solution/greenpages.app/pom.xml
+++ b/solution/greenpages.app/pom.xml
@@ -7,12 +7,11 @@
 	<parent>
 		<groupId>org.eclipse.virgo</groupId>
 		<artifactId>greenpages.parent-solution</artifactId>
-		<version>2.4.0.RELEASE</version>
+		<version>2.5.0.RELEASE</version>
 		<relativePath>../parent</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.virgo</groupId>
 	<artifactId>greenpages.app-solution</artifactId>
 	<name>greenpages.app</name>
 	<packaging>jar</packaging>
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 3fb434a..d60e24a 100644
--- a/solution/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
+++ b/solution/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Export-Package: greenpages;version="2.3.0"
+Export-Package: greenpages;version="2.5.0"
 Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.4.0
-Tool: Bundlor 1.0.0.RELEASE
+Bundle-Version: 2.5.0
+Tool: Bundlor 1.1.0.BUILD-20101220120024
 Bundle-Name: GreenPages Service
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: greenpages
diff --git a/solution/greenpages.app/template.mf b/solution/greenpages.app/template.mf
index 8d58604..a09f6bf 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.4.0
+Bundle-Version: 2.5.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 e45ada0..1ab27f1 100644
--- a/solution/greenpages.db/.classpath
+++ b/solution/greenpages.db/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/solution/greenpages.db/.project b/solution/greenpages.db/.project
index f2ef02a..e442cf1 100644
--- a/solution/greenpages.db/.project
+++ b/solution/greenpages.db/.project
@@ -30,8 +30,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.virgo.ide.bundlor.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>com.springsource.server.ide.facet.core.bundlenature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/solution/greenpages.db/.settings/org.eclipse.jdt.core.prefs b/solution/greenpages.db/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..74323cb
--- /dev/null
+++ b/solution/greenpages.db/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,3 @@
+#Thu Jan 12 14:42:01 GMT 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
diff --git a/solution/greenpages.db/.settings/org.eclipse.m2e.core.prefs b/solution/greenpages.db/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..26b5f72
--- /dev/null
+++ b/solution/greenpages.db/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Thu Jan 12 14:28:19 GMT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
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 3f55428..5e484ba 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,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <installed facet="jst.java" version="6.0"/>
-  <installed facet="com.springsource.server.bundle" version="1.0"/>
+  <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
 </faceted-project>
diff --git a/solution/greenpages.db/pom.xml b/solution/greenpages.db/pom.xml
index d0807b3..042fe09 100644
--- a/solution/greenpages.db/pom.xml
+++ b/solution/greenpages.db/pom.xml
@@ -12,7 +12,6 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.virgo</groupId>
 	<artifactId>greenpages.db-solution</artifactId>
 	<name>greenpages.db</name>
 	<packaging>jar</packaging>
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 41e8f13..df1ec56 100644
--- a/solution/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
+++ b/solution/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Bundle-Vendor: SpringSource Inc.
+Bundle-Vendor: SpringSource
 Bundle-Classpath: .
-Bundle-Version: 2.4.0
-Tool: Bundlor 1.0.0.RELEASE
+Bundle-Version: 2.5.0
+Tool: Bundlor 1.1.0.BUILD-20101220120024
 Bundle-Name: GreenPages DataSource
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: greenpages.db
diff --git a/solution/greenpages.db/template.mf b/solution/greenpages.db/template.mf
index 7cdd63f..1a3771c 100644
--- a/solution/greenpages.db/template.mf
+++ b/solution/greenpages.db/template.mf
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: GreenPages DataSource
 Bundle-SymbolicName: greenpages.db
-Bundle-Vendor: SpringSource Inc.
+Bundle-Vendor: SpringSource
 Bundle-Version: 2.5.0
 Import-Package: 
  org.h2;version="[1.0.71, 1.0.71]"
diff --git a/solution/greenpages.jpa/.classpath b/solution/greenpages.jpa/.classpath
index ff1a8fa..8be6238 100644
--- a/solution/greenpages.jpa/.classpath
+++ b/solution/greenpages.jpa/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<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.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/solution/greenpages.jpa/.project b/solution/greenpages.jpa/.project
index c3ed622..cbb0788 100644
--- a/solution/greenpages.jpa/.project
+++ b/solution/greenpages.jpa/.project
@@ -30,8 +30,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.virgo.ide.bundlor.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>com.springsource.server.ide.facet.core.bundlenature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/solution/greenpages.jpa/.settings/JpaDirectorySpringContextTests-solution.launch b/solution/greenpages.jpa/.settings/JpaDirectorySpringContextTests-solution.launch
index 2bc8cde..de7460e 100644
--- a/solution/greenpages.jpa/.settings/JpaDirectorySpringContextTests-solution.launch
+++ b/solution/greenpages.jpa/.settings/JpaDirectorySpringContextTests-solution.launch
@@ -11,9 +11,9 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="greenpages.jpa.JpaDirectorySpringContextTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="greenpages.jpa-solution"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/springframework/org.springframework.instrument/3.0.0.M3/org.springframework.instrument-3.0.0.M3.jar"/>
 </launchConfiguration>
diff --git a/solution/greenpages.jpa/.settings/org.eclipse.jdt.core.prefs b/solution/greenpages.jpa/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..d5214f3
--- /dev/null
+++ b/solution/greenpages.jpa/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,3 @@
+#Thu Jan 12 14:42:17 GMT 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
diff --git a/solution/greenpages.jpa/.settings/org.eclipse.m2e.core.prefs b/solution/greenpages.jpa/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..ac7c0bf
--- /dev/null
+++ b/solution/greenpages.jpa/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Thu Jan 12 14:28:24 GMT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/solution/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml b/solution/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml
index 3f55428..5e484ba 100644
--- a/solution/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/solution/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <installed facet="jst.java" version="6.0"/>
-  <installed facet="com.springsource.server.bundle" version="1.0"/>
+  <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
 </faceted-project>
diff --git a/solution/greenpages.jpa/.~/greenpages-db/greenpages.data.db b/solution/greenpages.jpa/.~/greenpages-db/greenpages.data.db
deleted file mode 100644
index be5e9a5..0000000
--- a/solution/greenpages.jpa/.~/greenpages-db/greenpages.data.db
+++ /dev/null
Binary files differ
diff --git a/solution/greenpages.jpa/.~/greenpages-db/greenpages.index.db b/solution/greenpages.jpa/.~/greenpages-db/greenpages.index.db
deleted file mode 100644
index b2427f4..0000000
--- a/solution/greenpages.jpa/.~/greenpages-db/greenpages.index.db
+++ /dev/null
Binary files differ
diff --git a/solution/greenpages.jpa/pom.xml b/solution/greenpages.jpa/pom.xml
index 99bc395..81e4125 100644
--- a/solution/greenpages.jpa/pom.xml
+++ b/solution/greenpages.jpa/pom.xml
@@ -12,7 +12,6 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.virgo</groupId>
 	<artifactId>greenpages.jpa-solution</artifactId>
 	<name>greenpages.jpa</name>
 	<packaging>jar</packaging>
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 89eb8ac..a1c2d33 100644
--- a/solution/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
+++ b/solution/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 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]"
-Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.4.0
-Tool: Bundlor 1.0.0.RELEASE
+Bundle-Vendor: SpringSource
+Bundle-Version: 2.5.0
+Tool: Bundlor 1.1.0.BUILD-20101220120024
 Bundle-Name: GreenPages JPA
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: greenpages.jpa
-Import-Package: greenpages;version="[2.3, 2.4)",javax.persistence;vers
+Import-Package: greenpages;version="[2.5, 2.6)",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
diff --git a/solution/greenpages.jpa/template.mf b/solution/greenpages.jpa/template.mf
index 41bfcac..67ff374 100644
--- a/solution/greenpages.jpa/template.mf
+++ b/solution/greenpages.jpa/template.mf
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: GreenPages JPA
 Bundle-SymbolicName: greenpages.jpa
-Bundle-Vendor: SpringSource Inc.
+Bundle-Vendor: SpringSource
 Bundle-Version: 2.5.0
 Import-Template: 
  org.springframework.*;version="[3.0, 3.1)",
diff --git a/solution/greenpages.web/.classpath b/solution/greenpages.web/.classpath
index ec54346..3fbd759 100644
--- a/solution/greenpages.web/.classpath
+++ b/solution/greenpages.web/.classpath
@@ -3,13 +3,8 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<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">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<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"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/solution/greenpages.web/.project b/solution/greenpages.web/.project
index a686b48..fbbb358 100644
--- a/solution/greenpages.web/.project
+++ b/solution/greenpages.web/.project
@@ -35,8 +35,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.virgo.ide.bundlor.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>com.springsource.server.ide.facet.core.bundlenature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
diff --git a/solution/greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch b/solution/greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch
index 0a971fd..e695a36 100644
--- a/solution/greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch
+++ b/solution/greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch
@@ -10,9 +10,9 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="greenpages.web.GreenPagesSpringContextTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="greenpages.web-solution"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/springframework/org.springframework.instrument/3.0.0.M3/org.springframework.instrument-3.0.0.M3.jar"/>
 </launchConfiguration>
diff --git a/solution/greenpages.web/.settings/org.eclipse.jdt.core.prefs b/solution/greenpages.web/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..46361fa
--- /dev/null
+++ b/solution/greenpages.web/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,3 @@
+#Thu Jan 12 14:42:30 GMT 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
diff --git a/solution/greenpages.web/.settings/org.eclipse.m2e.core.prefs b/solution/greenpages.web/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f6fee26
--- /dev/null
+++ b/solution/greenpages.web/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Thu Jan 12 14:28:38 GMT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/solution/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/solution/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml
index 96e2d7e..83385eb 100644
--- a/solution/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/solution/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="com.springsource.server.bundle" version="1.0"/>
+  <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
   <installed facet="jst.web" version="2.5"/>
   <installed facet="jst.java" version="6.0"/>
 </faceted-project>
diff --git a/solution/greenpages.web/.~/greenpages-db/greenpages.data.db b/solution/greenpages.web/.~/greenpages-db/greenpages.data.db
deleted file mode 100644
index d9bf4ba..0000000
--- a/solution/greenpages.web/.~/greenpages-db/greenpages.data.db
+++ /dev/null
Binary files differ
diff --git a/solution/greenpages.web/.~/greenpages-db/greenpages.index.db b/solution/greenpages.web/.~/greenpages-db/greenpages.index.db
deleted file mode 100644
index b2427f4..0000000
--- a/solution/greenpages.web/.~/greenpages-db/greenpages.index.db
+++ /dev/null
Binary files differ
diff --git a/solution/greenpages.web/pom.xml b/solution/greenpages.web/pom.xml
index 3fd71e6..4ec4c9c 100644
--- a/solution/greenpages.web/pom.xml
+++ b/solution/greenpages.web/pom.xml
@@ -12,7 +12,6 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.virgo</groupId>
 	<artifactId>greenpages.web-solution</artifactId>
 	<name>greenpages.web</name>
 	<packaging>war</packaging>
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 7ce4eb1..6587298 100644
--- a/solution/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/solution/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,22 +1,23 @@
 Manifest-Version: 1.0
 Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
- 1.1.2,1.3)"
-Bundle-Version: 2.4.0
-Tool: Bundlor 1.0.0.RELEASE
+ 1.1.2,2.0)"
+Bundle-ClassPath: .,WEB-INF/classes
+Bundle-Version: 2.5.0
+Tool: Bundlor 1.1.0.BUILD-20101220120024
 Bundle-Name: GreenPages Web
 Import-Library: org.springframework.spring;version="[3.0, 3.1)"
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: greenpages.web
 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)"
+Import-Package: freemarker.cache;version="[2.3.18,2.3.18]",greenpages;
+ version="[2.5, 2.6)",javax.servlet;version="[3.0.0, 3.1.0)",javax.ser
+ vlet.jsp.jstl.core;version="[1.2.0, 2.0.0)",javax.sql,org.apache.comm
+ ons.dbcp,org.eclipse.virgo.web.dm;version="[3.0.0, 4.0.0)",org.spring
+ framework.beans.factory.annotation;version="[3.0, 3.1)",org.springfra
+ mework.core.io;version="[3.0, 3.1)",org.springframework.stereotype;ve
+ rsion="[3.0, 3.1)",org.springframework.web.bind.annotation;version="[
+ 3.0, 3.1)",org.springframework.web.context;version="[3.0, 3.1)",org.s
+ pringframework.web.servlet;version="[3.0, 3.1)",org.springframework.w
+ eb.servlet.mvc.annotation;version="[3.0, 3.1)",org.springframework.we
+ b.servlet.view.freemarker;version="[3.0, 3.1)"
 
diff --git a/solution/greenpages.web/template.mf b/solution/greenpages.web/template.mf
index 32b2dfc..28ff36c 100644
--- a/solution/greenpages.web/template.mf
+++ b/solution/greenpages.web/template.mf
@@ -14,7 +14,7 @@
  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)"
+ com.springsource.org.apache.taglibs.standard;version="[1.1.2,2.0)"
 Import-Library: 
  org.springframework.spring;version="[3.0, 3.1)"
 Excluded-Exports: 
diff --git a/solution/greenpages/.classpath b/solution/greenpages/.classpath
index 5b3f131..464509f 100644
--- a/solution/greenpages/.classpath
+++ b/solution/greenpages/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/solution/greenpages/.project b/solution/greenpages/.project
index 9f4cf8b..efd8a35 100644
--- a/solution/greenpages/.project
+++ b/solution/greenpages/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
diff --git a/solution/greenpages/.settings/org.eclipse.jdt.core.prefs b/solution/greenpages/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..6119722
--- /dev/null
+++ b/solution/greenpages/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,3 @@
+#Thu Jan 12 16:04:38 GMT 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
diff --git a/solution/greenpages/.settings/org.eclipse.m2e.core.prefs b/solution/greenpages/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f3d930c
--- /dev/null
+++ b/solution/greenpages/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Thu Jan 12 14:28:13 GMT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/solution/greenpages/.settings/com.springsource.server.ide.runtime.core.par.xml b/solution/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
similarity index 100%
rename from solution/greenpages/.settings/com.springsource.server.ide.runtime.core.par.xml
rename to solution/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
diff --git a/solution/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml b/solution/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
index f856a12..64122a8 100644
--- a/solution/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/solution/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="com.springsource.server.par" version="1.0"/>
+  <runtime name="Virgo Web Server (Runtime) v2.1"/>
+  <installed facet="org.eclipse.virgo.server.par" version="1.0"/>
 </faceted-project>
diff --git a/solution/greenpages/META-INF/MANIFEST.MF b/solution/greenpages/META-INF/MANIFEST.MF
index cf8e80e..bcdad50 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.4.0.RELEASE
+Application-Version: 2.5.0.RELEASE
 Application-Name: Greenpages PAR
 
diff --git a/solution/greenpages/pom.xml b/solution/greenpages/pom.xml
index 077cc8e..556331c 100644
--- a/solution/greenpages/pom.xml
+++ b/solution/greenpages/pom.xml
@@ -12,9 +12,8 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.virgo</groupId>
 	<artifactId>greenpages-solution</artifactId>
-	<name>GreenPages PAR</name>
+	<name>greenpages.par</name>
 	<description>GreenPages PAR</description>
 	<packaging>par</packaging>
 
@@ -61,6 +60,11 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
+				<configuration>
+					<outputDirectory>${project.build.directory}/par-provided</outputDirectory>
+					<overWriteIfNewer>true</overWriteIfNewer>
+					<excludeGroupIds>org.eclipse.virgo,org.apache.log4j</excludeGroupIds>
+				</configuration>
 				<executions>
 					<execution>
 						<id>copy-dependencies</id>
@@ -68,15 +72,10 @@
 						<goals>
 							<goal>copy-dependencies</goal>
 						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/par-provided</outputDirectory>
-							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeGroupIds>org.eclipse.virgo,org.apache.log4j</excludeGroupIds>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 		</plugins>
-	</build>
-
+    </build>
+  
 </project>
diff --git a/solution/parent/.classpath b/solution/parent/.classpath
index b8a2888..aa6ee38 100644
--- a/solution/parent/.classpath
+++ b/solution/parent/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<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/.project b/solution/parent/.project
index 537c91f..0295531 100644
--- a/solution/parent/.project
+++ b/solution/parent/.project
@@ -15,8 +15,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 	</natures>
diff --git a/solution/parent/.settings/org.eclipse.m2e.core.prefs b/solution/parent/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..a7c1021
--- /dev/null
+++ b/solution/parent/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Thu Jan 12 14:28:31 GMT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/solution/parent/pom.xml b/solution/parent/pom.xml
index 119bd74..b23ec51 100644
--- a/solution/parent/pom.xml
+++ b/solution/parent/pom.xml
@@ -208,5 +208,5 @@
 			</plugin>
 		</plugins>
 	</build>
-
+  
 </project>
diff --git a/solution/pom.xml b/solution/pom.xml
index 6f3004c..2abfbe1 100644
--- a/solution/pom.xml
+++ b/solution/pom.xml
@@ -8,7 +8,7 @@
 	<groupId>org.eclipse.virgo</groupId>
 	<artifactId>greenpages-top-level-solution</artifactId>
 	<version>2.5.0.RELEASE</version>
-    <name>GreenPages App Build</name>
+	<name>GreenPages App Build</name>
 	<packaging>pom</packaging>
 	<modules>
 		<module>parent</module>
diff --git a/start/greenpages.app/.settings/org.eclipse.wst.common.project.facet.core.xml b/start/greenpages.app/.settings/org.eclipse.wst.common.project.facet.core.xml
index 7f43a0b..856dd1e 100644
--- a/start/greenpages.app/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/start/greenpages.app/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="com.springsource.server.bundle" version="1.0"/>
+  <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
   <installed facet="jst.java" version="6.0"/>
-  <installed facet="jst.utility" version="1.0"/>
 </faceted-project>
diff --git a/start/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml b/start/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856..92aa290 100644
--- a/start/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/start/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="com.springsource.server.bundle" version="1.0"/>
+  <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
 </faceted-project>
diff --git a/start/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/start/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml
index 0ce7597..2739bed 100644
--- a/start/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/start/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="com.springsource.server.bundle" version="1.0"/>
+  <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
   <installed facet="jst.java" version="6.0"/>
   <installed facet="jst.web" version="2.5"/>
 </faceted-project>