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 D1A3010435 for ; Wed, 2 Apr 2014 18:28:12 +0000 (UTC) Received: (qmail 89559 invoked by uid 500); 2 Apr 2014 18:27:53 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 89380 invoked by uid 500); 2 Apr 2014 18:27:50 -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 89135 invoked by uid 99); 2 Apr 2014 18:27:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2014 18:27:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2246C8AFCD9; Wed, 2 Apr 2014 18:27:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Wed, 02 Apr 2014 18:27:45 -0000 Message-Id: <5614c9fbe05249bd91de373d6623e7ab@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/8] git commit: Flip to using javadoc generated from the javadoc module. Remove the "all" bundle as it's not a bundle and not needed. Was only used for javadoc. Flip to using javadoc generated from the javadoc module. Remove the "all" bundle as it's not a bundle and not needed. Was only used for javadoc. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e083b4d5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e083b4d5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e083b4d5 Branch: refs/heads/master Commit: e083b4d532f2b5e747a152faca5dfaf73d55cfa8 Parents: c28f034 Author: Daniel Kulp Authored: Wed Apr 2 13:44:59 2014 -0400 Committer: Daniel Kulp Committed: Wed Apr 2 13:46:09 2014 -0400 ---------------------------------------------------------------------- core/pom.xml | 29 -- distribution/pom.xml | 1 + distribution/src/main/assembly/bin.xml | 2 +- osgi/bundle/all/pom.xml | 457 ---------------------------- osgi/bundle/pom.xml | 1 - 5 files changed, 2 insertions(+), 488 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e083b4d5/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 2d731ed..7ec7609 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -353,33 +353,4 @@ - - - fastinstall - - - - everything - - true - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - package - package - - jar - - - - - - - - http://git-wip-us.apache.org/repos/asf/cxf/blob/e083b4d5/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 6b5fdb7..9caba0b 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -40,6 +40,7 @@ manifest + javadoc http://git-wip-us.apache.org/repos/asf/cxf/blob/e083b4d5/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml index ad845c6..7243859 100644 --- a/distribution/src/main/assembly/bin.xml +++ b/distribution/src/main/assembly/bin.xml @@ -87,7 +87,7 @@ - target/javadoc + javadoc/target/apidocs apache-cxf-${cxf.version}/docs/api **/* http://git-wip-us.apache.org/repos/asf/cxf/blob/e083b4d5/osgi/bundle/all/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/bundle/all/pom.xml b/osgi/bundle/all/pom.xml deleted file mode 100644 index c59aeb0..0000000 --- a/osgi/bundle/all/pom.xml +++ /dev/null @@ -1,457 +0,0 @@ - - - - 4.0.0 - cxf-bundle - jar - Apache CXF Bundle Jar - Apache CXF Bundle Jar - http://cxf.apache.org - - org.apache.cxf - cxf-parent - 3.0.0-SNAPSHOT - ../../../parent - - - ${project.groupId}.bundle - - - - ${project.groupId} - cxf-tools-common - ${project.version} - - - ${project.groupId} - cxf-tools-validator - ${project.version} - - - ${project.groupId} - cxf-tools-wsdlto-core - ${project.version} - - - ${project.groupId} - cxf-tools-misctools - ${project.version} - - - ${project.groupId} - cxf-tools-wsdlto-databinding-jaxb - ${project.version} - - - ${project.groupId} - cxf-tools-corba - ${project.version} - - - ${project.groupId} - cxf-rt-databinding-xmlbeans - ${project.version} - - - ${project.groupId} - cxf-rt-databinding-jibx - ${project.version} - true - - - org.jibx - jibx-bind - - - org.jibx - jibx-run - - - org.jibx - jibx-schema - - - org.jibx - jibx-tools - - - - - ${project.groupId} - cxf-rt-databinding-sdo - ${project.version} - true - - - org.apache.tuscany.sdo - tuscany-sdo-tools - - - org.apache.tuscany.sdo - tuscany-sdo-impl - - - - - ${project.groupId} - cxf-tools-wsdlto-frontend-jaxws - ${project.version} - - - ${project.groupId} - cxf-tools-wadlto-jaxrs - ${project.version} - - - ${project.groupId} - cxf-tools-wsdlto-frontend-javascript - ${project.version} - - - ${project.groupId} - cxf-tools-java2ws - ${project.version} - - - ${project.groupId} - cxf-core - ${project.version} - - - ${project.groupId} - cxf-rt-features-clustering - ${project.version} - - - ${project.groupId} - cxf-rt-management - ${project.version} - - - ${project.groupId} - cxf-rt-transports-local - ${project.version} - - - ${project.groupId} - cxf-rt-transports-http - ${project.version} - - - ${project.groupId} - cxf-rt-transports-http-jetty - ${project.version} - - - ${project.groupId} - cxf-rt-transports-jms - ${project.version} - - - ${project.groupId} - cxf-rt-transports-http-hc - ${project.version} - - - ${project.groupId} - cxf-rt-transports-udp - ${project.version} - - - ${project.groupId} - cxf-rt-bindings-soap - ${project.version} - - - ${project.groupId} - cxf-rt-bindings-corba - ${project.version} - - - ${project.groupId} - cxf-rt-bindings-coloc - ${project.version} - - - ${project.groupId} - cxf-rt-bindings-object - ${project.version} - - - ${project.groupId} - cxf-rt-bindings-xml - ${project.version} - - - ${project.groupId} - cxf-rt-databinding-aegis - ${project.version} - - - ${project.groupId} - cxf-rt-databinding-jaxb - ${project.version} - - - ${project.groupId} - cxf-rt-frontend-jaxws - ${project.version} - - - ${project.groupId} - cxf-rt-frontend-js - ${project.version} - - - ${project.groupId} - cxf-rt-frontend-simple - ${project.version} - - - ${project.groupId} - cxf-rt-frontend-jaxrs - ${project.version} - - - ${project.groupId} - cxf-rt-rs-client - ${project.version} - - - ${project.groupId} - cxf-rt-rs-extension-providers - ${project.version} - - - ${project.groupId} - cxf-rt-rs-extension-search - ${project.version} - - - ${project.groupId} - cxf-rt-rs-security-cors - ${project.version} - - - ${project.groupId} - cxf-rt-rs-security-oauth - ${project.version} - - - ${project.groupId} - cxf-rt-rs-security-oauth2 - ${project.version} - - - ${project.groupId} - cxf-rt-rs-security-xml - ${project.version} - - - ${project.groupId} - cxf-rt-ws-mex - ${project.version} - - - ${project.groupId} - cxf-rt-ws-security - ${project.version} - - - ${project.groupId} - cxf-rt-security - ${project.version} - - - ${project.groupId} - cxf-rt-ws-policy - ${project.version} - - - ${project.groupId} - cxf-rt-ws-addr - ${project.version} - - - ${project.groupId} - cxf-rt-ws-rm - ${project.version} - - - ${project.groupId} - cxf-rt-javascript - ${project.version} - - - com.sun.xml.fastinfoset - FastInfoset - true - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - org.apache.cxf - false - ${createSourcesJar} - true - true - ${basedir}/target/dependency-reduced-pom.xml - - - ${project.groupId}:${project.artifactId} - - org/** - - - - - - Apache CXF - - - META-INF/spring.handlers - - - META-INF/services/com.sun.tools.xjc.Plugin - - - META-INF/spring.schemas - - - META-INF/cxf/cxf.extension - - - META-INF/extensions.xml - - - META-INF/cxf/extensions.xml - - - META-INF/cxf/bus-extensions.txt - - - META-INF/cxf/bus-extensions.xml - - - META-INF/wsdl.plugin.xml - - - META-INF/tools.service.validator.xml - - - META-INF/tools-plugin.xml - - - META-INF/cxf/java2wsbeans.xml - - - - - - - - - - - - deploy - - true - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-sources - generate-sources - - unpack-dependencies - - - org.apache.cxf - sources - ${project.build.directory}/sources - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-plugin-sources - generate-sources - - unpack - - - - - org.apache.cxf - cxf-codegen-plugin - ${project.version} - sources - - - ${project.build.directory}/sources - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - package - package - - jar - - - - - 128m - 512m -
Apache CXF API
-
Apache CXF API
- ${project.build.directory}/sources - true -
-
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/cxf/blob/e083b4d5/osgi/bundle/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/bundle/pom.xml b/osgi/bundle/pom.xml index 76be989..2f5441c 100644 --- a/osgi/bundle/pom.xml +++ b/osgi/bundle/pom.xml @@ -127,7 +127,6 @@ cxf.schema.version = ${os} - all compatible