Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Waibel2013-10-31 17:29:25 -0400
committerFlorian Waibel2013-10-31 17:29:25 -0400
commit217093577ca707701b22dfad9106e84003251073 (patch)
treea0964b140c01ced3112581c2be2c37a6381c8851
parent0f9f1bf30ab441693ba2ec65e8467745b6cb7014 (diff)
downloadorg.eclipse.virgo.samples-217093577ca707701b22dfad9106e84003251073.tar.gz
org.eclipse.virgo.samples-217093577ca707701b22dfad9106e84003251073.tar.xz
org.eclipse.virgo.samples-217093577ca707701b22dfad9106e84003251073.zip
Bug 329368 - migrates greenpages sample from com.springsource.bundlor.maven to maven-bundle-plugin
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF27
-rw-r--r--greenpages/greenpages.core/pom.xml26
-rw-r--r--greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF10
-rw-r--r--greenpages/greenpages.db/pom.xml36
-rw-r--r--greenpages/greenpages.db/template.mf11
-rw-r--r--greenpages/greenpages.jpa/pom.xml80
-rw-r--r--greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF22
-rw-r--r--greenpages/greenpages.jpa/template.mf24
-rw-r--r--greenpages/greenpages.par/template.mf2
-rw-r--r--greenpages/greenpages.parent/pom.xml168
-rw-r--r--greenpages/greenpages.web/pom.xml79
-rw-r--r--greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF20
-rw-r--r--greenpages/greenpages.web/template.mf27
-rw-r--r--greenpages/pom.xml2
14 files changed, 241 insertions, 293 deletions
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
deleted file mode 100644
index 347911e..0000000
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
- 1.1.2,1.3)"
-Bundle-ClassPath: .,WEB-INF/classes,images,styles
-Bundle-Version: 3.0.0
-Tool: Bundlor 1.1.2.RELEASE
-Bundle-Name: Configuration Sample Web Bundle
-Bundle-ManifestVersion: 2
-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.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)"
-Bundle-SymbolicName: org.eclipse.virgo.samples.configuration.propertie
- s.web
-Web-ContextPath: config-properties
-
diff --git a/greenpages/greenpages.core/pom.xml b/greenpages/greenpages.core/pom.xml
index e048010..3c203c6 100644
--- a/greenpages/greenpages.core/pom.xml
+++ b/greenpages/greenpages.core/pom.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.eclipse.virgo</groupId>
@@ -13,13 +13,23 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>greenpages.core</artifactId>
- <name>greenpages.core</name>
- <packaging>jar</packaging>
+ <name>GreenPages Service</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/spring/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
<dependencies>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.spring-library</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.spring-library</artifactId>
<type>libd</type>
</dependency>
<dependency>
diff --git a/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 9bc5078..0000000
--- a/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: greenpages;version="3.0.0"
-Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 3.0.0
-Tool: Bundlor 1.1.2.RELEASE
-Bundle-Name: GreenPages Service
-Bundle-ManifestVersion: 2
-Import-Package: org.springframework.stereotype;version="[3.0, 3.5)"
-Bundle-SymbolicName: greenpages.core
-
diff --git a/greenpages/greenpages.db/pom.xml b/greenpages/greenpages.db/pom.xml
index 3c60b29..3d993e9 100644
--- a/greenpages/greenpages.db/pom.xml
+++ b/greenpages/greenpages.db/pom.xml
@@ -13,8 +13,35 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>greenpages.db</artifactId>
- <name>greenpages.db</name>
- <packaging>jar</packaging>
+ <name>GreenPages DataSource</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/spring/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Bundle>
+ com.springsource.org.eclipse.persistence.jpa;version="[2, 3)"
+ </Import-Bundle>
+ <Import-Package>
+ org.h2;version="[1.0.71,2)",
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
@@ -46,11 +73,6 @@
<groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.weaver</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.instrument</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project> \ No newline at end of file
diff --git a/greenpages/greenpages.db/template.mf b/greenpages/greenpages.db/template.mf
deleted file mode 100644
index 80c7045..0000000
--- a/greenpages/greenpages.db/template.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: GreenPages DataSource
-Bundle-SymbolicName: greenpages.db
-Bundle-Vendor: SpringSource
-Bundle-Version: 3.0.0
-Import-Package:
- org.h2;version="[1.0.71, 1.0.71]"
-Import-Template:
- org.apache.commons.dbcp.*;version="[1.2.2.osgi, 1.2.2.osgi]",
- javax.sql;version="0"
diff --git a/greenpages/greenpages.jpa/pom.xml b/greenpages/greenpages.jpa/pom.xml
index 7837984..1340dbb 100644
--- a/greenpages/greenpages.jpa/pom.xml
+++ b/greenpages/greenpages.jpa/pom.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.eclipse.virgo</groupId>
@@ -13,8 +13,44 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>greenpages.jpa</artifactId>
- <name>greenpages.jpa</name>
- <packaging>jar</packaging>
+ <name>GreenPages JPA</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/spring/*</include>
+ <include>META-INF/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <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)"
+ </Import-Bundle>
+ <Import-Package>
+ org.springframework.context.weaving;version="[3,
+ 4)",
+ org.springframework.transaction.aspectj;version="[3.0, 3.5)",
+ javax.persistence.criteria;version="[2, 2.1)",
+ javax.persistence;version="[2, 2.1)",
+ javax.sql;version="0",
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
@@ -23,30 +59,33 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.spring-library</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.spring-library</artifactId>
<type>libd</type>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>com.springsource.javax.persistence</artifactId>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0.2</version>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>com.springsource.javax.validation</artifactId>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.persistence</artifactId>
+ <version>2.0.0</version>
+ <scope>test</scope>
</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>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>com.springsource.org.eclipse.persistence</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>com.springsource.org.eclipse.persistence.jpa</artifactId>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>com.springsource.org.eclipse.persistence.jpa</artifactId>
</dependency>
<dependency>
<groupId>org.junit</groupId>
@@ -54,8 +93,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.test</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -84,8 +123,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>com.springsource.org.aspectj.weaver</artifactId>
+ <groupId>org.aspectj</groupId>
+ <artifactId>com.springsource.org.aspectj.weaver</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 0f28e56..0000000
--- a/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.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: 3.0.0
-Tool: Bundlor 1.1.2.RELEASE
-Bundle-Name: GreenPages JPA
-Bundle-ManifestVersion: 2
-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)"
-Bundle-SymbolicName: greenpages.jpa
-
diff --git a/greenpages/greenpages.jpa/template.mf b/greenpages/greenpages.jpa/template.mf
deleted file mode 100644
index 413aae1..0000000
--- a/greenpages/greenpages.jpa/template.mf
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: GreenPages JPA
-Bundle-SymbolicName: greenpages.jpa
-Bundle-Vendor: SpringSource
-Bundle-Version: 3.0.0
-Import-Template:
- org.springframework.*;version="[3.0, 3.5)",
- greenpages;version="[3.0, 4.0)",
- 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="[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.criteria;version="[2, 2.1)",
- javax.persistence;version="[2, 2.1)"
-Excluded-Exports:
- greenpages.jpa
-Excluded-Imports:
- org.springframework.test.*,
- org.junit.*
diff --git a/greenpages/greenpages.par/template.mf b/greenpages/greenpages.par/template.mf
deleted file mode 100644
index ac59b66..0000000
--- a/greenpages/greenpages.par/template.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2 \ No newline at end of file
diff --git a/greenpages/greenpages.parent/pom.xml b/greenpages/greenpages.parent/pom.xml
index a4c9fb8..07e9280 100644
--- a/greenpages/greenpages.parent/pom.xml
+++ b/greenpages/greenpages.parent/pom.xml
@@ -2,46 +2,51 @@
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent</artifactId>
<version>3.0.0.RELEASE</version>
- <name>greenpages.parent</name>
+ <name>GreenPages parent pom</name>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.spring-library</artifactId>
- <type>libd</type>
- <version>3.1.0.RELEASE</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.spring-library</artifactId>
+ <type>libd</type>
+ <version>3.1.0.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
- <version>1.2.2.osgi</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
+ <version>1.2.2.osgi</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>com.springsource.org.h2</artifactId>
- <version>1.0.71</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.pool</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>com.springsource.org.h2</artifactId>
+ <version>1.0.71</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>com.springsource.javax.persistence</artifactId>
- <version>2.0.0</version>
+ <groupId>javax.persistence</groupId>
+ <artifactId>com.springsource.javax.persistence</artifactId>
+ <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>
+ <groupId>javax.validation</groupId>
+ <artifactId>com.springsource.javax.validation</artifactId>
+ <version>1.0.0.GA</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -50,27 +55,27 @@
<version>2.0.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>com.springsource.org.eclipse.persistence</artifactId>
- <version>2.0.0</version>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>com.springsource.org.eclipse.persistence</artifactId>
+ <version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>com.springsource.org.eclipse.persistence.jpa</artifactId>
- <version>2.0.0</version>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>com.springsource.org.eclipse.persistence.jpa</artifactId>
+ <version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>com.springsource.org.aspectj.weaver</artifactId>
- <version>1.6.12.RELEASE</version>
+ <groupId>org.aspectj</groupId>
+ <artifactId>com.springsource.org.aspectj.weaver</artifactId>
+ <version>1.6.12.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>com.springsource.freemarker</artifactId>
- <version>2.3.18</version>
+ <groupId>org.freemarker</groupId>
+ <artifactId>com.springsource.freemarker</artifactId>
+ <version>2.3.18</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -80,27 +85,27 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- <version>1.1.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+ <version>1.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.test</artifactId>
- <version>3.1.0.RELEASE</version>
+ <version>3.1.0.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.aspects</artifactId>
- <version>3.1.0.RELEASE</version>
+ <version>3.1.0.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.instrument</artifactId>
- <version>3.1.0.RELEASE</version>
+ <version>3.1.0.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -114,13 +119,8 @@
<repositories>
<repository>
- <id>com.springsource.repository.bundles.snapshot</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshot</name>
- <url>http://repository.springsource.com/maven/bundles/snapshot</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+ <id>com.springsource.repository.bundles.release</id>
+ <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
<url>http://repository.springsource.com/maven/bundles/release</url>
</repository>
<repository>
@@ -129,31 +129,10 @@
<url>http://repository.springsource.com/maven/bundles/external</url>
</repository>
<repository>
- <id>com.springsource.repository.bundle.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
- <url>http://repository.springsource.com/maven/bundles/milestone</url>
+ <id>com.springsource.repository.libraries.release</id>
+ <name>SpringSource Enterprise Bundle Repository - SpringSource Library Releases</name>
+ <url>http://repository.springsource.com/maven/libraries/release</url>
</repository>
-
- <repository>
- <id>com.springsource.repository.libraries.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Library Releases</name>
- <url>http://repository.springsource.com/maven/libraries/release</url>
- </repository>
- <!-- <repository>
- <id>com.springsource.repository.libraries.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Library Releases</name>
- <url>http://repository.springsource.com/maven/libraries/external</url>
- </repository>
- <repository>
- <id>com.springsource.repository.libraries.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - Milestone Library Releases</name>
- <url>http://repository.springsource.com/maven/libraries/milestone</url>
- </repository>
- <repository>
- <id>com.springsource.repository.libraries.snapshot</id>
- <name>SpringSource Enterprise Bundle Repository - Snapshot Library Releases</name>
- <url>http://repository.springsource.com/maven/libraries/snapshot</url>
- </repository> -->
</repositories>
<properties>
@@ -166,28 +145,19 @@
<name>SpringSource Enterprise Bundle Repository - Releases</name>
<url>http://repository.springsource.com/maven/bundles/release</url>
</pluginRepository>
- <!-- <pluginRepository>
- <id>com.springsource.repository.bundles.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - Milestone</name>
- <url>http://repository.springsource.com/maven/bundles/milestone</url>
- </pluginRepository> -->
</pluginRepositories>
<build>
<plugins>
<plugin>
- <groupId>com.springsource.bundlor</groupId>
- <artifactId>com.springsource.bundlor.maven</artifactId>
- <version>1.0.0.RELEASE</version>
- <executions>
- <execution>
- <id>bundlor</id>
- <goals>
- <goal>bundlor</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -199,15 +169,25 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
- <archive>
- <manifestFile>
- src/main/resources/META-INF/MANIFEST.MF
- </manifestFile>
- </archive>
+ <instructions>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Vendor>SpringSource Inc.</Bundle-Vendor>
+ <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+ </instructions>
</configuration>
</plugin>
<plugin>
@@ -222,10 +202,10 @@
<exclude>**/Abstract*.java</exclude>
</excludes>
<junitArtifactName>org.junit:com.springsource.org.junit</junitArtifactName>
- <argLine>-javaagent:${user.home}/.m2/repository/org/springframework/org.springframework.instrument/3.1.0.RELEASE/org.springframework.instrument-3.1.0.RELEASE.jar</argLine>
+ <argLine>-javaagent:${user.home}/.m2/repository/org/springframework/org.springframework.instrument/3.1.0.RELEASE/org.springframework.instrument-3.1.0.RELEASE.jar</argLine>
</configuration>
</plugin>
</plugins>
</build>
-
+
</project>
diff --git a/greenpages/greenpages.web/pom.xml b/greenpages/greenpages.web/pom.xml
index 31a6552..890dc5d 100644
--- a/greenpages/greenpages.web/pom.xml
+++ b/greenpages/greenpages.web/pom.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.eclipse.virgo</groupId>
@@ -13,8 +13,54 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>greenpages.web</artifactId>
- <name>greenpages.web</name>
- <packaging>jar</packaging>
+ <name>GreenPages Web</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/spring/*</include>
+ <include>META-INF/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>index.html</include>
+ <include>images/*</include>
+ <include>styles/*</include>
+ <include>WEB-INF/*</include>
+ <include>WEB-INF/ftl/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Web-ContextPath>greenpages</Web-ContextPath>
+ <Import-Library>
+ org.springframework.spring;version="[3.1, 3.5)"
+ </Import-Library>
+ <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)"
+ </Import-Bundle>
+ <Import-Package>
+ javax.servlet.jsp.jstl.core;version="[1.2.0, 2)",
+ javax.servlet;version="[3.0.0, 3.1)",
+ org.eclipse.virgo.web.dm;version="[3.6, 4)",
+ freemarker.cache;version="[2.3.18,2.3.18]",
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
@@ -39,8 +85,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>com.springsource.javax.persistence</artifactId>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.persistence</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>com.springsource.javax.persistence</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -91,16 +142,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <packagingExcludes>WEB-INF/lib/**</packagingExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index ef528b9..0000000
--- a/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-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: 3.0.0
-Tool: Bundlor 1.1.2.RELEASE
-Import-Library: org.springframework.spring;version="[3.1, 3.5)"
-Bundle-Name: GreenPages Web
-Bundle-ManifestVersion: 2
-Import-Package: freemarker.cache;version="[2.3.18,2.3.18]",greenpages;
- 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.6.0, 4.0.0)",org.spring
- framework.beans.factory.annotation;version="[3.1, 3.5)",org.springfra
- mework.core.io;version="[3.1, 3.5)",org.springframework.stereotype;ve
- rsion="[3.1, 3.5)",org.springframework.web.bind.annotation;version="[
- 3.1, 3.5)"
-Bundle-SymbolicName: greenpages.web
-Web-ContextPath: greenpages
-
diff --git a/greenpages/greenpages.web/template.mf b/greenpages/greenpages.web/template.mf
deleted file mode 100644
index a5019ea..0000000
--- a/greenpages/greenpages.web/template.mf
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: GreenPages Web
-Bundle-SymbolicName: greenpages.web
-Bundle-Version: 3.0.0
-Bundle-ClassPath: .,WEB-INF/classes
-Web-ContextPath: greenpages
-Import-Template:
- org.springframework.*;version="[3.1, 3.5)",
- greenpages.*;version="[3.0, 4.0)"
-Import-Package:
- javax.servlet.jsp.jstl.core;version="[1.2.0, 2.0.0)",
- javax.servlet;version="[3.0.0, 3.1.0)",
- org.eclipse.virgo.web.dm;version="[3.6.0, 4.0.0)",
- freemarker.cache;version="[2.3.18,2.3.18]"
-Import-Bundle:
- com.springsource.org.apache.taglibs.standard;version="[1.1.2,2.0)"
-Import-Library:
- org.springframework.spring;version="[3.1, 3.5)"
-Excluded-Exports:
- greenpages.tests,
- greenpages.web,
- images,
- styles
-Excluded-Imports:
- org.springframework.test.*,
- org.junit.*
diff --git a/greenpages/pom.xml b/greenpages/pom.xml
index d2d5b51..ec58208 100644
--- a/greenpages/pom.xml
+++ b/greenpages/pom.xml
@@ -2,7 +2,7 @@
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo</groupId>

Back to the top