Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-12-21 13:20:46 -0500
committerChristopher Frost2012-12-21 13:20:46 -0500
commit4db909c37bc4f15c50cd0fd21426252f6963771d (patch)
tree2ee25169fbd65ea6d9890a7cb4605f67da03adc3
parent88e948a4af4c60863113bcdab2e737d4d07539ff (diff)
downloadorg.eclipse.virgo.samples-4db909c37bc4f15c50cd0fd21426252f6963771d.tar.gz
org.eclipse.virgo.samples-4db909c37bc4f15c50cd0fd21426252f6963771d.tar.xz
org.eclipse.virgo.samples-4db909c37bc4f15c50cd0fd21426252f6963771d.zip
387814 - Consolidate the 4 sample repo in to a single one and add a CI job
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath1
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml3
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.classpath7
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.jst.common.project.facet.core.prefs4
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.classpath6
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.jst.common.project.facet.core.prefs3
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath7
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.jst.common.project.facet.core.prefs4
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath7
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.jst.common.project.facet.core.prefs4
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.common.project.facet.core.xml1
-rw-r--r--greenpages/greenpages.core/pom.xml2
-rw-r--r--greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF2
-rw-r--r--greenpages/greenpages.core/template.mf2
-rw-r--r--greenpages/greenpages.db/pom.xml2
-rw-r--r--greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF2
-rw-r--r--greenpages/greenpages.db/template.mf2
-rw-r--r--greenpages/greenpages.jpa/pom.xml2
-rw-r--r--greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF4
-rw-r--r--greenpages/greenpages.jpa/template.mf6
-rw-r--r--greenpages/greenpages.parent/pom.xml2
-rw-r--r--greenpages/greenpages.web/pom.xml2
-rw-r--r--greenpages/greenpages.web/template.mf2
-rw-r--r--greenpages/greenpages/pom.xml2
-rw-r--r--greenpages/guide/filters.properties2
-rw-r--r--greenpages/guide/src/installing-greenpages.xml4
-rw-r--r--greenpages/pom.xml2
-rw-r--r--osgi-examples/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml1
-rw-r--r--osgi-examples/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml1
-rw-r--r--osgi-examples/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml1
38 files changed, 50 insertions, 56 deletions
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
index 43dbd3d..fedcff1 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
@@ -28,5 +28,6 @@
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/Virgo Runtime at localhost Server"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml
index 31a5903..53f0252 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="SpringSource dm Server (Runtime) v2.0"/>
+ <runtime name="Virgo Runtime"/>
<installed facet="com.springsource.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
index 6f131eb..c317c9b 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
@@ -33,7 +33,7 @@
<classpathentry kind="var" path="IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.sample.configuration.properties.core"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.samples.configuration-properties.core"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.eclipse.virgo.samples.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml
index b9f452a..3afd064 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="Virgo Tomcat at localhost"/>
+ <runtime name="Virgo Runtime"/>
<installed facet="jst.java" version="5.0"/>
<installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.eclipse.virgo.samples.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml
index b9f452a..3afd064 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="Virgo Tomcat at localhost"/>
+ <runtime name="Virgo Runtime"/>
<installed facet="jst.java" version="5.0"/>
<installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml
index 94643fd..2a4afa6 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="Virgo Tomcat at localhost"/>
+ <runtime name="Virgo Runtime"/>
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.web" version="2.5"/>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml
index 8383324..4dfacf4 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="Virgo Jetty at localhost"/>
- <secondary-runtime name="Virgo Tomcat at localhost"/>
+ <runtime name="Virgo Runtime"/>
<installed facet="org.eclipse.virgo.server.par" version="1.0"/>
</faceted-project>
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.classpath b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.classpath
index 58d433f..0ec2835 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.classpath
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.classpath
@@ -5,7 +5,10 @@
<classpathentry kind="con" path="com.springsource.server.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.springsource.server.ide.server.core.runtime.classpath/SpringSource dm Server (Runtime) v2.0"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.jst.common.project.facet.core.prefs b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index af1970c..0000000
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Jun 12 17:18:21 BST 2009
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.launching.macosx.MacOSXType\:\:JVM\ 1.6.0/owners=jst.java\:6.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:com.springsource.server.ide.server.core.runtime.classpath\:\:SpringSource\ dm\ Server\ (Runtime)\ v2.0/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.project.facet.core.xml
index fa9b239..2bc8e97 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="SpringSource dm Server (Runtime) v2.0"/>
+ <runtime name="Virgo Runtime"/>
<fixed facet="jst.java"/>
<fixed facet="jst.web"/>
<installed facet="jst.web" version="2.4"/>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.classpath b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.classpath
index 3671d42..a288885 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.classpath
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.classpath
@@ -3,6 +3,10 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="com.springsource.server.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.jst.common.project.facet.core.prefs b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index 73cb4d8..0000000
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jun 11 16:55:50 BST 2009
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.launching.macosx.MacOSXType\:\:JVM\ 1.6.0/owners=jst.java\:5.0
-eclipse.preferences.version=1
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.wst.common.project.facet.core.xml
index 4eff0bc..db240c2 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="SpringSource dm Server (Runtime) v2.0"/>
+ <runtime name="Virgo Runtime"/>
<installed facet="jst.java" version="5.0"/>
<installed facet="com.springsource.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath
index 58d433f..0ec2835 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath
@@ -5,7 +5,10 @@
<classpathentry kind="con" path="com.springsource.server.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.springsource.server.ide.server.core.runtime.classpath/SpringSource dm Server (Runtime) v2.0"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.jst.common.project.facet.core.prefs b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index 50d7f87..0000000
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Jun 11 16:55:56 BST 2009
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.launching.macosx.MacOSXType\:\:JVM\ 1.6.0/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:com.springsource.server.ide.server.core.runtime.classpath\:\:SpringSource\ dm\ Server\ (Runtime)\ v2.0/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.project.facet.core.xml
index 8899e70..ca0de3d 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="SpringSource dm Server (Runtime) v2.0"/>
+ <runtime name="Virgo Runtime"/>
<fixed facet="jst.java"/>
<fixed facet="jst.web"/>
<installed facet="jst.java" version="5.0"/>
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath b/formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath
index baa95c3..3e3dd08 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath
@@ -4,7 +4,10 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.springsource.server.ide.server.core.runtime.classpath/SpringSource dm Server (Runtime) v2.0"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.jst.common.project.facet.core.prefs b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index afd6530..0000000
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Jun 11 16:56:02 BST 2009
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.launching.macosx.MacOSXType\:\:JVM\ 1.6.0/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:com.springsource.server.ide.server.core.runtime.classpath\:\:SpringSource\ dm\ Server\ (Runtime)\ v2.0/owners=jst.web\:2.5
-eclipse.preferences.version=1
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.common.project.facet.core.xml
index c6dc5ee..d24a733 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="SpringSource dm Server (Runtime) v2.0"/>
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.java" version="5.0"/>
diff --git a/greenpages/greenpages.core/pom.xml b/greenpages/greenpages.core/pom.xml
index 5ebd10a..a255a2a 100644
--- a/greenpages/greenpages.core/pom.xml
+++ b/greenpages/greenpages.core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent</artifactId>
- <version>2.5.0.RELEASE</version>
+ <version>2.6.0.RELEASE</version>
<relativePath>../greenpages.parent</relativePath>
</parent>
diff --git a/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
index 976ba23..081250f 100644
--- a/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Export-Package: greenpages;version="2.5.0"
Bundle-Vendor: SpringSource Inc.
Bundle-Version: 2.5.0
-Tool: Bundlor 1.1.0.RELEASE
+Tool: Bundlor 1.1.0.M04
Bundle-Name: GreenPages Service
Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages.core
diff --git a/greenpages/greenpages.core/template.mf b/greenpages/greenpages.core/template.mf
index 6e6bb86..16fafe8 100644
--- a/greenpages/greenpages.core/template.mf
+++ b/greenpages/greenpages.core/template.mf
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: GreenPages Service
Bundle-SymbolicName: greenpages.core
Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.5.0
+Bundle-Version: 2.6.0
Import-Template:
org.springframework.*;version="[3.0, 3.5)"
Excluded-Exports:
diff --git a/greenpages/greenpages.db/pom.xml b/greenpages/greenpages.db/pom.xml
index 5e82483..e5e2ca0 100644
--- a/greenpages/greenpages.db/pom.xml
+++ b/greenpages/greenpages.db/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent</artifactId>
- <version>2.5.0.RELEASE</version>
+ <version>2.6.0.RELEASE</version>
<relativePath>../greenpages.parent</relativePath>
</parent>
diff --git a/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
index 52ffa4a..abb69e8 100644
--- a/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-Vendor: SpringSource
Bundle-Classpath: .
Bundle-Version: 2.5.0
-Tool: Bundlor 1.1.0.RELEASE
+Tool: Bundlor 1.1.0.M04
Bundle-Name: GreenPages DataSource
Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages.db
diff --git a/greenpages/greenpages.db/template.mf b/greenpages/greenpages.db/template.mf
index 1a3771c..aa2be06 100644
--- a/greenpages/greenpages.db/template.mf
+++ b/greenpages/greenpages.db/template.mf
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: GreenPages DataSource
Bundle-SymbolicName: greenpages.db
Bundle-Vendor: SpringSource
-Bundle-Version: 2.5.0
+Bundle-Version: 2.6.0
Import-Package:
org.h2;version="[1.0.71, 1.0.71]"
Import-Template:
diff --git a/greenpages/greenpages.jpa/pom.xml b/greenpages/greenpages.jpa/pom.xml
index 2973d35..5bdfc4c 100644
--- a/greenpages/greenpages.jpa/pom.xml
+++ b/greenpages/greenpages.jpa/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent</artifactId>
- <version>2.5.0.RELEASE</version>
+ <version>2.6.0.RELEASE</version>
<relativePath>../greenpages.parent</relativePath>
</parent>
diff --git a/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
index a00792d..2f3a098 100644
--- a/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@ Import-Bundle: com.springsource.org.eclipse.persistence;version="[1.0.
.0, 1.0.0]"
Bundle-Vendor: SpringSource
Bundle-Version: 2.5.0
-Tool: Bundlor 1.1.0.RELEASE
+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.sql;version="0",
+Import-Package: greenpages;version="[2.5, 2.6)",javax.persistence;version="[1, 1]",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
diff --git a/greenpages/greenpages.jpa/template.mf b/greenpages/greenpages.jpa/template.mf
index c41540c..fb71f4a 100644
--- a/greenpages/greenpages.jpa/template.mf
+++ b/greenpages/greenpages.jpa/template.mf
@@ -3,11 +3,10 @@ Bundle-ManifestVersion: 2
Bundle-Name: GreenPages JPA
Bundle-SymbolicName: greenpages.jpa
Bundle-Vendor: SpringSource
-Bundle-Version: 2.5.0
+Bundle-Version: 2.6.0
Import-Template:
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]",
javax.sql;version="0"
Import-Bundle:
@@ -15,7 +14,8 @@ Import-Bundle:
com.springsource.org.eclipse.persistence.jpa;version="[1.0.0, 1.0.0]"
Import-Package:
org.springframework.context.weaving;version="[3.0, 3.5)",
- org.springframework.transaction.aspectj;version="[3.0, 3.5)"
+ org.springframework.transaction.aspectj;version="[3.0, 3.5)",
+ javax.persistence;version="[1, 1]"
Excluded-Exports:
greenpages.jpa
Excluded-Imports:
diff --git a/greenpages/greenpages.parent/pom.xml b/greenpages/greenpages.parent/pom.xml
index 09f2ae3..a05f85d 100644
--- a/greenpages/greenpages.parent/pom.xml
+++ b/greenpages/greenpages.parent/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent</artifactId>
- <version>2.5.0.RELEASE</version>
+ <version>2.6.0.RELEASE</version>
<name>greenpages.parent</name>
<packaging>pom</packaging>
diff --git a/greenpages/greenpages.web/pom.xml b/greenpages/greenpages.web/pom.xml
index e5ef9db..4e40aa6 100644
--- a/greenpages/greenpages.web/pom.xml
+++ b/greenpages/greenpages.web/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent</artifactId>
- <version>2.5.0.RELEASE</version>
+ <version>2.6.0.RELEASE</version>
<relativePath>../greenpages.parent</relativePath>
</parent>
diff --git a/greenpages/greenpages.web/template.mf b/greenpages/greenpages.web/template.mf
index 9057c42..2cad179 100644
--- a/greenpages/greenpages.web/template.mf
+++ b/greenpages/greenpages.web/template.mf
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: GreenPages Web
Bundle-SymbolicName: greenpages.web
-Bundle-Version: 2.5.0
+Bundle-Version: 2.6.0
Bundle-ClassPath: .,WEB-INF/classes
Web-ContextPath: greenpages
Import-Template:
diff --git a/greenpages/greenpages/pom.xml b/greenpages/greenpages/pom.xml
index 24f814d..5e2cb7a 100644
--- a/greenpages/greenpages/pom.xml
+++ b/greenpages/greenpages/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent</artifactId>
- <version>2.5.0.RELEASE</version>
+ <version>2.6.0.RELEASE</version>
<relativePath>../greenpages.parent</relativePath>
</parent>
diff --git a/greenpages/guide/filters.properties b/greenpages/guide/filters.properties
index 3a21bc7..3601da1 100644
--- a/greenpages/guide/filters.properties
+++ b/greenpages/guide/filters.properties
@@ -13,7 +13,7 @@ webserv.zip.file=virgo-web-server-@webserv.version@.zip
greenpages=GreenPages
#The url and version for greenpages is finalised
-greenpages.version.number=2.5.0
+greenpages.version.number=2.6.0
greenpages.version=@greenpages.version.number@.RELEASE
greenpages.download.url=http://eclipse.org/virgo/download/
greenpages.zip.file=greenpages-@greenpages.version@.zip
diff --git a/greenpages/guide/src/installing-greenpages.xml b/greenpages/guide/src/installing-greenpages.xml
index 8a7f446..420f127 100644
--- a/greenpages/guide/src/installing-greenpages.xml
+++ b/greenpages/guide/src/installing-greenpages.xml
@@ -140,12 +140,12 @@ prompt$ export GREENPAGES_HOME=/opt/springsource/samples/@greenpages.expanded.di
<para>Installing dependencies on Windows:
<programlisting>prompt> cd %GREENPAGES_HOME%\greenpages
-prompt> copy target\par-provided\* %SERVER_HOME%\repoorg.apache.commons.fileuploadsitory\usr
+prompt> copy target\par-provided\* %SERVER_HOME%\repository\usr
</programlisting>
</para>
<para>Installing dependencies on UNIX:
-<programlisting>prompt$ cd $GREENPAGES_HOME/org.apache.commons.fileuploadgreenpages
+<programlisting>prompt$ cd $GREENPAGES_HOME/greenpages
prompt$ cp target/par-provided/* $SERVER_HOME/repository/usr
</programlisting>
</para>
diff --git a/greenpages/pom.xml b/greenpages/pom.xml
index 0640c56..61a378c 100644
--- a/greenpages/pom.xml
+++ b/greenpages/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages-top-level</artifactId>
- <version>2.5.0.RELEASE</version>
+ <version>2.6.0.RELEASE</version>
<name>GreenPages App Build</name>
<packaging>pom</packaging>
<modules>
diff --git a/osgi-examples/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml b/osgi-examples/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml
index 31a5903..801f856 100644
--- a/osgi-examples/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/osgi-examples/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="SpringSource dm Server (Runtime) v2.0"/>
<installed facet="com.springsource.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/osgi-examples/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml b/osgi-examples/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml
index 31a5903..801f856 100644
--- a/osgi-examples/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/osgi-examples/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="SpringSource dm Server (Runtime) v2.0"/>
<installed facet="com.springsource.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/osgi-examples/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml b/osgi-examples/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml
index 31a5903..801f856 100644
--- a/osgi-examples/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/osgi-examples/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="SpringSource dm Server (Runtime) v2.0"/>
<installed facet="com.springsource.server.bundle" version="1.0"/>
</faceted-project>

Back to the top