svn commit: r452514 - in /incubator/cxf/trunk: ./ distribution/src/main/java/cxfinstaller/ rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/ systests/src/test/java/org/apache/cxf/systest/handlers/

[dk...@apache.org]

Author: dkulp
Date: Tue Oct  3 07:36:38 2006
New Revision: 452514

URL: http://svn.apache.org/viewvc?view=rev&rev=452514
Log:
Update to woodstox 3.0.2 (slightly faster), fix eclipse warning


Modified:
    incubator/cxf/trunk/distribution/src/main/java/cxfinstaller/Installer.java
    incubator/cxf/trunk/pom.xml
    incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java

Modified: incubator/cxf/trunk/distribution/src/main/java/cxfinstaller/Installer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/java/cxfinstaller/Installer.java?view=diff&rev=452514&r1=452513&r2=452514
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/java/cxfinstaller/Installer.java (original)
+++ incubator/cxf/trunk/distribution/src/main/java/cxfinstaller/Installer.java Tue Oct  3 07:36:38 2006
@@ -81,7 +81,7 @@
 
         if (!System.getProperty("java.version").startsWith("1.5")) {
             System.out.println("WARNING: Installing with Java " + System.getProperty("java.version") + ".");
-            System.out.println("         Celtix requires JDK 1.5 to run.");
+            System.out.println("         Apache CXF requires JDK 1.5 to run.");
         }
 
         if (args.length != 0 && "-verbose".equals(args[0])) {
@@ -94,7 +94,7 @@
             outputDir = new File(args[0]);
         }
 
-        System.out.println("Unpacking celtixfire to " + outputDir.toString());
+        System.out.println("Unpacking Apache CXF to " + outputDir.toString());
 
 
         URL url = Installer.class.getResource("/cxfinstaller/Installer.class");

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=452514&r1=452513&r2=452514
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Tue Oct  3 07:36:38 2006
@@ -359,7 +359,7 @@
             <dependency>
                 <groupId>woodstox</groupId>
                 <artifactId>wstx-asl</artifactId>
-                <version>2.9</version>
+                <version>3.0.2</version>
             </dependency>
             <dependency>
                 <groupId>javax.mail</groupId>

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java?view=diff&rev=452514&r1=452513&r2=452514
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java Tue Oct  3 07:36:38 2006
@@ -36,6 +36,7 @@
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
@@ -47,6 +48,7 @@
 import junit.framework.TestCase;
 
 import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.staxutils.StaxStreamFilter;
 import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.types.GreetMe;
@@ -175,11 +177,11 @@
         
         InputStream is =  getClass().getResourceAsStream("resources/GreetMeDocLiteralReq.xml");
         XMLInputFactory factory = XMLInputFactory.newInstance();
-        XMLEventReader reader = 
-            factory.createXMLEventReader(is);
+        XMLStreamReader reader = 
+            factory.createXMLStreamReader(is);
 
         QName[] tags = {SOAP_ENV, SOAP_BODY};
-        StaxEventFilter filter = new StaxEventFilter(tags);
+        StaxStreamFilter filter = new StaxStreamFilter(tags);
         reader = factory.createFilteredReader(reader, filter);
 
         //Remove START_DOCUMENT & START_ELEMENT pertaining to Envelope and Body Tags.

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java?view=diff&rev=452514&r1=452513&r2=452514
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java Tue Oct  3 07:36:38 2006
@@ -43,7 +43,6 @@
      */
     public void addNumbers(String number1) throws AddNumbersFault {
         System.out.println("addNumbers called....." + number1);
-        return;
     }
 
 }