Author: trustin
Date: Thu Sep 27 05:44:44 2007
New Revision: 579993
URL: http://svn.apache.org/viewvc?rev=579993&view=rev
Log:
Resolved issue: DIRMINA-27 (OSGi framework integration)
* Upgraded to felix bundle plugin version 1.0.0
* Polished the POM a little bit
Modified:
mina/trunk/core/pom.xml
mina/trunk/filter-codec-http/pom.xml
mina/trunk/filter-codec-netty/pom.xml
mina/trunk/filter-compression/pom.xml
mina/trunk/integration-jmx/pom.xml
mina/trunk/integration-spring/pom.xml
mina/trunk/pom.xml
mina/trunk/protocol-http-client/pom.xml
mina/trunk/protocol-http-server/pom.xml
mina/trunk/transport-apr/pom.xml
mina/trunk/transport-serial/pom.xml
Modified: mina/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/core/pom.xml?rev=579993&r1=579992&r2=579993&view=diff
==============================================================================
--- mina/trunk/core/pom.xml (original)
+++ mina/trunk/core/pom.xml Thu Sep 27 05:44:44 2007
@@ -10,24 +10,7 @@
<name>Apache MINA Core</name>
<packaging>bundle</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.apache.mina.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -48,8 +31,6 @@
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
-
</dependencies>
-
</project>
Modified: mina/trunk/filter-codec-http/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/pom.xml?rev=579993&r1=579992&r2=579993&view=diff
==============================================================================
--- mina/trunk/filter-codec-http/pom.xml (original)
+++ mina/trunk/filter-codec-http/pom.xml Thu Sep 27 05:44:44 2007
@@ -8,6 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>mina-filter-codec-http</artifactId>
<name>Apache MINA HTTP Codec</name>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>commons-codec</groupId>
Modified: mina/trunk/filter-codec-netty/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-netty/pom.xml?rev=579993&r1=579992&r2=579993&view=diff
==============================================================================
--- mina/trunk/filter-codec-netty/pom.xml (original)
+++ mina/trunk/filter-codec-netty/pom.xml Thu Sep 27 05:44:44 2007
@@ -8,7 +8,7 @@
</parent>
<artifactId>mina-filter-codec-netty</artifactId>
<name>Apache MINA Netty Codec</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
Modified: mina/trunk/filter-compression/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-compression/pom.xml?rev=579993&r1=579992&r2=579993&view=diff
==============================================================================
--- mina/trunk/filter-compression/pom.xml (original)
+++ mina/trunk/filter-compression/pom.xml Thu Sep 27 05:44:44 2007
@@ -8,7 +8,7 @@
</parent>
<artifactId>mina-filter-compression</artifactId>
<name>Apache MINA Compression Filter</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
Modified: mina/trunk/integration-jmx/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/integration-jmx/pom.xml?rev=579993&r1=579992&r2=579993&view=diff
==============================================================================
--- mina/trunk/integration-jmx/pom.xml (original)
+++ mina/trunk/integration-jmx/pom.xml Thu Sep 27 05:44:44 2007
@@ -7,8 +7,8 @@
<version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-jmx</artifactId>
- <name>Apache MINA JMX integration</name>
- <packaging>jar</packaging>
+ <name>Apache MINA JMX Integration</name>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.mina</groupId>
@@ -16,16 +16,6 @@
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
-
-<!-- This dependency makes the build process very cumbersome
- <dependency>
- <groupId>javax.management</groupId>
- <artifactId>jmxri</artifactId>
- <version>1.2.1</version>
- <scope>compile</scope>
- </dependency>
--->
</dependencies>
-
</project>
Modified: mina/trunk/integration-spring/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/integration-spring/pom.xml?rev=579993&r1=579992&r2=579993&view=diff
==============================================================================
--- mina/trunk/integration-spring/pom.xml (original)
+++ mina/trunk/integration-spring/pom.xml Thu Sep 27 05:44:44 2007
@@ -8,7 +8,7 @@
</parent>
<artifactId>mina-integration-spring</artifactId>
<name>Apache MINA Spring Integration</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
Modified: mina/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/pom.xml?rev=579993&r1=579992&r2=579993&view=diff
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Thu Sep 27 05:44:44 2007
@@ -133,7 +133,7 @@
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
- <id>attach-sources</id>
+ <id>attach-source</id>
<goals>
<goal>jar</goal>
</goals>
@@ -159,6 +159,18 @@
</tagBase>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.mina.*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
<reporting>
@@ -175,7 +187,7 @@
<windowtitle>Apache MINA ${project.version} API
Documentation</windowtitle>
<doctitle>Apache MINA ${project.version} API Documentation</doctitle>
<encoding>UTF-8</encoding>
- <excludePackageNames>*.support:*.example.*</excludePackageNames>
+ <excludePackageNames>*.example.*</excludePackageNames>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
<link>http://www.slf4j.org/api/</link>
Modified: mina/trunk/protocol-http-client/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/pom.xml?rev=579993&r1=579992&r2=579993&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/pom.xml (original)
+++ mina/trunk/protocol-http-client/pom.xml Thu Sep 27 05:44:44 2007
@@ -24,8 +24,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mina-protocol-http-client</artifactId>
- <packaging>jar</packaging>
<name>Apache MINA HTTP Client</name>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.mina</groupId>
Modified: mina/trunk/protocol-http-server/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/protocol-http-server/pom.xml?rev=579993&r1=579992&r2=579993&view=diff
==============================================================================
--- mina/trunk/protocol-http-server/pom.xml (original)
+++ mina/trunk/protocol-http-server/pom.xml Thu Sep 27 05:44:44 2007
@@ -8,6 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>mina-protocol-http-server</artifactId>
<name>Apache MINA HTTP Server</name>
+ <packaging>jar</packaging>
<dependencies>
</dependencies>
</project>
Modified: mina/trunk/transport-apr/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/pom.xml?rev=579993&r1=579992&r2=579993&view=diff
==============================================================================
--- mina/trunk/transport-apr/pom.xml (original)
+++ mina/trunk/transport-apr/pom.xml Thu Sep 27 05:44:44 2007
@@ -7,8 +7,8 @@
<version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-apr</artifactId>
- <name>Apache MINA Apache Portable Runtime (APR) communication support</name>
- <packaging>jar</packaging>
+ <name>Apache MINA APR Communication Support</name>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.mina</groupId>
Modified: mina/trunk/transport-serial/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-serial/pom.xml?rev=579993&r1=579992&r2=579993&view=diff
==============================================================================
--- mina/trunk/transport-serial/pom.xml (original)
+++ mina/trunk/transport-serial/pom.xml Thu Sep 27 05:44:44 2007
@@ -8,7 +8,7 @@
</parent>
<artifactId>mina-transport-serial</artifactId>
<name>Apache MINA Serial Communication support</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.mina</groupId>
