388572 [merge request] updating Formtags sample to work with Virgo Tools
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/.classpath b/formtags/par/org.springframework.showcase.formtags.domain/.classpath
index 3671d42..9abd83e 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/.classpath
+++ b/formtags/par/org.springframework.showcase.formtags.domain/.classpath
@@ -2,7 +2,11 @@
<classpath>
<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.virgo.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER"/>
+ <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/par/org.springframework.showcase.formtags.domain/.project b/formtags/par/org.springframework.showcase.formtags.domain/.project
index 5ad3ad0..7f922c7 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/.project
+++ b/formtags/par/org.springframework.showcase.formtags.domain/.project
@@ -22,7 +22,7 @@
</buildCommand>
</buildSpec>
<natures>
- <nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+ <nature>org.eclipse.virgo.ide.facet.core.bundlenature</nature>
<nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/.settings/org.eclipse.jst.common.project.facet.core.prefs b/formtags/par/org.springframework.showcase.formtags.domain/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index 9274d51..0000000
--- a/formtags/par/org.springframework.showcase.formtags.domain/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jun 11 16:56:17 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/par/org.springframework.showcase.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.springframework.showcase.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml
index 4eff0bc..b9f452a 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.springframework.showcase.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="SpringSource dm Server (Runtime) v2.0"/>
+ <runtime name="Virgo Tomcat at localhost"/>
<installed facet="jst.java" version="5.0"/>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/formtags/par/org.springframework.showcase.formtags.service/.classpath b/formtags/par/org.springframework.showcase.formtags.service/.classpath
index 3671d42..9abd83e 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/.classpath
+++ b/formtags/par/org.springframework.showcase.formtags.service/.classpath
@@ -2,7 +2,11 @@
<classpath>
<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.virgo.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER"/>
+ <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/par/org.springframework.showcase.formtags.service/.project b/formtags/par/org.springframework.showcase.formtags.service/.project
index 33c55ce..e44f30a 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/.project
+++ b/formtags/par/org.springframework.showcase.formtags.service/.project
@@ -23,7 +23,7 @@
</buildCommand>
</buildSpec>
<natures>
- <nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+ <nature>org.eclipse.virgo.ide.facet.core.bundlenature</nature>
<nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
diff --git a/formtags/par/org.springframework.showcase.formtags.service/.settings/org.eclipse.jst.common.project.facet.core.prefs b/formtags/par/org.springframework.showcase.formtags.service/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index 9312946..0000000
--- a/formtags/par/org.springframework.showcase.formtags.service/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jun 11 16:56:25 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/par/org.springframework.showcase.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.springframework.showcase.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml
index 4eff0bc..b9f452a 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.springframework.showcase.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="SpringSource dm Server (Runtime) v2.0"/>
+ <runtime name="Virgo Tomcat at localhost"/>
<installed facet="jst.java" version="5.0"/>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/formtags/par/org.springframework.showcase.formtags.web/.classpath b/formtags/par/org.springframework.showcase.formtags.web/.classpath
index 72b521b..9abd83e 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/.classpath
+++ b/formtags/par/org.springframework.showcase.formtags.web/.classpath
@@ -2,15 +2,10 @@
<classpath>
<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.jst.server.core.container/com.springsource.server.ide.server.core.runtime.classpath/SpringSource dm Server (Runtime) v2.0">
+ <classpathentry kind="con" path="org.eclipse.virgo.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER"/>
+ <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="jst.web"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6">
- <attributes>
- <attribute name="owner.project.facets" value="jst.java"/>
+ <attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
diff --git a/formtags/par/org.springframework.showcase.formtags.web/.project b/formtags/par/org.springframework.showcase.formtags.web/.project
index 336a3a9..fa4f409 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/.project
+++ b/formtags/par/org.springframework.showcase.formtags.web/.project
@@ -34,7 +34,7 @@
</buildCommand>
</buildSpec>
<natures>
- <nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+ <nature>org.eclipse.virgo.ide.facet.core.bundlenature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.springframework.ide.eclipse.core.springnature</nature>
diff --git a/formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml
index e98b7c3..94643fd 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="SpringSource dm Server (Runtime) v2.0"/>
+ <runtime name="Virgo Tomcat at localhost"/>
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.web" version="2.5"/>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
<installed facet="jst.java" version="5.0"/>
</faceted-project>
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/META-INF/MANIFEST.MF b/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/META-INF/MANIFEST.MF
index 886602a..6180abb 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/META-INF/MANIFEST.MF
@@ -11,4 +11,5 @@
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="1.1.2"
Import-Library: org.springframework.spring;version="[2.5.6.A,5.0.0)"
Web-ContextPath: formtags-par
+Bundle-Classpath: WEB-INF/classes
diff --git a/formtags/par/org.springframework.showcase.formtags/.project b/formtags/par/org.springframework.showcase.formtags/.project
index 2521009..c310bc1 100644
--- a/formtags/par/org.springframework.showcase.formtags/.project
+++ b/formtags/par/org.springframework.showcase.formtags/.project
@@ -17,7 +17,7 @@
</buildCommand>
</buildSpec>
<natures>
- <nature>com.springsource.server.ide.facet.core.parnature</nature>
+ <nature>org.eclipse.virgo.ide.facet.core.parnature</nature>
<nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
diff --git a/formtags/par/org.springframework.showcase.formtags/.settings/com.springsource.server.ide.runtime.core.par.xml b/formtags/par/org.springframework.showcase.formtags/.settings/com.springsource.server.ide.runtime.core.par.xml
deleted file mode 100644
index fbfb154..0000000
--- a/formtags/par/org.springframework.showcase.formtags/.settings/com.springsource.server.ide.runtime.core.par.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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">
- <bundle symbolicName="org.springframework.showcase.formtags.domain"/>
- <bundle symbolicName="org.springframework.showcase.formtags.service"/>
- <bundle symbolicName="org.springframework.showcase.formtags.web"/>
-</com.springsource.server.ide.par:Par>
diff --git a/formtags/par/org.springframework.showcase.formtags/.settings/org.eclipse.virgo.ide.runtime.core.par.xml b/formtags/par/org.springframework.showcase.formtags/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
new file mode 100644
index 0000000..3848f66
--- /dev/null
+++ b/formtags/par/org.springframework.showcase.formtags/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="org.springframework.showcase.formtags.domain"/>
+ <bundle symbolicName="org.springframework.showcase.formtags.service"/>
+ <bundle symbolicName="org.springframework.showcase.formtags.web"/>
+</org.eclipse.virgo.ide.par:Par>
diff --git a/formtags/par/org.springframework.showcase.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.springframework.showcase.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml
index b9894e8..8383324 100644
--- a/formtags/par/org.springframework.showcase.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.springframework.showcase.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="SpringSource dm Server (Runtime) v2.0"/>
- <installed facet="com.springsource.server.par" version="1.0"/>
+ <runtime name="Virgo Jetty at localhost"/>
+ <secondary-runtime name="Virgo Tomcat at localhost"/>
+ <installed facet="org.eclipse.virgo.server.par" version="1.0"/>
</faceted-project>
