Author: dkulp
Date: Thu Apr 17 10:08:58 2008
New Revision: 649190
URL: http://svn.apache.org/viewvc?rev=649190&view=rev
Log:
Merged revisions 649167 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r649167 | dkulp | 2008-04-17 12:19:58 -0400 (Thu, 17 Apr 2008) | 2 lines
Remove more incubator things.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
incubator/cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/README
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/in_jvm_transport/README.txt
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Impl.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceWithAnnotation.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/HelloService.java
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/GreeterNoWsdl.java
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/DBServiceFaultBean.java.source
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/FaultDetail.java.source
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/echo_date.xjb
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
Thu Apr 17 10:08:58 2008
@@ -23,9 +23,6 @@
/**
- * This class was generated by the CXF 2.0-incubator-M1-SNAPSHOT
- * Mon Oct 09 13:22:53 CST 2006
- * Generated source version: 2.0-incubator-M1-SNAPSHOT
*
*/
Modified:
incubator/cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
Thu Apr 17 10:08:58 2008
@@ -67,8 +67,8 @@
@Test
public void testFormatVersionNumber() throws Exception {
- assertEquals("2.0",
StringUtils.formatVersionNumber("2.0-incubator-M1-SNAPSHOT"));
- assertEquals("2.0.12",
StringUtils.formatVersionNumber("2.0.12-incubator-M1-SNAPSHOT"));
+ assertEquals("2.0",
StringUtils.formatVersionNumber("2.0-M1-SNAPSHOT"));
+ assertEquals("2.0.12",
StringUtils.formatVersionNumber("2.0.12-M1-SNAPSHOT"));
}
@Test
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=649190&r1=649189&r2=649190&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 10:08:58 2008
@@ -1,4 +1,4 @@
-Welcome to Apache Incubator CXF!
+Welcome to Apache CXF!
======================
Apache CXF is an open source services framework. CXF helps you build and
develop services using frontend programming APIs, like JAX-WS. These
@@ -81,5 +81,5 @@
Thank you for using CXF!
-The Apache Incubator CXF Team
+The Apache CXF Team
http://incubator.apache.org/cxf/
Modified:
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt
(original)
+++
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt
Thu Apr 17 10:08:58 2008
@@ -1,8 +1,8 @@
-Apache CXF 2.0.5 (incubating) Release Notes
+Apache CXF 2.0.5 Release Notes
1. Overview
-Apache CXF 2.0.5, under incubation, delivers the third milestone of
+Apache CXF 2.0.5 delivers the third milestone of
the Celtix project (http://celtix.objectweb.org) and the XFire project
(http://xfire.codehaus.org) merge. This release is mostly a patch release
from 2.0.4 fixing 34 JIRA issues as well as enhancing startup performance.
@@ -10,7 +10,7 @@
2. Installation Prerequisites
-Before installing Apache CXF (incubating), make sure the following products,
+Before installing Apache CXF, make sure the following products,
with the specified versions, are installed on your system:
* Java 5 Development Kit (Java 6 requires extra setup)
@@ -38,7 +38,7 @@
2.2 Apache Ant 1.6.5 (or newer, 1.7.0 should work as well)
-To run samples included in the binary distribution of Apache CXF (incubating),
+To run samples included in the binary distribution of Apache CXF,
you must install the Apache Ant 1.6.5 build utility, which can be downloaded
from:
Modified:
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/in_jvm_transport/README.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/in_jvm_transport/README.txt?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/in_jvm_transport/README.txt
(original)
+++
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/in_jvm_transport/README.txt
Thu Apr 17 10:08:58 2008
@@ -8,7 +8,7 @@
Prerequisite
------------
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf.jar on the
CLASSPATH, and the JDK and ant bin directories on the PATH
it is not necessary to set the environment as described in
the samples directory README. If your environment is not
@@ -55,12 +55,12 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf.jar:./build/classes
javac -d build/classes src/demo/colocated/server/*.java
javac -d build/classes src/demo/colocated/client/*.java
For Windows:
- set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\cxf.jar;.\build\classes
javac -d build\classes src\demo\colocated\server\*.java
javac -d build\classes src\demo\colocated\client\*.java
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Impl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Impl.java?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Impl.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Impl.java
Thu Apr 17 10:08:58 2008
@@ -22,9 +22,6 @@
import testnotification.NotificationServicePort;
/**
- * This class was generated by the CXF 2.1-incubator-SNAPSHOT
- * Wed Sep 12 16:41:52 CST 2007
- * Generated source version: 2.1-incubator-SNAPSHOT
*
*/
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceWithAnnotation.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceWithAnnotation.java?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceWithAnnotation.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceWithAnnotation.java
Thu Apr 17 10:08:58 2008
@@ -29,9 +29,6 @@
import javax.xml.ws.WebServiceClient;
import org.apache.handlers.AddNumbers;
/**
- * This class was generated by the CXF 2.0-incubator-RC-SNAPSHOT
- * Mon Jan 08 09:43:05 CST 2007
- * Generated source version: 2.0-incubator-RC-SNAPSHOT
*
*/
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/HelloService.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/HelloService.java?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/HelloService.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/HelloService.java
Thu Apr 17 10:08:58 2008
@@ -26,8 +26,7 @@
import javax.xml.ws.WebServiceClient;
/**
- * This class was generated by the CXF 2.0-incubator-SNAPSHOT Thu May 17
- * 12:06:33 CST 2007 Generated source version: 2.0-incubator-SNAPSHOT
+ *
*/
@WebServiceClient(name = "HelloService",
Modified:
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java
Thu Apr 17 10:08:58 2008
@@ -24,9 +24,6 @@
import javax.jws.WebService;
/**
- * This class was generated by the CXF 2.1-incubator-SNAPSHOT
- * Tue Jul 24 17:08:55 CST 2007
- * Generated source version: 2.1-incubator-SNAPSHOT
*
*/
Modified:
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/GreeterNoWsdl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/GreeterNoWsdl.java?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/GreeterNoWsdl.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/GreeterNoWsdl.java
Thu Apr 17 10:08:58 2008
@@ -28,9 +28,6 @@
import javax.xml.ws.ResponseWrapper;
/**
- * This class was generated by the CXF 2.0-incubator-RC-SNAPSHOT
- * Fri Mar 02 15:33:36 EST 2007
- * Generated source version: 2.0-incubator-RC-SNAPSHOT
*
*/
Modified:
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java
Thu Apr 17 10:08:58 2008
@@ -37,8 +37,7 @@
/**
- * This class was generated by the CXF 2.0-incubator-M1-SNAPSHOT Thu Nov 02
- * 16:39:27 CST 2006 Generated source version: 2.0-incubator-M1-SNAPSHOT
+ *
*/
@javax.jws.WebService(name = "LocatorService",
Modified:
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/DBServiceFaultBean.java.source
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/DBServiceFaultBean.java.source?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/DBServiceFaultBean.java.source
(original)
+++
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/DBServiceFaultBean.java.source
Thu Apr 17 10:08:58 2008
@@ -7,9 +7,6 @@
import javax.xml.bind.annotation.XmlType;
/**
- * This class was generated by the CXF 2.0-incubator-SNAPSHOT
- * Wed May 09 17:18:10 CST 2007
- * Generated source version: 2.0-incubator-SNAPSHOT
*
*/
Modified:
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/FaultDetail.java.source
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/FaultDetail.java.source?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/FaultDetail.java.source
(original)
+++
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/FaultDetail.java.source
Thu Apr 17 10:08:58 2008
@@ -7,9 +7,6 @@
import javax.xml.bind.annotation.XmlType;
/**
- * This class was generated by the CXF 2.0-incubator-SNAPSHOT
- * Wed May 09 17:04:04 CST 2007
- * Generated source version: 2.0-incubator-SNAPSHOT
*
*/
Modified:
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/echo_date.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/echo_date.xjb?rev=649190&r1=649189&r2=649190&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/echo_date.xjb
(original)
+++
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/echo_date.xjb
Thu Apr 17 10:08:58 2008
@@ -19,11 +19,6 @@
-->
<!--
- * This is a jaxb external customization binding file
- * was generated by the CXF 2.1-incubator-SNAPSHOT
- * Tue Jul 17 13:26:16 CST 2007
- * Generated source version: 2.1-incubator-SNAPSHOT
- *
* The reason we generate this file is that
* we detected java.util.Date or java.util.Calendar classes in your SEI
*
