Author: dkulp
Date: Thu Apr 17 09:26:16 2008
New Revision: 649171
URL: http://svn.apache.org/viewvc?rev=649171&view=rev
Log:
Merged revisions 648861 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r648861 | dkulp | 2008-04-16 17:32:05 -0400 (Wed, 16 Apr 2008) | 2 lines
Remove more incubator things
........
Removed:
incubator/cxf/branches/2.0.x-fixes/buildtools/src/main/resources/META-INF/DISCLAIMER.txt
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/benchmark/performance/etc/common_build.xml
incubator/cxf/branches/2.0.x-fixes/buildtools/pom.xml
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/resources-filtered/org/apache/cxf/version/version.properties
incubator/cxf/branches/2.0.x-fixes/distribution/manifest/pom.xml
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/bin.xml
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/jbi.xml
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/README
incubator/cxf/branches/2.0.x-fixes/integration/jbi/src/test/resources/components/CXFServiceEngine/version_1/META-INF/jbi.xml
incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
incubator/cxf/branches/2.0.x-fixes/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/eclipse-plugin/src/main/resources-filtered/about.html
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdltojavalib.properties
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/benchmark/performance/etc/common_build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/benchmark/performance/etc/common_build.xml?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/benchmark/performance/etc/common_build.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/benchmark/performance/etc/common_build.xml
Thu Apr 17 09:26:16 2008
@@ -32,7 +32,7 @@
<!-- Setup for building in a source build -->
<condition property="srcbuild_paths.file" value="./srcbuild_paths.xml">
- <available file="../../lib/cxf-manifest-incubator.jar"/>
+ <available file="../../lib/cxf-manifest.jar"/>
</condition>
<!-- default setting -->
<property name="srcbuild_paths.file"
value="../../../distribution/target/srcbuild_paths.xml"/>
@@ -76,7 +76,7 @@
<path id="cxf.classpath">
<pathelement location="${build.classes.dir}"/>
<pathelement path="${srcbuild.classpath}"/>
- <pathelement location="${cxf.home}/lib/cxf-manifest-incubator.jar"/>
+ <pathelement location="${cxf.home}/lib/cxf-manifest.jar"/>
<pathelement location="${testbase.classes.dir}"/>
</path>
<condition property="thirdparty.classpath" value="">
Modified: incubator/cxf/branches/2.0.x-fixes/buildtools/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/buildtools/pom.xml?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/buildtools/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/buildtools/pom.xml Thu Apr 17 09:26:16
2008
@@ -103,7 +103,6 @@
<version>1.0-alpha-5</version>
<configuration>
<resourceBundles>
-
<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.0</resourceBundle>
<resourceBundle>org.apache:apache-jar-resource-bundle:1.1</resourceBundle>
</resourceBundles>
<properties>
Modified:
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/resources-filtered/org/apache/cxf/version/version.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/main/resources-filtered/org/apache/cxf/version/version.properties?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/resources-filtered/org/apache/cxf/version/version.properties
(original)
+++
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/resources-filtered/org/apache/cxf/version/version.properties
Thu Apr 17 09:26:16 2008
@@ -19,4 +19,4 @@
#
#
product.version=${pom.version}
-product.name=Apache CXF (incubator)
\ No newline at end of file
+product.name=Apache CXF
\ No newline at end of file
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/manifest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/manifest/pom.xml?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/manifest/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/manifest/pom.xml Thu Apr 17
09:26:16 2008
@@ -244,7 +244,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <finalName>cxf-manifest-incubator</finalName>
+ <finalName>cxf-manifest</finalName>
<archive>
<manifest>
<addClasspath>true</addClasspath>
Modified:
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/bin.xml?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/bin.xml
(original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/bin.xml
Thu Apr 17 09:26:16 2008
@@ -100,14 +100,14 @@
<directory>manifest/target</directory>
<outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory>
<includes>
- <include>**/cxf-manifest-incubator.jar</include>
+ <include>**/cxf-manifest.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>manifest/target</directory>
<outputDirectory>apache-cxf-${cxf.version}/modules</outputDirectory>
<includes>
- <include>**/cxf-manifest-incubator.jar</include>
+ <include>**/cxf-manifest.jar</include>
</includes>
</fileSet>
<fileSet>
Modified:
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/jbi.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/jbi.xml?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/jbi.xml
(original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/jbi.xml
Thu Apr 17 09:26:16 2008
@@ -30,14 +30,14 @@
<path-element>[EMAIL PROTECTED]@.jar</path-element>
<path-element>[EMAIL PROTECTED]@.jar</path-element>
<path-element>[EMAIL PROTECTED]@.jar</path-element>
- <path-element>cxf-manifest-incubator.jar</path-element>
+ <path-element>cxf-manifest.jar</path-element>
</component-class-path>
<bootstrap-class-name>org.apache.cxf.jbi.se.CXFBootstrap</bootstrap-class-name>
<bootstrap-class-path>
<path-element>[EMAIL PROTECTED]@.jar</path-element>
<path-element>[EMAIL PROTECTED]@.jar</path-element>
<path-element>[EMAIL PROTECTED]@.jar</path-element>
- <path-element>cxf-manifest-incubator.jar</path-element>
+ <path-element>cxf-manifest.jar</path-element>
</bootstrap-class-path>
</component>
</jbi>
Modified:
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/README
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/README?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/README
(original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/README Thu
Apr 17 09:26:16 2008
@@ -25,19 +25,6 @@
bindings, such as JSON and CORBA, in combination with any type of
transport.
-Incubation Disclaimer
-=====================
-Apache Incubator CXF is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
-
Export Notice
============================
Modified:
incubator/cxf/branches/2.0.x-fixes/integration/jbi/src/test/resources/components/CXFServiceEngine/version_1/META-INF/jbi.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jbi/src/test/resources/components/CXFServiceEngine/version_1/META-INF/jbi.xml?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/integration/jbi/src/test/resources/components/CXFServiceEngine/version_1/META-INF/jbi.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/integration/jbi/src/test/resources/components/CXFServiceEngine/version_1/META-INF/jbi.xml
Thu Apr 17 09:26:16 2008
@@ -27,11 +27,11 @@
</identification>
<component-class-name
description="description">org.apache.cxf.jbi.se.CXFServiceEngine</component-class-name>
<component-class-path>
- <path-element>cxf-manifest-incubator.jar</path-element>
+ <path-element>cxf-manifest.jar</path-element>
</component-class-path>
<bootstrap-class-name>org.apache.cxf.jbi.se.CXFBootstrap</bootstrap-class-name>
<bootstrap-class-path>
- <path-element>cxf-manifest-incubator.jar</path-element>
+ <path-element>cxf-manifest.jar</path-element>
</bootstrap-class-path>
</component>
</jbi>
Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Thu Apr 17 09:26:16 2008
@@ -271,7 +271,6 @@
</goals>
<configuration>
<resourceBundles>
-
<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
</resourceBundles>
<supplementalModels>
Modified: incubator/cxf/branches/2.0.x-fixes/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/pom.xml?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/pom.xml Thu Apr 17 09:26:16 2008
@@ -378,7 +378,7 @@
<configuration>
<attach>true</attach>
<quiet>true</quiet>
- <bottom>Apache CXF is an effort undergoing incubation
at the Apache Software Foundation(ASF) and sponsored by the Apache Incubator
PMC.</bottom>
+ <bottom>Apache CXF</bottom>
<!--subpackages>org.apache.cxf</subpackages-->
</configuration>
</plugin>
Modified:
incubator/cxf/branches/2.0.x-fixes/tools/eclipse-plugin/src/main/resources-filtered/about.html
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/eclipse-plugin/src/main/resources-filtered/about.html?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/tools/eclipse-plugin/src/main/resources-filtered/about.html
(original)
+++
incubator/cxf/branches/2.0.x-fixes/tools/eclipse-plugin/src/main/resources-filtered/about.html
Thu Apr 17 09:26:16 2008
@@ -9,18 +9,8 @@
<h2>About This Content</h2>
<h4>Apache CXF ${project.version}</h4>
<p>The plug-in includes software developed by The Apache Software Foundation
as part of the
-<a href="http://incubator.apache.org/cxf/";>Apache CXF</a> project.</p>
+<a href="http://cxf.apache.org/";>Apache CXF</a> project.</p>
-<p>Apache CXF is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.</p>
<h3>License</h3>
Modified:
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdltojavalib.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdltojavalib.properties?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdltojavalib.properties
(original)
+++
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdltojavalib.properties
Thu Apr 17 09:26:16 2008
@@ -21,4 +21,4 @@
jaxrpc.version=1.1
saaj.version=1.2.1
-library.references=${cxf.version}/modules/cxf-manifest-incubator.jar
+library.references=${cxf.version}/modules/cxf-manifest.jar
Modified:
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm?rev=649171&r1=649170&r2=649171&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
(original)
+++
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
Thu Apr 17 09:26:16 2008
@@ -56,18 +56,18 @@
<fail message="Please set CXF_HOME environment variable."
unless="cxf.home"/>
<!-- Determine cxf.jar.file, either ${cxf.home}/build/lib/cxf.jar
- - in a source distribution, or
${cxf.home}/lib/cxf-manifest-incubator.jar in a binary
+ - in a source distribution, or ${cxf.home}/lib/cxf-manifest.jar in a
binary
- distribution.
-->
- <condition property="cxf-manifest-incubator.jar.file"
value="${cxf.home}/build/lib/cxf-manifest-incubator.jar">
- <available file="cxf-manifest-incubator.jar" type="file"
filepath="${cxf.home}/build/lib"/>
+ <condition property="cxf-manifest.jar.file"
value="${cxf.home}/build/lib/cxf-manifest.jar">
+ <available file="cxf-manifest.jar" type="file"
filepath="${cxf.home}/build/lib"/>
</condition>
- <property name="cxf-manifest-incubator.jar.file"
value="${cxf.home}/lib/cxf-manifest-incubator.jar"/>
+ <property name="cxf-manifest.jar.file"
value="${cxf.home}/lib/cxf-manifest.jar"/>
<fail message="The location ${cxf.home} does not seem to contain a cxf
installation; if you are importing this common build file from a location other
than the cxf samples directory then you need to set the cxf_HOME environment
variable.">
<condition>
<not>
- <isset property="cxf-manifest-incubator.jar.file" />
+ <isset property="cxf-manifest.jar.file" />
</not>
</condition>
</fail>
@@ -88,7 +88,7 @@
<path id="cxf.classpath">
<pathelement location="${build.classes.dir}"/>
- <pathelement location="${cxf-manifest-incubator.jar.file}"/>
+ <pathelement location="${cxf-manifest.jar.file}"/>
</path>
#foreach ($targetName in $clientClassNamesMap.keySet())
