cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r517296 - in /incubator/cxf/trunk: ./ common/common/src/main/java/org/apache/cxf/common/util/ common/common/src/test/java/org/apache/cxf/common/util/ parent/ rt/databinding/aegis/ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/ rt/...
Date Mon, 12 Mar 2007 17:31:49 GMT
Author: dkulp
Date: Mon Mar 12 10:31:47 2007
New Revision: 517296

URL: http://svn.apache.org/viewvc?view=rev&rev=517296
Log:
Update to release versions of some plugins
Prepare for PMD 2.2 plugin (which will check the tests and be more verbose)
Remove some duplicate code in aegis
More checkstyle fixes in aegis

Removed:
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/Base64.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/CachedOutputStream.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/JavaUtils.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/STAXUtils.java
Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/Base64Utility.java
    incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
    incubator/cxf/trunk/parent/   (props changed)
    incubator/cxf/trunk/parent/pom.xml
    incubator/cxf/trunk/pom.xml
    incubator/cxf/trunk/rt/databinding/aegis/   (props changed)
    incubator/cxf/trunk/rt/databinding/aegis/pom.xml
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMDocumentType.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMElementType.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/XMLStreamReaderType.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/DOMStreamReader.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java
    incubator/cxf/trunk/tools/eclipse-plugin/   (props changed)
    incubator/cxf/trunk/tools/eclipse3.1-plugin/   (props changed)

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/Base64Utility.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/Base64Utility.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/Base64Utility.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/Base64Utility.java Mon Mar 12 10:31:47 2007
@@ -123,10 +123,10 @@
                                      int l) 
         throws Base64Exception {
         
-        // Keep it simple - must be >= 4 and a multiple of 4. Unpadded
+        // Keep it simple - must be >= 4. Unpadded
         // base64 data contain < 3 octets is invalid.
         //
-        if (((l - o) % 4 != 0) || (l - o) < 4) {
+        if ((l - o) < 4) {
             return null;
         }
 
@@ -164,6 +164,12 @@
                     obcount += processEncodeme(ib, ob, obcount);
                 }
             }
+        }
+        
+        if (obcount != ob.length) {
+            byte []tmp = new byte[obcount];
+            System.arraycopy(ob, 0, tmp, 0, obcount);
+            ob = tmp;
         }
 
         return ob;

Modified: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java (original)
+++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java Mon Mar 12 10:31:47 2007
@@ -85,8 +85,6 @@
         
         bytesDecoded = Base64Utility.decodeChunk(new char[3], 0, 3);
         assertNull(bytesDecoded);
-        bytesDecoded = Base64Utility.decodeChunk(new char[9], 0, 9);
-        assertNull(bytesDecoded);
     }
 
     @Test

Propchange: incubator/cxf/trunk/parent/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 12 10:31:47 2007
@@ -1,3 +1,5 @@
 .checkstyle
 .pmd
 .ruleset
+target
+

Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Mon Mar 12 10:31:47 2007
@@ -134,8 +134,8 @@
                     </dependencies>
                     <executions>
                         <execution>
-                            <id>process-sources</id>
-                            <phase>process-sources</phase>
+                            <id>validate</id>
+                            <phase>validate</phase>
                             <configuration>
                                 <configLocation>cxf-checkstyle.xml</configLocation>
                                 <consoleOutput>true</consoleOutput>
@@ -166,11 +166,16 @@
                         </rulesets>
                         <targetJdk>1.5</targetJdk>
                         <linkXRef>false</linkXRef>
+                        <includeTests>true</includeTests>
+                        <verbose>true</verbose>
+                        <excludeRoots>
+                            <excludeRoot>${basedir}/src/main/generated</excludeRoot>
+                        </excludeRoots>
                     </configuration>
                     <executions>
                         <execution>
-                            <id>process-sources</id>
-                            <phase>process-sources</phase>
+                            <id>validate</id>
+                            <phase>validate</phase>
                             <goals>
                                 <goal>check</goal>
                             </goals>
@@ -216,7 +221,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.0-alpha-2</version>
+                <version>1.0-alpha-3</version>
                 <executions>
                     <execution>
                         <goals>
@@ -224,8 +229,8 @@
                         </goals>
                         <configuration>
                             <resourceBundles>
-                                <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.0</resourceBundle>
-                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.1</resourceBundle>
+                                <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
                             </resourceBundles>
                             <properties>
                                 <addLicense>true</addLicense>

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Mon Mar 12 10:31:47 2007
@@ -245,7 +245,7 @@
                                             <entry key="org.eclipse.jdt.ui.text.custom_code_templates" value="${eclipse.code.templates}" />
 
                                             <!-- Add import order -->
-                                            <entry key="org.eclipse.jdt.ui.importorder" value="java;javax;org.w3c;org.xml;junit;com;org;" />
+                                            <entry key="org.eclipse.jdt.ui.importorder" value="java;javax;org.w3c;org.xml;w3c;" />
                                             <!-- Sort order -->
                                             <entry key="org.eclipse.jdt.ui.visibility.order" value="B,R,D,V," />
                                             <entry key="outlinesortoption" value="T,SF,F,SI,I,C,SM,M," />
@@ -279,15 +279,12 @@
                     <!-- We want to sign the artifact, the POM, and all attached artifacts -->
                     <plugin>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.0-alpha-1</version>
+                        <version>1.0-alpha-3</version>
                         <executions>
                             <execution>
                                 <goals>
                                     <goal>sign</goal>
                                 </goals>
-                                <configuration>
-                                    <passphrase>${gpg.passphrase}</passphrase>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>

Propchange: incubator/cxf/trunk/rt/databinding/aegis/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 12 10:31:47 2007
@@ -1 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
 target
+.settings
+.classpath
+.project
+.wtpmodules
+
+

Modified: incubator/cxf/trunk/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/pom.xml?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/pom.xml Mon Mar 12 10:31:47 2007
@@ -139,8 +139,8 @@
         </dependencies>
         <executions>
           <execution>
-            <id>process-sources</id>
-            <phase>process-sources</phase>
+            <id>validate</id>
+            <phase>validate</phase>
             <configuration>
               <failsOnError>false</failsOnError>
               <consoleOutput>false</consoleOutput>

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java Mon Mar 12 10:31:47 2007
@@ -20,6 +20,8 @@
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * 
@@ -29,8 +31,7 @@
  */
 public class DatabindingException extends RuntimeException {
     
-    private final Throwable cause;
-    private String message2;
+    private final List<String> extraMessages = new LinkedList<String>();
     
 
     /**
@@ -40,9 +41,7 @@
      * @param message the detail message.
      */
     public DatabindingException(String message) {
-        super();
-        this.message2 = message;
-        this.cause = null;
+        super(message);
     }
 
     /**
@@ -53,21 +52,9 @@
      * @param cause the cause.
      */
     public DatabindingException(String message, Throwable cause) {
-        super(message);
-        this.message2 = message;
-        this.cause = cause;
+        super(message, cause);
     }
 
-    /**
-     * Returns the cause of this throwable or <code>null</code> if the cause
-     * is nonexistent or unknown.
-     * 
-     * @return the nested cause.
-     */
-    @Override
-    public Throwable getCause() {
-        return this.cause == this ? null : this.cause;
-    }
 
     /**
      * Return the detail message, including the message from the
@@ -75,18 +62,25 @@
      * 
      * @return the detail message.
      */
-    @Override
     public String getMessage() {
-        if (this.cause == null || this.cause == this) {
-            return message2;
+        if (getCause() == null || getCause() == this) {
+            return getActualMessage();
         } else {
-            return message2 + ". Nested exception is " + this.cause.getClass().getName() + ": "
-                   + this.cause.getMessage();
+            return getActualMessage() + ". Nested exception is "
+                   + getCause().getClass().getName() + ": "
+                   + getCause().getMessage();
         }
     }
 
     public String getActualMessage() {
-        return message2;
+        if (extraMessages.isEmpty()) {
+            return super.getMessage();
+        }
+        StringBuffer buf = new StringBuffer();
+        for (String s : extraMessages) {
+            buf.append(s);
+        }
+        return buf.toString();
     }
 
     /**
@@ -96,11 +90,11 @@
      */
     @Override
     public void printStackTrace(PrintStream s) {
-        if (this.cause == null || this.cause == this) {
+        if (getCause() == null || getCause() == this) {
             super.printStackTrace(s);
         } else {
             s.println(this);
-            this.cause.printStackTrace(s);
+            getCause().printStackTrace(s);
         }
     }
 
@@ -111,23 +105,20 @@
      */
     @Override
     public void printStackTrace(PrintWriter w) {
-        if (this.cause == null || this.cause == this) {
+        if (getCause() == null || getCause() == this) {
             super.printStackTrace(w);
         } else {
             w.println(this);
-            this.cause.printStackTrace(w);
+            getCause().printStackTrace(w);
         }
     }
 
-    public void prepend(String m) {
-        if (this.message2 != null) {
-            this.message2 = m + ": " + this.message2;
-        } else {
-            this.message2 = m;
-        }
+    public final void prepend(String m) {
+        extraMessages.add(0, m + ": ");
     }
 
     public void setMessage(String s) {
-        message2 = s;
+        extraMessages.clear();
+        extraMessages.add(s);
     }
 }

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java Mon Mar 12 10:31:47 2007
@@ -106,64 +106,59 @@
     protected Object makeArray(Class arrayType, Collection values) {
         int i;
         int n;
+        Object array = null;
         if (Integer.TYPE.equals(arrayType)) {
             Object[] objects = values.toArray();
-            Object array = Array.newInstance(Integer.TYPE, objects.length);
+            array = Array.newInstance(Integer.TYPE, objects.length);
             for (i = 0, n = objects.length; i < n; i++) {
                 Array.set(array, i, objects[i]);
             }
-            return array;
         } else if (Long.TYPE.equals(arrayType)) {
             Object[] objects = values.toArray();
-            Object array = Array.newInstance(Long.TYPE, objects.length);
+            array = Array.newInstance(Long.TYPE, objects.length);
             for (i = 0, n = objects.length; i < n; i++) {
                 Array.set(array, i, objects[i]);
             }
-            return array;
         } else if (Short.TYPE.equals(arrayType)) {
             Object[] objects = values.toArray();
-            Object array = Array.newInstance(Short.TYPE, objects.length);
+            array = Array.newInstance(Short.TYPE, objects.length);
             for (i = 0, n = objects.length; i < n; i++) {
                 Array.set(array, i, objects[i]);
             }
-            return array;
         } else if (Double.TYPE.equals(arrayType)) {
             Object[] objects = values.toArray();
-            Object array = Array.newInstance(Double.TYPE, objects.length);
+            array = Array.newInstance(Double.TYPE, objects.length);
             for (i = 0, n = objects.length; i < n; i++) {
                 Array.set(array, i, objects[i]);
             }
-            return array;
         } else if (Float.TYPE.equals(arrayType)) {
             Object[] objects = values.toArray();
-            Object array = Array.newInstance(Float.TYPE, objects.length);
+            array = Array.newInstance(Float.TYPE, objects.length);
             for (i = 0, n = objects.length; i < n; i++) {
                 Array.set(array, i, objects[i]);
             }
-            return array;
         } else if (Byte.TYPE.equals(arrayType)) {
             Object[] objects = values.toArray();
-            Object array = Array.newInstance(Byte.TYPE, objects.length);
+            array = Array.newInstance(Byte.TYPE, objects.length);
             for (i = 0, n = objects.length; i < n; i++) {
                 Array.set(array, i, objects[i]);
             }
-            return array;
         } else if (Boolean.TYPE.equals(arrayType)) {
             Object[] objects = values.toArray();
-            Object array = Array.newInstance(Boolean.TYPE, objects.length);
+            array = Array.newInstance(Boolean.TYPE, objects.length);
             for (i = 0, n = objects.length; i < n; i++) {
                 Array.set(array, i, objects[i]);
             }
-            return array;
         } else if (Character.TYPE.equals(arrayType)) {
             Object[] objects = values.toArray();
-            Object array = Array.newInstance(Character.TYPE, objects.length);
+            array = Array.newInstance(Character.TYPE, objects.length);
             for (i = 0, n = objects.length; i < n; i++) {
                 Array.set(array, i, objects[i]);
             }
-            return array;
         }
-        return values.toArray((Object[])Array.newInstance(getComponentType().getTypeClass(), values.size()));
+        return array == null
+            ? values.toArray((Object[])Array.newInstance(getComponentType().getTypeClass(), values.size()))
+            : array;
     }
 
     @Override

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java Mon Mar 12 10:31:47 2007
@@ -19,7 +19,6 @@
 package org.apache.cxf.aegis.type.basic;
 
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
@@ -30,10 +29,11 @@
 import org.apache.cxf.aegis.type.Type;
 import org.apache.cxf.aegis.type.mtom.AbstractXOPType;
 import org.apache.cxf.aegis.type.mtom.ByteArrayType;
-import org.apache.cxf.aegis.util.Base64;
 import org.apache.cxf.aegis.util.XmlConstants;
 import org.apache.cxf.aegis.xml.MessageReader;
 import org.apache.cxf.aegis.xml.MessageWriter;
+import org.apache.cxf.common.util.Base64Exception;
+import org.apache.cxf.common.util.Base64Utility;
 
 /**
  * Converts back and forth to byte[] objects.
@@ -78,7 +78,9 @@
             for (int sourceStart = 0;; sourceStart += length) {
                 int nCopied = reader.getTextCharacters(sourceStart, myBuffer, 0, length);
 
-                Base64.decode(myBuffer, 0, nCopied, bos);
+                if (nCopied > 0) {
+                    Base64Utility.decode(myBuffer, 0, nCopied, bos);
+                }
 
                 if (nCopied < length) {
                     break;
@@ -93,7 +95,7 @@
             reader.next();
 
             return bos.toByteArray();
-        } catch (IOException e) {
+        } catch (Base64Exception e) {
             throw new DatabindingException("Could not parse base64Binary data.", e);
         } catch (XMLStreamException e) {
             throw new DatabindingException("Could not parse base64Binary data.", e);
@@ -112,6 +114,6 @@
 
         byte[] data = (byte[])object;
 
-        writer.writeValue(Base64.encode(data));
+        writer.writeValue(Base64Utility.encode(data));
     }
 }

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java Mon Mar 12 10:31:47 2007
@@ -35,10 +35,10 @@
 import org.apache.cxf.aegis.DatabindingException;
 import org.apache.cxf.aegis.type.Type;
 import org.apache.cxf.aegis.type.TypeMapping;
-import org.apache.cxf.aegis.util.Base64;
 import org.apache.cxf.aegis.util.XmlConstants;
 import org.apache.cxf.aegis.xml.MessageReader;
 import org.apache.cxf.aegis.xml.MessageWriter;
+import org.apache.cxf.common.util.Base64Utility;
 import org.jdom.Attribute;
 import org.jdom.Element;
 
@@ -150,9 +150,9 @@
     }
 
     private Object reconstituteJavaObject(MessageReader reader) throws DatabindingException {
-        ByteArrayInputStream in = new ByteArrayInputStream(Base64.decode(reader.getValue()));
 
         try {
+            ByteArrayInputStream in = new ByteArrayInputStream(Base64Utility.decode(reader.getValue()));
             return new ObjectInputStream(in).readObject();
         } catch (Exception e) {
             throw new DatabindingException("Unable to reconstitute serialized object", e);
@@ -255,7 +255,7 @@
                                            + object.getClass().getName() + "]", e);
         }
 
-        writer.writeValue(Base64.encode(out.toByteArray()));
+        writer.writeValue(Base64Utility.encode(out.toByteArray()));
     }
 
     public boolean isReadToDocument() {

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java Mon Mar 12 10:31:47 2007
@@ -29,12 +29,12 @@
 import org.apache.cxf.aegis.Context;
 import org.apache.cxf.aegis.DatabindingException;
 import org.apache.cxf.aegis.type.Type;
-import org.apache.cxf.aegis.util.STAXUtils;
 import org.apache.cxf.aegis.util.stax.FragmentStreamReader;
 import org.apache.cxf.aegis.xml.MessageReader;
 import org.apache.cxf.aegis.xml.MessageWriter;
 import org.apache.cxf.aegis.xml.stax.ElementReader;
 import org.apache.cxf.aegis.xml.stax.ElementWriter;
+import org.apache.cxf.staxutils.StaxUtils;
 
 /**
  * Reads and writes <code>org.w3c.dom.Document</code> types.
@@ -63,7 +63,7 @@
     public Object readObject(MessageReader mreader, Context context) throws DatabindingException {
         try {
             XMLStreamReader reader = ((ElementReader)mreader).getXMLStreamReader();
-            return STAXUtils.read(builder, new FragmentStreamReader(reader), true);
+            return StaxUtils.read(builder, new FragmentStreamReader(reader), true);
         } catch (XMLStreamException e) {
             throw new DatabindingException("Could not parse xml.", e);
         }
@@ -75,7 +75,7 @@
         Document doc = (Document)object;
 
         try {
-            STAXUtils.writeElement(doc.getDocumentElement(), ((ElementWriter)writer).getXMLStreamWriter(),
+            StaxUtils.writeElement(doc.getDocumentElement(), ((ElementWriter)writer).getXMLStreamWriter(),
                                    false);
         } catch (XMLStreamException e) {
             throw new DatabindingException("Could not write xml.", e);

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMDocumentType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMDocumentType.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMDocumentType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMDocumentType.java Mon Mar 12 10:31:47 2007
@@ -40,7 +40,7 @@
  */
 public class JDOMDocumentType extends Type {
     // private static final StaxBuilder builder = new StaxBuilder();
-    private static final StaxSerializer serializer = new StaxSerializer();
+    private static final StaxSerializer SERIALIZER = new StaxSerializer();
 
     public JDOMDocumentType() {
         setWriteOuter(false);
@@ -68,7 +68,7 @@
         Document doc = (Document)object;
 
         try {
-            serializer.writeElement(doc.getRootElement(), ((ElementWriter)writer).getXMLStreamWriter());
+            SERIALIZER.writeElement(doc.getRootElement(), ((ElementWriter)writer).getXMLStreamWriter());
         } catch (XMLStreamException e) {
             throw new DatabindingException("Could not write xml.", e);
         }

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMElementType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMElementType.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMElementType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMElementType.java Mon Mar 12 10:31:47 2007
@@ -40,7 +40,7 @@
  */
 public class JDOMElementType extends Type {
     // private static final StaxBuilder builder = new StaxBuilder();
-    private static final StaxSerializer serializer = new StaxSerializer();
+    private static final StaxSerializer SERIALIZER = new StaxSerializer();
 
     public JDOMElementType() {
         setWriteOuter(false);
@@ -68,7 +68,7 @@
         Element el = (Element)object;
 
         try {
-            serializer.writeElement(el, ((ElementWriter)writer).getXMLStreamWriter());
+            SERIALIZER.writeElement(el, ((ElementWriter)writer).getXMLStreamWriter());
         } catch (XMLStreamException e) {
             throw new DatabindingException("Could not write xml.", e);
         }

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java Mon Mar 12 10:31:47 2007
@@ -18,8 +18,6 @@
  */
 package org.apache.cxf.aegis.type.xml;
 
-import javanet.staxutils.ContentHandlerToXMLStreamWriter;
-
 import javax.xml.stream.FactoryConfigurationError;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -36,13 +34,15 @@
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
+import javanet.staxutils.ContentHandlerToXMLStreamWriter;
+
 import org.apache.cxf.aegis.Context;
 import org.apache.cxf.aegis.DatabindingException;
 import org.apache.cxf.aegis.type.Type;
-import org.apache.cxf.aegis.util.STAXUtils;
 import org.apache.cxf.aegis.xml.MessageReader;
 import org.apache.cxf.aegis.xml.MessageWriter;
 import org.apache.cxf.aegis.xml.stax.ElementWriter;
+import org.apache.cxf.staxutils.StaxUtils;
 
 /**
  * Reads and writes <code>javax.xml.transform.Source</code> types.
@@ -100,7 +100,7 @@
                                                + " was not understood.");
             }
 
-            STAXUtils.writeElement(element, writer, false);
+            StaxUtils.writeElement(element, writer, false);
         } else if (object instanceof SAXSource) {
             SAXSource source = (SAXSource)object;
 
@@ -118,8 +118,8 @@
             }
         } else if (object instanceof StreamSource) {
             StreamSource ss = (StreamSource)object;
-            XMLStreamReader reader = STAXUtils.createXMLStreamReader(ss.getInputStream(), null, null);
-            STAXUtils.copy(reader, writer);
+            XMLStreamReader reader = StaxUtils.createXMLStreamReader(ss.getInputStream(), null);
+            StaxUtils.copy(reader, writer);
         }
     }
 

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/XMLStreamReaderType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/XMLStreamReaderType.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/XMLStreamReaderType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/XMLStreamReaderType.java Mon Mar 12 10:31:47 2007
@@ -24,11 +24,11 @@
 import org.apache.cxf.aegis.Context;
 import org.apache.cxf.aegis.DatabindingException;
 import org.apache.cxf.aegis.type.Type;
-import org.apache.cxf.aegis.util.STAXUtils;
 import org.apache.cxf.aegis.xml.MessageReader;
 import org.apache.cxf.aegis.xml.MessageWriter;
 import org.apache.cxf.aegis.xml.stax.ElementReader;
 import org.apache.cxf.aegis.xml.stax.ElementWriter;
+import org.apache.cxf.staxutils.StaxUtils;
 
 /**
  * Reads and writes <code>org.w3c.dom.Document</code> types.
@@ -52,7 +52,7 @@
         XMLStreamReader reader = (XMLStreamReader)object;
 
         try {
-            STAXUtils.copy(reader, ((ElementWriter)writer).getXMLStreamWriter());
+            StaxUtils.copy(reader, ((ElementWriter)writer).getXMLStreamWriter());
             reader.close();
         } catch (XMLStreamException e) {
             throw new DatabindingException("Could not write xml.", e);

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java Mon Mar 12 10:31:47 2007
@@ -1,21 +1,21 @@
- /**
-  * Licensed to the Apache Software Foundation (ASF) under one
-  * or more contributor license agreements. See the NOTICE file
-  * distributed with this work for additional information
-  * regarding copyright ownership. The ASF licenses this file
-  * to you under the Apache License, Version 2.0 (the
-  * "License"); you may not use this file except in compliance
-  * with the License. You may obtain a copy of the License at
-  *
-  * http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing,
-  * software distributed under the License is distributed on an
-  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  * KIND, either express or implied. See the License for the
-  * specific language governing permissions and limitations
-  * under the License.
-  */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.cxf.aegis.util;
 
 import java.net.MalformedURLException;
@@ -31,6 +31,7 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.cxf.aegis.DatabindingException;
+import org.apache.cxf.helpers.JavaUtils;
 import org.jdom.Element;
 import org.jdom.Namespace;
 
@@ -40,7 +41,11 @@
  * @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
  * @author <a href="mailto:poutsma@mac.com">Arjen Poutsma</a>
  */
-public class NamespaceHelper {
+public final class NamespaceHelper {
+    
+    private NamespaceHelper() {
+        //utility class
+    }
     /**
      * Create a unique namespace uri/prefix combination.
      * 
@@ -251,7 +256,7 @@
         StringBuffer sb = new StringBuffer(namespace.length());
 
         for (int i = words.length - 1; i >= 0; --i) {
-            addWordToPackageBuffer(sb, words[i], (i == words.length - 1));
+            addWordToPackageBuffer(sb, words[i], i == words.length - 1);
         }
 
         // tokenize the path

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java Mon Mar 12 10:31:47 2007
@@ -64,7 +64,6 @@
         return pOffset;
     }
 
-    @Override
     public Object parseObject(String pString, ParsePosition pParsePosition) {
         if (pString == null) {
             throw new NullPointerException("The String argument must not be null.");
@@ -77,7 +76,9 @@
 
         boolean isMinus = false;
         StringBuffer digits = new StringBuffer();
-        int year, month, mday;
+        int year;
+        int month;
+        int mday;
         if (parseDate) {
             // Sign
             if (offset < length) {
@@ -134,10 +135,15 @@
                 }
             }
         } else {
-            year = month = mday = 0;
+            year = 0;
+            month = 0;
+            mday = 0;
         }
 
-        int hour, minute, second, millis;
+        int hour;
+        int minute;
+        int second;
+        int millis;
         if (parseTime) {
             offset = parseInt(pString, offset, digits);
             if (digits.length() != 2) {
@@ -187,7 +193,10 @@
                 millis = 0;
             }
         } else {
-            hour = minute = second = millis = 0;
+            hour = 0;
+            minute = 0;
+            second = 0;
+            millis = 0;
         }
 
         digits.setLength(0);

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/jdom/StaxBuilder.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/jdom/StaxBuilder.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/jdom/StaxBuilder.java Mon Mar 12 10:31:47 2007
@@ -65,7 +65,7 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.cxf.aegis.util.STAXUtils;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.jdom.Attribute;
 import org.jdom.Content;
 import org.jdom.Document;
@@ -131,11 +131,11 @@
      * Default constructor.
      */
     public StaxBuilder() {
-        xifactory = STAXUtils.getXMLInputFactory(null);
+        xifactory = StaxUtils.getXMLInputFactory();
     }
 
     public StaxBuilder(Map namespaces) {
-        xifactory = STAXUtils.getXMLInputFactory(null);
+        xifactory = StaxUtils.getXMLInputFactory();
         this.additionalNamespaces = namespaces;
     }
 
@@ -364,12 +364,11 @@
                 }
                 // And then 'push' new element...
                 current = newElem;
-            }
-
+                
                 // Already added the element, can continue
                 noadd = true;
                 break;
-
+            }
             case XMLStreamConstants.START_DOCUMENT:
                 /*
                  * This should only be received at the beginning of document...

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/DOMStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/DOMStreamReader.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/DOMStreamReader.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/DOMStreamReader.java Mon Mar 12 10:31:47 2007
@@ -37,7 +37,7 @@
  * @author <a href="mailto:tsztelak@gmail.com">Tomasz Sztelak</a>
  */
 public abstract class DOMStreamReader implements XMLStreamReader {
-    public Map properties = new HashMap();
+    private Map properties = new HashMap();
 
     private FastStack<ElementFrame> frames = new FastStack<ElementFrame>();
 
@@ -220,7 +220,7 @@
      * @see javax.xml.stream.XMLStreamReader#isStartElement()
      */
     public boolean isStartElement() {
-        return (currentEvent == START_ELEMENT);
+        return currentEvent == START_ELEMENT;
     }
 
     /*
@@ -229,7 +229,7 @@
      * @see javax.xml.stream.XMLStreamReader#isEndElement()
      */
     public boolean isEndElement() {
-        return (currentEvent == END_ELEMENT);
+        return currentEvent == END_ELEMENT;
     }
 
     /*
@@ -238,7 +238,7 @@
      * @see javax.xml.stream.XMLStreamReader#isCharacters()
      */
     public boolean isCharacters() {
-        return (currentEvent == CHARACTERS);
+        return currentEvent == CHARACTERS;
     }
 
     /*
@@ -247,7 +247,7 @@
      * @see javax.xml.stream.XMLStreamReader#isWhiteSpace()
      */
     public boolean isWhiteSpace() {
-        return (currentEvent == SPACE);
+        return currentEvent == SPACE;
     }
 
     public int getEventType() {
@@ -270,8 +270,8 @@
     }
 
     public boolean hasText() {
-        return (currentEvent == CHARACTERS || currentEvent == DTD || currentEvent == ENTITY_REFERENCE
-                || currentEvent == COMMENT || currentEvent == SPACE);
+        return currentEvent == CHARACTERS || currentEvent == DTD || currentEvent == ENTITY_REFERENCE
+                || currentEvent == COMMENT || currentEvent == SPACE;
     }
 
     public Location getLocation() {
@@ -301,7 +301,7 @@
     }
 
     public boolean hasName() {
-        return (currentEvent == START_ELEMENT || currentEvent == END_ELEMENT);
+        return currentEvent == START_ELEMENT || currentEvent == END_ELEMENT;
     }
 
     public String getVersion() {

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java Mon Mar 12 10:31:47 2007
@@ -28,11 +28,11 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.cxf.aegis.DatabindingException;
-import org.apache.cxf.aegis.util.STAXUtils;
 import org.apache.cxf.aegis.util.XmlConstants;
 import org.apache.cxf.aegis.util.stax.DepthXMLStreamReader;
 import org.apache.cxf.aegis.xml.AbstractMessageReader;
 import org.apache.cxf.aegis.xml.MessageReader;
+import org.apache.cxf.staxutils.StaxUtils;
 
 /**
  * Reads literal encoded messages.
@@ -87,7 +87,7 @@
     public ElementReader(InputStream is) throws XMLStreamException {
         // XMLInputFactory factory = XMLInputFactory.newInstance();
         // XMLStreamReader xmlReader = factory.createXMLStreamReader(is);
-        XMLStreamReader xmlReader = STAXUtils.createXMLStreamReader(is, null, null);
+        XMLStreamReader xmlReader = StaxUtils.createXMLStreamReader(is, null);
 
         xmlReader.nextTag();
 

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java Mon Mar 12 10:31:47 2007
@@ -22,11 +22,11 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.cxf.aegis.util.STAXUtils;
 import org.apache.cxf.aegis.util.jdom.StaxBuilder;
 import org.apache.cxf.aegis.xml.MessageReader;
 import org.apache.cxf.aegis.xml.jdom.JDOMReader;
 import org.apache.cxf.binding.soap.Soap11;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.test.AbstractCXFTest;
 import org.jdom.Document;
 import org.junit.Test;
@@ -52,7 +52,7 @@
          * XMLStreamReader reader = factory.createXMLStreamReader(
          * getResourceAsStream(resource));
          */
-        XMLStreamReader reader = STAXUtils.createXMLStreamReader(getResourceAsStream(resource), null, null);
+        XMLStreamReader reader = StaxUtils.createXMLStreamReader(getResourceAsStream(resource), null);
 
         while (reader.getEventType() != XMLStreamReader.START_ELEMENT) {
             reader.next();

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java Mon Mar 12 10:31:47 2007
@@ -24,13 +24,13 @@
  * @author jdavias
  */
 public class BeanD implements Serializable {
-    private String m_propD;
+    private String propD;
 
-    public String getM_propD() {
-        return m_propD;
+    public String getMpropD() {
+        return propD;
     }
 
-    public void setM_propD(String m_propD) {
-        this.m_propD = m_propD;
+    public void setMpropD(String prop) {
+        this.propD = prop;
     }
 }

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java Mon Mar 12 10:31:47 2007
@@ -26,24 +26,23 @@
  * @author xfournet
  */
 public class ResultBean {
-    private BeanA[] m_result1;
-
-    private RootBean[] m_result2;
+    private BeanA[] result1;
+    private RootBean[] result2;
 
     public BeanA[] getResult1() {
-        return m_result1;
+        return result1;
     }
 
     public void setResult1(BeanA[] result1) {
-        m_result1 = result1;
+        this.result1 = result1;
     }
 
     public RootBean[] getResult2() {
-        return m_result2;
+        return result2;
     }
 
     public void setResult2(RootBean[] result2) {
-        m_result2 = result2;
+        this.result2 = result2;
     }
 
     public boolean equals(Object o) {
@@ -56,10 +55,10 @@
 
         final ResultBean that = (ResultBean)o;
 
-        if (!Arrays.equals(m_result1, that.m_result1)) {
+        if (!Arrays.equals(result1, that.result1)) {
             return false;
         }
-        if (!Arrays.equals(m_result2, that.m_result2)) {
+        if (!Arrays.equals(result2, that.result2)) {
             return false;
         }
 

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java Mon Mar 12 10:31:47 2007
@@ -24,28 +24,27 @@
  * @author xfournet
  */
 public class RootBean {
-    private String m_id;
-
-    private BeanA m_child;
+    private String id;
+    private BeanA child;
 
     public String getId() {
-        return m_id;
+        return id;
     }
 
     public void setId(String id) {
-        m_id = id;
+        this.id = id;
     }
 
     public BeanA getChild() {
-        return m_child;
+        return child;
     }
 
     public void setChild(BeanA child) {
-        m_child = child;
+        this.child = child;
     }
 
     public String toString() {
-        return "[" + getClass().getName() + "] id=" + m_id + "; child={" + m_child + "}";
+        return "[" + getClass().getName() + "] id=" + id + "; child={" + child + "}";
     }
 
     public boolean equals(Object o) {
@@ -58,10 +57,10 @@
 
         final RootBean rootBean = (RootBean)o;
 
-        if (m_child != null ? !m_child.equals(rootBean.m_child) : rootBean.m_child != null) {
+        if (child != null ? !child.equals(rootBean.child) : rootBean.child != null) {
             return false;
         }
-        if (m_id != null ? !m_id.equals(rootBean.m_id) : rootBean.m_id != null) {
+        if (id != null ? !id.equals(rootBean.id) : rootBean.id != null) {
             return false;
         }
 
@@ -70,8 +69,8 @@
 
     public int hashCode() {
         int result;
-        result = (m_id != null ? m_id.hashCode() : 0);
-        result = 29 * result + (m_child != null ? m_child.hashCode() : 0);
+        result = id != null ? id.hashCode() : 0;
+        result = 29 * result + (child != null ? child.hashCode() : 0);
         return result;
     }
 }

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java Mon Mar 12 10:31:47 2007
@@ -24,35 +24,37 @@
  * @author xfournet
  */
 public class WS1Exception extends Exception {
-    private int errorCode;
-    private Object simpleBean;
+    private final int errorCode;
+    private final Object simpleBean;
 
     public WS1Exception() {
+        simpleBean = null;
+        errorCode = 0;
     }
 
     public WS1Exception(String message) {
         super(message);
+        simpleBean = null;
+        errorCode = 0;
     }
 
     public WS1Exception(String message, int errorCode1) {
         super(message);
         errorCode = errorCode1;
+        simpleBean = null;
+    }
+    public WS1Exception(String message, int errorCode1, Object bean) {
+        super(message);
+        errorCode = errorCode1;
+        simpleBean = bean;
     }
 
     public int getErrorCode() {
         return errorCode;
     }
 
-    public void setErrorCode(int errorCode) {
-        this.errorCode = errorCode;
-    }
-
     public Object getSimpleBean() {
         return simpleBean;
-    }
-
-    public void setSimpleBean(Object simpleBean) {
-        this.simpleBean = simpleBean;
     }
 
     public String toString() {

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java Mon Mar 12 10:31:47 2007
@@ -24,26 +24,27 @@
  * @author xfournet
  */
 public class WS1ExtendedException extends WS1Exception {
-    private int extendedCode;
+    private final int extendedCode;
 
     public WS1ExtendedException() {
+        extendedCode = 0;
     }
 
     public WS1ExtendedException(String message) {
         super(message);
+        extendedCode = 0;
     }
 
-    public WS1ExtendedException(String message, int errorCode1, int extendedCode) {
-        super(message, errorCode1);
+    public WS1ExtendedException(String message,
+                                int errorCode1,
+                                int extendedCode,
+                                Object object) {
+        super(message, errorCode1, object);
         this.extendedCode = extendedCode;
     }
 
     public int getExtendedCode() {
         return extendedCode;
-    }
-
-    public void setExtendedCode(int extendedCode) {
-        this.extendedCode = extendedCode;
     }
 
     public String toString() {

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java Mon Mar 12 10:31:47 2007
@@ -114,9 +114,9 @@
 
     public void throwException(boolean extendedOne) throws WS1Exception {
         if (extendedOne) {
-            WS1Exception ex = new WS1ExtendedException("WS1 extended exception", 20, 30);
-            ex.setSimpleBean(new SimpleBean());
-            throw ex;
+            throw new WS1ExtendedException("WS1 extended exception",
+                                             20, 30,
+                                             new SimpleBean());
         } else {
             throw new WS1Exception("WS1 base exception", 10);
         }

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java Mon Mar 12 10:31:47 2007
@@ -24,25 +24,19 @@
  * @author xfournet
  */
 public class AlreadyExistsException extends Exception {
-    private String m_id;
-
-    public AlreadyExistsException() {
-    }
+    private final String id;
 
     public AlreadyExistsException(String id) {
-        m_id = id;
+        this.id = id;
     }
 
     public String getId() {
-        return m_id;
+        return id;
     }
 
-    public void setId(String id) {
-        m_id = id;
-    }
 
     public String toString() {
-        return "[" + getClass().getName() + "] id=" + m_id;
+        return "[" + getClass().getName() + "] id=" + id;
     }
 
     public boolean equals(Object o) {
@@ -59,7 +53,7 @@
             return false;
         }
 
-        if (m_id != null ? !m_id.equals(that.m_id) : that.m_id != null) {
+        if (id != null ? !id.equals(that.id) : that.id != null) {
             return false;
         }
 
@@ -67,6 +61,6 @@
     }
 
     public int hashCode() {
-        return (m_id != null ? m_id.hashCode() : 0);
+        return id != null ? id.hashCode() : 0;
     }
 }

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java?view=diff&rev=517296&r1=517295&r2=517296
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java Mon Mar 12 10:31:47 2007
@@ -24,25 +24,19 @@
  * @author xfournet
  */
 public class NotFoundException extends Exception {
-    private String m_id;
-
-    public NotFoundException() {
-    }
+    private final String id;
 
     public NotFoundException(String id) {
-        m_id = id;
+        this.id = id;
     }
 
     public String getId() {
-        return m_id;
+        return id;
     }
 
-    public void setId(String id) {
-        m_id = id;
-    }
 
     public String toString() {
-        return "[" + getClass().getName() + "] id=" + m_id;
+        return "[" + getClass().getName() + "] id=" + id;
     }
 
     public boolean equals(Object o) {
@@ -59,7 +53,7 @@
             return false;
         }
 
-        if (m_id != null ? !m_id.equals(that.m_id) : that.m_id != null) {
+        if (id != null ? !id.equals(that.id) : that.id != null) {
             return false;
         }
 
@@ -67,6 +61,6 @@
     }
 
     public int hashCode() {
-        return (m_id != null ? m_id.hashCode() : 0);
+        return id != null ? id.hashCode() : 0;
     }
 }

Propchange: incubator/cxf/trunk/tools/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 12 10:31:47 2007
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+.settings
+.classpath
+.project
+.wtpmodules
+
+

Propchange: incubator/cxf/trunk/tools/eclipse3.1-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 12 10:31:47 2007
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+.settings
+.classpath
+.project
+.wtpmodules
+
+



Mime
View raw message