Author: norman
Date: Sun Dec 12 11:24:35 2010
New Revision: 1044795
URL: http://svn.apache.org/viewvc?rev=1044795&view=rev
Log:
More work on osgi. See JAMES-910
Modified:
james/server/trunk/core-api/pom.xml
james/server/trunk/dnsservice-api/pom.xml
james/server/trunk/domainlist-api/pom.xml
james/server/trunk/mail-api/pom.xml
james/server/trunk/pom.xml
james/server/trunk/queue-api/pom.xml
james/server/trunk/user-api/pom.xml
james/server/trunk/util/pom.xml
Modified: james/server/trunk/core-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-api/pom.xml?rev=1044795&r1=1044794&r2=1044795&view=diff
==============================================================================
--- james/server/trunk/core-api/pom.xml (original)
+++ james/server/trunk/core-api/pom.xml Sun Dec 12 11:24:35 2010
@@ -28,6 +28,7 @@
<artifactId>james-server-core-api</artifactId>
<name>Apache James Server Core API</name>
<properties>
+ <!-- OSGI stuff -->
<james.osgi.export>
org.apache.james.*
</james.osgi.export>
Modified: james/server/trunk/dnsservice-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/dnsservice-api/pom.xml?rev=1044795&r1=1044794&r2=1044795&view=diff
==============================================================================
--- james/server/trunk/dnsservice-api/pom.xml (original)
+++ james/server/trunk/dnsservice-api/pom.xml Sun Dec 12 11:24:35 2010
@@ -27,7 +27,15 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<name>Apache James Server DNS Server API</name>
-
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
<build>
<plugins>
<plugin>
@@ -62,26 +70,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.apache.james.api.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: james/server/trunk/domainlist-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/domainlist-api/pom.xml?rev=1044795&r1=1044794&r2=1044795&view=diff
==============================================================================
--- james/server/trunk/domainlist-api/pom.xml (original)
+++ james/server/trunk/domainlist-api/pom.xml Sun Dec 12 11:24:35 2010
@@ -27,6 +27,16 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-domainlist-api</artifactId>
<name>Apache James Server DomainList API</name>
+
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
<build>
<plugins>
@@ -62,26 +72,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.apache.james.api.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: james/server/trunk/mail-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-api/pom.xml?rev=1044795&r1=1044794&r2=1044795&view=diff
==============================================================================
--- james/server/trunk/mail-api/pom.xml (original)
+++ james/server/trunk/mail-api/pom.xml Sun Dec 12 11:24:35 2010
@@ -27,6 +27,51 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-mail-api</artifactId>
<name>Apache James Mail API</name>
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1044795&r1=1044794&r2=1044795&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sun Dec 12 11:24:35 2010
@@ -118,6 +118,7 @@
<target>1.5</target>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Modified: james/server/trunk/queue-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-api/pom.xml?rev=1044795&r1=1044794&r2=1044795&view=diff
==============================================================================
--- james/server/trunk/queue-api/pom.xml (original)
+++ james/server/trunk/queue-api/pom.xml Sun Dec 12 11:24:35 2010
@@ -27,6 +27,54 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-queue-api</artifactId>
<name>Apache James Server Queue API</name>
+
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/user-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-api/pom.xml?rev=1044795&r1=1044794&r2=1044795&view=diff
==============================================================================
--- james/server/trunk/user-api/pom.xml (original)
+++ james/server/trunk/user-api/pom.xml Sun Dec 12 11:24:35 2010
@@ -27,7 +27,17 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-api</artifactId>
<name>Apache James Server User API</name>
- <build>
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
+
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -61,26 +71,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.apache.james.api.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: james/server/trunk/util/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/util/pom.xml?rev=1044795&r1=1044794&r2=1044795&view=diff
==============================================================================
--- james/server/trunk/util/pom.xml (original)
+++ james/server/trunk/util/pom.xml Sun Dec 12 11:24:35 2010
@@ -27,7 +27,17 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-util</artifactId>
<name>Apache James Server Common Utilities</name>
- <build>
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
+
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -61,26 +71,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.apache.james.util.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
