Author: jbonofre
Date: Sat May 21 13:08:38 2011
New Revision: 1125692
URL: http://svn.apache.org/viewvc?rev=1125692&view=rev
Log:
[SMX4-823] Include jetty-naming and jetty-plus in the Jetty bundle.
Modified:
servicemix/smx4/bundles/trunk/jetty-6.1.25/pom.xml
servicemix/smx4/bundles/trunk/jetty-6.1.26/pom.xml
servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml
servicemix/smx4/bundles/trunk/jetty-bundle-6.1.24/pom.xml
servicemix/smx4/bundles/trunk/pom.xml
Modified: servicemix/smx4/bundles/trunk/jetty-6.1.25/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-6.1.25/pom.xml?rev=1125692&r1=1125691&r2=1125692&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-6.1.25/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-6.1.25/pom.xml Sat May 21 13:08:38 2011
@@ -45,7 +45,27 @@
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
!org.mortbay,
- *
+ javax.mail,
+ javax.management,
+ javax.management.loading,
+ javax.management.modelmbean,
+ javax.naming,
+ javax.naming.spi,
+ javax.net,
+ javax.net.ssl,
+ javax.security.auth,
+ javax.security.auth.callback,
+ javax.security.auth.login,
+ javax.security.auth.spi,
+ javax.security.cert,
+ javax.servlet,
+ javax.servlet.http,
+ javax.sql,
+ javax.transaction,
+ javax.xml.parsers,
+ org.slf4j;resolution:=optional,
+ org.xml.sax,
+ org.xml.sax.helpers
</servicemix.osgi.import.pkg>
</properties>
@@ -80,6 +100,18 @@
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>jetty-naming</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
@@ -101,6 +133,8 @@
<include>${pkgGroupId}:jetty-management</include>
<include>${pkgGroupId}:jetty-client</include>
<include>${pkgGroupId}:jetty-sslengine</include>
+
<include>${pkgGroupId}:jetty-naming</include>
+ <include>${pkgGroupId}:jetty-plus</include>
</includes>
</artifactSet>
<filters>
@@ -134,6 +168,18 @@
<exclude>**</exclude>
</excludes>
</filter>
+ <filter>
+
<artifact>${pkgGroupId}:jetty-naming</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+
<artifact>${pkgGroupId}:jetty-plus</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
</filters>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<createDependencyReducedPom>false</createDependencyReducedPom>
Modified: servicemix/smx4/bundles/trunk/jetty-6.1.26/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-6.1.26/pom.xml?rev=1125692&r1=1125691&r2=1125692&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-6.1.26/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-6.1.26/pom.xml Sat May 21 13:08:38 2011
@@ -42,7 +42,27 @@
<servicemix.osgi.export.pkg>org.mortbay</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
!org.mortbay,
- *
+ javax.mail,
+ javax.management,
+ javax.management.loading,
+ javax.management.modelmbean,
+ javax.naming,
+ javax.naming.spi,
+ javax.net,
+ javax.net.ssl,
+ javax.security.auth,
+ javax.security.auth.callback,
+ javax.security.auth.login,
+ javax.security.auth.spi,
+ javax.security.cert,
+ javax.servlet,
+ javax.servlet.http,
+ javax.sql,
+ javax.transaction,
+ javax.xml.parsers,
+ org.slf4j;resolution:=optional,
+ org.xml.sax,
+ org.xml.sax.helpers
</servicemix.osgi.import.pkg>
</properties>
@@ -77,6 +97,18 @@
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>jetty-naming</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
@@ -98,6 +130,8 @@
<include>${pkgGroupId}:jetty-management</include>
<include>${pkgGroupId}:jetty-client</include>
<include>${pkgGroupId}:jetty-sslengine</include>
+
<include>${pkgGroupId}:jetty-naming</include>
+ <include>${pkgGroupId}:jetty-plus</include>
</includes>
</artifactSet>
<filters>
@@ -131,6 +165,18 @@
<exclude>**</exclude>
</excludes>
</filter>
+ <filter>
+
<artifact>${pkgGroupId}:jetty-naming</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+
<artifact>${pkgGroupId}:jetty-plus</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
</filters>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<createDependencyReducedPom>false</createDependencyReducedPom>
Modified: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml?rev=1125692&r1=1125691&r2=1125692&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml Sat May 21
13:08:38 2011
@@ -43,7 +43,27 @@
<servicemix.osgi.export.pkg>org.mortbay</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
!org.mortbay*,
- *
+ javax.mail,
+ javax.management,
+ javax.management.loading,
+ javax.management.modelmbean,
+ javax.naming,
+ javax.naming.spi,
+ javax.net,
+ javax.net.ssl,
+ javax.security.auth,
+ javax.security.auth.callback,
+ javax.security.auth.login,
+ javax.security.auth.spi,
+ javax.security.cert,
+ javax.servlet,
+ javax.servlet.http,
+ javax.sql,
+ javax.transaction,
+ javax.xml.parsers,
+ org.slf4j;resolution:=optional,
+ org.xml.sax,
+ org.xml.sax.helpers
</servicemix.osgi.import.pkg>
</properties>
@@ -78,6 +98,18 @@
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>jetty-naming</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<repositories>
@@ -108,6 +140,8 @@
<include>${pkgGroupId}:jetty-management</include>
<include>${pkgGroupId}:jetty-client</include>
<include>${pkgGroupId}:jetty-sslengine</include>
+
<include>${pkgGroupId}:jetty-naming</include>
+ <include>${pkgGroupId}:jetty-plus</include>
</includes>
</artifactSet>
<filters>
@@ -141,6 +175,18 @@
<exclude>**</exclude>
</excludes>
</filter>
+ <filter>
+
<artifact>${pkgGroupId}:jetty-naming</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+
<artifact>${pkgGroupId}:jetty-plus</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
</filters>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<createDependencyReducedPom>false</createDependencyReducedPom>
Modified: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.24/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-bundle-6.1.24/pom.xml?rev=1125692&r1=1125691&r2=1125692&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-bundle-6.1.24/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-bundle-6.1.24/pom.xml Sat May 21
13:08:38 2011
@@ -42,7 +42,27 @@
<servicemix.osgi.export.pkg>org.mortbay</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
!org.mortbay,
- *
+ javax.mail,
+ javax.management,
+ javax.management.loading,
+ javax.management.modelmbean,
+ javax.naming,
+ javax.naming.spi,
+ javax.net,
+ javax.net.ssl,
+ javax.security.auth,
+ javax.security.auth.callback,
+ javax.security.auth.login,
+ javax.security.auth.spi,
+ javax.security.cert,
+ javax.servlet,
+ javax.servlet.http,
+ javax.sql,
+ javax.transaction,
+ javax.xml.parsers,
+ org.slf4j;resolution:=optional,
+ org.xml.sax,
+ org.xml.sax.helpers
</servicemix.osgi.import.pkg>
</properties>
@@ -77,6 +97,18 @@
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>jetty-naming</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
@@ -98,6 +130,8 @@
<include>${pkgGroupId}:jetty-management</include>
<include>${pkgGroupId}:jetty-client</include>
<include>${pkgGroupId}:jetty-sslengine</include>
+
<include>${pkgGroupId}:jetty-naming</include>
+ <include>${pkgGroupId}:jetty-plus</include>
</includes>
</artifactSet>
<filters>
@@ -131,6 +165,18 @@
<exclude>**</exclude>
</excludes>
</filter>
+ <filter>
+
<artifact>${pkgGroupId}:jetty-naming</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+
<artifact>${pkgGroupId}:jetty-plus</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
</filters>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<createDependencyReducedPom>false</createDependencyReducedPom>
Modified: servicemix/smx4/bundles/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1125692&r1=1125691&r2=1125692&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Sat May 21 13:08:38 2011
@@ -68,6 +68,10 @@
<module>freemarker-2.3.17</module>
<module>scala-compiler-2.9.0</module>
<module>scala-library-2.9.0</module>
+ <module>jetty-6.1.26</module>
+ <module>jetty-6.1.25</module>
+ <module>jetty-bundle-6.1.24</module>
+ <module>jetty-bundle-6.1.22</module>
</modules>
