372640 373496 Removing the start folder and updating the build and docs to reflect this. Also fixing the build to run from a clean m2 repo.
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..4f9bffb
--- /dev/null
+++ b/.DS_Store
Binary files differ
diff --git a/build-greenpages/build.xml b/build-greenpages/build.xml
index 9dc64e5..c4add90 100644
--- a/build-greenpages/build.xml
+++ b/build-greenpages/build.xml
@@ -7,11 +7,47 @@
<pathelement location="../guide"/>
</path>
- <property name="integration.repo.dir" value="${basedir}/../integration-repo"/>
- <property name="ivy.cache.dir" value="${basedir}/../ivy-cache"/>
<property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../build.versions"/>
- <import file="${basedir}/package-top-level.xml"/>
<import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
+ <target name="package" description="Creates the release package for this project">
+ <delete dir="${package.output.dir}" quiet="true"/>
+ <mkdir dir="${package.output.dir}"/>
+ <delete file="${package.output.file}" quiet="true"/>
+ <mkdir dir="${artifacts.dir}"/>
+
+ <copy todir="${package.output.dir}">
+ <fileset dir="${basedir}/resources"/>
+ </copy>
+
+ <all-bundles buildpathRef="doc.bundles" target="doc">
+ <property name="docbook.output.dir" value="${package.docs.dir}"/>
+ </all-bundles>
+
+ <copy todir="${package.output.dir}">
+ <fileset dir="${basedir}/..">
+ <include name="db/**"/>
+ <include name="greenpages/**"/>
+ <include name="greenpages.core/**"/>
+ <include name="greenpages.db/**"/>
+ <include name="greenpages.jpa/**"/>
+ <include name="greenpages.web/**"/>
+ <include name="greenpages.parent/**"/>
+ <include name="pom.xml"/>
+ <exclude name="**/target/**"/>
+ </fileset>
+ </copy>
+
+ <chmod perm="755">
+ <fileset dir="${package.output.dir}">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+
+ <zip destfile="${package.output.file}">
+ <zipfileset dir="${package.dir}" includes="${package.basename}/**/*.sh" filemode="755"/>
+ <zipfileset dir="${package.dir}" excludes="${package.basename}/**/*.sh"/>
+ </zip>
+ </target>
+
</project>
diff --git a/build-greenpages/package-top-level.xml b/build-greenpages/package-top-level.xml
deleted file mode 100644
index 866e928..0000000
--- a/build-greenpages/package-top-level.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="package-top-level">
-
- <target name="package" description="Creates the release package for this project">
- <delete dir="${package.output.dir}" quiet="true"/>
- <mkdir dir="${package.output.dir}"/>
- <delete file="${package.output.file}" quiet="true"/>
- <mkdir dir="${artifacts.dir}"/>
-
- <copy todir="${package.output.dir}">
- <fileset dir="${basedir}/resources"/>
- </copy>
-
- <all-bundles buildpathRef="doc.bundles" target="doc">
- <property name="docbook.output.dir" value="${package.docs.dir}"/>
- </all-bundles>
-
- <copy todir="${package.output.dir}">
- <fileset dir="${basedir}/..">
- <include name="db/**"/>
- <include name="start/**"/>
- <include name="solution/**"/>
- <exclude name="**/target/**"/>
- </fileset>
- </copy>
-
- <chmod perm="755">
- <fileset dir="${package.output.dir}">
- <include name="**/*.sh"/>
- </fileset>
- </chmod>
-
- <zip destfile="${package.output.file}">
- <zipfileset dir="${package.dir}" includes="${package.basename}/**/*.sh" filemode="755"/>
- <zipfileset dir="${package.dir}" excludes="${package.basename}/**/*.sh"/>
- </zip>
- </target>
-
-</project>
diff --git a/solution/greenpages.app/.classpath b/greenpages.core/.classpath
similarity index 100%
rename from solution/greenpages.app/.classpath
rename to greenpages.core/.classpath
diff --git a/solution/greenpages.app/.project b/greenpages.core/.project
similarity index 100%
rename from solution/greenpages.app/.project
rename to greenpages.core/.project
diff --git a/solution/greenpages.app/.settings/org.eclipse.jdt.core.prefs b/greenpages.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from solution/greenpages.app/.settings/org.eclipse.jdt.core.prefs
rename to greenpages.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/solution/greenpages.app/.settings/org.eclipse.m2e.core.prefs b/greenpages.core/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from solution/greenpages.app/.settings/org.eclipse.m2e.core.prefs
rename to greenpages.core/.settings/org.eclipse.m2e.core.prefs
diff --git a/solution/greenpages.app/.settings/org.eclipse.wst.common.component b/greenpages.core/.settings/org.eclipse.wst.common.component
similarity index 100%
rename from solution/greenpages.app/.settings/org.eclipse.wst.common.component
rename to greenpages.core/.settings/org.eclipse.wst.common.component
diff --git a/solution/greenpages.app/.settings/org.eclipse.wst.common.project.facet.core.xml b/greenpages.core/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from solution/greenpages.app/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to greenpages.core/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/solution/greenpages.app/.settings/org.maven.ide.eclipse.prefs b/greenpages.core/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from solution/greenpages.app/.settings/org.maven.ide.eclipse.prefs
rename to greenpages.core/.settings/org.maven.ide.eclipse.prefs
diff --git a/solution/greenpages.app/.springBeans b/greenpages.core/.springBeans
similarity index 100%
rename from solution/greenpages.app/.springBeans
rename to greenpages.core/.springBeans
diff --git a/start/greenpages.app/pom.xml b/greenpages.core/pom.xml
similarity index 73%
rename from start/greenpages.app/pom.xml
rename to greenpages.core/pom.xml
index e572b6a..5ebd10a 100644
--- a/start/greenpages.app/pom.xml
+++ b/greenpages.core/pom.xml
@@ -8,13 +8,12 @@
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent</artifactId>
<version>2.5.0.RELEASE</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../greenpages.parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.app</artifactId>
- <name>greenpages.app</name>
+ <artifactId>greenpages.core</artifactId>
+ <name>greenpages.core</name>
<packaging>jar</packaging>
<dependencies>
@@ -24,6 +23,11 @@
<type>libd</type>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.instrument</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.junit</groupId>
<artifactId>com.springsource.org.junit</artifactId>
</dependency>
diff --git a/start/greenpages.app/src/main/java/greenpages/Directory.java b/greenpages.core/src/main/java/greenpages/Directory.java
similarity index 100%
rename from start/greenpages.app/src/main/java/greenpages/Directory.java
rename to greenpages.core/src/main/java/greenpages/Directory.java
diff --git a/start/greenpages.app/src/main/java/greenpages/Listing.java b/greenpages.core/src/main/java/greenpages/Listing.java
similarity index 100%
rename from start/greenpages.app/src/main/java/greenpages/Listing.java
rename to greenpages.core/src/main/java/greenpages/Listing.java
diff --git a/solution/greenpages.app/src/main/java/greenpages/internal/DirectoryImpl.java b/greenpages.core/src/main/java/greenpages/internal/DirectoryImpl.java
similarity index 100%
rename from solution/greenpages.app/src/main/java/greenpages/internal/DirectoryImpl.java
rename to greenpages.core/src/main/java/greenpages/internal/DirectoryImpl.java
diff --git a/solution/greenpages.app/src/main/java/greenpages/internal/ImmutableListing.java b/greenpages.core/src/main/java/greenpages/internal/ImmutableListing.java
similarity index 100%
rename from solution/greenpages.app/src/main/java/greenpages/internal/ImmutableListing.java
rename to greenpages.core/src/main/java/greenpages/internal/ImmutableListing.java
diff --git a/solution/greenpages.app/src/main/resources/META-INF/MANIFEST.MF b/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from solution/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
rename to greenpages.core/src/main/resources/META-INF/MANIFEST.MF
diff --git a/solution/greenpages.app/src/main/resources/META-INF/spring/module-context.xml b/greenpages.core/src/main/resources/META-INF/spring/module-context.xml
similarity index 100%
rename from solution/greenpages.app/src/main/resources/META-INF/spring/module-context.xml
rename to greenpages.core/src/main/resources/META-INF/spring/module-context.xml
diff --git a/solution/greenpages.app/src/main/resources/META-INF/spring/osgi-context.xml b/greenpages.core/src/main/resources/META-INF/spring/osgi-context.xml
similarity index 100%
rename from solution/greenpages.app/src/main/resources/META-INF/spring/osgi-context.xml
rename to greenpages.core/src/main/resources/META-INF/spring/osgi-context.xml
diff --git a/solution/greenpages.app/template.mf b/greenpages.core/template.mf
similarity index 70%
rename from solution/greenpages.app/template.mf
rename to greenpages.core/template.mf
index a09f6bf..6e6bb86 100644
--- a/solution/greenpages.app/template.mf
+++ b/greenpages.core/template.mf
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: GreenPages Service
-Bundle-SymbolicName: greenpages
+Bundle-SymbolicName: greenpages.core
Bundle-Vendor: SpringSource Inc.
Bundle-Version: 2.5.0
Import-Template:
- org.springframework.*;version="[3.0, 3.1)"
+ org.springframework.*;version="[3.0, 3.5)"
Excluded-Exports:
greenpages.internal
diff --git a/solution/greenpages.db/.classpath b/greenpages.db/.classpath
similarity index 100%
rename from solution/greenpages.db/.classpath
rename to greenpages.db/.classpath
diff --git a/solution/greenpages.db/.project b/greenpages.db/.project
similarity index 100%
rename from solution/greenpages.db/.project
rename to greenpages.db/.project
diff --git a/solution/greenpages.db/.settings/org.eclipse.jdt.core.prefs b/greenpages.db/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from solution/greenpages.db/.settings/org.eclipse.jdt.core.prefs
rename to greenpages.db/.settings/org.eclipse.jdt.core.prefs
diff --git a/solution/greenpages.db/.settings/org.eclipse.m2e.core.prefs b/greenpages.db/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from solution/greenpages.db/.settings/org.eclipse.m2e.core.prefs
rename to greenpages.db/.settings/org.eclipse.m2e.core.prefs
diff --git a/solution/greenpages.db/.settings/org.eclipse.wst.common.project.facet.core.xml b/greenpages.db/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from solution/greenpages.db/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to greenpages.db/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/solution/greenpages.db/.springBeans b/greenpages.db/.springBeans
similarity index 100%
rename from solution/greenpages.db/.springBeans
rename to greenpages.db/.springBeans
diff --git a/solution/greenpages.db/pom.xml b/greenpages.db/pom.xml
similarity index 79%
rename from solution/greenpages.db/pom.xml
rename to greenpages.db/pom.xml
index 042fe09..5e82483 100644
--- a/solution/greenpages.db/pom.xml
+++ b/greenpages.db/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent-solution</artifactId>
+ <artifactId>greenpages.parent</artifactId>
<version>2.5.0.RELEASE</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../greenpages.parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>greenpages.db-solution</artifactId>
+ <artifactId>greenpages.db</artifactId>
<name>greenpages.db</name>
<packaging>jar</packaging>
@@ -43,9 +43,13 @@
<artifactId>com.springsource.org.h2</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.instrument</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.aspectj</groupId>
- <artifactId>org.aspectj-library</artifactId>
- <type>libd</type>
+ <artifactId>com.springsource.org.aspectj.weaver</artifactId>
</dependency>
</dependencies>
diff --git a/solution/greenpages.db/src/main/resources/META-INF/MANIFEST.MF b/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from solution/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
rename to greenpages.db/src/main/resources/META-INF/MANIFEST.MF
diff --git a/solution/greenpages.db/src/main/resources/META-INF/spring/module-context.xml b/greenpages.db/src/main/resources/META-INF/spring/module-context.xml
similarity index 100%
rename from solution/greenpages.db/src/main/resources/META-INF/spring/module-context.xml
rename to greenpages.db/src/main/resources/META-INF/spring/module-context.xml
diff --git a/solution/greenpages.db/src/main/resources/META-INF/spring/osgi-context.xml b/greenpages.db/src/main/resources/META-INF/spring/osgi-context.xml
similarity index 100%
rename from solution/greenpages.db/src/main/resources/META-INF/spring/osgi-context.xml
rename to greenpages.db/src/main/resources/META-INF/spring/osgi-context.xml
diff --git a/solution/greenpages.db/template.mf b/greenpages.db/template.mf
similarity index 100%
rename from solution/greenpages.db/template.mf
rename to greenpages.db/template.mf
diff --git a/solution/greenpages.jpa/.classpath b/greenpages.jpa/.classpath
similarity index 100%
rename from solution/greenpages.jpa/.classpath
rename to greenpages.jpa/.classpath
diff --git a/solution/greenpages.jpa/.project b/greenpages.jpa/.project
similarity index 100%
rename from solution/greenpages.jpa/.project
rename to greenpages.jpa/.project
diff --git a/solution/greenpages.jpa/.settings/JpaDirectorySpringContextTests-solution.launch b/greenpages.jpa/.settings/JpaDirectorySpringContextTests-solution.launch
similarity index 100%
rename from solution/greenpages.jpa/.settings/JpaDirectorySpringContextTests-solution.launch
rename to greenpages.jpa/.settings/JpaDirectorySpringContextTests-solution.launch
diff --git a/solution/greenpages.jpa/.settings/org.eclipse.jdt.core.prefs b/greenpages.jpa/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from solution/greenpages.jpa/.settings/org.eclipse.jdt.core.prefs
rename to greenpages.jpa/.settings/org.eclipse.jdt.core.prefs
diff --git a/solution/greenpages.jpa/.settings/org.eclipse.jst.common.project.facet.core.prefs b/greenpages.jpa/.settings/org.eclipse.jst.common.project.facet.core.prefs
similarity index 100%
rename from solution/greenpages.jpa/.settings/org.eclipse.jst.common.project.facet.core.prefs
rename to greenpages.jpa/.settings/org.eclipse.jst.common.project.facet.core.prefs
diff --git a/solution/greenpages.jpa/.settings/org.eclipse.m2e.core.prefs b/greenpages.jpa/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from solution/greenpages.jpa/.settings/org.eclipse.m2e.core.prefs
rename to greenpages.jpa/.settings/org.eclipse.m2e.core.prefs
diff --git a/solution/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml b/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from solution/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/start/greenpages.jpa/.settings/org.maven.ide.eclipse.prefs b/greenpages.jpa/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from start/greenpages.jpa/.settings/org.maven.ide.eclipse.prefs
rename to greenpages.jpa/.settings/org.maven.ide.eclipse.prefs
diff --git a/solution/greenpages.jpa/.springBeans b/greenpages.jpa/.springBeans
similarity index 100%
rename from solution/greenpages.jpa/.springBeans
rename to greenpages.jpa/.springBeans
diff --git a/solution/greenpages.jpa/pom.xml b/greenpages.jpa/pom.xml
similarity index 84%
rename from solution/greenpages.jpa/pom.xml
rename to greenpages.jpa/pom.xml
index 81e4125..2973d35 100644
--- a/solution/greenpages.jpa/pom.xml
+++ b/greenpages.jpa/pom.xml
@@ -6,20 +6,20 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent-solution</artifactId>
+ <artifactId>greenpages.parent</artifactId>
<version>2.5.0.RELEASE</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../greenpages.parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>greenpages.jpa-solution</artifactId>
+ <artifactId>greenpages.jpa</artifactId>
<name>greenpages.jpa</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.app-solution</artifactId>
+ <artifactId>greenpages.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -50,8 +50,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.instrument</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.instrument</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -70,8 +71,7 @@
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
- <artifactId>org.aspectj-library</artifactId>
- <type>libd</type>
+ <artifactId>com.springsource.org.aspectj.weaver</artifactId>
</dependency>
</dependencies>
diff --git a/solution/greenpages.jpa/src/main/java/greenpages/jpa/JpaDirectory.java b/greenpages.jpa/src/main/java/greenpages/jpa/JpaDirectory.java
similarity index 100%
rename from solution/greenpages.jpa/src/main/java/greenpages/jpa/JpaDirectory.java
rename to greenpages.jpa/src/main/java/greenpages/jpa/JpaDirectory.java
diff --git a/start/greenpages.jpa/src/main/java/greenpages/jpa/JpaListing.java b/greenpages.jpa/src/main/java/greenpages/jpa/JpaListing.java
similarity index 100%
rename from start/greenpages.jpa/src/main/java/greenpages/jpa/JpaListing.java
rename to greenpages.jpa/src/main/java/greenpages/jpa/JpaListing.java
diff --git a/solution/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF b/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from solution/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
rename to greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
diff --git a/solution/greenpages.jpa/src/main/resources/META-INF/orm.xml b/greenpages.jpa/src/main/resources/META-INF/orm.xml
similarity index 100%
rename from solution/greenpages.jpa/src/main/resources/META-INF/orm.xml
rename to greenpages.jpa/src/main/resources/META-INF/orm.xml
diff --git a/solution/greenpages.jpa/src/main/resources/META-INF/persistence.xml b/greenpages.jpa/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from solution/greenpages.jpa/src/main/resources/META-INF/persistence.xml
rename to greenpages.jpa/src/main/resources/META-INF/persistence.xml
diff --git a/solution/greenpages.jpa/src/main/resources/META-INF/spring/module-context.xml b/greenpages.jpa/src/main/resources/META-INF/spring/module-context.xml
similarity index 100%
rename from solution/greenpages.jpa/src/main/resources/META-INF/spring/module-context.xml
rename to greenpages.jpa/src/main/resources/META-INF/spring/module-context.xml
diff --git a/solution/greenpages.jpa/src/main/resources/META-INF/spring/osgi-context.xml b/greenpages.jpa/src/main/resources/META-INF/spring/osgi-context.xml
similarity index 100%
rename from solution/greenpages.jpa/src/main/resources/META-INF/spring/osgi-context.xml
rename to greenpages.jpa/src/main/resources/META-INF/spring/osgi-context.xml
diff --git a/solution/greenpages.jpa/src/test/java/greenpages/jpa/JpaDirectorySpringContextTests.java b/greenpages.jpa/src/test/java/greenpages/jpa/JpaDirectorySpringContextTests.java
similarity index 100%
rename from solution/greenpages.jpa/src/test/java/greenpages/jpa/JpaDirectorySpringContextTests.java
rename to greenpages.jpa/src/test/java/greenpages/jpa/JpaDirectorySpringContextTests.java
diff --git a/start/greenpages.jpa/src/test/java/greenpages/jpa/TestDataPopulator.java b/greenpages.jpa/src/test/java/greenpages/jpa/TestDataPopulator.java
similarity index 100%
rename from start/greenpages.jpa/src/test/java/greenpages/jpa/TestDataPopulator.java
rename to greenpages.jpa/src/test/java/greenpages/jpa/TestDataPopulator.java
diff --git a/solution/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml b/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml
similarity index 100%
rename from solution/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml
rename to greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml
diff --git a/solution/greenpages.jpa/template.mf b/greenpages.jpa/template.mf
similarity index 78%
rename from solution/greenpages.jpa/template.mf
rename to greenpages.jpa/template.mf
index 67ff374..c41540c 100644
--- a/solution/greenpages.jpa/template.mf
+++ b/greenpages.jpa/template.mf
@@ -5,7 +5,7 @@
Bundle-Vendor: SpringSource
Bundle-Version: 2.5.0
Import-Template:
- org.springframework.*;version="[3.0, 3.1)",
+ org.springframework.*;version="[3.0, 3.5)",
greenpages;version="[2.5, 2.6)",
javax.persistence;version="[1.0.0, 1.0.0]",
org.apache.commons.dbcp.*;version="[1.2.2.osgi, 1.2.2.osgi]",
@@ -14,8 +14,8 @@
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:
- org.springframework.context.weaving;version="[3.0, 3.1)",
- org.springframework.transaction.aspectj;version="[3.0, 3.1)"
+ org.springframework.context.weaving;version="[3.0, 3.5)",
+ org.springframework.transaction.aspectj;version="[3.0, 3.5)"
Excluded-Exports:
greenpages.jpa
Excluded-Imports:
diff --git a/solution/parent/.classpath b/greenpages.parent/.classpath
similarity index 100%
rename from solution/parent/.classpath
rename to greenpages.parent/.classpath
diff --git a/solution/parent/.project b/greenpages.parent/.project
similarity index 100%
rename from solution/parent/.project
rename to greenpages.parent/.project
diff --git a/solution/parent/.settings/org.eclipse.m2e.core.prefs b/greenpages.parent/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from solution/parent/.settings/org.eclipse.m2e.core.prefs
rename to greenpages.parent/.settings/org.eclipse.m2e.core.prefs
diff --git a/solution/parent/.settings/org.maven.ide.eclipse.prefs b/greenpages.parent/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from solution/parent/.settings/org.maven.ide.eclipse.prefs
rename to greenpages.parent/.settings/org.maven.ide.eclipse.prefs
diff --git a/solution/parent/pom.xml b/greenpages.parent/pom.xml
similarity index 92%
rename from solution/parent/pom.xml
rename to greenpages.parent/pom.xml
index b23ec51..09f2ae3 100644
--- a/solution/parent/pom.xml
+++ b/greenpages.parent/pom.xml
@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent-solution</artifactId>
+ <artifactId>greenpages.parent</artifactId>
<version>2.5.0.RELEASE</version>
<name>greenpages.parent</name>
<packaging>pom</packaging>
@@ -52,9 +52,8 @@
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
- <artifactId>org.aspectj-library</artifactId>
- <type>libd</type>
- <version>1.6.2.RELEASE</version>
+ <artifactId>com.springsource.org.aspectj.weaver</artifactId>
+ <version>1.6.12.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -123,7 +122,7 @@
<name>SpringSource Enterprise Bundle Repository - SpringSource Library Releases</name>
<url>http://repository.springsource.com/maven/libraries/release</url>
</repository>
- <repository>
+ <!-- <repository>
<id>com.springsource.repository.libraries.external</id>
<name>SpringSource Enterprise Bundle Repository - External Library Releases</name>
<url>http://repository.springsource.com/maven/libraries/external</url>
@@ -137,7 +136,7 @@
<id>com.springsource.repository.libraries.snapshot</id>
<name>SpringSource Enterprise Bundle Repository - Snapshot Library Releases</name>
<url>http://repository.springsource.com/maven/libraries/snapshot</url>
- </repository>
+ </repository> -->
</repositories>
<properties>
@@ -150,11 +149,11 @@
<name>SpringSource Enterprise Bundle Repository - Releases</name>
<url>http://repository.springsource.com/maven/bundles/release</url>
</pluginRepository>
- <pluginRepository>
+ <!-- <pluginRepository>
<id>com.springsource.repository.bundles.milestone</id>
<name>SpringSource Enterprise Bundle Repository - Milestone</name>
<url>http://repository.springsource.com/maven/bundles/milestone</url>
- </pluginRepository>
+ </pluginRepository> -->
</pluginRepositories>
<build>
@@ -162,12 +161,12 @@
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
- <version>1.0.0.M2</version>
+ <version>1.0.0.RELEASE</version>
<executions>
<execution>
<id>bundlor</id>
<goals>
- <goal>transform</goal>
+ <goal>bundlor</goal>
</goals>
<phase>package</phase>
</execution>
@@ -176,6 +175,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -184,6 +184,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<archive>
<manifestFile>
@@ -195,6 +196,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
<configuration>
<includes>
<include>**/*Tests.java</include>
@@ -203,7 +205,7 @@
<exclude>**/Abstract*.java</exclude>
</excludes>
<junitArtifactName>org.junit:com.springsource.org.junit</junitArtifactName>
- <argLine>-javaagent:${user.home}/.m2/repository/org/springframework/org.springframework.instrument/3.0.0.M3/org.springframework.instrument-3.0.0.M3.jar</argLine>
+ <argLine>-javaagent:${user.home}/.m2/repository/org/springframework/org.springframework.instrument/3.0.5.RELEASE/org.springframework.instrument-3.0.5.RELEASE.jar</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/solution/greenpages.web/.classpath b/greenpages.web/.classpath
similarity index 100%
rename from solution/greenpages.web/.classpath
rename to greenpages.web/.classpath
diff --git a/solution/greenpages.web/.project b/greenpages.web/.project
similarity index 100%
rename from solution/greenpages.web/.project
rename to greenpages.web/.project
diff --git a/solution/greenpages.web/.settings/.jsdtscope b/greenpages.web/.settings/.jsdtscope
similarity index 100%
rename from solution/greenpages.web/.settings/.jsdtscope
rename to greenpages.web/.settings/.jsdtscope
diff --git a/solution/greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch b/greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch
similarity index 100%
rename from solution/greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch
rename to greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch
diff --git a/solution/greenpages.web/.settings/org.eclipse.jdt.core.prefs b/greenpages.web/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from solution/greenpages.web/.settings/org.eclipse.jdt.core.prefs
rename to greenpages.web/.settings/org.eclipse.jdt.core.prefs
diff --git a/solution/greenpages.web/.settings/org.eclipse.m2e.core.prefs b/greenpages.web/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from solution/greenpages.web/.settings/org.eclipse.m2e.core.prefs
rename to greenpages.web/.settings/org.eclipse.m2e.core.prefs
diff --git a/solution/greenpages.web/.settings/org.eclipse.wst.common.component b/greenpages.web/.settings/org.eclipse.wst.common.component
similarity index 100%
rename from solution/greenpages.web/.settings/org.eclipse.wst.common.component
rename to greenpages.web/.settings/org.eclipse.wst.common.component
diff --git a/solution/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from solution/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/start/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.container b/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
similarity index 100%
rename from start/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
rename to greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/start/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.name b/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
similarity index 100%
rename from start/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
rename to greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/solution/greenpages.web/.settings/org.maven.ide.eclipse.prefs b/greenpages.web/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from solution/greenpages.web/.settings/org.maven.ide.eclipse.prefs
rename to greenpages.web/.settings/org.maven.ide.eclipse.prefs
diff --git a/start/greenpages.web/.settings/org.springframework.ide.eclipse.beans.core.prefs b/greenpages.web/.settings/org.springframework.ide.eclipse.beans.core.prefs
similarity index 100%
rename from start/greenpages.web/.settings/org.springframework.ide.eclipse.beans.core.prefs
rename to greenpages.web/.settings/org.springframework.ide.eclipse.beans.core.prefs
diff --git a/start/greenpages.web/.springBeans b/greenpages.web/.springBeans
similarity index 100%
rename from start/greenpages.web/.springBeans
rename to greenpages.web/.springBeans
diff --git a/solution/greenpages.web/pom.xml b/greenpages.web/pom.xml
similarity index 86%
rename from solution/greenpages.web/pom.xml
rename to greenpages.web/pom.xml
index 4ec4c9c..e5ef9db 100644
--- a/solution/greenpages.web/pom.xml
+++ b/greenpages.web/pom.xml
@@ -6,20 +6,20 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent-solution</artifactId>
+ <artifactId>greenpages.parent</artifactId>
<version>2.5.0.RELEASE</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../greenpages.parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>greenpages.web-solution</artifactId>
+ <artifactId>greenpages.web</artifactId>
<name>greenpages.web</name>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.app-solution</artifactId>
+ <artifactId>greenpages.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.jpa-solution</artifactId>
+ <artifactId>greenpages.jpa</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -76,8 +76,7 @@
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
- <artifactId>org.aspectj-library</artifactId>
- <type>libd</type>
+ <artifactId>com.springsource.org.aspectj.weaver</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -86,7 +85,7 @@
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
+ <version>2.2</version>
<configuration>
<packagingExcludes>WEB-INF/lib/**</packagingExcludes>
</configuration>
diff --git a/solution/greenpages.web/src/main/java/greenpages/web/GreenPagesController.java b/greenpages.web/src/main/java/greenpages/web/GreenPagesController.java
similarity index 100%
rename from solution/greenpages.web/src/main/java/greenpages/web/GreenPagesController.java
rename to greenpages.web/src/main/java/greenpages/web/GreenPagesController.java
diff --git a/solution/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF b/greenpages.web/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
rename to greenpages.web/src/main/resources/META-INF/MANIFEST.MF
diff --git a/solution/greenpages.web/src/main/webapp/WEB-INF/applicationContext.xml b/greenpages.web/src/main/resources/WEB-INF/applicationContext.xml
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/WEB-INF/applicationContext.xml
rename to greenpages.web/src/main/resources/WEB-INF/applicationContext.xml
diff --git a/solution/greenpages.web/src/main/webapp/WEB-INF/ftl/entry.ftl b/greenpages.web/src/main/resources/WEB-INF/ftl/entry.ftl
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/WEB-INF/ftl/entry.ftl
rename to greenpages.web/src/main/resources/WEB-INF/ftl/entry.ftl
diff --git a/solution/greenpages.web/src/main/webapp/WEB-INF/ftl/home.ftl b/greenpages.web/src/main/resources/WEB-INF/ftl/home.ftl
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/WEB-INF/ftl/home.ftl
rename to greenpages.web/src/main/resources/WEB-INF/ftl/home.ftl
diff --git a/solution/greenpages.web/src/main/webapp/WEB-INF/ftl/search.ftl b/greenpages.web/src/main/resources/WEB-INF/ftl/search.ftl
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/WEB-INF/ftl/search.ftl
rename to greenpages.web/src/main/resources/WEB-INF/ftl/search.ftl
diff --git a/solution/greenpages.web/src/main/webapp/WEB-INF/greenpages-servlet.xml b/greenpages.web/src/main/resources/WEB-INF/greenpages-servlet.xml
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/WEB-INF/greenpages-servlet.xml
rename to greenpages.web/src/main/resources/WEB-INF/greenpages-servlet.xml
diff --git a/start/greenpages.web/src/main/webapp/WEB-INF/web.xml b/greenpages.web/src/main/resources/WEB-INF/web.xml
similarity index 100%
rename from start/greenpages.web/src/main/webapp/WEB-INF/web.xml
rename to greenpages.web/src/main/resources/WEB-INF/web.xml
diff --git a/solution/greenpages.web/src/main/webapp/images/favicon.ico b/greenpages.web/src/main/resources/images/favicon.ico
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/favicon.ico
rename to greenpages.web/src/main/resources/images/favicon.ico
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/footer-left.png b/greenpages.web/src/main/resources/images/footer-left.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/footer-left.png
rename to greenpages.web/src/main/resources/images/footer-left.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/footer-right.png b/greenpages.web/src/main/resources/images/footer-right.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/footer-right.png
rename to greenpages.web/src/main/resources/images/footer-right.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/footer-stretch.png b/greenpages.web/src/main/resources/images/footer-stretch.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/footer-stretch.png
rename to greenpages.web/src/main/resources/images/footer-stretch.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/header-left.png b/greenpages.web/src/main/resources/images/header-left.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/header-left.png
rename to greenpages.web/src/main/resources/images/header-left.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/header-right.png b/greenpages.web/src/main/resources/images/header-right.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/header-right.png
rename to greenpages.web/src/main/resources/images/header-right.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/loader-white-large.gif b/greenpages.web/src/main/resources/images/loader-white-large.gif
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/loader-white-large.gif
rename to greenpages.web/src/main/resources/images/loader-white-large.gif
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/loader-white-small.gif b/greenpages.web/src/main/resources/images/loader-white-small.gif
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/loader-white-small.gif
rename to greenpages.web/src/main/resources/images/loader-white-small.gif
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/menu-curve-left.png b/greenpages.web/src/main/resources/images/menu-curve-left.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/menu-curve-left.png
rename to greenpages.web/src/main/resources/images/menu-curve-left.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/menu-curve-right.png b/greenpages.web/src/main/resources/images/menu-curve-right.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/menu-curve-right.png
rename to greenpages.web/src/main/resources/images/menu-curve-right.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/menu-stretch.png b/greenpages.web/src/main/resources/images/menu-stretch.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/menu-stretch.png
rename to greenpages.web/src/main/resources/images/menu-stretch.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/mini-header-left.png b/greenpages.web/src/main/resources/images/mini-header-left.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/mini-header-left.png
rename to greenpages.web/src/main/resources/images/mini-header-left.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/mini-header-right.png b/greenpages.web/src/main/resources/images/mini-header-right.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/mini-header-right.png
rename to greenpages.web/src/main/resources/images/mini-header-right.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/s2ap_soda_can.png b/greenpages.web/src/main/resources/images/s2ap_soda_can.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/s2ap_soda_can.png
rename to greenpages.web/src/main/resources/images/s2ap_soda_can.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/spring.png b/greenpages.web/src/main/resources/images/spring.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/spring.png
rename to greenpages.web/src/main/resources/images/spring.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/images/table-header-background.png b/greenpages.web/src/main/resources/images/table-header-background.png
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/images/table-header-background.png
rename to greenpages.web/src/main/resources/images/table-header-background.png
Binary files differ
diff --git a/solution/greenpages.web/src/main/webapp/index.html b/greenpages.web/src/main/resources/index.html
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/index.html
rename to greenpages.web/src/main/resources/index.html
diff --git a/solution/greenpages.web/src/main/webapp/styles/local.css b/greenpages.web/src/main/resources/styles/local.css
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/styles/local.css
rename to greenpages.web/src/main/resources/styles/local.css
diff --git a/solution/greenpages.web/src/main/webapp/styles/main.css b/greenpages.web/src/main/resources/styles/main.css
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/styles/main.css
rename to greenpages.web/src/main/resources/styles/main.css
diff --git a/solution/greenpages.web/src/main/webapp/styles/print.css b/greenpages.web/src/main/resources/styles/print.css
similarity index 100%
rename from solution/greenpages.web/src/main/webapp/styles/print.css
rename to greenpages.web/src/main/resources/styles/print.css
diff --git a/solution/greenpages.web/src/test/java/greenpages/web/GreenPagesSpringContextTests.java b/greenpages.web/src/test/java/greenpages/web/GreenPagesSpringContextTests.java
similarity index 100%
rename from solution/greenpages.web/src/test/java/greenpages/web/GreenPagesSpringContextTests.java
rename to greenpages.web/src/test/java/greenpages/web/GreenPagesSpringContextTests.java
diff --git a/solution/greenpages.web/src/test/java/greenpages/web/TestDataPopulator.java b/greenpages.web/src/test/java/greenpages/web/TestDataPopulator.java
similarity index 100%
rename from solution/greenpages.web/src/test/java/greenpages/web/TestDataPopulator.java
rename to greenpages.web/src/test/java/greenpages/web/TestDataPopulator.java
diff --git a/solution/greenpages.web/src/test/resources/META-INF/spring/test-context.xml b/greenpages.web/src/test/resources/META-INF/spring/test-context.xml
similarity index 100%
rename from solution/greenpages.web/src/test/resources/META-INF/spring/test-context.xml
rename to greenpages.web/src/test/resources/META-INF/spring/test-context.xml
diff --git a/solution/greenpages.web/template.mf b/greenpages.web/template.mf
similarity index 87%
rename from solution/greenpages.web/template.mf
rename to greenpages.web/template.mf
index 28ff36c..9057c42 100644
--- a/solution/greenpages.web/template.mf
+++ b/greenpages.web/template.mf
@@ -6,7 +6,7 @@
Bundle-ClassPath: .,WEB-INF/classes
Web-ContextPath: greenpages
Import-Template:
- org.springframework.*;version="[3.0, 3.1)",
+ org.springframework.*;version="[3.0, 3.5)",
greenpages.*;version="[2.5, 2.6)"
Import-Package:
javax.servlet.jsp.jstl.core;version="[1.2.0, 2.0.0)",
@@ -16,7 +16,7 @@
Import-Bundle:
com.springsource.org.apache.taglibs.standard;version="[1.1.2,2.0)"
Import-Library:
- org.springframework.spring;version="[3.0, 3.1)"
+ org.springframework.spring;version="[3.0, 3.5)"
Excluded-Exports:
greenpages.tests,
greenpages.web,
diff --git a/solution/greenpages/.classpath b/greenpages/.classpath
similarity index 100%
rename from solution/greenpages/.classpath
rename to greenpages/.classpath
diff --git a/solution/greenpages/.project b/greenpages/.project
similarity index 100%
rename from solution/greenpages/.project
rename to greenpages/.project
diff --git a/solution/greenpages/.settings/org.eclipse.jdt.core.prefs b/greenpages/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from solution/greenpages/.settings/org.eclipse.jdt.core.prefs
rename to greenpages/.settings/org.eclipse.jdt.core.prefs
diff --git a/solution/greenpages/.settings/org.eclipse.m2e.core.prefs b/greenpages/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from solution/greenpages/.settings/org.eclipse.m2e.core.prefs
rename to greenpages/.settings/org.eclipse.m2e.core.prefs
diff --git a/solution/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml b/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
similarity index 100%
rename from solution/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
rename to 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/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from solution/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/solution/greenpages/.settings/org.maven.ide.eclipse.prefs b/greenpages/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from solution/greenpages/.settings/org.maven.ide.eclipse.prefs
rename to greenpages/.settings/org.maven.ide.eclipse.prefs
diff --git a/solution/greenpages/META-INF/MANIFEST.MF b/greenpages/META-INF/MANIFEST.MF
similarity index 100%
rename from solution/greenpages/META-INF/MANIFEST.MF
rename to greenpages/META-INF/MANIFEST.MF
diff --git a/solution/greenpages/pom.xml b/greenpages/pom.xml
similarity index 83%
rename from solution/greenpages/pom.xml
rename to greenpages/pom.xml
index 208345b..24f814d 100644
--- a/solution/greenpages/pom.xml
+++ b/greenpages/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent-solution</artifactId>
+ <artifactId>greenpages.parent</artifactId>
<version>2.5.0.RELEASE</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../greenpages.parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>greenpages-solution</artifactId>
+ <artifactId>greenpages</artifactId>
<name>greenpages.par</name>
<description>GreenPages PAR</description>
<packaging>par</packaging>
@@ -20,24 +20,23 @@
<dependencies>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.app-solution</artifactId>
+ <artifactId>greenpages.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.jpa-solution</artifactId>
+ <artifactId>greenpages.jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.db-solution</artifactId>
+ <artifactId>greenpages.db</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.web-solution</artifactId>
+ <artifactId>greenpages.web</artifactId>
<version>${project.version}</version>
- <type>war</type>
</dependency>
<!-- Needs to be included in the PAR so that its classes are loadable via the PAR's synthetic context class loader -->
<dependency>
@@ -68,7 +67,7 @@
<configuration>
<outputDirectory>${project.build.directory}/par-provided</outputDirectory>
<overWriteIfNewer>true</overWriteIfNewer>
- <excludeGroupIds>org.eclipse.virgo,org.apache.log4j,com.h2database</excludeGroupIds>
+ <excludeGroupIds>org.eclipse.virgo,org.apache.log4j</excludeGroupIds>
</configuration>
<executions>
<execution>
diff --git a/start/greenpages.web/src/main/java/greenpages/web/.gitignore b/greenpages/src/main/resources/.gitignore
similarity index 100%
rename from start/greenpages.web/src/main/java/greenpages/web/.gitignore
rename to greenpages/src/main/resources/.gitignore
diff --git a/greenpages/template.mf b/greenpages/template.mf
new file mode 100644
index 0000000..ac59b66
--- /dev/null
+++ b/greenpages/template.mf
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
\ No newline at end of file
diff --git a/guide/filters.properties b/guide/filters.properties
index 35b23de..3a21bc7 100644
--- a/guide/filters.properties
+++ b/guide/filters.properties
@@ -6,7 +6,7 @@
webserv.community.forums.url=http://www.eclipse.org/forums
webserv.download.url=http://www.eclipse.org/virgo/download
-webserv.version.number=3.0.0
+webserv.version.number=3.0.2
webserv.version=@webserv.version.number@.RELEASE
webserv.expanded.dir=virgo-web-server-@webserv.version@
webserv.zip.file=virgo-web-server-@webserv.version@.zip
diff --git a/guide/images/.DS_Store b/guide/images/.DS_Store
new file mode 100644
index 0000000..9b383fd
--- /dev/null
+++ b/guide/images/.DS_Store
Binary files differ
diff --git a/guide/images/installing-greenpages/.DS_Store b/guide/images/installing-greenpages/.DS_Store
new file mode 100644
index 0000000..5008ddf
--- /dev/null
+++ b/guide/images/installing-greenpages/.DS_Store
Binary files differ
diff --git a/guide/src/highlights.xml b/guide/src/highlights.xml
index 5d5b083..7a2697a 100644
--- a/guide/src/highlights.xml
+++ b/guide/src/highlights.xml
@@ -5,7 +5,7 @@
<title>@greenpages@ Highlights</title>
<para>
-This chapter picks out some notable features of the @greenpages@ sample code from the <literal>solution</literal> folder.
+This chapter picks out some notable features of the @greenpages@ sample code from the <literal>greenpages.*</literal> folders.
</para>
<section id="highlights.wab">
@@ -442,14 +442,14 @@
This file defines a parent POM and a packaging type of <literal>par</literal>:
<programlisting language="xml"><![CDATA[<parent>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent-solution</artifactId>
+ <artifactId>greenpages.parent</artifactId>
<version>2.4.0.RELEASE</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../greenpages.parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo</groupId>
-<artifactId>greenpages-solution</artifactId>
+<artifactId>greenpages</artifactId>
<name>GreenPages PAR</name>
<description>GreenPages PAR</description>
<packaging>par</packaging>]]>
@@ -463,22 +463,22 @@
<programlisting language="xml"><![CDATA[<dependencies>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.app-solution</artifactId>
+ <artifactId>greenpages.app</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.jpa-solution</artifactId>
+ <artifactId>greenpages.jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.db-solution</artifactId>
+ <artifactId>greenpages.db</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.web-solution</artifactId>
+ <artifactId>greenpages.web</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
diff --git a/guide/src/installing-greenpages.xml b/guide/src/installing-greenpages.xml
index 8879c2a..8a7f446 100644
--- a/guide/src/installing-greenpages.xml
+++ b/guide/src/installing-greenpages.xml
@@ -88,10 +88,8 @@
<para>The environment variable <literal>GREENPAGES_HOME</literal> set here is not used by the projects, but is used as a shorthand
in the instructions that follow.
</para>
-<para>The @greenpages@ Zip file contains two main directories called <literal>solution</literal> and <literal>start</literal>.
- The <literal>solution</literal> directory contains the completed application which can be built and tested (as described in the next section).
- The <literal>start</literal> directory, which is ignored by this guide, contains an initial skeleton of the @greenpages@ application which
- could be used to generate the full application.
+<para>The @greenpages@ Zip file contains several directories with names that start <literal>greenpages</literal>.
+ They contain the completed application which can be built and tested (as described in the next section).
</para>
</section>
@@ -105,7 +103,7 @@
file:
<orderedlist>
<listitem>
- <para>Make <code>$GREENPAGES_HOME/solution</code> the current directory.</para>
+ <para>Make <code>$GREENPAGES_HOME/</code> the current directory.</para>
</listitem>
<listitem>
<para>Run the command
@@ -116,7 +114,7 @@
<listitem>
<para>Verify that the
<code>greenpages-@greenpages.version@.par</code> file exists in
- <code>$GREENPAGES_HOME/solution/greenpages/target</code>.
+ <code>$GREENPAGES_HOME/greenpages/target</code>.
</para>
</listitem>
</orderedlist>
@@ -135,19 +133,19 @@
all the artifacts that @greenpages@ depends on that are not supplied by the @webserv@ runtime. These dependencies
can then be installed into the @webserv@ repository. Dependencies are gathered automatically during the
<code>package</code> phase. These dependencies can be found in
- <literal>$GREENPAGES_HOME/solution/greenpages/target/par-provided</literal>. To install dependencies
+ <literal>$GREENPAGES_HOME/greenpages/target/par-provided</literal>. To install dependencies
simply copy all the <code>*.jar</code> files from this directory into <literal>$SERVER_HOME/repository/usr</literal>
(where <literal>$SERVER_HOME</literal> is the @webserv@ installation directory).
</para>
<para>Installing dependencies on Windows:
-<programlisting>prompt> cd %GREENPAGES_HOME%\solution\greenpages
-prompt> copy target\par-provided\* %SERVER_HOME%\repository\usr
+<programlisting>prompt> cd %GREENPAGES_HOME%\greenpages
+prompt> copy target\par-provided\* %SERVER_HOME%\repoorg.apache.commons.fileuploadsitory\usr
</programlisting>
</para>
<para>Installing dependencies on UNIX:
-<programlisting>prompt$ cd $GREENPAGES_HOME/solution/greenpages
+<programlisting>prompt$ cd $GREENPAGES_HOME/org.apache.commons.fileuploadgreenpages
prompt$ cp target/par-provided/* $SERVER_HOME/repository/usr
</programlisting>
</para>
@@ -197,10 +195,10 @@
<orderedlist>
<listitem><para>Copy the @greenpages@ PAR to the <code>$SERVER_HOME/pickup</code> directory. On Unix:</para>
<programlisting>prompt$ cd $SERVER_HOME
-prompt$ cp $GREENPAGES_HOME/solution/greenpages/target/greenpages-solution-@greenpages.version@.par pickup/</programlisting>
+prompt$ cp $GREENPAGES_HOME/greenpages/target/greenpages-@greenpages.version@.par pickup/</programlisting>
<para>On Windows:</para>
<programlisting>prompt> cd %SERVER_HOME%
-prompt> copy %GREENPAGES_HOME%\solution\greenpages\target\greenpages-solution-@greenpages.version@.par pickup\</programlisting>
+prompt> copy %GREENPAGES_HOME%\greenpages\target\greenpages-@greenpages.version@.par pickup\</programlisting>
</listitem>
<listitem><para>Start @webserv@ with the <literal>-clean</literal> option. On Unix:</para>
<programlisting>prompt$ $SERVER_HOME/bin/startup.sh -clean</programlisting>
@@ -297,10 +295,10 @@
</para>
</listitem>
<listitem>
-<para>Click <guibutton>Browse…</guibutton> and select <code>$GREENPAGES_HOME/solution</code> as the root directory.</para>
+<para>Click <guibutton>Browse…</guibutton> and select <code>$GREENPAGES_HOME/</code> as the root directory.</para>
</listitem>
<listitem>
-<para>In the <emphasis>Import Projects</emphasis> window, select all the projects and click <emphasis>Finish</emphasis>:
+<para>In the <emphasis>Import Projects</emphasis> window, select all the projects which include <literal>greenpages</literal> in their name and click <emphasis>Finish</emphasis>:
<mediaobject>
<imageobject role="fo">
<imagedata fileref="images/installing-greenpages/import-projects3.png" format="PNG" align="center" width="15cm"/>
@@ -429,11 +427,11 @@
<para>If the @greenpages@ PAR file was previously copied to the <literal>pickup</literal> directory, be sure it is now removed so that
it does not conflict with the deployment of the Eclipse project. On Unix:</para>
<programlisting>prompt$ cd $SERVER_HOME/pickup
-prompt$ rm greenpages-solution-@greenpages.version@.par</programlisting>
+prompt$ rm greenpages-@greenpages.version@.par</programlisting>
<para>On Windows:</para>
<programlisting>prompt> cd %SERVER_HOME%\pickup
-prompt> del greenpages-solution-@greenpages.version@.par</programlisting>
+prompt> del greenpages-@greenpages.version@.par</programlisting>
<para>Also, to prevent conflicts with the server configured in Eclipse, stop a currently-running @webserv@ by typing <literal>Control-C</literal> in the console window.</para>
@@ -455,7 +453,7 @@
</para>
</listitem>
<listitem><para>
- Add <emphasis>greenpages-solution</emphasis> (which is the containing project or PAR) to the server and finish.
+ Add <emphasis>greenpages</emphasis> (which is the containing project or PAR) to the server and finish.
</para></listitem>
<listitem>
<para>To start @webserv@ from within Eclipse right-click on the @webserv@ node in the Servers window and choose <guimenuitem>Start</guimenuitem>.
diff --git a/solution/pom.xml b/pom.xml
similarity index 82%
rename from solution/pom.xml
rename to pom.xml
index 2abfbe1..0640c56 100644
--- a/solution/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages-top-level-solution</artifactId>
+ <artifactId>greenpages-top-level</artifactId>
<version>2.5.0.RELEASE</version>
<name>GreenPages App Build</name>
<packaging>pom</packaging>
<modules>
- <module>parent</module>
+ <module>greenpages.parent</module>
<module>greenpages.db</module>
- <module>greenpages.app</module>
+ <module>greenpages.core</module>
<module>greenpages.jpa</module>
<module>greenpages.web</module>
<module>greenpages</module>
diff --git a/solution/greenpages.app/pom.xml b/solution/greenpages.app/pom.xml
deleted file mode 100644
index b93a569..0000000
--- a/solution/greenpages.app/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent-solution</artifactId>
- <version>2.5.0.RELEASE</version>
- <relativePath>../parent</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>greenpages.app-solution</artifactId>
- <name>greenpages.app</name>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.spring-library</artifactId>
- <type>libd</type>
- </dependency>
- <dependency>
- <groupId>org.junit</groupId>
- <artifactId>com.springsource.org.junit</artifactId>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/solution/greenpages.app/src/main/java/greenpages/Directory.java b/solution/greenpages.app/src/main/java/greenpages/Directory.java
deleted file mode 100644
index 08ddb9e..0000000
--- a/solution/greenpages.app/src/main/java/greenpages/Directory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package greenpages;
-
-import java.util.List;
-
-/**
- * Main business interface for the GreenPages application.
- *
- * <p>
- * Using this interface you can {@link #search(String) search} the directory for a {@link Listing} and you can access a
- * <code>Listing</code> {@link #findListing(int) by ID}.
- *
- * @see Listing
- */
-public interface Directory {
-
- /**
- * Searches the directory for all {@link Listing Listings} that match the supplied term. Matching is done against
- * the {@link Listing#getLastName() last name} of all known <code>Listings</code>.
- *
- * @param term the search criteria.
- * @return the search results or an empty {@link List} if no matches are found.
- */
- List<Listing> search(String term);
-
- /**
- * Finds the {@link Listing} with the supplied ID.
- *
- * @param id the ID of the <code>Listing</code>
- * @return the <code>Listing</code> or <code>null</code> if no match is found.
- */
- Listing findListing(int id);
-}
diff --git a/solution/greenpages.app/src/main/java/greenpages/Listing.java b/solution/greenpages.app/src/main/java/greenpages/Listing.java
deleted file mode 100644
index 65e1c0e..0000000
--- a/solution/greenpages.app/src/main/java/greenpages/Listing.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package greenpages;
-
-/**
- * Represents a listing in the GreenPages {@link Directory}.
- *
- * @see Directory
- */
-public interface Listing {
-
- Integer getListingNumber();
-
- String getFirstName();
-
- String getLastName();
-
- String getEmailAddress();
-}
diff --git a/solution/greenpages.jpa/.settings/org.maven.ide.eclipse.prefs b/solution/greenpages.jpa/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 8f47b36..0000000
--- a/solution/greenpages.jpa/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Apr 21 16:53:36 BST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/solution/greenpages.jpa/src/main/java/greenpages/jpa/JpaListing.java b/solution/greenpages.jpa/src/main/java/greenpages/jpa/JpaListing.java
deleted file mode 100644
index 1965495..0000000
--- a/solution/greenpages.jpa/src/main/java/greenpages/jpa/JpaListing.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package greenpages.jpa;
-
-import greenpages.Listing;
-
-/**
- * Basic implementation of {@link Listing} that is configured as a persistent type in JPA.
- */
-public class JpaListing implements Listing {
-
- private Integer listingNumber;
-
- private String firstName;
-
- private String lastName;
-
- private String emailAddress;
-
- public Integer getListingNumber() {
- return listingNumber;
- }
-
- public void setListingNumber(Integer listingNumber) {
- this.listingNumber = listingNumber;
- }
-
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
- public String getEmailAddress() {
- return emailAddress;
- }
-
- public void setEmailAddress(String emailAddress) {
- this.emailAddress = emailAddress;
- }
-
-}
diff --git a/solution/greenpages.jpa/src/test/java/greenpages/jpa/TestDataPopulator.java b/solution/greenpages.jpa/src/test/java/greenpages/jpa/TestDataPopulator.java
deleted file mode 100644
index 24f779b..0000000
--- a/solution/greenpages.jpa/src/test/java/greenpages/jpa/TestDataPopulator.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package greenpages.jpa;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import javax.sql.DataSource;
-
-import org.springframework.core.io.Resource;
-
-/**
- * A class that populates a datasource with test data
- */
-public class TestDataPopulator {
-
- private final DataSource dataSource;
-
- private final Resource testDataLocation;
-
- public TestDataPopulator(DataSource dataSource, Resource testDataLocation) {
- this.dataSource = dataSource;
- this.testDataLocation = testDataLocation;
- }
-
- public void populate() {
- Connection connection = null;
- try {
- connection = dataSource.getConnection();
- insertTestData(connection);
- } catch (SQLException e) {
- throw new RuntimeException("SQL exception occurred acquiring connection", e);
- } finally {
- if (connection != null) {
- try {
- connection.close();
- } catch (SQLException e) {
- }
- }
- }
- }
-
- private void insertTestData(Connection connection) {
- try {
- String sql = parseSqlIn(testDataLocation);
- executeSql(sql, connection);
- } catch (IOException e) {
- throw new RuntimeException("I/O exception occurred accessing the test data file", e);
- } catch (SQLException e) {
- throw new RuntimeException("SQL exception occurred loading test data", e);
- }
- }
-
- private String parseSqlIn(Resource resource) throws IOException {
- InputStream is = null;
- try {
- is = resource.getInputStream();
- BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-
- StringWriter sw = new StringWriter();
- BufferedWriter writer = new BufferedWriter(sw);
-
- for (int c = reader.read(); c != -1; c = reader.read()) {
- writer.write(c);
- }
- writer.flush();
- return sw.toString();
-
- } finally {
- if (is != null) {
- is.close();
- }
- }
- }
-
- private void executeSql(String sql, Connection connection) throws SQLException {
- Statement statement = connection.createStatement();
- statement.execute(sql);
- }
-}
diff --git a/solution/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.container b/solution/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a..0000000
--- a/solution/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/solution/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.name b/solution/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b..0000000
--- a/solution/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/solution/greenpages.web/.settings/org.springframework.ide.eclipse.beans.core.prefs b/solution/greenpages.web/.settings/org.springframework.ide.eclipse.beans.core.prefs
deleted file mode 100644
index af8ab8b..0000000
--- a/solution/greenpages.web/.settings/org.springframework.ide.eclipse.beans.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Mar 09 17:11:56 GMT 2009
-eclipse.preferences.version=1
-org.springframework.ide.eclipse.beans.core.ignoreMissingNamespaceHandler=false
diff --git a/solution/greenpages.web/.springBeans b/solution/greenpages.web/.springBeans
deleted file mode 100644
index 618a258..0000000
--- a/solution/greenpages.web/.springBeans
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
- <version>1</version>
- <pluginVersion><![CDATA[2.2.8.200911091054-RELEASE]]></pluginVersion>
- <configSuffixes>
- <configSuffix><![CDATA[xml]]></configSuffix>
- </configSuffixes>
- <enableImports><![CDATA[false]]></enableImports>
- <configs>
- </configs>
- <configSets>
- </configSets>
-</beansProjectDescription>
diff --git a/solution/greenpages.web/src/main/webapp/WEB-INF/web.xml b/solution/greenpages.web/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index adf7d6c..0000000
--- a/solution/greenpages.web/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
-
- <display-name>Greenpages solution - web</display-name>
-
-
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- </welcome-file-list>
-
-<!-- CONFIGURE A PARENT APPLICATION CONTEXT -->
-
- <context-param>
- <param-name>contextClass</param-name>
- <param-value>org.eclipse.virgo.web.dm.ServerOsgiBundleXmlWebApplicationContext</param-value>
- </context-param>
-
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
-
- <!-- DISPATCHER SERVLET CONFIG -->
- <servlet>
- <servlet-name>greenpages</servlet-name>
- <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>greenpages</servlet-name>
- <url-pattern>/app/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
\ No newline at end of file
diff --git a/start/greenpages.app/.classpath b/start/greenpages.app/.classpath
deleted file mode 100644
index 4d6dcbf..0000000
--- a/start/greenpages.app/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/start/greenpages.app/.project b/start/greenpages.app/.project
deleted file mode 100644
index b74ff78..0000000
--- a/start/greenpages.app/.project
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>greenpages.app</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.springframework.ide.eclipse.core.springbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.springsource.server.ide.bundlor.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.springframework.ide.eclipse.core.springnature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>com.springsource.server.ide.facet.core.bundlenature</nature>
- </natures>
-</projectDescription>
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
deleted file mode 100644
index 856dd1e..0000000
--- a/start/greenpages.app/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
- <installed facet="jst.java" version="6.0"/>
-</faceted-project>
diff --git a/start/greenpages.app/.settings/org.maven.ide.eclipse.prefs b/start/greenpages.app/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 36f8d7b..0000000
--- a/start/greenpages.app/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Apr 21 16:53:30 BST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/start/greenpages.app/.springBeans b/start/greenpages.app/.springBeans
deleted file mode 100644
index 4cdca85..0000000
--- a/start/greenpages.app/.springBeans
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
- <version>1</version>
- <pluginVersion><![CDATA[2.2.2.v200901262210]]></pluginVersion>
- <configSuffixes>
- <configSuffix><![CDATA[xml]]></configSuffix>
- </configSuffixes>
- <enableImports><![CDATA[false]]></enableImports>
- <configs>
- <config>src/main/resources/META-INF/spring/module-context.xml</config>
- <config>src/main/resources/META-INF/spring/osgi-context.xml</config>
- </configs>
- <configSets>
- </configSets>
-</beansProjectDescription>
diff --git a/start/greenpages.app/src/main/java/greenpages/internal/DirectoryImpl.java b/start/greenpages.app/src/main/java/greenpages/internal/DirectoryImpl.java
deleted file mode 100644
index b39904c..0000000
--- a/start/greenpages.app/src/main/java/greenpages/internal/DirectoryImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package greenpages.internal;
-
-import java.util.Collections;
-import java.util.List;
-
-import greenpages.Directory;
-import greenpages.Listing;
-
-/**
- * Stub implementation of {@link Directory} that allows for simple testing without a database.
- *
- * Uses Spring 2.* component scanning to find this class and create a bean. The name for this bean
- * is extracted from the {@link Component} annotation.
- */
-
-public class DirectoryImpl implements Directory {
-
- private static final Listing ANDY_WILKINSON = new ImmutableListing(1, "Andy", "Wilkinson", "andy.wilkinson@springsource.com");
-
- /**
- * {@inheritDoc}
- *
- * Stub implementation will match only for term '<code>johnson</code>'.
- */
- public List<Listing> search(String term) {
- if (ANDY_WILKINSON.getLastName().equalsIgnoreCase(term)) {
- Listing l = ANDY_WILKINSON;
-
- return Collections.singletonList(l);
- } else {
- return Collections.emptyList();
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * Stub implementation will return a {@link Listing} for ID 1.
- */
- public Listing findListing(int id) {
- if (id == ANDY_WILKINSON.getListingNumber()) {
- return ANDY_WILKINSON;
- } else {
- return null;
- }
- }
-
-}
diff --git a/start/greenpages.app/src/main/java/greenpages/internal/ImmutableListing.java b/start/greenpages.app/src/main/java/greenpages/internal/ImmutableListing.java
deleted file mode 100644
index b15494c..0000000
--- a/start/greenpages.app/src/main/java/greenpages/internal/ImmutableListing.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package greenpages.internal;
-
-import greenpages.Listing;
-
-final class ImmutableListing implements Listing {
-
- private final Integer listingNumber;
-
- private final String firstName;
-
- private final String lastName;
-
- private final String emailAddress;
-
- public ImmutableListing(int listingNumber, String firstName,String lastName, String emailAddress) {
-
- this.listingNumber = listingNumber;
- this.firstName = firstName;
- this.lastName = lastName;
- this.emailAddress = emailAddress;
- }
-
- public Integer getListingNumber() {
- return listingNumber;
- }
-
- public String getFirstName() {
- return firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public String getEmailAddress() {
- return emailAddress;
- }
-
-}
diff --git a/start/greenpages.app/src/main/resources/META-INF/MANIFEST.MF b/start/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index ebc5665..0000000
--- a/start/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: greenpages;version="2.3.0",greenpages.internal;version
- ="2.3.0";uses:="greenpages"
-Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.5.0
-Tool: Bundlor 1.0.0.RELEASE
-Bundle-Name: GreenPages Service
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: greenpages
-
diff --git a/start/greenpages.app/src/main/resources/META-INF/spring/module-context.xml b/start/greenpages.app/src/main/resources/META-INF/spring/module-context.xml
deleted file mode 100644
index 0c595e9..0000000
--- a/start/greenpages.app/src/main/resources/META-INF/spring/module-context.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
- xmlns:context="http://www.springframework.org/schema/context">
-
- <!-- enables classpath component scanning for this module -->
-
-
-</beans>
diff --git a/start/greenpages.app/src/main/resources/META-INF/spring/osgi-context.xml b/start/greenpages.app/src/main/resources/META-INF/spring/osgi-context.xml
deleted file mode 100644
index 7cc7faa..0000000
--- a/start/greenpages.app/src/main/resources/META-INF/spring/osgi-context.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd"
- xmlns:osgi="http://www.springframework.org/schema/osgi">
-
-
-
-</beans>
diff --git a/start/greenpages.app/template.mf b/start/greenpages.app/template.mf
deleted file mode 100644
index c794eed..0000000
--- a/start/greenpages.app/template.mf
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: GreenPages Service
-Bundle-SymbolicName: greenpages
-Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.5.0
-Import-Template:
- org.springframework.*;version="[3.0, 3.1)"
diff --git a/start/greenpages.jpa/.classpath b/start/greenpages.jpa/.classpath
deleted file mode 100644
index ff1a8fa..0000000
--- a/start/greenpages.jpa/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <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.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/start/greenpages.jpa/.project b/start/greenpages.jpa/.project
deleted file mode 100644
index d9903d5..0000000
--- a/start/greenpages.jpa/.project
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>greenpages.jpa</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.springframework.ide.eclipse.core.springbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.springsource.server.ide.bundlor.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.springframework.ide.eclipse.core.springnature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>com.springsource.server.ide.facet.core.bundlenature</nature>
- </natures>
-</projectDescription>
diff --git a/start/greenpages.jpa/.settings/JpaDirectorySpringContextTests.launch b/start/greenpages.jpa/.settings/JpaDirectorySpringContextTests.launch
deleted file mode 100644
index 267c841..0000000
--- a/start/greenpages.jpa/.settings/JpaDirectorySpringContextTests.launch
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<stringAttribute key="bad_container_name" value="/greenpages.jpa/.setting"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/greenpages.jpa/src/test/java/greenpages/jpa/JpaDirectorySpringContextTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<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.MAIN_TYPE" value="greenpages.jpa.JpaDirectorySpringContextTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="greenpages.jpa"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.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/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
deleted file mode 100644
index 92aa290..0000000
--- a/start/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
-</faceted-project>
diff --git a/start/greenpages.jpa/.springBeans b/start/greenpages.jpa/.springBeans
deleted file mode 100644
index 27e7084..0000000
--- a/start/greenpages.jpa/.springBeans
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
- <version>1</version>
- <pluginVersion><![CDATA[2.2.5.200906231226-RC1]]></pluginVersion>
- <configSuffixes>
- <configSuffix><![CDATA[xml]]></configSuffix>
- </configSuffixes>
- <enableImports><![CDATA[false]]></enableImports>
- <configs>
- <config>src/main/resources/META-INF/spring/osgi-context.xml</config>
- <config>src/main/resources/META-INF/spring/module-context.xml</config>
- </configs>
- <configSets>
- </configSets>
-</beansProjectDescription>
diff --git a/start/greenpages.jpa/pom.xml b/start/greenpages.jpa/pom.xml
deleted file mode 100644
index 7d41c33..0000000
--- a/start/greenpages.jpa/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent</artifactId>
- <version>2.5.0.RELEASE</version>
- <relativePath>../parent</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.jpa</artifactId>
- <name>greenpages.jpa</name>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.app</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.junit</groupId>
- <artifactId>com.springsource.org.junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.instrument</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.aspects</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>com.springsource.org.h2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>org.aspectj-library</artifactId>
- <type>libd</type>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/start/greenpages.jpa/src/main/java/greenpages/jpa/JpaDirectory.java b/start/greenpages.jpa/src/main/java/greenpages/jpa/JpaDirectory.java
deleted file mode 100644
index b6cfe72..0000000
--- a/start/greenpages.jpa/src/main/java/greenpages/jpa/JpaDirectory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package greenpages.jpa;
-
-import greenpages.Directory;
-import greenpages.Listing;
-
-import java.util.List;
-
-final class JpaDirectory implements Directory {
-
- private static final String SEARCH_QUERY = "select l from Listing l where upper(l.lastName) like :term";
-
- public Listing findListing(int id) {
- return null;
- }
-
- public List<Listing> search(String term) {
- return null;
- }
-}
diff --git a/start/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF b/start/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 2635847..0000000
--- a/start/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: greenpages.jpa;version="2.3.0";uses:="greenpages,javax
- .sql,org.junit,org.springframework.beans.factory.annotation,org.sprin
- gframework.core.io"
-Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.5.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.sql;version="0",
- org.springframework.beans.factory.annotation;version="[3.0, 3.1)",org
- .springframework.core.io;version="[3.0, 3.1)"
-
diff --git a/start/greenpages.jpa/src/main/resources/META-INF/spring/module-context.xml b/start/greenpages.jpa/src/main/resources/META-INF/spring/module-context.xml
deleted file mode 100644
index d776245..0000000
--- a/start/greenpages.jpa/src/main/resources/META-INF/spring/module-context.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Application context definition for GreenPages JPA.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:tx="http://www.springframework.org/schema/tx"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
-
-</beans>
diff --git a/start/greenpages.jpa/src/main/resources/META-INF/spring/osgi-context.xml b/start/greenpages.jpa/src/main/resources/META-INF/spring/osgi-context.xml
deleted file mode 100644
index 82041ec..0000000
--- a/start/greenpages.jpa/src/main/resources/META-INF/spring/osgi-context.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd"
- xmlns:osgi="http://www.springframework.org/schema/osgi">
-
-</beans>
diff --git a/start/greenpages.jpa/src/test/java/greenpages/jpa/JpaDirectorySpringContextTests.java b/start/greenpages.jpa/src/test/java/greenpages/jpa/JpaDirectorySpringContextTests.java
deleted file mode 100644
index 5f3e1ac..0000000
--- a/start/greenpages.jpa/src/test/java/greenpages/jpa/JpaDirectorySpringContextTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package greenpages.jpa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import greenpages.Directory;
-import greenpages.Listing;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class JpaDirectorySpringContextTests {
-
- @Autowired
- private Directory directory;
-
- @Test
- public void search() {
- List<Listing> results = this.directory.search("johnson");
- assertNotNull(results);
- assertEquals(1, results.size());
-
- Listing listing = results.get(0);
- assertNotNull(listing);
- assertEquals("Johnson", listing.getLastName());
- }
-}
diff --git a/start/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml b/start/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml
deleted file mode 100644
index 578d192..0000000
--- a/start/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-</beans>
diff --git a/start/greenpages.jpa/template.mf b/start/greenpages.jpa/template.mf
deleted file mode 100644
index e0b1263..0000000
--- a/start/greenpages.jpa/template.mf
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: GreenPages JPA
-Bundle-SymbolicName: greenpages.jpa
-Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.5.0
-Import-Template:
- org.springframework.*;version="[3.0, 3.1)",
- greenpages;version="[2.5, 2.6)",
- 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"
-Excluded-Imports:
- org.springframework.test.*,
- org.junit.*
diff --git a/start/greenpages.web/.classpath b/start/greenpages.web/.classpath
deleted file mode 100644
index ff5c3ef..0000000
--- a/start/greenpages.web/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/start/greenpages.web/.project b/start/greenpages.web/.project
deleted file mode 100644
index 11b1821..0000000
--- a/start/greenpages.web/.project
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>greenpages.web</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.springframework.ide.eclipse.core.springbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>com.springsource.server.ide.facet.core.bundlenature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.springframework.ide.eclipse.core.springnature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
diff --git a/start/greenpages.web/.settings/.jsdtscope b/start/greenpages.web/.settings/.jsdtscope
deleted file mode 100644
index bbb8e68..0000000
--- a/start/greenpages.web/.settings/.jsdtscope
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
- <attributes>
- <attribute name="hide" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
- <classpathentry kind="output" path=""/>
-</classpath>
diff --git a/start/greenpages.web/.settings/GreenPagesSpringContextTests.launch b/start/greenpages.web/.settings/GreenPagesSpringContextTests.launch
deleted file mode 100644
index 172c900..0000000
--- a/start/greenpages.web/.settings/GreenPagesSpringContextTests.launch
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/src/test/java/greenpages/tests/GreenPagesSpringContextTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<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.MAIN_TYPE" value="greenpages.tests.GreenPagesSpringContextTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="greenpages.web"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.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/start/greenpages.web/.settings/org.eclipse.wst.common.component b/start/greenpages.web/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 60d1ce0..0000000
--- a/start/greenpages.web/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="greenpages.web">
-<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-<property name="context-root" value="greenpages"/>
-<property name="java-output-path"/>
-</wb-module>
-</project-modules>
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
deleted file mode 100644
index 2739bed..0000000
--- a/start/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <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>
diff --git a/start/greenpages.web/.settings/org.maven.ide.eclipse.prefs b/start/greenpages.web/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 6f0c672..0000000
--- a/start/greenpages.web/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Dec 15 16:06:27 GMT 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/start/greenpages.web/pom.xml b/start/greenpages.web/pom.xml
deleted file mode 100644
index 7374800..0000000
--- a/start/greenpages.web/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent</artifactId>
- <version>2.5.0.RELEASE</version>
- <relativePath>../parent</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.web</artifactId>
- <name>greenpages.web</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.spring-library</artifactId>
- <type>libd</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>com.springsource.freemarker</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.junit</groupId>
- <artifactId>com.springsource.org.junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.aspects</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.instrument</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>com.springsource.org.h2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>org.aspectj-library</artifactId>
- <type>libd</type>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
diff --git a/start/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF b/start/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 3793b05..0000000
--- a/start/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Name: GreenPages Web
-Import-Library: org.springframework.spring;version="[3.0, 3.1)"
-Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
- 1.1.2,1.3)"
-Import-Package: 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.c
- ore;version="[1.1.2,1.2.0)",javax.sql,org.apache.commons.dbcp,org.spr
- ingframework.core.io,org.springframework.stereotype,org.springframewo
- rk.web.bind.annotation,org.springframework.web.context,org.springfram
- ework.web.servlet
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: greenpages.web
-Tool: Bundlor 1.0.0.M6
-Bundle-Version: 3.0.0
-
diff --git a/start/greenpages.web/src/main/webapp/WEB-INF/applicationContext.xml b/start/greenpages.web/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100644
index 47967d3..0000000
--- a/start/greenpages.web/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:osgi="http://www.springframework.org/schema/osgi">
-
-
-</beans>
diff --git a/start/greenpages.web/src/main/webapp/WEB-INF/ftl/entry.ftl b/start/greenpages.web/src/main/webapp/WEB-INF/ftl/entry.ftl
deleted file mode 100644
index 504e6ec..0000000
--- a/start/greenpages.web/src/main/webapp/WEB-INF/ftl/entry.ftl
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>GreenPages</title>
- <link rel="stylesheet" href="/greenpages/styles/main.css" type="text/css" />
- <link rel="stylesheet" href="/greenpages/styles/local.css" type="text/css" />
- <link rel="stylesheet" href="/greenpages/styles/print.css" type="text/css" media="print" />
-</head>
-<body class="main tundra">
- <div id="page">
- <div id="mini-header">
- <div id="mini-header-left"></div>
- <div id="mini-header-right"></div>
- </div> <!-- /mini-header -->
-
- <div id="primary-navigation">
- <div id="primary-left">
- <ul>
- <li><a href="/greenpages" title="Admin Console">GreenPages</a></li>
- </ul>
- </div>
- <img id="left-curve" src="/greenpages/images/menu-curve-left.png"/>
- <div id="primary-right">
- <ul>
- <li><a href="/admin" title="Admin Console">Admin Console</a></li>
- <li><a href="http://www.eclipse.org/virgo" title="Admin Console">Virgo</a></li>
- </ul>
- </div>
- <img id="right-curve" src="/greenpages/images/menu-curve-right.png"/>
- </div><!-- /primary-navigation -->
-
- <div id="container">
- <div id="content-no-nav">
- <h1>Virgo Web Server - Greenpages sample</h1>
- <p/>
- <h2>${listing.firstName} ${listing.lastName}</h2>
- <a href="mailto:${listing.emailAddress}">${listing.emailAddress}</a>
- </div> <!-- /content -->
- </div> <!-- /container -->
-
- <div id="footer-wrapper">
- <div id="footer-left">© Copyright 2008, 2010 VMware Inc. Licensed under the Eclipse Public License v1.0.</div>
- <div id="footer-right"></div>
- </div> <!-- /footer-wrapper -->
-
- </div> <!-- /page -->
-
-</body>
-</html>
\ No newline at end of file
diff --git a/start/greenpages.web/src/main/webapp/WEB-INF/ftl/home.ftl b/start/greenpages.web/src/main/webapp/WEB-INF/ftl/home.ftl
deleted file mode 100644
index bec4830..0000000
--- a/start/greenpages.web/src/main/webapp/WEB-INF/ftl/home.ftl
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>GreenPages</title>
- <link rel="stylesheet" href="/greenpages/styles/main.css" type="text/css" />
- <link rel="stylesheet" href="/greenpages/styles/local.css" type="text/css" />
- <link rel="stylesheet" href="/greenpages/styles/print.css" type="text/css" media="print" />
-</head>
-<body class="main tundra">
- <div id="page">
- <div id="mini-header">
- <div id="mini-header-left"></div>
- <div id="mini-header-right"></div>
- </div> <!-- /mini-header -->
-
- <div id="primary-navigation">
- <div id="primary-left">
- <ul>
- <li><a href="/greenpages" title="Admin Console">GreenPages</a></li>
- </ul>
- </div>
- <img id="left-curve" src="/greenpages/images/menu-curve-left.png"/>
- <div id="primary-right">
- <ul>
- <li><a href="/admin" title="Admin Console">Admin Console</a></li>
- <li><a href="http://www.eclipse.org/virgo" title="Admin Console">Virgo</a></li>
- </ul>
- </div>
- <img id="right-curve" src="/greenpages/images/menu-curve-right.png"/>
- </div><!-- /primary-navigation -->
-
- <div id="container">
- <div id="content-no-nav">
- <h1>Virgo Web Server - Greenpages sample</h1>
- <p/>
- <form name="searchForm" method="GET" action="search.htm">
- <input name="query" type="text"/> <input type="submit"/>
- </form>
- </div> <!-- /content -->
- </div> <!-- /container -->
-
- <div id="footer-wrapper">
- <div id="footer-left">© Copyright 2008, 2010 VMware Inc. Licensed under the Eclipse Public License v1.0.</div>
- <div id="footer-right"></div>
- </div> <!-- /footer-wrapper -->
-
- </div> <!-- /page -->
-
-</body>
-</html>
\ No newline at end of file
diff --git a/start/greenpages.web/src/main/webapp/WEB-INF/ftl/search.ftl b/start/greenpages.web/src/main/webapp/WEB-INF/ftl/search.ftl
deleted file mode 100644
index f116e48..0000000
--- a/start/greenpages.web/src/main/webapp/WEB-INF/ftl/search.ftl
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>GreenPages</title>
- <link rel="stylesheet" href="/greenpages/styles/main.css" type="text/css" />
- <link rel="stylesheet" href="/greenpages/styles/local.css" type="text/css" />
- <link rel="stylesheet" href="/greenpages/styles/print.css" type="text/css" media="print" />
-</head>
-<body class="main tundra">
- <div id="page">
- <div id="mini-header">
- <div id="mini-header-left"></div>
- <div id="mini-header-right"></div>
- </div> <!-- /mini-header -->
-
- <div id="primary-navigation">
- <div id="primary-left">
- <ul>
- <li><a href="/greenpages" title="Admin Console">GreenPages</a></li>
- </ul>
- </div>
- <img id="left-curve" src="/greenpages/images/menu-curve-left.png"/>
- <div id="primary-right">
- <ul>
- <li><a href="/admin" title="Admin Console">Admin Console</a></li>
- <li><a href="http://www.eclipse.org/virgo" title="Admin Console">Virgo</a></li>
- </ul>
- </div>
- <img id="right-curve" src="/greenpages/images/menu-curve-right.png"/>
- </div><!-- /primary-navigation -->
-
- <div id="container">
- <div id="content-no-nav">
- <h1>Virgo Web Server - Greenpages sample</h1>
- <p/>
- <form name="searchForm" method="GET" action="search.htm">
- <input name="query" type="text"/> <input type="submit"/>
- </form>
- <#if listingList?? && (listingList?size > 0)>
- <table id="results">
- <thead>
- <tr>
- <th>Last Name</th>
- <th>First Name</th>
- <th> </th>
- </tr>
- </thead>
- <tbody>
- <#list listingList as listing>
- <tr>
- <td>${listing.lastName}</td>
- <td>${listing.firstName}</td>
- <td><a href="entry.htm?id=${listing.listingNumber}">view</a></td>
- </tr>
- </#list>
- </tbody>
- </table>
- <#else>
- <h2>No results found.</h2>
- </#if>
- </div> <!-- /content -->
- </div> <!-- /container -->
-
- <div id="footer-wrapper">
- <div id="footer-left">© Copyright 2008, 2010 VMware Inc. Licensed under the Eclipse Public License v1.0.</div>
- <div id="footer-right"></div>
- </div> <!-- /footer-wrapper -->
-
- </div> <!-- /page -->
-
-</body>
-</html>
\ No newline at end of file
diff --git a/start/greenpages.web/src/main/webapp/WEB-INF/greenpages-servlet.xml b/start/greenpages.web/src/main/webapp/WEB-INF/greenpages-servlet.xml
deleted file mode 100644
index e5a784c..0000000
--- a/start/greenpages.web/src/main/webapp/WEB-INF/greenpages-servlet.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
- xmlns:context="http://www.springframework.org/schema/context">
-
- <!-- enable classpath scanning -->
-
-
- <!-- enable anntotation-driven controllers -->
- <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter" />
-
-
- <!-- configure FreeMarker support -->
- <bean id="freemarkerConfig" class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer">
- <property name="templateLoaderPath" value="/WEB-INF/ftl/" />
- </bean>
-
- <bean id="viewResolver" class="org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver">
- <property name="cache" value="true" />
- <property name="suffix" value=".ftl" />
- </bean>
-</beans>
diff --git a/start/greenpages.web/src/main/webapp/images/favicon.ico b/start/greenpages.web/src/main/webapp/images/favicon.ico
deleted file mode 100755
index 9244a9c..0000000
--- a/start/greenpages.web/src/main/webapp/images/favicon.ico
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/footer-left.png b/start/greenpages.web/src/main/webapp/images/footer-left.png
deleted file mode 100644
index 8bfe3b1..0000000
--- a/start/greenpages.web/src/main/webapp/images/footer-left.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/footer-right.png b/start/greenpages.web/src/main/webapp/images/footer-right.png
deleted file mode 100644
index 51527ad..0000000
--- a/start/greenpages.web/src/main/webapp/images/footer-right.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/footer-stretch.png b/start/greenpages.web/src/main/webapp/images/footer-stretch.png
deleted file mode 100644
index c58f721..0000000
--- a/start/greenpages.web/src/main/webapp/images/footer-stretch.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/header-left.png b/start/greenpages.web/src/main/webapp/images/header-left.png
deleted file mode 100644
index 4920a0a..0000000
--- a/start/greenpages.web/src/main/webapp/images/header-left.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/header-right.png b/start/greenpages.web/src/main/webapp/images/header-right.png
deleted file mode 100644
index 09b0a59..0000000
--- a/start/greenpages.web/src/main/webapp/images/header-right.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/loader-white-large.gif b/start/greenpages.web/src/main/webapp/images/loader-white-large.gif
deleted file mode 100644
index aa4ec5a..0000000
--- a/start/greenpages.web/src/main/webapp/images/loader-white-large.gif
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/loader-white-small.gif b/start/greenpages.web/src/main/webapp/images/loader-white-small.gif
deleted file mode 100644
index 75ad2b3..0000000
--- a/start/greenpages.web/src/main/webapp/images/loader-white-small.gif
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/menu-curve-left.png b/start/greenpages.web/src/main/webapp/images/menu-curve-left.png
deleted file mode 100644
index c48a2e0..0000000
--- a/start/greenpages.web/src/main/webapp/images/menu-curve-left.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/menu-curve-right.png b/start/greenpages.web/src/main/webapp/images/menu-curve-right.png
deleted file mode 100644
index 1f3b100..0000000
--- a/start/greenpages.web/src/main/webapp/images/menu-curve-right.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/menu-stretch.png b/start/greenpages.web/src/main/webapp/images/menu-stretch.png
deleted file mode 100644
index 0ca66f7..0000000
--- a/start/greenpages.web/src/main/webapp/images/menu-stretch.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/mini-header-left.png b/start/greenpages.web/src/main/webapp/images/mini-header-left.png
deleted file mode 100644
index 72551e7..0000000
--- a/start/greenpages.web/src/main/webapp/images/mini-header-left.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/mini-header-right.png b/start/greenpages.web/src/main/webapp/images/mini-header-right.png
deleted file mode 100644
index 8aaf50c..0000000
--- a/start/greenpages.web/src/main/webapp/images/mini-header-right.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/s2ap_soda_can.png b/start/greenpages.web/src/main/webapp/images/s2ap_soda_can.png
deleted file mode 100644
index 8eb53a8..0000000
--- a/start/greenpages.web/src/main/webapp/images/s2ap_soda_can.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/spring.png b/start/greenpages.web/src/main/webapp/images/spring.png
deleted file mode 100644
index 05a1940..0000000
--- a/start/greenpages.web/src/main/webapp/images/spring.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/images/table-header-background.png b/start/greenpages.web/src/main/webapp/images/table-header-background.png
deleted file mode 100644
index 8f2ba1b..0000000
--- a/start/greenpages.web/src/main/webapp/images/table-header-background.png
+++ /dev/null
Binary files differ
diff --git a/start/greenpages.web/src/main/webapp/index.html b/start/greenpages.web/src/main/webapp/index.html
deleted file mode 100644
index a541368..0000000
--- a/start/greenpages.web/src/main/webapp/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
- <head>
- <title>GreenPages</title>
- <meta http-equiv="REFRESH" content="0;url=/greenpages/app/home.htm">
- </head>
- <body>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/start/greenpages.web/src/main/webapp/styles/local.css b/start/greenpages.web/src/main/webapp/styles/local.css
deleted file mode 100644
index 8302e89..0000000
--- a/start/greenpages.web/src/main/webapp/styles/local.css
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Local style information for the Virgo Splash Screen
- *
- * Contains both style and colour information and
- * overrides content from the dojo/tundra style.
- *
- * Christopher Frost - March 2010
- *
- */
-
-#mini-header, #mini-header-left, #mini-header-right {
- height: 7px;
- width: 7px;
- margin: 0px;
- padding: 0px;
-}
-
-#mini-header {
- width: 100%;
- background-color: #002e62;
-}
-
-#mini-header-left {
- background-image: url(../images/mini-header-left.png);
- background-repeat: no-repeat;
- background-position: left top;
- float: left;
-}
-
-#mini-header-right {
- background-image: url(../images/mini-header-right.png);
- background-repeat: no-repeat scroll;
- background-position: right top;
- float: right;
-}
-
-#content-no-nav {
- background: transparent url(../images/s2ap_soda_can.png) no-repeat bottom right;
- height: 400px;
-}
\ No newline at end of file
diff --git a/start/greenpages.web/src/main/webapp/styles/main.css b/start/greenpages.web/src/main/webapp/styles/main.css
deleted file mode 100644
index 8eac83a..0000000
--- a/start/greenpages.web/src/main/webapp/styles/main.css
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * MAIN CSS
- *
- * All styles for the screen, other than color-specific styles,
- * should be included here.
- *
- * COMMON STYLES
- */
-body {
- font: 12px Helvetica, Arial, "Bitstream Vera Sans", sans-serif;
- background-color: #dfdfdf;
-}
-
-#page {
- margin: auto;
- width: 800px;
- color: #333;
-}
-
-/*
- * HEADER STYLES
- */
-#header {
- background: #fff url(../images/header-right.png) no-repeat scroll right top;
- width: 100%;
- height: 100px;
-}
-
-#name-and-company {
- background: transparent url(../images/header-left.png) no-repeat top left;
- width: 100%;
- height: 100px;
- top: 0px;
- left: 0px;
-}
-
-#site-name {
- background: transparent url(../images/header-title-left.png) no-repeat scroll center center;
- height: 100px;
- width: 345px;
-}
-
-#site-name a, #site-name a:hover {
- height: 60px;
- width: 190px;
-}
-
-#company-name a, #site-name a:hover {
- height: 60px;
- width: 190px;
-}
-
-
-/*
- * TEXT FORMATTING STYLES
- */
-h1 {
- font-size: 1.4em;
- padding: 12px 0 5px 0;
- line-height: 125%;
- color: #002E62;
- border-bottom: 1px solid #BAD9EC;
-}
-
-h2 {
- font-size: 1.2em;
- padding: 10px 0 2px 0;
- color: #002E62;
-}
-
-h3 {
- font-size: 1em;
- padding: 8px 0 5px 0;
- color: #002E62;
-}
-
-h4 {
- font-size: 1em;
- padding-top: 8px;
- color: #333;
-}
-
-h5 {
- font-size: 1em;
- padding-top: 6px;
- color: #333;
-}
-
-/*
- * LINK STYLES
- */
-
-a:link, a:visited {
- color: #333;
- text-decoration: underline;
-}
-
-a:hover, a:focus {
- color: #0093CF;
- text-decoration: underline;
-}
-
-a:active, a.active {
- color: #0093CF;
-}
-
-/*
- * MENU STYLES
- */
-#primary-navigation {
- background: #fff url(../images/menu-stretch.png) repeat-x scroll 0 0;
- height:29px;
- margin:0;
- padding:0;
- position: relative;
-}
-
-#primary-left {
- background: #002E62;
- float: left;
- height: 26px;
- line-height: normal;
- padding: 3px 0 0;
- position: relative;
-}
-
-#primary-right {
- background: #002E62;
- float: right;
- height: 26px;
- line-height: normal;
- padding: 3px 0 0;
- position: relative;
-}
-
-#primary-left ul, #primary-right ul {
- padding: 0 4px 0 4px;
- margin: 2px 0 0 0;
- list-style: none;
-}
-
-#primary-left li, #primary-right li {
- display: inline;
-}
-
-#primary-left a, #primary-right a {
- color: #ffffff;
- display: block;
- float: left;
- font-weight:normal;
- margin: 0 1px 0 1px;
- padding: 7px 8px 4px 10px;
- text-decoration: none;
-}
-
-#primary-left a:hover, #primary-right a:hover, .selected-menu {
- background: #ffffff;
- color:#002E62;
- text-decoration: none;
-}
-
-#left-curve {
- float: left;
-}
-
-#right-curve {
- float: right;
-}
-
-/*
- * CONTAINER STYLES
- */
-#content-no-nav {
- display: block;
- margin: 0px 22px 20px 22px;
- padding: 0;
-}
-
-#container {
- margin: 0;
- padding-bottom: 20px;
- overflow:hidden;
- background:#fff;
-}
-
-/*
- * TABLE STYLES
- */
-table {
- border-spacing: 0;
- margin: 0;
- border-collapse: collapse;
- color:#666;
-}
-
-th {
- height: 19px;
- text-align: left;
- font-weight: bold;
- margin: 0;
- padding: 3px 6px 0 6px;
- line-height: 19px;
- color:#333;
-}
-
-.bordered-table {
- border:1px solid #BAD9EC;
-}
-
-.bordered-table th {
- background-image: url(../images/table-header-background.png);
- background-repeat: repeat-x;
- white-space: nowrap;
- border-bottom: 1px solid #BAD9EC;
-}
-
-td {
- margin: 0;
- padding: 4px 6px 4px 6px;
- vertical-align: top;
-}
-
-td.table-icon {
- padding-top: 2px;
- padding-bottom: 1px;
-}
-
-.sublevel1-odd {
- background:#fff;
-}
-
-.sublevel1-even {
- background:#E8F6FF;
-}
-
-.two-tables {
- width:100%;
-}
-
-.two-tables .left {
- float:left;
-}
-
-.two-tables .right {
- float:right;
-}
-
-/*
- * FOOTER STYLES
- */
-#footer-wrapper {
- clear: both;
- margin: 0;
- background-image: url(../images/footer-stretch.png);
- background-repeat: repeat-x;
- height: 29px;
- width: 100%;
-}
-
-#footer-left, #footer-right {
- margin: 0;
- font-size: 85%;
- padding: 1em;
- height: 29px;
- color: #bbb;
-}
-
-#footer-left {
- text-align: left;
- background-image: url(../images/footer-left.png);
- background-repeat: no-repeat;
- position: relative;
- left: 0;
- float: left;
-}
-
-#footer-right {
- text-align: right;
- background-image: url(../images/footer-right.png);
- background-repeat: no-repeat;
- background-position: top right;
- position: relative;
- right: 0;
- float: right;
-}
-
-#footer-left a, #footer-right a {
- color: #999;
- text-decoration:none;
-}
diff --git a/start/greenpages.web/src/main/webapp/styles/print.css b/start/greenpages.web/src/main/webapp/styles/print.css
deleted file mode 100644
index f325cfc..0000000
--- a/start/greenpages.web/src/main/webapp/styles/print.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/* White background, black text, arial font, decent font size */
-body {
- background-color: #fff;
- color: #000;
- font-family: Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
- font-size: 10pt;
- width: 100%;
-}
-
-/* Change the layout to remove columns */
-html body {
- background: transparent;
- width: auto;
-}
-
-#main,#container {
- width: 100%;
-}
-
-#page {
- margin: 0;
- width: 90%;
-}
-
-#content {
- margin: 0;
- overflow: visible;
-}
-
-/* Hide header and nav elements */
-#header,#primary-navigation,#secondary-navigation,#footer-wrapper {
- visibility: hidden;
- display: none;
-}
-
-/* Style links */
-a:link,a:visited {
- color: #520;
- background: transparent;
- text-decoration: underline !important;
-}
-
-/* Remove table header graphic */
-.bordered-table th {
- background-image: none;
-}
\ No newline at end of file
diff --git a/start/greenpages.web/src/test/java/greenpages/tests/GreenPagesSpringContextTests.java b/start/greenpages.web/src/test/java/greenpages/tests/GreenPagesSpringContextTests.java
deleted file mode 100644
index 47deaf1..0000000
--- a/start/greenpages.web/src/test/java/greenpages/tests/GreenPagesSpringContextTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package greenpages.tests;
-
-//import static org.junit.Assert.assertEquals;
-//import static org.junit.Assert.assertNotNull;
-//import greenpages.Listing;
-//import java.util.List;
-//import org.springframework.beans.factory.annotation.Autowired;
-
-import org.junit.Test;
-
-public class GreenPagesSpringContextTests {
-
-// @Autowired
-// private GreenPagesController controller;
-
- @Test
- public void search() {
-// List<Listing> results = this.controller.search("johnson");
-// assertNotNull(results);
-// assertEquals(1, results.size());
-//
-// Listing listing = results.get(0);
-// assertNotNull(listing);
-// assertEquals("Johnson", listing.getLastName());
- }
-
- @Test
- public void entry() {
-// Listing listing = this.controller.entry(1);
-// assertNotNull(listing);
-// assertEquals("Johnson", listing.getLastName());
- }
-}
diff --git a/start/greenpages.web/src/test/java/greenpages/tests/TestDataPopulator.java b/start/greenpages.web/src/test/java/greenpages/tests/TestDataPopulator.java
deleted file mode 100644
index 0283b9b..0000000
--- a/start/greenpages.web/src/test/java/greenpages/tests/TestDataPopulator.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package greenpages.tests;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import javax.sql.DataSource;
-
-import org.springframework.core.io.Resource;
-
-/**
- * A class that populates a datasource with test data
- */
-public class TestDataPopulator {
-
- private final DataSource dataSource;
-
- private final Resource testDataLocation;
-
- public TestDataPopulator(DataSource dataSource, Resource testDataLocation) {
- this.dataSource = dataSource;
- this.testDataLocation = testDataLocation;
- }
-
- public void populate() {
- Connection connection = null;
- try {
- connection = dataSource.getConnection();
- insertTestData(connection);
- } catch (SQLException e) {
- throw new RuntimeException("SQL exception occurred acquiring connection", e);
- } finally {
- if (connection != null) {
- try {
- connection.close();
- } catch (SQLException e) {
- }
- }
- }
- }
-
- private void insertTestData(Connection connection) {
- try {
- String sql = parseSqlIn(testDataLocation);
- executeSql(sql, connection);
- } catch (IOException e) {
- throw new RuntimeException("I/O exception occurred accessing the test data file", e);
- } catch (SQLException e) {
- throw new RuntimeException("SQL exception occurred loading test data", e);
- }
- }
-
- private String parseSqlIn(Resource resource) throws IOException {
- InputStream is = null;
- try {
- is = resource.getInputStream();
- BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-
- StringWriter sw = new StringWriter();
- BufferedWriter writer = new BufferedWriter(sw);
-
- for (int c = reader.read(); c != -1; c = reader.read()) {
- writer.write(c);
- }
- writer.flush();
- return sw.toString();
-
- } finally {
- if (is != null) {
- is.close();
- }
- }
- }
-
- private void executeSql(String sql, Connection connection) throws SQLException {
- Statement statement = connection.createStatement();
- statement.execute(sql);
- }
-}
diff --git a/start/greenpages.web/src/test/resources/META-INF/spring/test-context.xml b/start/greenpages.web/src/test/resources/META-INF/spring/test-context.xml
deleted file mode 100644
index 39c88f1..0000000
--- a/start/greenpages.web/src/test/resources/META-INF/spring/test-context.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
- p:driverClassName="org.h2.Driver" p:url="jdbc:h2:.~/greenpages-db/greenpages"
- p:username="greenpages" p:password="pass"
- init-method="createDataSource" destroy-method="close"/>
-
- <bean class="greenpages.tests.TestDataPopulator" init-method="populate">
- <constructor-arg ref="dataSource"/>
- <constructor-arg value="file:../../db/db.sql"/>
- </bean>
-
-</beans>
diff --git a/start/greenpages.web/template.mf b/start/greenpages.web/template.mf
deleted file mode 100644
index d0e53f2..0000000
--- a/start/greenpages.web/template.mf
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: GreenPages Web
-Bundle-SymbolicName: greenpages.web
-Bundle-Version: 2.5.0
-Import-Package:
- 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:
- org.springframework.spring;version="[3.0, 3.1)"
-Excluded-Exports:
- greenpages.tests,
- greenpages.web,
- images,
- styles
-Excluded-Imports:
- org.springframework.test.*,
- org.junit.*
diff --git a/start/parent/.classpath b/start/parent/.classpath
deleted file mode 100644
index b8a2888..0000000
--- a/start/parent/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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/start/parent/.project b/start/parent/.project
deleted file mode 100644
index 1b729b7..0000000
--- a/start/parent/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>greenpages.parent</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/start/parent/.settings/org.maven.ide.eclipse.prefs b/start/parent/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 980e36e..0000000
--- a/start/parent/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jun 23 10:37:10 BST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/start/parent/pom.xml b/start/parent/pom.xml
deleted file mode 100644
index 771b1f0..0000000
--- a/start/parent/pom.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent</artifactId>
- <version>2.5.0.RELEASE</version>
- <name>greenpages.parent</name>
- <packaging>pom</packaging>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.spring-library</artifactId>
- <type>libd</type>
- <version>3.0.5.RELEASE</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
- <version>1.2.2.osgi</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>com.springsource.org.h2</artifactId>
- <version>1.0.71</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>com.springsource.javax.persistence</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>com.springsource.org.eclipse.persistence</artifactId>
- <version>1.0.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>com.springsource.org.eclipse.persistence.jpa</artifactId>
- <version>1.0.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>org.aspectj-library</artifactId>
- <type>libd</type>
- <version>1.6.2.RELEASE</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>com.springsource.freemarker</artifactId>
- <version>2.3.18</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.junit</groupId>
- <artifactId>com.springsource.org.junit</artifactId>
- <version>4.7.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.test</artifactId>
- <version>3.0.5.RELEASE</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.instrument</artifactId>
- <version>3.0.5.RELEASE</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.aspects</artifactId>
- <version>3.0.5.RELEASE</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>3.0.0.v201103241009</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <repositories>
- <repository>
- <id>com.springsource.repository.bundles.snapshot</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshot</name>
- <url>http://repository.springsource.com/maven/bundles/snapshot</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/release</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundle.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundle.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
- <url>http://repository.springsource.com/maven/bundles/milestone</url>
- </repository>
-
- <repository>
- <id>com.springsource.repository.libraries.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Library Releases</name>
- <url>http://repository.springsource.com/maven/libraries/release</url>
- </repository>
- <repository>
- <id>com.springsource.repository.libraries.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Library Releases</name>
- <url>http://repository.springsource.com/maven/libraries/external</url>
- </repository>
- <repository>
- <id>com.springsource.repository.libraries.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - Milestone Library Releases</name>
- <url>http://repository.springsource.com/maven/libraries/milestone</url>
- </repository>
- <repository>
- <id>com.springsource.repository.libraries.snapshot</id>
- <name>SpringSource Enterprise Bundle Repository - Snapshot Library Releases</name>
- <url>http://repository.springsource.com/maven/libraries/snapshot</url>
- </repository>
- </repositories>
-
- <properties>
- <maven.test.failure.ignore>true</maven.test.failure.ignore>
- </properties>
-
- <pluginRepositories>
- <pluginRepository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - Releases</name>
- <url>http://repository.springsource.com/maven/bundles/release</url>
- </pluginRepository>
- <pluginRepository>
- <id>com.springsource.repository.bundles.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - Milestone</name>
- <url>http://repository.springsource.com/maven/bundles/milestone</url>
- </pluginRepository>
- </pluginRepositories>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.springsource.bundlor</groupId>
- <artifactId>com.springsource.bundlor.maven</artifactId>
- <version>1.0.0.M2</version>
- <executions>
- <execution>
- <id>bundlor</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>
- src/main/resources/META-INF/MANIFEST.MF
- </manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Tests.java</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/start/pom.xml b/start/pom.xml
deleted file mode 100644
index 7caf77f..0000000
--- a/start/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages-top-level</artifactId>
- <version>2.5.0.RELEASE</version>
- <name>GreenPages App Build</name>
- <packaging>pom</packaging>
- <modules>
- <module>parent</module>
- <module>greenpages.db</module>
- <module>greenpages.app</module>
- <module>greenpages.jpa</module>
- <module>greenpages.web</module>
- </modules>
-</project>
diff --git a/virgo-build b/virgo-build
index f5c53ef..bef1f30 160000
--- a/virgo-build
+++ b/virgo-build
@@ -1 +1 @@
-Subproject commit f5c53ef245713f342100d49b8c1c85c491740b31
+Subproject commit bef1f300190836f9fa1f36281d57a9b0ebe3c11e
