From commits-return-33555-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org Fri Aug 22 20:43:44 2014 Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3F1AF11520 for ; Fri, 22 Aug 2014 20:43:44 +0000 (UTC) Received: (qmail 87464 invoked by uid 500); 22 Aug 2014 20:43:44 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 87415 invoked by uid 500); 22 Aug 2014 20:43:44 -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 87394 invoked by uid 99); 22 Aug 2014 20:43:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2014 20:43:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A2E399C8ADC; Fri, 22 Aug 2014 20:43:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ay@apache.org To: commits@cxf.apache.org Message-Id: <8ef0057a321441898df730cb32cb3531@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [CXF-5962] add a separate plain blueprint version Date: Fri, 22 Aug 2014 20:43:43 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 1aac5314c -> b34912c44 [CXF-5962] add a separate plain blueprint version Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b34912c4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b34912c4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b34912c4 Branch: refs/heads/3.0.x-fixes Commit: b34912c44affb602597602aa485cedaef5e9cb72 Parents: 1aac531 Author: Akitoshi Yoshida Authored: Fri Aug 22 16:11:51 2014 +0200 Committer: Akitoshi Yoshida Committed: Fri Aug 22 22:42:52 2014 +0200 ---------------------------------------------------------------------- .../samples/logbrowser-blueprint/README.txt | 32 +++++++ .../samples/logbrowser-blueprint/pom.xml | 93 ++++++++++++++++++++ .../resources/OSGI-INF/blueprint/context.xml | 54 ++++++++++++ .../main/release/samples/logbrowser/README.txt | 10 ++- rt/management-web/pom.xml | 5 ++ 5 files changed, 191 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b34912c4/distribution/src/main/release/samples/logbrowser-blueprint/README.txt ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/logbrowser-blueprint/README.txt b/distribution/src/main/release/samples/logbrowser-blueprint/README.txt new file mode 100644 index 0000000..c7aa735 --- /dev/null +++ b/distribution/src/main/release/samples/logbrowser-blueprint/README.txt @@ -0,0 +1,32 @@ +Building and running the logbrowser-blueprint demo on Karaf +---------------------------------------------------- + +From the base directory of this sample (i.e., where this README file is +located), the pom.xml file is used to build and run the demo. + +Using either UNIX or Windows: + +0) Build the project by typing: + mvn clean install + +This sample project generates a bundle file which can be used in an OSGi container. + +Assuming you have a freshly intalled Apache Karaf-3.x, +1) Start Karaf and at its console, type(*Note) + feature:repo-add cxf 3.0.2 + feature:install cxf-management-web + install -s mvn:org.apache.cxf.samples/logbrowser-blueprint/3.0.2 + +2) Open browser and go to: + http://localhost:8181/cxf/samples/logbrowser/browser/LogBrowser.html + +3) Add a new endpoint with URL: + http://localhost:8181/cxf/samples/logbrowser/logs + +4) To generate custom log entry, run some CXF scenarios that write some logs. + +*Note: +- CXF version 3.0.2 is used in this example, but any verions that include this +sample code may be used. +- The default logging setting is set to org.apache.cxf:INFO. This can be changed +in the configuration file org.apache.cxf.samples.logbrowser.cfg file in etc/. http://git-wip-us.apache.org/repos/asf/cxf/blob/b34912c4/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml b/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml new file mode 100644 index 0000000..2395d81 --- /dev/null +++ b/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml @@ -0,0 +1,93 @@ + + + + 4.0.0 + logbrowser-blueprint + bundle + Apache CXF Samples LogBrowser Blueprint + Apacher CXF Samples LogBrowser Blueprint + + org.apache.cxf.samples + cxf-samples + 3.0.2-SNAPSHOT + .. + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId};blueprint.aries.xml-validation:=false + + org.apache.cxf.jaxrs.servlet, + org.apache.abdera.parser.stax, + com.ctc.wstx.stax, + org.apache.abdera, + * + + + + + + + + + org.apache.cxf + cxf-rt-management-web + ${project.version} + + + org.apache.cxf + cxf-rt-rs-extension-providers + ${project.version} + + + org.apache.cxf + cxf-rt-rs-extension-search + ${project.version} + + + org.apache.cxf + cxf-rt-transports-http-jetty + ${project.version} + + + org.apache.abdera + abdera-core + + + org.apache.abdera + abdera-parser + + + org.apache.james + apache-mime4j-core + + + + + org.eclipse.jetty + jetty-webapp + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/b34912c4/distribution/src/main/release/samples/logbrowser-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/logbrowser-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml b/distribution/src/main/release/samples/logbrowser-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml new file mode 100644 index 0000000..43d5530 --- /dev/null +++ b/distribution/src/main/release/samples/logbrowser-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/b34912c4/distribution/src/main/release/samples/logbrowser/README.txt ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/logbrowser/README.txt b/distribution/src/main/release/samples/logbrowser/README.txt index 912ba46..454838f 100644 --- a/distribution/src/main/release/samples/logbrowser/README.txt +++ b/distribution/src/main/release/samples/logbrowser/README.txt @@ -25,10 +25,10 @@ or even in an OSGi container. Assuming you have a freshly intalled Apache Karaf-3.x, 1) Start Karaf and at its console, type(*Note) - feature:repo-add cxf 3.m.n + feature:repo-add cxf 3.0.2 feature:install war feature:install cxf-management-web - install -s mvn:org.apache.cxf.samples/logbrowser/3.1.0-SNAPSHOT/war + install -s mvn:org.apache.cxf.samples/logbrowser/3.0.2/war 2) Open browser and go to: http://localhost:8181/cxf-samples-logbrowser/log/browser/LogBrowser.html @@ -38,8 +38,12 @@ Assuming you have a freshly intalled Apache Karaf-3.x, http://localhost:8181/cxf-samples-logbrowser/customer-service.html *Note: -- 3.m.n corresponding the CXF's version numbers (e.g., 3.1.0, 3.0.2, etc) +- CXF version 3.0.2 is used in this example, but any verions that include this +sample code may be used. - As this web.xml registers two CXFServlets (one for the browsing the log and the other for providing the test service), OSGi system property org.apache.cxf.osgi.http.transport.disable must be set to false (in etc/system.properties) to allow these two servlets to be started. +However, this will disable the auto-registration of normal CXF endpoints. +To avoid this issue, use samples/logbrowser-blueprint which is compatible +with the normal CXF endpoints. http://git-wip-us.apache.org/repos/asf/cxf/blob/b34912c4/rt/management-web/pom.xml ---------------------------------------------------------------------- diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml index d54f2cd..1f05112 100644 --- a/rt/management-web/pom.xml +++ b/rt/management-web/pom.xml @@ -175,6 +175,11 @@ {maven-resources}, static-content=${gwt.classes.dir}/static-content + + org.apache.cxf.management.web.browser, + org.apache.cxf.management.web.browser*, + org.apache.cxf.management.web.logging.atom*, +