cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject git commit: [CXF-5972] Fix all karaf features definitions
Date Wed, 27 Aug 2014 08:33:09 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 45cacadd1 -> 4383951cc


[CXF-5972] Fix all karaf features definitions

Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4383951c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4383951c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4383951c

Branch: refs/heads/3.0.x-fixes
Commit: 4383951ccf3d0752605a6413f4bd118f0c83df77
Parents: 45cacad
Author: Guillaume Nodet <gnodet@gmail.com>
Authored: Wed Aug 27 10:32:48 2014 +0200
Committer: Guillaume Nodet <gnodet@gmail.com>
Committed: Wed Aug 27 10:32:48 2014 +0200

----------------------------------------------------------------------
 .../features/src/main/resources/features.xml    |  6 +++---
 parent/pom.xml                                  |  2 +-
 rt/transports/websocket/pom.xml                 |  1 +
 services/ws-discovery/ws-discovery-api/pom.xml  | 16 ++++++++++++++
 services/wsn/wsn-api/pom.xml                    |  2 +-
 services/wsn/wsn-core/pom.xml                   |  2 +-
 tools/common/pom.xml                            |  2 +-
 tools/corba/pom.xml                             |  2 +-
 tools/javato/ws/pom.xml                         |  2 +-
 tools/validator/pom.xml                         | 22 +++++++++++++++++++-
 tools/wadlto/jaxrs/pom.xml                      |  2 +-
 tools/wsdlto/core/pom.xml                       |  2 +-
 tools/wsdlto/databinding/jaxb/pom.xml           |  2 +-
 tools/wsdlto/frontend/javascript/pom.xml        |  2 +-
 tools/wsdlto/frontend/jaxws/pom.xml             |  2 +-
 tools/wsdlto/misc/pom.xml                       |  2 +-
 16 files changed, 53 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 97eafe1..5612d04 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -185,7 +185,7 @@
     </feature>
     <feature name="cxf-rs-security-xml" version="${project.version}" resolver="(obr)">
         <feature version="${project.version}">cxf-jaxrs</feature>
-        <feature version="${cxf.wss4j.version}">wss4j</feature>
+        <feature version="${project.version}">cxf-rt-security</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-xml/${project.version}</bundle>
     </feature>
     <feature name="cxf-rs-security-sso-saml" version="${project.version}" resolver="(obr)">
@@ -395,8 +395,8 @@
 
     <feature name="cxf-bean-validation-java6" version="${project.version}" resolver="(obr)">
         <feature version="${project.version}">cxf-bean-validation-core</feature>
-        <bundle start-level="30" dependency="true">mvn:javax.el/javax.el-api/3.0-b2</bundle>

-        <bundle start-level="30" dependency="true">mvn:org.glassfish/javax.el/3.0-b1</bundle>
 
+        <bundle start-level="30" dependency="true">mvn:javax.el/javax.el-api/3.0-b02</bundle>
+        <bundle start-level="30" dependency="true">mvn:org.glassfish/javax.el/3.0-b01</bundle>
     </feature>
 
     <feature name="cxf-management-web" version="${project.version}" resolver="(obr)">

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 27e8c1d..3e4cfe2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -130,7 +130,7 @@
         <cxf.maven.core.version>2.2.1</cxf.maven.core.version>
         <cxf.msv.version>2011.1</cxf.msv.version>
         <cxf.neethi.version>3.0.3</cxf.neethi.version>
-        <cxf.netty.version>4.0.18.Final</cxf.netty.version>
+        <cxf.netty.version>4.0.19.Final</cxf.netty.version>
         <cxf.netty3.version>3.9.1.Final</cxf.netty3.version>
         <cxf.netty.version.range>[4,5)</cxf.netty.version.range>
         <cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/rt/transports/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml
index 34aebad..b049a81 100644
--- a/rt/transports/websocket/pom.xml
+++ b/rt/transports/websocket/pom.xml
@@ -81,6 +81,7 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${project.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/services/ws-discovery/ws-discovery-api/pom.xml
----------------------------------------------------------------------
diff --git a/services/ws-discovery/ws-discovery-api/pom.xml b/services/ws-discovery/ws-discovery-api/pom.xml
index 261afd3..d1cdf9e 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -31,6 +31,12 @@
         <version>3.0.2-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
+	<properties>
+        <cxf.osgi.export>
+			=org.apache.cxf.ws.discovery.internal,
+            org.apache.cxf.ws.discovery.*,
+        </cxf.osgi.export>
+	</properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -102,6 +108,16 @@
                     </execution>
                 </executions>
             </plugin>
+			<plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>${cxf.osgi.export}</Export-Package>
+                    </instructions>
+                </configuration>
+			</plugin>
         </plugins>
     </build>
     <profiles>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/services/wsn/wsn-api/pom.xml
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index 0e9ac5c..e402b44 100644
--- a/services/wsn/wsn-api/pom.xml
+++ b/services/wsn/wsn-api/pom.xml
@@ -84,7 +84,7 @@
                             javax.xml.bind*;version="[0.0,3)",
                             javax.jws*;version="[0.0,3)",
                             javax.xml.ws*;version="[0.0,3)",
-                            org.apache.cxf*;version="[2.5,3)",
+                            org.apache.cxf*;version="[3.0,4)",
                             *
                         </Import-Package>
                         <Export-Package>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/services/wsn/wsn-core/pom.xml
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index efaf601..7d2669b 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -162,7 +162,7 @@
                             javax.xml.bind*;version="[0.0,3)",
                             javax.jws*;version="[0.0,3)",
                             javax.xml.ws*;version="[0.0,3)",
-                            org.apache.cxf*;version="[2.5,3)",
+                            org.apache.cxf*;version="[3.0,4)",
                             *
                         </Import-Package>
                         <Export-Package>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/tools/common/pom.xml
----------------------------------------------------------------------
diff --git a/tools/common/pom.xml b/tools/common/pom.xml
index 515815f..3bccc98 100644
--- a/tools/common/pom.xml
+++ b/tools/common/pom.xml
@@ -20,7 +20,7 @@
 <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>
     <artifactId>cxf-tools-common</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Apache CXF Command Line Tools Common</name>
     <description>Apache CXF Command Line Tools Common</description>
     <url>http://cxf.apache.org</url>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/tools/corba/pom.xml
----------------------------------------------------------------------
diff --git a/tools/corba/pom.xml b/tools/corba/pom.xml
index a03d8bd..788168c 100644
--- a/tools/corba/pom.xml
+++ b/tools/corba/pom.xml
@@ -20,7 +20,7 @@
 <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>
     <artifactId>cxf-tools-corba</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Apache CXF Command Line Tools CORBA</name>
     <description>Apache CXF Command Line Tools CORBA</description>
     <url>http://cxf.apache.org</url>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/tools/javato/ws/pom.xml
----------------------------------------------------------------------
diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml
index bf82f46..0a1a959 100644
--- a/tools/javato/ws/pom.xml
+++ b/tools/javato/ws/pom.xml
@@ -20,7 +20,7 @@
 <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>
     <artifactId>cxf-tools-java2ws</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Apache CXF Command Line Tools JavaTo WS</name>
     <description>Apache CXF Command Line Tools JavaTo WS</description>
     <url>http://cxf.apache.org</url>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/tools/validator/pom.xml
----------------------------------------------------------------------
diff --git a/tools/validator/pom.xml b/tools/validator/pom.xml
index aa1283c..acbe68b 100644
--- a/tools/validator/pom.xml
+++ b/tools/validator/pom.xml
@@ -20,7 +20,7 @@
 <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>
     <artifactId>cxf-tools-validator</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Apache CXF Command Line Tools Validator</name>
     <description>Apache CXF Command Line Tools Validator</description>
     <url>http://cxf.apache.org</url>
@@ -30,6 +30,12 @@
         <version>3.0.2-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
+	<properties>
+        <cxf.osgi.export>
+			=org.apache.cxf.tools.validator.internal,
+            org.apache.cxf.tools.validator.*,
+        </cxf.osgi.export>
+	</properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -81,4 +87,18 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+	<build>
+		<plugins>
+			<plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>${cxf.osgi.export}</Export-Package>
+                    </instructions>
+                </configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/tools/wadlto/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/pom.xml b/tools/wadlto/jaxrs/pom.xml
index 87aced2..4e00c0a 100644
--- a/tools/wadlto/jaxrs/pom.xml
+++ b/tools/wadlto/jaxrs/pom.xml
@@ -20,7 +20,7 @@
 <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>
     <artifactId>cxf-tools-wadlto-jaxrs</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Apache CXF Command Line Tools WADLTo JAXRS Frontend</name>
     <description>Apache CXF Command Line Tools WADLTo JAXRS Frontend</description>
     <url>http://cxf.apache.org</url>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/tools/wsdlto/core/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wsdlto/core/pom.xml b/tools/wsdlto/core/pom.xml
index 6aba67e..b758062 100644
--- a/tools/wsdlto/core/pom.xml
+++ b/tools/wsdlto/core/pom.xml
@@ -20,7 +20,7 @@
 <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>
     <artifactId>cxf-tools-wsdlto-core</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Apache CXF Command Line Tools WSDLTo Core</name>
     <description>Apache CXF Command Line Tools WSDLTo Core</description>
     <url>http://cxf.apache.org</url>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/tools/wsdlto/databinding/jaxb/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wsdlto/databinding/jaxb/pom.xml b/tools/wsdlto/databinding/jaxb/pom.xml
index 45f212d..36944b1 100644
--- a/tools/wsdlto/databinding/jaxb/pom.xml
+++ b/tools/wsdlto/databinding/jaxb/pom.xml
@@ -20,7 +20,7 @@
 <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>
     <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Apache CXF Command Line Tools WSDLTo JAXB Databinding</name>
     <description>Apache CXF Command Line Tools WSDLTo JAXB Databinding</description>
     <url>http://cxf.apache.org</url>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/tools/wsdlto/frontend/javascript/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/javascript/pom.xml b/tools/wsdlto/frontend/javascript/pom.xml
index fd3920a..20c4c10 100644
--- a/tools/wsdlto/frontend/javascript/pom.xml
+++ b/tools/wsdlto/frontend/javascript/pom.xml
@@ -20,7 +20,7 @@
 <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>
     <artifactId>cxf-tools-wsdlto-frontend-javascript</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Apache CXF Command Line Tools WSDL to JavaScript Front End</name>
     <description>Apache CXF Command Line Tools WSDL to JavaScript Front End</description>
     <url>http://cxf.apache.org</url>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/tools/wsdlto/frontend/jaxws/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/pom.xml b/tools/wsdlto/frontend/jaxws/pom.xml
index 376a71e..e4a4e52 100644
--- a/tools/wsdlto/frontend/jaxws/pom.xml
+++ b/tools/wsdlto/frontend/jaxws/pom.xml
@@ -20,7 +20,7 @@
 <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>
     <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Apache CXF Command Line Tools WSDLTo JAXWS Frontend</name>
     <description>Apache CXF Command Line Tools WSDLTo JAXWS Frontend</description>
     <url>http://cxf.apache.org</url>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4383951c/tools/wsdlto/misc/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wsdlto/misc/pom.xml b/tools/wsdlto/misc/pom.xml
index cc7e926..b833222 100644
--- a/tools/wsdlto/misc/pom.xml
+++ b/tools/wsdlto/misc/pom.xml
@@ -20,7 +20,7 @@
 <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>
     <artifactId>cxf-tools-misctools</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Apache CXF Command Line Tools WSDLTo Misctools</name>
     <description>Apache CXF Command Line Tools WSDLTo Misctools</description>
     <url>http://cxf.apache.org</url>


Mime
View raw message