Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2013-01-23 13:04:30 -0500
committerChristopher Frost2013-01-23 13:04:30 -0500
commit44486004ddebfaa969953b8a4313a835a6315e77 (patch)
tree3bfb6e1ca1ae03adc5e4356846b3780aa487d550
parent081a7be9518cc69d1d2ec2113efe5146323676e5 (diff)
downloadorg.eclipse.virgo.samples-44486004ddebfaa969953b8a4313a835a6315e77.tar.gz
org.eclipse.virgo.samples-44486004ddebfaa969953b8a4313a835a6315e77.tar.xz
org.eclipse.virgo.samples-44486004ddebfaa969953b8a4313a835a6315e77.zip
329368 GreenPages can now be deployed via the admin console or pickup, not working from the tooling
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath1
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF25
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf1
-rw-r--r--greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF4
-rw-r--r--greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF2
-rw-r--r--greenpages/greenpages.jpa/pom.xml8
-rw-r--r--greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF29
-rw-r--r--greenpages/greenpages.jpa/template.mf7
-rw-r--r--greenpages/greenpages.parent/pom.xml17
-rw-r--r--greenpages/greenpages.web/src/main/resources/META-INF/MANIFEST.MF22
-rw-r--r--greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF4
-rw-r--r--greenpages/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml8
-rw-r--r--greenpages/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml1
13 files changed, 77 insertions, 52 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 1304211..5e772be 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
@@ -27,6 +27,5 @@
<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.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/src/main/webapp/META-INF/MANIFEST.MF b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF
index 3d7c25c..3877eff 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
Manifest-Version: 1.0
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
1.1.2,1.3)"
+Bundle-ClassPath: .,WEB-INF/classes
Bundle-Version: 3.0.0
Tool: Bundlor 1.1.0.RELEASE
Bundle-Name: Configuration Sample Web Bundle
@@ -10,15 +11,17 @@ Bundle-SymbolicName: org.eclipse.virgo.samples.configuration.propertie
Web-ContextPath: config-properties
Import-Package: org.eclipse.virgo.samples.configuration.properties.cor
e;version="[3.0.0,4.0.0)",org.eclipse.virgo.web.dm;version="[3.0.0,4.
- 0.0)",org.springframework.beans.factory.xml;version="[3.0,4.0)",org.s
- pringframework.context.config;version="[3.0,4.0)",org.springframework
- .context.support;version="[3.0,4.0)",org.springframework.web.context;
- version="[3.0,4.0)",org.springframework.web.context.support;version="
- [3.0,4.0)",org.springframework.web.servlet;version="[3.0,4.0)",org.sp
- ringframework.web.servlet.config;version="[3.0,4.0)",org.springframew
- ork.web.servlet.handler;version="[3.0,4.0)",org.springframework.web.s
- ervlet.mvc;version="[3.0,4.0)",org.springframework.web.servlet.mvc.an
- notation;version="[3.0,4.0)",org.springframework.web.servlet.support;
- version="[3.0,4.0)",org.springframework.web.servlet.view;version="[3.
- 0,4.0)"
+ 0.0)",org.springframework.beans.factory.annotation;version="[3.0,4.0)
+ ",org.springframework.beans.factory.xml;version="[3.0,4.0)",org.sprin
+ gframework.context.config;version="[3.0,4.0)",org.springframework.con
+ text.support;version="[3.0,4.0)",org.springframework.stereotype;versi
+ on="[3.0,4.0)",org.springframework.web.bind.annotation;version="[3.0,
+ 4.0)",org.springframework.web.context;version="[3.0,4.0)",org.springf
+ ramework.web.context.support;version="[3.0,4.0)",org.springframework.
+ web.servlet;version="[3.0,4.0)",org.springframework.web.servlet.confi
+ g;version="[3.0,4.0)",org.springframework.web.servlet.handler;version
+ ="[3.0,4.0)",org.springframework.web.servlet.mvc;version="[3.0,4.0)",
+ org.springframework.web.servlet.mvc.annotation;version="[3.0,4.0)",or
+ g.springframework.web.servlet.support;version="[3.0,4.0)",org.springf
+ ramework.web.servlet.view;version="[3.0,4.0)"
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf
index 49485c4..4dba198 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf
@@ -3,6 +3,7 @@ Bundle-Name: Configuration Sample Web Bundle
Bundle-Version: 3.0.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.virgo.samples.configuration.properties.web
+Bundle-ClassPath: .,WEB-INF/classes
Import-Template:
org.eclipse.virgo.samples.configuration.properties.core;version="[3.0.0,4.0.0)",
org.springframework.*;version="[3.0,4.0)",
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 f1eaecf..a54d066 100644
--- a/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
-Export-Package: greenpages;version="2.6.0"
+Export-Package: greenpages;version="3.0.0"
Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.6.0
+Bundle-Version: 3.0.0
Tool: Bundlor 1.1.0.RELEASE
Bundle-Name: GreenPages Service
Bundle-ManifestVersion: 2
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 dce2d37..0daa073 100644
--- a/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Vendor: SpringSource
Bundle-Classpath: .
-Bundle-Version: 2.6.0
+Bundle-Version: 3.0.0
Tool: Bundlor 1.1.0.RELEASE
Bundle-Name: GreenPages DataSource
Bundle-ManifestVersion: 2
diff --git a/greenpages/greenpages.jpa/pom.xml b/greenpages/greenpages.jpa/pom.xml
index bfe9ce3..30e68d5 100644
--- a/greenpages/greenpages.jpa/pom.xml
+++ b/greenpages/greenpages.jpa/pom.xml
@@ -32,6 +32,14 @@
<artifactId>com.springsource.javax.persistence</artifactId>
</dependency>
<dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>com.springsource.javax.validation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>com.springsource.org.eclipse.persistence.internal.libraries.antlr</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>com.springsource.org.eclipse.persistence</artifactId>
</dependency>
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 db59c6d..7471562 100644
--- a/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
@@ -1,21 +1,22 @@
Manifest-Version: 1.0
-Import-Bundle: 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-Bundle: com.springsource.org.eclipse.persistence;version="[2.0.
+ 0, 2.1.0)",com.springsource.org.eclipse.persistence.jpa;version="[2.0
+ .0, 2.1.0)"
Bundle-Vendor: SpringSource
-Bundle-Version: 2.6.0
+Bundle-Version: 3.0.0
Tool: Bundlor 1.1.0.RELEASE
Bundle-Name: GreenPages JPA
Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages.jpa
-Import-Package: greenpages;version="[2.5, 2.6)",javax.persistence;vers
- ion="[1, 1]",javax.sql;version="0",org.apache.commons.dbcp;version="[
- 1.2.2.osgi, 1.2.2.osgi]",org.springframework.beans.factory.annotation
- ;version="[3.0, 3.5)",org.springframework.context.weaving;version="[3
- .0, 3.5)",org.springframework.core.io;version="[3.0, 3.5)",org.spring
- framework.dao.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.stereotype;version="[3.0, 3.5)",org.
- springframework.transaction.annotation;version="[3.0, 3.5)",org.sprin
- gframework.transaction.aspectj;version="[3.0, 3.5)"
+Import-Package: greenpages;version="[3.0, 4.0)",javax.persistence;vers
+ ion="[2, 2.1)",javax.persistence.criteria;version="[2, 2.1)",javax.sq
+ l;version="0",org.apache.commons.dbcp;version="[1.2.2.osgi, 1.2.2.osg
+ i]",org.springframework.beans.factory.annotation;version="[3.0, 3.5)"
+ ,org.springframework.context.weaving;version="[3.0, 3.5)",org.springf
+ ramework.core.io;version="[3.0, 3.5)",org.springframework.dao.annotat
+ ion;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.spri
+ ngframework.stereotype;version="[3.0, 3.5)",org.springframework.trans
+ action.annotation;version="[3.0, 3.5)",org.springframework.transactio
+ n.aspectj;version="[3.0, 3.5)"
diff --git a/greenpages/greenpages.jpa/template.mf b/greenpages/greenpages.jpa/template.mf
index a20ff4b..413aae1 100644
--- a/greenpages/greenpages.jpa/template.mf
+++ b/greenpages/greenpages.jpa/template.mf
@@ -10,12 +10,13 @@ Import-Template:
org.apache.commons.dbcp.*;version="[1.2.2.osgi, 1.2.2.osgi]",
javax.sql;version="0"
Import-Bundle:
- 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]"
+ com.springsource.org.eclipse.persistence;version="[2.0.0, 2.1.0)",
+ com.springsource.org.eclipse.persistence.jpa;version="[2.0.0, 2.1.0)"
Import-Package:
org.springframework.context.weaving;version="[3.0, 3.5)",
org.springframework.transaction.aspectj;version="[3.0, 3.5)",
- javax.persistence;version="[1, 1]"
+ javax.persistence.criteria;version="[2, 2.1)",
+ javax.persistence;version="[2, 2.1)"
Excluded-Exports:
greenpages.jpa
Excluded-Imports:
diff --git a/greenpages/greenpages.parent/pom.xml b/greenpages/greenpages.parent/pom.xml
index 82c2f79..a893086 100644
--- a/greenpages/greenpages.parent/pom.xml
+++ b/greenpages/greenpages.parent/pom.xml
@@ -35,19 +35,30 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>com.springsource.javax.persistence</artifactId>
- <version>1.0.0</version>
+ <version>2.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>com.springsource.javax.validation</artifactId>
+ <version>1.0.0.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>com.springsource.org.eclipse.persistence.internal.libraries.antlr</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>com.springsource.org.eclipse.persistence</artifactId>
- <version>1.0.0</version>
+ <version>2.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>
+ <version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/greenpages/greenpages.web/src/main/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.web/src/main/resources/META-INF/MANIFEST.MF
index 6587298..fd5ac12 100644
--- a/greenpages/greenpages.web/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.web/src/main/resources/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
1.1.2,2.0)"
Bundle-ClassPath: .,WEB-INF/classes
-Bundle-Version: 2.5.0
+Bundle-Version: 3.0.0
Tool: Bundlor 1.1.0.BUILD-20101220120024
Bundle-Name: GreenPages Web
-Import-Library: org.springframework.spring;version="[3.0, 3.1)"
+Import-Library: org.springframework.spring;version="[3.0, 3.5)"
Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages.web
Web-ContextPath: greenpages
Import-Package: freemarker.cache;version="[2.3.18,2.3.18]",greenpages;
- version="[2.5, 2.6)",javax.servlet;version="[3.0.0, 3.1.0)",javax.ser
+ version="[3.0, 3.5)",javax.servlet;version="[3.0.0, 3.1.0)",javax.ser
vlet.jsp.jstl.core;version="[1.2.0, 2.0.0)",javax.sql,org.apache.comm
- ons.dbcp,org.eclipse.virgo.web.dm;version="[3.0.0, 4.0.0)",org.spring
- framework.beans.factory.annotation;version="[3.0, 3.1)",org.springfra
- mework.core.io;version="[3.0, 3.1)",org.springframework.stereotype;ve
- rsion="[3.0, 3.1)",org.springframework.web.bind.annotation;version="[
- 3.0, 3.1)",org.springframework.web.context;version="[3.0, 3.1)",org.s
- pringframework.web.servlet;version="[3.0, 3.1)",org.springframework.w
- eb.servlet.mvc.annotation;version="[3.0, 3.1)",org.springframework.we
- b.servlet.view.freemarker;version="[3.0, 3.1)"
+ ons.dbcp,org.eclipse.virgo.web.dm;version="[3.5.0, 4.0.0)",org.spring
+ framework.beans.factory.annotation;version="[3.0, 3.5)",org.springfra
+ mework.core.io;version="[3.0, 3.5)",org.springframework.stereotype;ve
+ rsion="[3.0, 3.5)",org.springframework.web.bind.annotation;version="[
+ 3.0, 3.5)",org.springframework.web.context;version="[3.0, 3.5)",org.s
+ pringframework.web.servlet;version="[3.0, 3.5)",org.springframework.w
+ eb.servlet.mvc.annotation;version="[3.0, 3.5)",org.springframework.we
+ b.servlet.view.freemarker;version="[3.0, 3.5)"
diff --git a/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
index 8cd3df4..f853672 100644
--- a/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
1.1.2,2.0)"
Bundle-ClassPath: .,WEB-INF/classes
-Bundle-Version: 2.6.0
+Bundle-Version: 3.0.0
Tool: Bundlor 1.1.0.RELEASE
Bundle-Name: GreenPages Web
Import-Library: org.springframework.spring;version="[3.0, 3.5)"
@@ -10,7 +10,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages.web
Web-ContextPath: greenpages
Import-Package: freemarker.cache;version="[2.3.18,2.3.18]",greenpages;
- version="[2.5, 2.6)",javax.servlet;version="[3.0.0, 3.1.0)",javax.ser
+ version="[3.0, 4.0)",javax.servlet;version="[3.0.0, 3.1.0)",javax.ser
vlet.jsp.jstl.core;version="[1.2.0, 2.0.0)",javax.sql,org.apache.comm
ons.dbcp,org.eclipse.virgo.web.dm;version="[3.0.0, 4.0.0)",org.spring
framework.beans.factory.annotation;version="[3.0, 3.5)",org.springfra
diff --git a/greenpages/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml b/greenpages/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
index bd5604a..63b3898 100644
--- a/greenpages/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
+++ b/greenpages/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
@@ -1,7 +1,7 @@
<?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="greenpages.app-solution"/>
- <bundle symbolicName="greenpages.db-solution"/>
- <bundle symbolicName="greenpages.jpa-solution"/>
- <bundle symbolicName="greenpages.web-solution"/>
+ <bundle symbolicName="greenpages.core"/>
+ <bundle symbolicName="greenpages.db"/>
+ <bundle symbolicName="greenpages.jpa"/>
+ <bundle symbolicName="greenpages.web"/>
</org.eclipse.virgo.ide.par:Par>
diff --git a/greenpages/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml b/greenpages/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
index 3342fa9..4dfacf4 100644
--- a/greenpages/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/greenpages/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <runtime name="Virgo Runtime"/>
<installed facet="org.eclipse.virgo.server.par" version="1.0"/>
</faceted-project>

Back to the top