Tidy up of Eclipse Settings but needs further work
diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 4f9bffb..0000000
--- a/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/greenpages.core/.project b/greenpages.core/.project
index 6618467..8dbcbb0 100644
--- a/greenpages.core/.project
+++ b/greenpages.core/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>greenpages.app-solution</name>
+ <name>greenpages.core</name>
<comment></comment>
<projects>
</projects>
@@ -16,26 +16,11 @@
</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>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
@@ -48,12 +33,9 @@
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+ <nature>org.eclipse.virgo.ide.facet.core.bundlenature</nature>
<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>
</natures>
</projectDescription>
diff --git a/greenpages.core/.springBeans b/greenpages.core/.springBeans
deleted file mode 100644
index 4cdca85..0000000
--- a/greenpages.core/.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/greenpages.core/src/main/resources/META-INF/MANIFEST.MF b/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
index d60e24a..081250f 100644
--- a/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
@@ -2,9 +2,8 @@
Export-Package: greenpages;version="2.5.0"
Bundle-Vendor: SpringSource Inc.
Bundle-Version: 2.5.0
-Tool: Bundlor 1.1.0.BUILD-20101220120024
+Tool: Bundlor 1.1.0.M04
Bundle-Name: GreenPages Service
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: greenpages
-Import-Package: org.springframework.stereotype;version="[3.0, 3.1)"
+Bundle-SymbolicName: greenpages.core
diff --git a/greenpages.db/.project b/greenpages.db/.project
index e442cf1..dbe832e 100644
--- a/greenpages.db/.project
+++ b/greenpages.db/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>greenpages.db-solution</name>
+ <name>greenpages.db</name>
<comment></comment>
<projects>
</projects>
@@ -16,21 +16,11 @@
</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>
- <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
@@ -43,10 +33,9 @@
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+ <nature>org.eclipse.virgo.ide.facet.core.bundlenature</nature>
<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>
</natures>
</projectDescription>
diff --git a/greenpages.db/src/main/resources/META-INF/MANIFEST.MF b/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
index df1ec56..abb69e8 100644
--- a/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-Vendor: SpringSource
Bundle-Classpath: .
Bundle-Version: 2.5.0
-Tool: Bundlor 1.1.0.BUILD-20101220120024
+Tool: Bundlor 1.1.0.M04
Bundle-Name: GreenPages DataSource
Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages.db
diff --git a/greenpages.jpa/.classpath b/greenpages.jpa/.classpath
index 8be6238..0b54c36 100644
--- a/greenpages.jpa/.classpath
+++ b/greenpages.jpa/.classpath
@@ -6,5 +6,6 @@
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/greenpages.jpa/.project b/greenpages.jpa/.project
index cbb0788..0c4c749 100644
--- a/greenpages.jpa/.project
+++ b/greenpages.jpa/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>greenpages.jpa-solution</name>
+ <name>greenpages.jpa</name>
<comment></comment>
<projects>
</projects>
@@ -16,21 +16,11 @@
</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>
- <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
@@ -43,10 +33,9 @@
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+ <nature>org.eclipse.virgo.ide.facet.core.bundlenature</nature>
<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>
</natures>
</projectDescription>
diff --git a/greenpages.jpa/.springBeans b/greenpages.jpa/.springBeans
deleted file mode 100644
index 974ce77..0000000
--- a/greenpages.jpa/.springBeans
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
- <version>1</version>
- <pluginVersion><![CDATA[2.2.2.RC]]></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>
- <config>src/test/resources/META-INF/spring/test-context.xml</config>
- </configs>
- <configSets>
- </configSets>
-</beansProjectDescription>
diff --git a/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF b/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
index a1c2d33..a9cee37 100644
--- a/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
@@ -4,18 +4,14 @@
.0, 1.0.0]"
Bundle-Vendor: SpringSource
Bundle-Version: 2.5.0
-Tool: Bundlor 1.1.0.BUILD-20101220120024
+Tool: Bundlor 1.1.0.M04
Bundle-Name: GreenPages JPA
Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages.jpa
-Import-Package: greenpages;version="[2.5, 2.6)",javax.persistence;vers
- ion="[1.0.0, 1.0.0]",javax.sql;version="0",org.apache.commons.dbcp;ve
- rsion="[1.2.2.osgi, 1.2.2.osgi]",org.springframework.beans.factory.an
- notation;version="[3.0, 3.1)",org.springframework.context.weaving;ver
- sion="[3.0, 3.1)",org.springframework.core.io;version="[3.0, 3.1)",or
- g.springframework.dao.annotation;version="[3.0, 3.1)",org.springframe
- work.orm.jpa;version="[3.0, 3.1)",org.springframework.orm.jpa.vendor;
- version="[3.0, 3.1)",org.springframework.stereotype;version="[3.0, 3.
- 1)",org.springframework.transaction.annotation;version="[3.0, 3.1)",o
- rg.springframework.transaction.aspectj;version="[3.0, 3.1)"
+Import-Package: greenpages;version="[2.5, 2.6)",javax.sql;version="0",
+ org.apache.commons.dbcp;version="[1.2.2.osgi, 1.2.2.osgi]",org.spring
+ framework.context.weaving;version="[3.0, 3.5)",org.springframework.da
+ o.annotation;version="[3.0, 3.5)",org.springframework.orm.jpa;version
+ ="[3.0, 3.5)",org.springframework.orm.jpa.vendor;version="[3.0, 3.5)"
+ ,org.springframework.transaction.aspectj;version="[3.0, 3.5)"
diff --git a/greenpages.parent/.project b/greenpages.parent/.project
index 0295531..db43513 100644
--- a/greenpages.parent/.project
+++ b/greenpages.parent/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>greenpages.parent-solution</name>
+ <name>greenpages.parent</name>
<comment></comment>
<projects>
</projects>
diff --git a/greenpages.web/.classpath b/greenpages.web/.classpath
index 3fbd759..cbd76e1 100644
--- a/greenpages.web/.classpath
+++ b/greenpages.web/.classpath
@@ -6,5 +6,6 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/greenpages.web/.project b/greenpages.web/.project
index fbbb358..21a2da6 100644
--- a/greenpages.web/.project
+++ b/greenpages.web/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>greenpages.web-solution</name>
+ <name>greenpages.web</name>
<comment></comment>
<projects>
</projects>
@@ -16,21 +16,6 @@
</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>com.springsource.server.ide.bundlor.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
@@ -48,13 +33,9 @@
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.virgo.ide.facet.core.bundlenature</nature>
<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/greenpages.web/.springBeans b/greenpages.web/.springBeans
deleted file mode 100644
index 618a258..0000000
--- a/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/greenpages/.project b/greenpages/.project
index efd8a35..35c8920 100644
--- a/greenpages/.project
+++ b/greenpages/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>greenpages-solution</name>
+ <name>greenpages</name>
<comment></comment>
<projects>
</projects>
@@ -21,11 +21,6 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.springframework.ide.eclipse.core.springbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
@@ -33,10 +28,9 @@
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>com.springsource.server.ide.facet.core.parnature</nature>
+ <nature>org.eclipse.virgo.ide.facet.core.parnature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
diff --git a/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml b/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
index 655afb3..bd5604a 100644
--- a/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
+++ b/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<com.springsource.server.ide.par:Par xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:com.springsource.server.ide.par="http:///com/springsource/server/ide/par.ecore">
+<org.eclipse.virgo.ide.par:Par xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.virgo.ide.par="http://eclipse.org/virgo/par.ecore">
<bundle symbolicName="greenpages.app-solution"/>
<bundle symbolicName="greenpages.db-solution"/>
<bundle symbolicName="greenpages.jpa-solution"/>
<bundle symbolicName="greenpages.web-solution"/>
-</com.springsource.server.ide.par:Par>
+</org.eclipse.virgo.ide.par:Par>
diff --git a/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml b/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
index 64122a8..3342fa9 100644
--- a/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="Virgo Web Server (Runtime) v2.1"/>
<installed facet="org.eclipse.virgo.server.par" version="1.0"/>
</faceted-project>
