Author: ieugen
Date: Sat Jan 5 10:55:27 2013
New Revision: 1429258
URL: http://svn.apache.org/viewvc?rev=1429258&view=rev
Log:
PROTOCOLS-103 Created OSGi bundles
Modified:
james/protocols/trunk/api/pom.xml
james/protocols/trunk/imap/pom.xml
james/protocols/trunk/lmtp/pom.xml
james/protocols/trunk/netty/pom.xml
james/protocols/trunk/pom.xml
james/protocols/trunk/pop3/pom.xml
james/protocols/trunk/smtp/pom.xml
Modified: james/protocols/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1429258&r1=1429257&r2=1429258&view=diff
==============================================================================
--- james/protocols/trunk/api/pom.xml (original)
+++ james/protocols/trunk/api/pom.xml Sat Jan 5 10:55:27 2013
@@ -29,8 +29,9 @@
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-api</artifactId>
+ <packaging>bundle</packaging>
- <name>Apache James Protocols API</name>
+ <name>Apache James :: Protocols :: API</name>
<dependencies>
@@ -48,49 +49,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <!-- This configuration is used by all goals -->
- <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>
- <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.protocols.api.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
Modified: james/protocols/trunk/imap/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/imap/pom.xml?rev=1429258&r1=1429257&r2=1429258&view=diff
==============================================================================
--- james/protocols/trunk/imap/pom.xml (original)
+++ james/protocols/trunk/imap/pom.xml Sat Jan 5 10:55:27 2013
@@ -29,8 +29,9 @@
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-imap</artifactId>
+ <packaging>bundle</packaging>
- <name>Apache James Protocols IMAP</name>
+ <name>Apache James :: Protocols :: IMAP</name>
<dependencies>
<dependency>
@@ -99,49 +100,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <!-- This configuration is used by all goals -->
- <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>
- <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.protocols.imap.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
Modified: james/protocols/trunk/lmtp/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1429258&r1=1429257&r2=1429258&view=diff
==============================================================================
--- james/protocols/trunk/lmtp/pom.xml (original)
+++ james/protocols/trunk/lmtp/pom.xml Sat Jan 5 10:55:27 2013
@@ -29,8 +29,9 @@
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-lmtp</artifactId>
+ <packaging>bundle</packaging>
- <name>Apache James Protocols LMTP</name>
+ <name>Apache James :: Protocols :: LMTP</name>
<dependencies>
<dependency>
@@ -70,49 +71,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <!-- This configuration is used by all goals -->
- <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>
- <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.protocols.lmtp.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
Modified: james/protocols/trunk/netty/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/netty/pom.xml?rev=1429258&r1=1429257&r2=1429258&view=diff
==============================================================================
--- james/protocols/trunk/netty/pom.xml (original)
+++ james/protocols/trunk/netty/pom.xml Sat Jan 5 10:55:27 2013
@@ -29,8 +29,9 @@
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-netty</artifactId>
+ <packaging>bundle</packaging>
- <name>Apache James Protocols Netty Implementation</name>
+ <name>Apache James :: Protocols :: Netty Implementation</name>
<dependencies>
<dependency>
@@ -43,49 +44,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <!-- This configuration is used by all goals -->
- <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>
- <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.protocols.netty.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
Modified: james/protocols/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1429258&r1=1429257&r2=1429258&view=diff
==============================================================================
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Sat Jan 5 10:55:27 2013
@@ -32,7 +32,7 @@
<version>1.6.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache James Protocols</name>
+ <name>Apache James :: Protocols</name>
<description>James Protocols</description>
<url>http://james.apache.org/protocols</url>
<inceptionYear>2010</inceptionYear>
@@ -207,6 +207,12 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
@@ -219,6 +225,17 @@
</filesets>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: james/protocols/trunk/pop3/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/pop3/pom.xml?rev=1429258&r1=1429257&r2=1429258&view=diff
==============================================================================
--- james/protocols/trunk/pop3/pom.xml (original)
+++ james/protocols/trunk/pop3/pom.xml Sat Jan 5 10:55:27 2013
@@ -29,8 +29,9 @@
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-pop3</artifactId>
+ <packaging>bundle</packaging>
- <name>Apache James Protocols POP3</name>
+ <name>Apache James :: Protocols :: POP3</name>
<dependencies>
<dependency>
@@ -60,49 +61,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <!-- This configuration is used by all goals -->
- <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>
- <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.protocols.pop3.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
Modified: james/protocols/trunk/smtp/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1429258&r1=1429257&r2=1429258&view=diff
==============================================================================
--- james/protocols/trunk/smtp/pom.xml (original)
+++ james/protocols/trunk/smtp/pom.xml Sat Jan 5 10:55:27 2013
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,8 +30,9 @@
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-smtp</artifactId>
+ <packaging>bundle</packaging>
- <name>Apache James Protocols SMTP</name>
+ <name>Apache James :: Protocols :: SMTP</name>
<dependencies>
<dependency>
@@ -75,49 +77,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <!-- This configuration is used by all goals -->
- <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>
- <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.protocols.smtp.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- <!-- exclude commons codec as we pull it in via shade
plugin -->
-
<Import-Package>!org.apache.commons.codec.*,*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
@@ -134,22 +93,23 @@
<filters>
<filter>
<artifact>commons-codec:commons-codec</artifact>
- <excludes>
-
<exclude>org/apache/commons/codec/*</exclude>
- </excludes>
- <includes>
-
<include>org/apache/commons/codec/binary/*</include>
- </includes>
- </filter>
- </filters>
- <relocations>
- <relocation>
-
<pattern>org.apache.commons.codec.binary</pattern>
-
<shadedPattern>org.apache.james.protocols.smtp.util</shadedPattern>
- </relocation>
- </relocations>
+ <excludes>
+
<exclude>org/apache/commons/codec/*</exclude>
+ </excludes>
+ <includes>
+
<include>org/apache/commons/codec/binary/*</include>
+ </includes>
+ </filter>
+ </filters>
+ <relocations>
+ <relocation>
+
<pattern>org.apache.commons.codec.binary</pattern>
+
<shadedPattern>org.apache.james.protocols.smtp.util</shadedPattern>
+ </relocation>
+ </relocations>
<transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
/>
+ <transformer
+
implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>
</transformers>
</configuration>
</execution>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
