You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/12/12 16:02:50 UTC
svn commit: r1044830 - in /james/server/trunk: core-api/pom.xml
core-library/pom.xml dnsservice-api/pom.xml dnsservice-dnsjava/pom.xml
domainlist-api/pom.xml mail-api/pom.xml mailetcontainer-api/pom.xml
queue-api/pom.xml user-api/pom.xml util/pom.xml
Author: norman
Date: Sun Dec 12 15:02:50 2010
New Revision: 1044830
URL: http://svn.apache.org/viewvc?rev=1044830&view=rev
Log:
Again more work on the OSGI front.. See JAMES-910
Modified:
james/server/trunk/core-api/pom.xml
james/server/trunk/core-library/pom.xml
james/server/trunk/dnsservice-api/pom.xml
james/server/trunk/dnsservice-dnsjava/pom.xml
james/server/trunk/domainlist-api/pom.xml
james/server/trunk/mail-api/pom.xml
james/server/trunk/mailetcontainer-api/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=1044830&r1=1044829&r2=1044830&view=diff
==============================================================================
--- james/server/trunk/core-api/pom.xml (original)
+++ james/server/trunk/core-api/pom.xml Sun Dec 12 15:02:50 2010
@@ -39,19 +39,6 @@
<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>
@@ -65,6 +52,7 @@
<executions>
<execution>
<goals>
+ <goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
Modified: james/server/trunk/core-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=1044830&r1=1044829&r2=1044830&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Sun Dec 12 15:02:50 2010
@@ -27,6 +27,17 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
<name>Apache James Server Core Library</name>
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
+
+
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
@@ -136,26 +147,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.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: james/server/trunk/dnsservice-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-api/pom.xml?rev=1044830&r1=1044829&r2=1044830&view=diff
==============================================================================
--- james/server/trunk/dnsservice-api/pom.xml (original)
+++ james/server/trunk/dnsservice-api/pom.xml Sun Dec 12 15:02:50 2010
@@ -39,19 +39,6 @@
<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>
@@ -65,6 +52,7 @@
<executions>
<execution>
<goals>
+ <goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
Modified: james/server/trunk/dnsservice-dnsjava/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-dnsjava/pom.xml?rev=1044830&r1=1044829&r2=1044830&view=diff
==============================================================================
--- james/server/trunk/dnsservice-dnsjava/pom.xml (original)
+++ james/server/trunk/dnsservice-dnsjava/pom.xml Sun Dec 12 15:02:50 2010
@@ -27,6 +27,16 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-dnsservice-dnsjava</artifactId>
<name>Apache James Server DNSService Implementation</name>
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -49,28 +59,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>
- <!-- We need to import the lifecycle methods of james and spring stuff just to me sure it works -->
- <Import-Package>org.apache.james.container.spring.lifecycle.*,org.springframework.*,org.apache.james.dnsservice.api.*,*</Import-Package>
- <Export-Package>org.apache.james.dnsservice.dnsjava.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
Modified: james/server/trunk/domainlist-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-api/pom.xml?rev=1044830&r1=1044829&r2=1044830&view=diff
==============================================================================
--- james/server/trunk/domainlist-api/pom.xml (original)
+++ james/server/trunk/domainlist-api/pom.xml Sun Dec 12 15:02:50 2010
@@ -41,19 +41,6 @@
<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>
@@ -67,6 +54,7 @@
<executions>
<execution>
<goals>
+ <goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
Modified: james/server/trunk/mail-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-api/pom.xml?rev=1044830&r1=1044829&r2=1044830&view=diff
==============================================================================
--- james/server/trunk/mail-api/pom.xml (original)
+++ james/server/trunk/mail-api/pom.xml Sun Dec 12 15:02:50 2010
@@ -39,19 +39,6 @@
<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>
@@ -65,6 +52,7 @@
<executions>
<execution>
<goals>
+ <goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
Modified: james/server/trunk/mailetcontainer-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/pom.xml?rev=1044830&r1=1044829&r2=1044830&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-api/pom.xml (original)
+++ james/server/trunk/mailetcontainer-api/pom.xml Sun Dec 12 15:02:50 2010
@@ -27,6 +27,40 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
<name>Apache James Server Mailetcontainer API</name>
+
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
+ <build>
+ <plugins>
+ <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>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/queue-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-api/pom.xml?rev=1044830&r1=1044829&r2=1044830&view=diff
==============================================================================
--- james/server/trunk/queue-api/pom.xml (original)
+++ james/server/trunk/queue-api/pom.xml Sun Dec 12 15:02:50 2010
@@ -41,19 +41,6 @@
<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>
@@ -67,6 +54,7 @@
<executions>
<execution>
<goals>
+ <goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
Modified: james/server/trunk/user-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/pom.xml?rev=1044830&r1=1044829&r2=1044830&view=diff
==============================================================================
--- james/server/trunk/user-api/pom.xml (original)
+++ james/server/trunk/user-api/pom.xml Sun Dec 12 15:02:50 2010
@@ -40,19 +40,6 @@
<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>
@@ -66,6 +53,7 @@
<executions>
<execution>
<goals>
+ <goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
Modified: james/server/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/util/pom.xml?rev=1044830&r1=1044829&r2=1044830&view=diff
==============================================================================
--- james/server/trunk/util/pom.xml (original)
+++ james/server/trunk/util/pom.xml Sun Dec 12 15:02:50 2010
@@ -40,19 +40,6 @@
<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>
@@ -66,6 +53,7 @@
<executions>
<execution>
<goals>
+ <goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org