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 2017/09/21 08:49:02 UTC
[cxf-dosgi] branch master updated (ea16df0 -> 722f4c2)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git.
from ea16df0 Make sure we do not export the IntentsProvider interface
new de19dd5 Add swagger UI bundle to distro
new 722f4c2 Add itest for swagger json
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
distribution/multi-bundle/distro.bndrun | 89 ++++++++++++----------
distribution/multi-bundle/pom.xml | 5 ++
.../cxf/dosgi/itests/multi/TestExportService.java | 4 +
3 files changed, 56 insertions(+), 42 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].
[cxf-dosgi] 01/02: Add swagger UI bundle to distro
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git
commit de19dd5292df71d4b1b9359050667668b73a123e
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Thu Sep 21 10:48:21 2017 +0200
Add swagger UI bundle to distro
---
distribution/multi-bundle/distro.bndrun | 89 +++++++++++++++++----------------
distribution/multi-bundle/pom.xml | 5 ++
2 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/distribution/multi-bundle/distro.bndrun b/distribution/multi-bundle/distro.bndrun
index df08e7b..36c8b5b 100644
--- a/distribution/multi-bundle/distro.bndrun
+++ b/distribution/multi-bundle/distro.bndrun
@@ -4,29 +4,21 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=slf4j.api)',\
osgi.identity;filter:='(osgi.identity=osgi.cmpn)',\
- osgi.identity;filter:='(osgi.identity=osgi.core)'
+ osgi.identity;filter:='(osgi.identity=osgi.core)',\
+ osgi.identity;filter:='(osgi.identity=org.osgi.service.http)'
-runfw: org.apache.felix.framework;version='[5.6.8,5.6.8]'
-runee: JavaSE-1.8
-
+# rsa.export.policy.filter="(name=rest)",\
-runproperties: \
org.ops4j.pax.logging.DefaultServiceLog.level=INFO,\
- rsa.export.policy.filter="(name=rest)",\
org.osgi.framework.bootdelegation=com.sun.*,\
org.osgi.framework.system.packages.extra='sun.misc,javax.xml.bind.annotation;version=2.2.1,javax.xml.bind;version=2.2.1'
-
-# felix.cm.loglevel=4,\
-# felix.fileinstall.dir=./etc,\
-# felix.fileinstall.noInitialDelay=true,\
-# felix.fileinstall.enableConfigSave=false,\
-# felix.fileinstall.log.level=4,\
-# org.osgi.framework.startlevel.beginning=100,\
-
-# Only needed for karaf console
-# karaf.systemBundlesStartLevel=0,\
-# karaf.startLocalConsole=true,\
-# karaf.local.roles='admin,manager,viewer,systembundles',\
-
+ felix.cm.loglevel=4,\
+ felix.fileinstall.dir=./etc,\
+ felix.fileinstall.noInitialDelay=true,\
+ felix.fileinstall.log.level=4,\
+ org.ops4j.pax.logging.DefaultServiceLog.level=INFO
-runrequires: \
osgi.identity;filter:='(osgi.identity=org.apache.felix.fileinstall)',\
@@ -38,46 +30,34 @@
osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.topology-manager)',\
osgi.identity;filter:='(&(osgi.identity=org.apache.aries.rsa.discovery.command)(version>=1.9.0))',\
osgi.identity;filter:='(osgi.identity=org.apache.cxf.dosgi.cxf-dosgi-provider-rs)',\
+ osgi.identity;filter:='(osgi.identity=org.webjars.swagger-ui)',\
osgi.identity;filter:='(osgi.identity=org.apache.cxf.cxf-rt-rs-service-description-swagger)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.discovery.zookeeper)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)'
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)',\
+ osgi.identity;filter:='(&(osgi.identity=org.apache.felix.metatype)(version>=1.1.2))',\
+ osgi.identity;filter:='(&(osgi.identity=org.apache.cxf.cxf-rt-ws-policy)(version>=3.2.0))',\
+ osgi.identity;filter:='(&(osgi.identity=com.fasterxml.woodstox.woodstox-core)(version>=5.0.3))'
+
-runbundles: \
- org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
- org.apache.felix.fileinstall;version='[3.5.2,3.5.3)',\
- org.objectweb.asm.all;version='[5.0.4,5.0.5)',\
- org.ops4j.pax.logging.pax-logging-api;version='[1.8.5,1.8.6)',\
- org.ops4j.pax.logging.pax-logging-service;version='[1.8.5,1.8.6)',\
- javax.servlet-api;version='[3.1.0,3.1.1)',\
- org.apache.felix.eventadmin;version='[1.4.6,1.4.7)',\
- org.apache.felix.http.api;version='[2.3.2,2.3.3)',\
- org.apache.felix.http.jetty;version='[3.0.0,3.0.1)',\
- org.apache.servicemix.bundles.wsdl4j;version='[1.6.3,1.6.4)',\
- org.fusesource.jansi;version='[1.13.0,1.13.1)',\
- org.apache.aries.rsa.core;version='[1.11.0,1.11.1)',\
- org.apache.aries.rsa.discovery.command;version='[1.11.0,1.11.1)',\
- org.apache.aries.rsa.spi;version='[1.11.0,1.11.1)',\
- org.apache.aries.rsa.topology-manager;version='[1.11.0,1.11.1)',\
- org.apache.cxf.dosgi.cxf-dosgi-common;version='[2.3.0,2.3.1)',\
- org.apache.cxf.dosgi.cxf-dosgi-provider-rs;version='[2.3.0,2.3.1)',\
- org.apache.cxf.dosgi.cxf-dosgi-provider-ws;version='[2.3.0,2.3.1)',\
- org.apache.ws.xmlschema.core;version='[2.2.2,2.2.3)',\
- org.apache.felix.scr;version='[2.0.12,2.0.13)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.8.9,2.8.10)',\
com.fasterxml.jackson.core.jackson-core;version='[2.8.9,2.8.10)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.8.9,2.8.10)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.8.9,2.8.10)',\
+ com.fasterxml.woodstox.woodstox-core;version='[5.0.3,5.0.4)',\
com.google.guava;version='[20.0.0,20.0.1)',\
io.swagger.annotations;version='[1.5.16,1.5.17)',\
io.swagger.core;version='[1.5.16,1.5.17)',\
io.swagger.jaxrs;version='[1.5.16,1.5.17)',\
io.swagger.models;version='[1.5.16,1.5.17)',\
+ javax.annotation-api;version='[1.3.0,1.3.1)',\
+ javax.servlet-api;version='[3.1.0,3.1.1)',\
javax.validation.api;version='[1.1.0,1.1.1)',\
- org.apache.servicemix.bundles.reflections;version='[0.9.10,0.9.11)',\
- org.yaml.snakeyaml;version='[1.17.0,1.17.1)',\
+ org.apache.aries.rsa.core;version='[1.11.0,1.11.1)',\
+ org.apache.aries.rsa.discovery.command;version='[1.11.0,1.11.1)',\
org.apache.aries.rsa.discovery.local;version='[1.11.0,1.11.1)',\
org.apache.aries.rsa.discovery.zookeeper;version='[1.11.0,1.11.1)',\
- org.apache.hadoop.zookeeper;version='[3.4.10,3.4.11)',\
- javax.annotation-api;version='[1.3.0,1.3.1)',\
+ org.apache.aries.rsa.spi;version='[1.11.0,1.11.1)',\
+ org.apache.aries.rsa.topology-manager;version='[1.11.0,1.11.1)',\
org.apache.commons.lang3;version='[3.6.0,3.6.1)',\
org.apache.cxf.cxf-core;version='[3.2.0,3.2.1)',\
org.apache.cxf.cxf-rt-bindings-soap;version='[3.2.0,3.2.1)',\
@@ -90,10 +70,35 @@
org.apache.cxf.cxf-rt-rs-client;version='[3.2.0,3.2.1)',\
org.apache.cxf.cxf-rt-rs-service-description-swagger;version='[3.2.0,3.2.1)',\
org.apache.cxf.cxf-rt-transports-http;version='[3.2.0,3.2.1)',\
+ org.apache.cxf.cxf-rt-ws-policy;version='[3.2.0,3.2.1)',\
org.apache.cxf.cxf-rt-wsdl;version='[3.2.0,3.2.1)',\
+ org.apache.cxf.dosgi.cxf-dosgi-common;version='[2.3.0,2.3.1)',\
+ org.apache.cxf.dosgi.cxf-dosgi-provider-rs;version='[2.3.0,2.3.1)',\
+ org.apache.cxf.dosgi.cxf-dosgi-provider-ws;version='[2.3.0,2.3.1)',\
+ org.apache.cxf.dosgi.samples.cxf-dosgi-samples-rest-api;version='[2.3.0,2.3.1)',\
+ org.apache.cxf.dosgi.samples.cxf-dosgi-samples-rest-impl;version='[2.3.0,2.3.1)',\
org.apache.felix.bundlerepository;version='[1.6.0,1.6.1)',\
+ org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
+ org.apache.felix.eventadmin;version='[1.4.6,1.4.7)',\
+ org.apache.felix.fileinstall;version='[3.5.2,3.5.3)',\
org.apache.felix.gogo.command;version='[1.0.0,1.0.1)',\
org.apache.felix.gogo.jline;version='[1.0.6,1.0.7)',\
org.apache.felix.gogo.runtime;version='[1.0.0,1.0.1)',\
+ org.apache.felix.http.api;version='[2.3.2,2.3.3)',\
+ org.apache.felix.http.jetty;version='[3.0.0,3.0.1)',\
+ org.apache.felix.metatype;version='[1.1.2,1.1.3)',\
+ org.apache.felix.scr;version='[2.0.12,2.0.13)',\
+ org.apache.hadoop.zookeeper;version='[3.4.10,3.4.11)',\
+ org.apache.neethi;version='[3.1.0,3.1.1)',\
+ org.apache.servicemix.bundles.reflections;version='[0.9.10,0.9.11)',\
+ org.apache.servicemix.bundles.wsdl4j;version='[1.6.3,1.6.4)',\
org.apache.servicemix.specs.jaxrs-api-2.1;version='[2.9.1,2.9.2)',\
- org.jline;version='[3.3.1,3.3.2)'
+ org.apache.ws.xmlschema.core;version='[2.2.2,2.2.3)',\
+ org.fusesource.jansi;version='[1.13.0,1.13.1)',\
+ org.jline;version='[3.3.1,3.3.2)',\
+ org.objectweb.asm.all;version='[5.0.4,5.0.5)',\
+ org.ops4j.pax.logging.pax-logging-api;version='[1.8.5,1.8.6)',\
+ org.ops4j.pax.logging.pax-logging-service;version='[1.8.5,1.8.6)',\
+ org.yaml.snakeyaml;version='[1.17.0,1.17.1)',\
+ stax2-api;version='[3.1.4,3.1.5)',\
+ org.webjars.swagger-ui;version='[2.2.10,2.2.11)'
\ No newline at end of file
diff --git a/distribution/multi-bundle/pom.xml b/distribution/multi-bundle/pom.xml
index b55c364..179a5b1 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -184,6 +184,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>swagger-ui</artifactId>
+ <version>2.2.10-1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.reflections</artifactId>
<version>0.9.10_3</version>
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf-dosgi] 02/02: Add itest for swagger json
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git
commit 722f4c261a9798dce71b3839a7ddcb670ae399a4
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Thu Sep 21 10:48:53 2017 +0200
Add itest for swagger json
---
.../java/org/apache/cxf/dosgi/itests/multi/TestExportService.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java
index a4bc5a1..fcc70c0 100644
--- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java
+++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java
@@ -90,6 +90,10 @@ public class TestExportService extends AbstractDosgiTest {
}
);
Assert.assertEquals("Buy some coffee", task.getTitle());
+ final WebClient swaggerClient = WebClient.create(REST_SERVICE_URI + "/swagger.json");
+ String swaggerJson = swaggerClient.get(String.class);
+ Assert.assertEquals("{\"swagger\":\"2.0\"", swaggerJson.substring(0, 16));
+
}
@Test
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.