You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/06/24 11:51:44 UTC
svn commit: r671107 - in /servicemix/smx4/bundles/trunk: ./ bundles-pom/
commons-beanutils-1.7.0/ commons-jxpath-1.2/ jasper-6.0.14/
jaxb-impl-2.1.6/ neethi-2.0.2/ neethi-2.0.4/ saaj-impl-1.3/
saaj-impl-1.3/src/ saaj-impl-1.3/src/main/ saaj-impl-1.3/sr...
Author: gnodet
Date: Tue Jun 24 02:51:43 2008
New Revision: 671107
URL: http://svn.apache.org/viewvc?rev=671107&view=rev
Log:
Add beanutils, fix some bundles, add missing META-INF/services entries for saaj-impl
Added:
servicemix/smx4/bundles/trunk/commons-beanutils-1.7.0/
servicemix/smx4/bundles/trunk/commons-beanutils-1.7.0/pom.xml
servicemix/smx4/bundles/trunk/neethi-2.0.4/
- copied from r670755, servicemix/smx4/bundles/trunk/neethi-2.0.2/
servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/
servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/
servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/
servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/
servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/
servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.MessageFactory
servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory
servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory
servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.SOAPFactory
Removed:
servicemix/smx4/bundles/trunk/neethi-2.0.2/
Modified:
servicemix/smx4/bundles/trunk/bundles-pom/pom.xml
servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml
servicemix/smx4/bundles/trunk/jasper-6.0.14/pom.xml
servicemix/smx4/bundles/trunk/jaxb-impl-2.1.6/pom.xml
servicemix/smx4/bundles/trunk/neethi-2.0.4/pom.xml
servicemix/smx4/bundles/trunk/pom.xml
servicemix/smx4/bundles/trunk/saaj-impl-1.3/pom.xml
servicemix/smx4/bundles/trunk/woodstox-3.2.6/pom.xml
servicemix/smx4/bundles/trunk/wsdl4j-1.6.1/pom.xml
Modified: servicemix/smx4/bundles/trunk/bundles-pom/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/bundles-pom/pom.xml?rev=671107&r1=671106&r2=671107&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/bundles-pom/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/bundles-pom/pom.xml Tue Jun 24 02:51:43 2008
@@ -37,6 +37,7 @@
<servicemix.osgi.export.pkg />
<servicemix.osgi.import.pkg />
<servicemix.osgi.private.pkg />
+ <servicemix.osgi.failok>false</servicemix.osgi.failok>
</properties>
<prerequisites>
@@ -98,6 +99,7 @@
<Export-Package>${servicemix.osgi.export}</Export-Package>
<Import-Package>${servicemix.osgi.import.pkg}*</Import-Package>
<Private-Package>${servicemix.osgi.private.pkg}</Private-Package>
+ <_failok>${servicemix.osgi.failok}</_failok>
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
Added: servicemix/smx4/bundles/trunk/commons-beanutils-1.7.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-beanutils-1.7.0/pom.xml?rev=671107&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-beanutils-1.7.0/pom.xml (added)
+++ servicemix/smx4/bundles/trunk/commons-beanutils-1.7.0/pom.xml Tue Jun 24 02:51:43 2008
@@ -0,0 +1,96 @@
+<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">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
+ <version>1.7.0_1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+
+ <properties>
+ <pkgGroupId>commons-beanutils</pkgGroupId>
+ <pkgArtifactId>commons-beanutils</pkgArtifactId>
+ <pkgVersion>1.7.0</pkgVersion>
+ <servicemix.osgi.export.pkg>
+ org.apache.commons.beanutils
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ org.apache.commons.collections*;resolution:=optional,
+ *
+ </servicemix.osgi.import.pkg>
+ <servicemix.osgi.private.pkg>
+ org.apache.commons.collections*
+ </servicemix.osgi.private.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${pkgGroupId}:${pkgArtifactId}</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml?rev=671107&r1=671106&r2=671107&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml Tue Jun 24 02:51:43 2008
@@ -40,13 +40,14 @@
<pkgArtifactId>commons-jxpath</pkgArtifactId>
<pkgVersion>1.2</pkgVersion>
<servicemix.osgi.export.pkg>
- org.apache.commons.jxpath*,org.apache.commons.beanutils*,org.apache.commons.collections*,org.jdom*,org.apache.xerces*,
- javax.servlet.jsp*,org.apache.xml*
+ org.apache.commons.jxpath
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- oracle.xml.parser*;resolution:=optional,org.jaxen.*;resolution:=optional,org.saxpath*;resolution:=optional,*
-
+ javax.servlet*;resolution:=optional,
+ org.jdom*;resolution:=optional,
+ *
</servicemix.osgi.import.pkg>
+ <servicemix.osgi.failok>true</servicemix.osgi.failok>
</properties>
<dependencies>
Modified: servicemix/smx4/bundles/trunk/jasper-6.0.14/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jasper-6.0.14/pom.xml?rev=671107&r1=671106&r2=671107&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jasper-6.0.14/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jasper-6.0.14/pom.xml Tue Jun 24 02:51:43 2008
@@ -39,12 +39,14 @@
<pkgGroupId>org.apache.tomcat</pkgGroupId>
<pkgArtifactId>jasper</pkgArtifactId>
<pkgVersion>6.0.14</pkgVersion>
- <servicemix.osgi.export.pkg>org.apache,org.apache.jasper*</servicemix.osgi.export.pkg>
+ <servicemix.osgi.export.pkg>
+ org.apache;-split-package:=merge-first,
+ org.apache.jasper*
+ </servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
javax*;resolution:=optional,
javax.servlet.jsp.resources;resolution:=optional,
org.apache*;resolution:=optional,
- org.apache.tools.ant*;resolution:=optional,
org.eclipse.jdt*;resolution:=optional,
*
</servicemix.osgi.import.pkg>
Modified: servicemix/smx4/bundles/trunk/jaxb-impl-2.1.6/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxb-impl-2.1.6/pom.xml?rev=671107&r1=671106&r2=671107&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxb-impl-2.1.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxb-impl-2.1.6/pom.xml Tue Jun 24 02:51:43 2008
@@ -40,9 +40,9 @@
<pkgArtifactId>jaxb-impl</pkgArtifactId>
<pkgVersion>2.1.6</pkgVersion>
<servicemix.osgi.export.pkg>
- com.sun.xml.bind*,
- com.sun.istack*,
- com.sun.xml.txw2*
+ com.sun.xml.bind*;-split-package:=merge-first,
+ com.sun.istack*;-split-package:=merge-first,
+ com.sun.xml.txw2*;-split-package:=merge-first
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
com.sun.xml.fastinfoset*;resolution:=optional,
Modified: servicemix/smx4/bundles/trunk/neethi-2.0.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/neethi-2.0.4/pom.xml?rev=671107&r1=670755&r2=671107&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/neethi-2.0.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/neethi-2.0.4/pom.xml Tue Jun 24 02:51:43 2008
@@ -28,7 +28,7 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.neethi</artifactId>
- <version>2.0.2_1-SNAPSHOT</version>
+ <version>2.0.4_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
@@ -38,7 +38,7 @@
<properties>
<pkgGroupId>org.apache.neethi</pkgGroupId>
<pkgArtifactId>neethi</pkgArtifactId>
- <pkgVersion>2.0.2</pkgVersion>
+ <pkgVersion>2.0.4</pkgVersion>
<servicemix.osgi.import.pkg>
org.apache.axiom*;resolution:=optional,
sun.misc*;resolution:=optional,
Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=671107&r1=671106&r2=671107&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Tue Jun 24 02:51:43 2008
@@ -54,7 +54,7 @@
<module>jencks-2.1</module>
<module>junit-4.4</module>
<module>mina-1.1.6</module>
- <module>neethi-2.0.2</module>
+ <module>neethi-2.0.4</module>
<module>saaj-impl-1.3</module>
<module>woodstox-3.2.6</module>
<module>wsdl4j-1.6.1</module>
Modified: servicemix/smx4/bundles/trunk/saaj-impl-1.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saaj-impl-1.3/pom.xml?rev=671107&r1=671106&r2=671107&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/saaj-impl-1.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/saaj-impl-1.3/pom.xml Tue Jun 24 02:51:43 2008
@@ -47,6 +47,11 @@
org.jvnet.fastinfoset*;resolution:=optional,
*
</servicemix.osgi.import.pkg>
+ <servicemix.osgi.private.pkg>
+ META-INF;-split-package:=merge-first,
+ META-INF.maven.org.apache.servicemix.bundles*;-split-package:=merge-first,
+ META-INF.services;-split-package:=merge-first,
+ </servicemix.osgi.private.pkg>
</properties>
<dependencies>
Added: servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.MessageFactory
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.MessageFactory?rev=671107&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.MessageFactory (added)
+++ servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.MessageFactory Tue Jun 24 02:51:43 2008
@@ -0,0 +1 @@
+com.sun.xml.messaging.saaj.soap.MessageFactoryImpl
Added: servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory?rev=671107&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory (added)
+++ servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory Tue Jun 24 02:51:43 2008
@@ -0,0 +1 @@
+com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl
Added: servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory?rev=671107&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory (added)
+++ servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory Tue Jun 24 02:51:43 2008
@@ -0,0 +1 @@
+com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory
Added: servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.SOAPFactory
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.SOAPFactory?rev=671107&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.SOAPFactory (added)
+++ servicemix/smx4/bundles/trunk/saaj-impl-1.3/src/main/resources/META-INF/services/javax.xml.soap.SOAPFactory Tue Jun 24 02:51:43 2008
@@ -0,0 +1 @@
+com.sun.xml.messaging.saaj.soap.SOAPFactoryImpl
Modified: servicemix/smx4/bundles/trunk/woodstox-3.2.6/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/woodstox-3.2.6/pom.xml?rev=671107&r1=671106&r2=671107&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/woodstox-3.2.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/woodstox-3.2.6/pom.xml Tue Jun 24 02:51:43 2008
@@ -50,7 +50,9 @@
org.codehaus.stax2*;version=${pkgVersion};-split-package:=merge-first,
</servicemix.osgi.export>
<servicemix.osgi.private.pkg>
- META-INF*
+ META-INF;-split-package:=merge-first,
+ META-INF.maven.org.apache.servicemix.bundles*;-split-package:=merge-first,
+ META-INF.services;-split-package:=merge-first,
</servicemix.osgi.private.pkg>
</properties>
Modified: servicemix/smx4/bundles/trunk/wsdl4j-1.6.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/wsdl4j-1.6.1/pom.xml?rev=671107&r1=671106&r2=671107&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/wsdl4j-1.6.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/wsdl4j-1.6.1/pom.xml Tue Jun 24 02:51:43 2008
@@ -40,8 +40,8 @@
<pkgArtifactId>wsdl4j</pkgArtifactId>
<pkgVersion>1.6.1</pkgVersion>
<servicemix.osgi.export>
- javax.wsdl*;version=1.2,
- com.ibm.wsdl*;version=${pkgVersion}
+ javax.wsdl*;version=1.2;-split-package:=merge-first,
+ com.ibm.wsdl*;version=${pkgVersion};-split-package:=merge-first
</servicemix.osgi.export>
</properties>