Author: gnodet
Date: Thu Mar 6 06:49:51 2008
New Revision: 634283
URL: http://svn.apache.org/viewvc?rev=634283&view=rev
Log:
Do not include neethi and xmlresolver inside the cxf bundle
Added:
servicemix/smx4/features/trunk/ejb3/bundles/neethi/ (with props)
servicemix/smx4/features/trunk/ejb3/bundles/neethi/pom.xml
servicemix/smx4/features/trunk/ejb3/bundles/xmlresolver/ (with props)
servicemix/smx4/features/trunk/ejb3/bundles/xmlresolver/pom.xml
Modified:
servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml
servicemix/smx4/features/trunk/ejb3/bundles/pom.xml
Modified: servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml?rev=634283&r1=634282&r2=634283&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml Thu Mar 6 06:49:51
2008
@@ -68,8 +68,6 @@
</servicemix.osgi.import.pkg>
<servicemix.osgi.private.pkg>
META-INF*,
- org.apache.xml.resolver*,
- org.apache.neethi*,
</servicemix.osgi.private.pkg>
</properties>
@@ -79,44 +77,6 @@
<artifactId>cxf-bundle</artifactId>
<version>2.0.4-incubator</version>
<optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- <version>1.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>2.0.2</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Dependency on other bundles -->
Propchange: servicemix/smx4/features/trunk/ejb3/bundles/neethi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 6 06:49:51 2008
@@ -0,0 +1,7 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
Added: servicemix/smx4/features/trunk/ejb3/bundles/neethi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/neethi/pom.xml?rev=634283&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/neethi/pom.xml (added)
+++ servicemix/smx4/features/trunk/ejb3/bundles/neethi/pom.xml Thu Mar 6
06:49:51 2008
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ejb3.bundles</groupId>
+ <artifactId>bundles</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+
+ <properties>
+ <pkgArtifactId>neethi</pkgArtifactId>
+ <pkgVersion>2.0.2</pkgVersion>
+ <servicemix.osgi.import.pkg>
+ org.apache.axiom*;resolution:=optional,
+ sun.misc*;resolution:=optional,
+ *
+ </servicemix.osgi.import.pkg>
+ <servicemix.osgi.export.pkg>
+ org.apache.neethi
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.private.pkg></servicemix.osgi.private.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-parent</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: servicemix/smx4/features/trunk/ejb3/bundles/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/pom.xml?rev=634283&r1=634282&r2=634283&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/bundles/pom.xml Thu Mar 6 06:49:51 2008
@@ -36,10 +36,12 @@
<module>commons-cli</module>
<module>cxf</module>
<module>jaxws-api</module>
+ <module>neethi</module>
<module>openjpa</module>
<module>saaj-impl</module>
<module>swizzle</module>
<module>wsdl4j</module>
+ <module>xmlresolver</module>
<module>xmlschema</module>
</modules>
Propchange: servicemix/smx4/features/trunk/ejb3/bundles/xmlresolver/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 6 06:49:51 2008
@@ -0,0 +1,7 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
Added: servicemix/smx4/features/trunk/ejb3/bundles/xmlresolver/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/xmlresolver/pom.xml?rev=634283&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/xmlresolver/pom.xml (added)
+++ servicemix/smx4/features/trunk/ejb3/bundles/xmlresolver/pom.xml Thu Mar 6
06:49:51 2008
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ejb3.bundles</groupId>
+ <artifactId>bundles</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+
+ <properties>
+ <pkgArtifactId>xmlresolver</pkgArtifactId>
+ <pkgVersion>1.2</pkgVersion>
+
<servicemix.osgi.export.pkg>org.apache.xml.resolver</servicemix.osgi.export.pkg>
+ <servicemix.osgi.private.pkg></servicemix.osgi.private.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+</project>
