Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CCC4F200B8C for ; Mon, 12 Sep 2016 14:04:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CB6BF160AC8; Mon, 12 Sep 2016 12:04:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7C550160AB8 for ; Mon, 12 Sep 2016 14:04:14 +0200 (CEST) Received: (qmail 32134 invoked by uid 500); 12 Sep 2016 12:04:13 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 32121 invoked by uid 99); 12 Sep 2016 12:04:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Sep 2016 12:04:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8E2C7E0158; Mon, 12 Sep 2016 12:04:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cschneider@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf-dosgi git commit: [DOSGI-249] Adapt artifact ids Date: Mon, 12 Sep 2016 12:04:13 +0000 (UTC) archived-at: Mon, 12 Sep 2016 12:04:16 -0000 Repository: cxf-dosgi Updated Branches: refs/heads/master 5352c05d4 -> 5494b35c9 [DOSGI-249] Adapt artifact ids Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/5494b35c Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/5494b35c Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/5494b35c Branch: refs/heads/master Commit: 5494b35c9145b9709173c1bc9b265a1c0497fb0a Parents: 5352c05 Author: Christian Schneider Authored: Mon Sep 12 14:04:04 2016 +0200 Committer: Christian Schneider Committed: Mon Sep 12 14:04:04 2016 +0200 ---------------------------------------------------------------------- .gitignore | 1 + common/pom.xml | 4 +-- decorator/pom.xml | 4 +-- distribution/features/pom.xml | 2 +- .../features/src/main/resources/features.xml | 8 ++--- distribution/multi-bundle/pom.xml | 4 +-- .../multi-bundle/src/main/assembly/assembly.xml | 8 ++--- .../multi-bundle/src/main/release/README | 38 +++++--------------- distribution/pom.xml | 4 +-- distribution/repository/pom.xml | 30 ++++++++++++---- distribution/sources/pom.xml | 4 +-- itests/multi-bundle/pom.xml | 6 ++-- itests/pom.xml | 4 +-- parent/pom.xml | 6 ++-- pom.xml | 2 +- provider-rs/bnd.bnd | 2 ++ provider-rs/pom.xml | 6 ++-- provider-ws/bnd.bnd | 2 ++ provider-ws/pom.xml | 6 ++-- samples/pom.xml | 7 +++- samples/rest/api/pom.xml | 20 ++++------- samples/rest/impl/pom.xml | 5 --- samples/security_filter/pom.xml | 4 +-- 23 files changed, 86 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 9629ccf..a1bddc7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ .settings/ target/ velocity.log +generated/ http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index cf06052..00dd723 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - cxf-dosgi-ri-common + cxf-dosgi-common bundle CXF DOSGi Common org.apache.cxf.dosgi - cxf-dosgi-ri-parent + cxf-dosgi-parent 2.0-SNAPSHOT ../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/decorator/pom.xml ---------------------------------------------------------------------- diff --git a/decorator/pom.xml b/decorator/pom.xml index 495124f..153e05c 100644 --- a/decorator/pom.xml +++ b/decorator/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - cxf-dosgi-ri-decorator + cxf-dosgi-decorator bundle CXF DOSGi Service decorator support org.apache.cxf.dosgi - cxf-dosgi-ri-parent + cxf-dosgi-parent 2.0-SNAPSHOT ../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/distribution/features/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml index 22f8eeb..2446931 100644 --- a/distribution/features/pom.xml +++ b/distribution/features/pom.xml @@ -20,7 +20,7 @@ org.apache.cxf.dosgi - cxf-dosgi-ri-distribution-parent + cxf-dosgi-distribution-parent 2.0-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/distribution/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/distribution/features/src/main/resources/features.xml b/distribution/features/src/main/resources/features.xml index 442b922..8297d20 100644 --- a/distribution/features/src/main/resources/features.xml +++ b/distribution/features/src/main/resources/features.xml @@ -19,21 +19,21 @@ http cxf-http-jetty mvn:org.apache.felix/org.apache.felix.scr/2.0.2 - mvn:${project.groupId}/cxf-dosgi-ri-common/${project.version} - mvn:${project.groupId}/cxf-dosgi-ri-decorator/${project.version} + mvn:${project.groupId}/cxf-dosgi-common/${project.version} + mvn:${project.groupId}/cxf-dosgi-decorator/${project.version} cxf-dosgi-common cxf-jaxws cxf-databinding-aegis - mvn:${project.groupId}/cxf-dosgi-ri-provider-ws/${project.version} + mvn:${project.groupId}/cxf-dosgi-provider-ws/${project.version} cxf-dosgi-common cxf-jaxrs - mvn:${project.groupId}/cxf-dosgi-ri-provider-rs/${project.version} + mvn:${project.groupId}/cxf-dosgi-provider-rs/${project.version} http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/distribution/multi-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/multi-bundle/pom.xml b/distribution/multi-bundle/pom.xml index ab39138..a91c103 100644 --- a/distribution/multi-bundle/pom.xml +++ b/distribution/multi-bundle/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - cxf-dosgi-ri-multibundle-distribution + cxf-dosgi-multibundle-distribution CXF DOSGi Multi-Bundle Distribution http://cxf.apache.org org.apache.cxf.dosgi - cxf-dosgi-ri-distribution-parent + cxf-dosgi-distribution-parent 2.0-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/distribution/multi-bundle/src/main/assembly/assembly.xml ---------------------------------------------------------------------- diff --git a/distribution/multi-bundle/src/main/assembly/assembly.xml b/distribution/multi-bundle/src/main/assembly/assembly.xml index 2844317..4744815 100644 --- a/distribution/multi-bundle/src/main/assembly/assembly.xml +++ b/distribution/multi-bundle/src/main/assembly/assembly.xml @@ -29,18 +29,18 @@ target/distribution_bundles - apache-cxf-dosgi-ri-${dosgi.version}/dosgi_bundles + apache-cxf-dosgi-${dosgi.version}/dosgi_bundles target/distribution_configs - apache-cxf-dosgi-ri-${dosgi.version}/conf + apache-cxf-dosgi-${dosgi.version}/conf target/maven-shared-archive-resources/META-INF DEPENDENCIES - apache-cxf-dosgi-ri-${dosgi.version} + apache-cxf-dosgi-${dosgi.version} src/main/release @@ -48,7 +48,7 @@ README release_notes.txt - apache-cxf-dosgi-ri-${dosgi.version} + apache-cxf-dosgi-${dosgi.version} http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/distribution/multi-bundle/src/main/release/README ---------------------------------------------------------------------- diff --git a/distribution/multi-bundle/src/main/release/README b/distribution/multi-bundle/src/main/release/README index 40d7b0d..d87959c 100644 --- a/distribution/multi-bundle/src/main/release/README +++ b/distribution/multi-bundle/src/main/release/README @@ -2,16 +2,13 @@ Welcome to the Apache CXF Distributed OSGi DSW Reference Implementation ======================================================================= -The dOSGi subproject of Apache CXF provides the Reference Implementation -of the Remote Services Specification version 1.0, Chapter 13 in the OSGi -Compendium Specification, and OSGi Remote Service Admin Specification +The dOSGi subproject of Apache CXF provides the Remote Services Specification version 1.0, + Chapter 13 in the OSGi Compendium Specification, and OSGi Remote Service Admin Specification version 1.0, Chapter 122 in the OSGi Enterprise Specification[1]. +This release is provided for your convenience in two distribution formats: -This release is provided for your convenience in three different -distribution formats: - -1. Multi-bundle distro: cxf-dosgi-ri-multibundle-distribution-1.2.{tar.gaz|zip} +1. Multi-bundle distro Contains the dOSGi implementation and all 3rd party dependencies as separate bundles within an archive. The current distribution is an @@ -27,37 +24,18 @@ appending the felix.discovery.config.properties.append or equinox.discovery.config.ini.append snippets as appropriate. -2. Single-bundle distro: cxf-dosgi-ri-singlebundle-distribution-1.2.jar - -Contains the dOSGi implementation and all 3rd party dependencies wrapped -in a single OSGi bundle so as to allow direct installation in your favourite -OSGi container in one fell swoop. - - -3. Source distro: cxf-dosgi-ri-source-distribution-1.2.{tar.gz|zip} +2. Source distro Contains the entire source tree for dOSGi. -The best starting point for using dOSGi is the Getting Started Guide[2]. - -Also note the very detailed walk-through of the greeter demo[3]. - -If you need more help, or want to provide any feedback, please feel free -to drop us a note on the CXF dev or users list[4]. - -If you trip over any problems with dOSGi, don't hesitate to submit an issue -to the CXF JIRA[5] with the component set to "Distributed-OSGi". - +For more information check the CXF DOSGi web site [2] -Thanks for using dOSGi! +Thanks for using CXF dOSGi! Regards, The CXF dOSGi team. [1] see chapter 122 http://www.osgi.org/Download/Release4V42 -[2] http://cxf.apache.org/distributed-osgi.html#DistributedOSGi-GettingStarted -[3] http://cxf.apache.org/distributed-osgi-greeter-demo-walkthrough.htm -[4] http://cxf.apache.org/mailing-lists.html -[5] https://issues.apache.org/jira/browse/CXF +[2] http://cxf.apache.org/distributed-osgi.html http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 5bb17cd..60c09d8 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.apache.cxf.dosgi - cxf-dosgi-ri-distribution-parent + cxf-dosgi-distribution-parent 2.0-SNAPSHOT pom CXF DOSGi Distribution Parent @@ -28,7 +28,7 @@ org.apache.cxf.dosgi - cxf-dosgi-ri-parent + cxf-dosgi-parent 2.0-SNAPSHOT ../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/distribution/repository/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml index f87ce62..f70d989 100644 --- a/distribution/repository/pom.xml +++ b/distribution/repository/pom.xml @@ -3,27 +3,40 @@ 4.0.0 org.apache.cxf.dosgi - cxf-dosgi-ri-parent + cxf-dosgi-parent 2.0-SNAPSHOT ../../parent/pom.xml - cxf-dosgi-ri-repository + cxf-dosgi-repository + CXF DOSGi Distribution Repository + org.apache.aries.rsa repository - 1.9.0 + 1.10-SNAPSHOT pom + org.ow2.asm + asm-all + 5.0.4 + + org.apache.cxf.dosgi - cxf-dosgi-ri-provider-ws + cxf-dosgi-provider-ws ${project.version} org.apache.cxf.dosgi - cxf-dosgi-ri-provider-rs + cxf-dosgi-provider-rs ${project.version} + + + javax.ws.rs + javax.ws.rs-api + + org.apache.servicemix.bundles @@ -32,6 +45,11 @@ 1.6.3_1 + + org.apache.servicemix.specs + org.apache.servicemix.specs.jsr339-api-2.0.1 + 2.6.0 + - CXF DOSGi Distribution Repository + http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/distribution/sources/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/sources/pom.xml b/distribution/sources/pom.xml index 56a0d0d..809e1fe 100644 --- a/distribution/sources/pom.xml +++ b/distribution/sources/pom.xml @@ -21,14 +21,14 @@ 4.0.0 org.apache.cxf.dosgi - cxf-dosgi-ri-source-distribution + cxf-dosgi-source-distribution 2.0-SNAPSHOT CXF DOSGi Source Distribution http://cxf.apache.org org.apache.cxf.dosgi - cxf-dosgi-ri-distribution-parent + cxf-dosgi-distribution-parent 2.0-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/itests/multi-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml index 2dae19b..e7d2ec4 100644 --- a/itests/multi-bundle/pom.xml +++ b/itests/multi-bundle/pom.xml @@ -23,13 +23,13 @@ org.apache.cxf.dosgi - cxf-dosgi-ri-parent + cxf-dosgi-parent 2.0-SNAPSHOT ../../parent/pom.xml org.apache.cxf.dosgi.systests - cxf-dosgi-ri-itests-multibundle + cxf-dosgi-itests-multibundle jar CXF DOSGi Integration Tests Multi Bundle @@ -194,7 +194,7 @@ org.apache.cxf.dosgi - cxf-dosgi-ri-multibundle-distribution + cxf-dosgi-multibundle-distribution ${project.version} zip dir http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index f8f6e5f..d4c3594 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -23,13 +23,13 @@ org.apache.cxf.dosgi - cxf-dosgi-ri-parent + cxf-dosgi-parent 2.0-SNAPSHOT ../parent/pom.xml org.apache.cxf.dosgi.systests - cxf-dosgi-ri-itests + cxf-dosgi-itests 2.0-SNAPSHOT pom http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 461b71f..e5fc564 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -14,12 +14,12 @@ org.apache.cxf.dosgi - cxf-dosgi-ri + cxf-dosgi-main 2.0-SNAPSHOT 4.0.0 - cxf-dosgi-ri-parent + cxf-dosgi-parent pom CXF DOSGi Parent @@ -30,7 +30,7 @@ 5.0.0 5.0.0 - 1.9.0 + 1.10-SNAPSHOT 3.1.7 5.4.0 3.4.8 http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 87e8472..7ee4200 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.apache.cxf.dosgi - cxf-dosgi-ri + cxf-dosgi-main 2.0-SNAPSHOT pom http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/provider-rs/bnd.bnd ---------------------------------------------------------------------- diff --git a/provider-rs/bnd.bnd b/provider-rs/bnd.bnd index 99f067a..1b3fa2e 100644 --- a/provider-rs/bnd.bnd +++ b/provider-rs/bnd.bnd @@ -1,3 +1,5 @@ Import-Package: javax.servlet;version='[2,4)', javax.servlet.http;version='[2,4)', * Private-Package: org.apache.cxf.dosgi.dsw.* +Provide-Capability: osgi.remoteserviceadmin.distribution;\ + configs:List="org.apache.cxf.rs"; version:Version=1.0 http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/provider-rs/pom.xml ---------------------------------------------------------------------- diff --git a/provider-rs/pom.xml b/provider-rs/pom.xml index 0a097c7..f51ebf0 100644 --- a/provider-rs/pom.xml +++ b/provider-rs/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - cxf-dosgi-ri-provider-rs + cxf-dosgi-provider-rs bundle CXF DOSGi provider rs org.apache.cxf.dosgi - cxf-dosgi-ri-parent + cxf-dosgi-parent 2.0-SNAPSHOT ../parent/pom.xml @@ -38,7 +38,7 @@ org.apache.cxf.dosgi - cxf-dosgi-ri-common + cxf-dosgi-common ${project.version} http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/provider-ws/bnd.bnd ---------------------------------------------------------------------- diff --git a/provider-ws/bnd.bnd b/provider-ws/bnd.bnd index 99f067a..0282b4b 100644 --- a/provider-ws/bnd.bnd +++ b/provider-ws/bnd.bnd @@ -1,3 +1,5 @@ Import-Package: javax.servlet;version='[2,4)', javax.servlet.http;version='[2,4)', * Private-Package: org.apache.cxf.dosgi.dsw.* +Provide-Capability: osgi.remoteserviceadmin.distribution;\ + configs:List="org.apache.cxf.ws"; version:Version=1.0 http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/provider-ws/pom.xml ---------------------------------------------------------------------- diff --git a/provider-ws/pom.xml b/provider-ws/pom.xml index e816f2c..c969a31 100644 --- a/provider-ws/pom.xml +++ b/provider-ws/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - cxf-dosgi-ri-provider-ws + cxf-dosgi-provider-ws bundle CXF DOSGi provider ws org.apache.cxf.dosgi - cxf-dosgi-ri-parent + cxf-dosgi-parent 2.0-SNAPSHOT ../parent/pom.xml @@ -38,7 +38,7 @@ org.apache.cxf.dosgi - cxf-dosgi-ri-common + cxf-dosgi-common ${project.version} http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/samples/pom.xml ---------------------------------------------------------------------- diff --git a/samples/pom.xml b/samples/pom.xml index 21ceeb8..17596cd 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -28,10 +28,15 @@ org.apache.cxf.dosgi - cxf-dosgi-ri-parent + cxf-dosgi-parent 2.0-SNAPSHOT ../parent/pom.xml + + + + .. + rest http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/samples/rest/api/pom.xml ---------------------------------------------------------------------- diff --git a/samples/rest/api/pom.xml b/samples/rest/api/pom.xml index 71187c1..3799608 100644 --- a/samples/rest/api/pom.xml +++ b/samples/rest/api/pom.xml @@ -19,16 +19,15 @@ --> 4.0.0 - org.apache.cxf.dosgi.samples cxf-dosgi-samples-rest-api bundle CXF DOSGi Samples REST API - org.apache.cxf.dosgi - cxf-dosgi-ri-parent - 2.0-SNAPSHOT - ../../../parent/pom.xml + org.apache.cxf.dosgi.samples + cxf-dosgi-samples-rest-parent + 2.0-SNAPSHOT + ../pom.xml @@ -37,14 +36,9 @@ - org.apache.servicemix.specs - org.apache.servicemix.specs.jsr339-api-m10 - ${servicemix.specs.version} - - - org.apache.servicemix.specs - org.apache.servicemix.specs.jaxb-api-2.1 - ${servicemix.specs.version} + org.apache.servicemix.specs + org.apache.servicemix.specs.jsr339-api-2.0.1 + 2.6.0 http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/samples/rest/impl/pom.xml ---------------------------------------------------------------------- diff --git a/samples/rest/impl/pom.xml b/samples/rest/impl/pom.xml index 3886700..6f8ca18 100644 --- a/samples/rest/impl/pom.xml +++ b/samples/rest/impl/pom.xml @@ -30,11 +30,6 @@ - javax.ws.rs - javax.ws.rs-api - 2.0.1 - - org.apache.cxf.dosgi.samples cxf-dosgi-samples-rest-api ${project.version} http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5494b35c/samples/security_filter/pom.xml ---------------------------------------------------------------------- diff --git a/samples/security_filter/pom.xml b/samples/security_filter/pom.xml index bdaec00..5e1c75c 100644 --- a/samples/security_filter/pom.xml +++ b/samples/security_filter/pom.xml @@ -13,13 +13,13 @@ 4.0.0 org.apache.cxf.dosgi.samples - cxf-dosgi-ri-samples-security-filter + cxf-dosgi-samples-security-filter bundle CXF DOSGi Samples Security Filter org.apache.cxf.dosgi - cxf-dosgi-ri-parent + cxf-dosgi-parent 2.0-SNAPSHOT ../../parent/pom.xml