cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject cxf git commit: update sample swagger2_osgi's readme by using feature cxf-rs-description-swagger2
Date Wed, 21 Oct 2015 14:33:11 GMT
Repository: cxf
Updated Branches:
  refs/heads/master b33b7d7ab -> 7ffa1d7e5


update sample swagger2_osgi's readme by using feature cxf-rs-description-swagger2


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

Branch: refs/heads/master
Commit: 7ffa1d7e54c88e2ee11e90e866bb34b5481762d4
Parents: b33b7d7
Author: Akitoshi Yoshida <ay@apache.org>
Authored: Wed Oct 21 16:29:32 2015 +0200
Committer: Akitoshi Yoshida <ay@apache.org>
Committed: Wed Oct 21 16:32:51 2015 +0200

----------------------------------------------------------------------
 .../jax_rs/description_swagger2_osgi/README.txt | 48 +++++---------------
 .../jax_rs/description_swagger2_osgi/pom.xml    |  6 ---
 .../src/test/resources/features/features.xml    | 47 -------------------
 3 files changed, 12 insertions(+), 89 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/7ffa1d7e/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
index f17859e..d31287f 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
@@ -35,54 +35,30 @@ Starting Karaf (refer to http://karaf.apache.org/manual/latest-3.0.x/quick-start
   Hit '<ctrl-d>' or type 'system:shutdown' or 'logout' to shutdown Karaf.
 
 
-Install this demo feature using the local features.xml file that is located in
-samples/jax_rs/description_swagger2_osgi/target/test-classes/features/features.xml, you
-can directly use this file or copy it to somewhere. Assuming you have put this features.xml
file at
-/Users/me/work/cxf/samples/features.xml
+In order to install CXF's features, you need to add the CXF's features repo using
 
-You can add this local feature url by typing
+  feature:repo-add cxf 3.n.m
 
-  karaf@root()> feature:repo-add file:///Users/me/work/cxf/samples/features.xml
-  Adding feature url file:///Users/me/work/cxf/samples/features.xml
+ where 3.n.m corresponds to a valid CXF version number (e.g., 3.1.4).
 
-Now you can see the features defined in this features file.
+Install CXF's cxf-rs-description-swagger2 feature that installs all the required bundles
+for this demo bundle.
 
-  karaf@root()> feature:list | grep demo
-  demo-swagger-core             | 1.0.0            |           | demo-cxf-swagger-sample-1.0.0
| 
-  demo-swagger-jaxrs            | 1.0.0            |           | demo-cxf-swagger-sample-1.0.0
| 
-  demo-cxf-swagger-jaxrs-sample | 1.0.0            |           | demo-cxf-swagger-sample-1.0.0
| 
-  karaf@root()> 
+  feature:install cxf-rs-description-swagger2
 
-Install the demo sample feature that transitively install other features and bundles that
are
-required to run this demo sample.
+Install this demo bundle
 
-  feature:install demo-cxf-swagger-jaxrs-sample
+  install -s mvn:org.apache.cxf.samples/jax_rs_description_swagger2_osgi
 
 You can verify if the CXF JAX-RS Swagger2 Blueprint Demo is installed and started.
 
-  karaf@root()> list 
+  karaf@root()> list
   START LEVEL 100 , List Threshold: 50
-   ID | State  | Lvl | Version          | Name                                       
-  -----------------------------------------------------------------------------------
-  107 | Active |  80 | 1.1.0.Final      | Bean Validation API                        
-  108 | Active |  80 | 3.4.0            | Apache Commons Lang                        
-  109 | Active |  80 | 2.4.6            | Jackson-core                               
-  110 | Active |  80 | 2.4.6            | Jackson-annotations                        
-  111 | Active |  80 | 2.4.6            | jackson-databind                           
-  112 | Active |  80 | 2.4.6            | Jackson-dataformat-YAML                    
-  113 | Active |  80 | 1.5.4.SNAPSHOT   | swagger-annotations                        
-  114 | Active |  80 | 1.5.4.SNAPSHOT   | swagger-models                             
-  115 | Active |  80 | 1.5.4.SNAPSHOT   | swagger-core                               
-  116 | Active |  80 | 18.0.0           | Guava: Google Core Libraries for Java      
-  117 | Active |  80 | 3.19.0.GA        | Javassist                                  
-  118 | Active |  80 | 0.9.9.2          | Apache ServiceMix :: Bundles :: reflections
-  119 | Active |  80 | 2.4.6            | Jackson-JAXRS-base                         
-  120 | Active |  80 | 2.4.6            | Jackson-JAXRS-JSON                         
-  121 | Active |  80 | 1.5.4.SNAPSHOT   | swagger-jaxrs                              
-  122 | Active |  80 | 3.1.3            | CXF JAX-RS Swagger2 Blueprint Demo    
+   ID | State  | Lvl | Version | Name                              
+  -----------------------------------------------------------------
+  122 | Active |  80 | 3.1.4   | CXF JAX-RS Swagger2 Blueprint Demo
   karaf@root()>
 
-
 Now, you will be able to access this CXF JAXRS demo service on your Karaf instance at
 
   http://localhost:8181/cxf/swaggerSample

http://git-wip-us.apache.org/repos/asf/cxf/blob/7ffa1d7e/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
index 9e9dbfc..dae6d4c 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
@@ -35,12 +35,6 @@ under the License.
     </properties>
 
     <build>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-                <filtering>true</filtering>
-            </testResource>
-        </testResources>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>

http://git-wip-us.apache.org/repos/asf/cxf/blob/7ffa1d7e/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml
deleted file mode 100644
index 0c78bba..0000000
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="demo-cxf-swagger-sample-1.0.0">
-    <repository>mvn:org.apache.cxf.karaf/apache-cxf/${project.version}/xml/features</repository>
-
-    <!-- Note demo-swagger-core and demo-swagger-jaxrs features may be published by swagger
as
-         features swagger-core and swagger-jaxrs, respectively -->
-    <feature name="demo-swagger-core" version="1.0.0" resolver="(obr)">
-        <bundle dependency="true">mvn:javax.validation/validation-api/1.1.0.Final</bundle>
-        <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.4</bundle>
-
-        <!-- jackson -->
-        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.4.6</bundle>
-        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.6</bundle>
-        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.4.6</bundle>
-        <bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.4.6</bundle>
-
-        <!-- swagger -->
-        <bundle dependency="true">mvn:io.swagger/swagger-annotations/1.5.4</bundle>
-        <bundle dependency="true">mvn:io.swagger/swagger-models/1.5.4</bundle>
-        <bundle dependency="true">mvn:io.swagger/swagger-core/1.5.4</bundle>
-    </feature>
-
-    <feature name="demo-swagger-jaxrs" version="1.0.0" resolver="(obr)">
-        <!-- this feature can work with jsr-311 or jsr-339, so let the jaxrs provider
decide which one install -->
-
-        <bundle dependency="true">mvn:com.google.guava/guava/18.0</bundle>
-        <bundle dependency="true">mvn:org.javassist/javassist/3.19.0-GA</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/0.9.9_2</bundle>
-
-        <!-- jackson -->
-        <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.4.6</bundle>
-        <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.4.6</bundle>
-
-        <!-- swagger -->
-        <feature version='1.0.0'>demo-swagger-core</feature>
-        <bundle dependency="true">mvn:io.swagger/swagger-jaxrs/1.5.4</bundle>
-    </feature>
-
-
-    <!-- this is the feature definition for this cxf jaxrs swagger blueprint sample demo
-->
-    <feature name="demo-cxf-swagger-jaxrs-sample" version="1.0.0" resolver="(obr)">
-        <feature version='[3.0,4)'>cxf-jaxrs</feature>
-        <feature version='1.0.0'>demo-swagger-jaxrs</feature>
-
-        <bundle dependency="true">mvn:org.apache.cxf.samples/jax_rs_description_swagger2_osgi/${project.version}</bundle>
-    </feature>
-</features>


Mime
View raw message