You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2016/01/20 13:43:56 UTC
[1/2] cxf git commit: [CXF-6703] Generate an OBR index for CXF OSGi
runtime
Repository: cxf
Updated Branches:
refs/heads/master fa76530bb -> 343d06d94
[CXF-6703] Generate an OBR index for CXF OSGi runtime
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/343d06d9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/343d06d9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/343d06d9
Branch: refs/heads/master
Commit: 343d06d94838cd26f682f7afbcea0e422aa1597d
Parents: ae70cdf
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Jan 20 13:37:30 2016 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Jan 20 13:43:45 2016 +0100
----------------------------------------------------------------------
osgi/pom.xml | 1 +
osgi/repository/pom.xml | 272 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 273 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/343d06d9/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 41675a3..5978de5 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -34,5 +34,6 @@
<module>itests</module>
<module>itests-felix</module>
<module>karaf</module>
+ <module>repository</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/343d06d9/osgi/repository/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/repository/pom.xml b/osgi/repository/pom.xml
new file mode 100644
index 0000000..45a5441
--- /dev/null
+++ b/osgi/repository/pom.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-parent</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+ <artifactId>cxf-repository</artifactId>
+ <packaging>pom</packaging>
+ <properties>
+ <bnd.version>3.1.0</bnd.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <local.index.policy>ALLOWED</local.index.policy>
+ </properties>
+ <profiles>
+ <profile>
+ <id>RunningInCI</id>
+ <activation>
+ <property>
+ <name>running.in.ci</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <local.url.policy>FORBIDDEN</local.url.policy>
+ </properties>
+ </profile>
+ <profile>
+ <id>apache-release</id>
+ <properties>
+ <local.url.policy>FORBIDDEN</local.url.policy>
+ </properties>
+ </profile>
+ </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-indexer-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
+ <configuration>
+ <localURLs>${local.index.policy}</localURLs>
+ <includeTransitive>true</includeTransitive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>index</id>
+ <goals>
+ <goal>index</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-coloc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-corba</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-object</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-xml</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-aegis</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-jaxb</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-xmlbeans</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-clustering</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-metrics</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-throttling</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-js</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-simple</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-javascript</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-management</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-search</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-service-description</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-security</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-security-saml</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-jms</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-udp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-addr</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-mex</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-wsdl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>cxf-xjc-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
+ <version>${cxf.servicemix.specs.version.jaxrs}</version>
+ </dependency>
+ </dependencies>
+</project>
[2/2] cxf git commit: Fixes for OSGi
Posted by cs...@apache.org.
Fixes for OSGi
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ae70cdfc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ae70cdfc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ae70cdfc
Branch: refs/heads/master
Commit: ae70cdfcd5ebbb63a84236d61055e5cf233df5bc
Parents: fa76530
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Jan 19 16:33:38 2016 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Jan 20 13:43:45 2016 +0100
----------------------------------------------------------------------
.../apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java | 7 ++++++-
core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae70cdfc/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java b/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java
index 390b76c..400dfd9 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java
@@ -44,7 +44,12 @@ public final class NamespaceHandlerRegisterer {
LOG.info("Registered blueprint namespace handler for " + namespace);
}
} catch (Throwable e) {
- LOG.log(Level.WARNING, "Aries Blueprint packages not available. So namespaces will not be registered", e);
+ String msg = "Aries Blueprint packages not available. So namespaces will not be registered";
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.WARNING, msg, e);
+ } else {
+ LOG.log(Level.WARNING, msg);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae70cdfc/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
index 030c8a0..c66d136 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
@@ -47,7 +47,7 @@ import org.osgi.util.tracker.ServiceTracker;
public class CXFActivator implements BundleActivator {
private List<Extension> extensions;
- private ManagedWorkQueueList workQueues = new ManagedWorkQueueList();
+ private ManagedWorkQueueList workQueues;
private ServiceTracker configAdminTracker;
private CXFExtensionBundleListener cxfBundleListener;
private ServiceRegistration workQueueServiceRegistration;
@@ -56,6 +56,7 @@ public class CXFActivator implements BundleActivator {
/** {@inheritDoc}*/
public void start(BundleContext context) throws Exception {
+ workQueues = new ManagedWorkQueueList();
cxfBundleListener = new CXFExtensionBundleListener(context.getBundle().getBundleId());
context.addBundleListener(cxfBundleListener);
cxfBundleListener.registerExistingBundles(context);