Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2013-01-11 12:20:27 -0500
committerChristopher Frost2013-01-11 12:20:27 -0500
commita03dac37e8c1cd0396cb801a0a4d8fa4f14b1aeb (patch)
tree3c8268b07dedb435d7dbd9fff32d9f05d7c3d008
parent0bafbb1db7a8257beee74ffaa7f099da4d49c880 (diff)
downloadorg.eclipse.virgo.samples-a03dac37e8c1cd0396cb801a0a4d8fa4f14b1aeb.tar.gz
org.eclipse.virgo.samples-a03dac37e8c1cd0396cb801a0a4d8fa4f14b1aeb.tar.xz
org.eclipse.virgo.samples-a03dac37e8c1cd0396cb801a0a4d8fa4f14b1aeb.zip
329368 more fixes to the build, versions are up to date and some deprecated code removed
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath2
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath2
-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/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF10
5 files changed, 9 insertions, 9 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 593d082..521d242 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
@@ -27,7 +27,7 @@
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RC1/org.springframework.beans-sources-3.0.0.RC1.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.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.eclipse.osgi/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar" sourcepath="/IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.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.web/.classpath b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
index 4f28a3e..10fa3f6 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
@@ -22,7 +22,7 @@
<classpathentry kind="var" path="IVY_CACHE/org.springframework.webflow/org.springframework.js/2.0.8.RELEASE/org.springframework.js-2.0.8.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework.webflow/org.springframework.js/2.0.8.RELEASE/org.springframework.js-sources-2.0.8.RELEASE.jar"/>
<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.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.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.eclipse.osgi/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar" sourcepath="/IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar" sourcepath="/IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
<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"/>
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 f407418..7717477 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
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.samples.formtags.shared-services.service"/>
<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"/>
@@ -13,5 +12,6 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.samples.formtags.shared-services.service"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
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 2a4afa6..ea69099 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
@@ -4,6 +4,6 @@
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.web" version="2.5"/>
- <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
<installed facet="jst.java" version="5.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF
index 3fb682b..7723339 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: FormTags Shared Services WAR
-Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.sharedservices.war
+Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.sharedservices.web
Bundle-Version: 3.0.0
-Import-Package: org.eclipse.virgo.samples.formtags.sharedservices.domain,
- org.eclipse.virgo.samples.formtags.sharedservices.service,
- org.eclipse.virgo.web.dm;version="[3.0,5.0)",
+Import-Package: javax.servlet.http,
javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.1)",
- javax.servlet.http
+ org.eclipse.virgo.samples.formtags.sharedservices.domain,
+ org.eclipse.virgo.samples.formtags.sharedservices.service,
+ org.eclipse.virgo.web.dm;version="[3.0,5.0)"
Import-Library: org.springframework.spring;version="[2.5.6.A,4.0.0)"
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="1.1.2.v20110517"

Back to the top