cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1041122 - in /cxf/branches/2.3.x-fixes: ./ api/src/main/java/org/apache/cxf/phase/ parent/ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/ systest...
Date Wed, 01 Dec 2010 18:39:38 GMT
Author: dkulp
Date: Wed Dec  1 18:39:37 2010
New Revision: 1041122

URL: http://svn.apache.org/viewvc?rev=1041122&view=rev
Log:
Merged revisions 1041119 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1041119 | dkulp | 2010-12-01 13:30:58 -0500 (Wed, 01 Dec 2010) | 3 lines
  
  Fix builds with latest eclipse checkstyle plugin
  Will require a release of the buildtools.  Depend on the snapshot for a
  few days.
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
    cxf/branches/2.3.x-fixes/parent/pom.xml
    cxf/branches/2.3.x-fixes/pom.xml
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java
    cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/SdoFactoryImpl.java
    cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
    cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceUnwrap.java
    cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersUnwrap.java
    cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbers.java
    cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbersResponse.java
    cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/package-info.java
    cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customer.java
    cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customers.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original)
+++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Wed Dec  1 18:39:37 2010
@@ -59,7 +59,8 @@ import org.apache.cxf.transport.MessageO
  *  
  */
 public class PhaseInterceptorChain implements InterceptorChain {
-
+    public static final String PREVIOUS_MESSAGE = PhaseInterceptorChain.class.getName() + ".PREVIOUS_MESSAGE";
+    
     private static final Logger LOG = LogUtils.getL7dLogger(PhaseInterceptorChain.class); 
 
     private static final ThreadLocal<Message> CURRENT_MESSAGE = new ThreadLocal<Message>();
@@ -237,6 +238,9 @@ public class PhaseInterceptorChain imple
         Message oldMessage = CURRENT_MESSAGE.get();
         try {
             CURRENT_MESSAGE.set(message);
+            if (oldMessage != null && !message.containsKey(PREVIOUS_MESSAGE)) {
+                message.put(PREVIOUS_MESSAGE, oldMessage);
+            }
             while (state == State.EXECUTING && iterator.hasNext()) {
                 try {
                     Interceptor currentInterceptor = iterator.next();

Modified: cxf/branches/2.3.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/parent/pom.xml?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/parent/pom.xml Wed Dec  1 18:39:37 2010
@@ -183,6 +183,11 @@
                     <version>2.6</version>
                     <dependencies>
                         <dependency>
+                            <groupId>com.puppycrawl.tools</groupId>
+                            <artifactId>checkstyle</artifactId>
+                            <version>5.2</version>
+                        </dependency>
+                        <dependency>
                             <groupId>org.apache.cxf.build-utils</groupId>
                             <artifactId>cxf-buildtools</artifactId>
                             <version>${cxf.build-utils.version}</version>

Modified: cxf/branches/2.3.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/pom.xml?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/pom.xml Wed Dec  1 18:39:37 2010
@@ -42,7 +42,7 @@
 
     <properties>
         <cxf.compiler.fork>false</cxf.compiler.fork>
-        <cxf.build-utils.version>2.3.0</cxf.build-utils.version>
+        <cxf.build-utils.version>2.3.1-SNAPSHOT</cxf.build-utils.version>
         <cxf.xjc-utils.version>2.3.0</cxf.xjc-utils.version>
         <cxf.jdk.version>1.6</cxf.jdk.version>
     </properties>

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java Wed Dec  1 18:39:37 2010
@@ -31,155 +31,124 @@ import commonj.sdo.Property;
 import commonj.sdo.Type;
 import commonj.sdo.helper.HelperContext;
 
-//CHECKSTYLE:OFF
 public class SdoFactoryImpl extends FactoryBase implements SdoFactory {
     public static final String NAMESPACE_URI = "http://apache.org/structure/types";
     public static final String NAMESPACE_PREFIX = "tns";
     public static final String PATTERN_VERSION = "1.2";
-    public static final int STRUCTURE = 1;      
-    private static SdoFactoryImpl instance = null;
-    protected Type structureType = null;
-    private boolean isCreated = false;
-    private boolean isInitialized = false;
-  
+    public static final int STRUCTURE = 1;
+    private static SdoFactoryImpl instance;
+
+    protected Type structureType;
+    private boolean isCreated;
+    private boolean isInitialized;
+
     public SdoFactoryImpl() {
         super(NAMESPACE_URI, NAMESPACE_PREFIX, "org.apache.cxf.jaxrs.resources.sdo");
     }
-    
+
     public void register(HelperContext scope) {
-    if(scope == null) {
+        if (scope == null) {
             throw new IllegalArgumentException("Scope can not be null");
-    }
-    
-    if (((HelperContextImpl)scope).getExtendedMetaData().getPackage(NAMESPACE_URI) != null) {
+        }
+
+        if (((HelperContextImpl)scope).getExtendedMetaData().getPackage(NAMESPACE_URI) != null) {
             return;
         }
-    // Register this package with provided scope   
-    ((HelperContextImpl)scope).getExtendedMetaData().putPackage(NAMESPACE_URI, this);
-    
-    //Register dependent packages with provided scope
+        // Register this package with provided scope
+        ((HelperContextImpl)scope).getExtendedMetaData().putPackage(NAMESPACE_URI, this);
+
+        // Register dependent packages with provided scope
         ModelFactory.INSTANCE.register(scope);
+    }
+
+    public DataObject create(int typeNumber) {
+        switch (typeNumber) {
+        case STRUCTURE:
+            return (DataObject)createStructure();
+        default:
+            return super.create(typeNumber);
         }
-        
-        public DataObject create(int typeNumber) {
-            switch (typeNumber) {
-            case STRUCTURE : 
-                    return (DataObject)createStructure();
-            default :
-                return super.create(typeNumber);
-            }
-        }
-    
-        public Structure createStructure() {
-            return new StructureImpl();
-        }
-        
-        public Type getStructure() {
+    }
+
+    public Structure createStructure() {
+        return new StructureImpl();
+    }
+
+    public Type getStructure() {
         return structureType;
-        }
-                
-        public static SdoFactoryImpl init() {
-            if (instance != null) {
-                return instance;
-            }
-            instance = new SdoFactoryImpl();
-    
-            instance.createMetaData();
-            instance.initializeMetaData();
+    }
+
+    public static SdoFactoryImpl init() {
+        if (instance != null) {
             return instance;
         }
-      
-        public void createMetaData() {
-            if (isCreated) {
-                return;
-            }
-            isCreated = true;   
-    
-            structureType = createType(false, STRUCTURE);
-            createProperty(true, structureType,StructureImpl._INTERNAL_TEXT); 
-            createProperty(true, structureType,StructureImpl._INTERNAL_INT); 
-            createProperty(true, structureType,StructureImpl._INTERNAL_DBL); 
-            createProperty(true, structureType,StructureImpl._INTERNAL_TEXTS); 
-        }
-        
-        public void initializeMetaData() {
-            if (isInitialized) {
-                return;
-            }
-            isInitialized = true;
-        
-            ModelFactoryImpl theModelPackageImpl = (ModelFactoryImpl)ModelFactoryImpl.init();
-                Property property = null;
-        
-                // Add supertypes to types
-    
-    
+        instance = new SdoFactoryImpl();
+
+        instance.createMetaData();
+        instance.initializeMetaData();
+        return instance;
+    }
+
+    public void createMetaData() {
+        if (isCreated) {
+            return;
+        }
+        isCreated = true;
+
+        structureType = createType(false, STRUCTURE);
+        createProperty(true, structureType, StructureImpl._INTERNAL_TEXT);
+        createProperty(true, structureType, StructureImpl._INTERNAL_INT);
+        createProperty(true, structureType, StructureImpl._INTERNAL_DBL);
+        createProperty(true, structureType, StructureImpl._INTERNAL_TEXTS);
+    }
+
+    public void initializeMetaData() {
+        if (isInitialized) {
+            return;
+        }
+        isInitialized = true;
+
+        ModelFactoryImpl theModelPackageImpl = (ModelFactoryImpl)ModelFactoryImpl.init();
+        Property property = null;
+
+        // Add supertypes to types
+
         initializeType(structureType, Structure.class, "Structure", false);
         property = getLocalProperty(structureType, 0);
-        initializeProperty(property, theModelPackageImpl.getString(), "text", null, 1, 1, 
-                           Structure.class, false, true, false);
-    
+        initializeProperty(property, theModelPackageImpl.getString(), "text", null, 1, 1, Structure.class,
+                           false, true, false);
+
         property = getLocalProperty(structureType, 1);
-        initializeProperty(property, theModelPackageImpl.getInt(), "int", null, 1, 1, 
-                           Structure.class, false, true, false);
-    
+        initializeProperty(property, theModelPackageImpl.getInt(), "int", null, 1, 1, Structure.class, false,
+                           true, false);
+
         property = getLocalProperty(structureType, 2);
-        initializeProperty(property, theModelPackageImpl.getDouble(), "dbl", null, 1, 1, 
-                           Structure.class, false, true, false);
-    
+        initializeProperty(property, theModelPackageImpl.getDouble(), "dbl", null, 1, 1, Structure.class,
+                           false, true, false);
+
         property = getLocalProperty(structureType, 3);
-        initializeProperty(property, theModelPackageImpl.getString(), "texts", null, 1, -1, 
-                           Structure.class, false, false, false);
-    
-    
+        initializeProperty(property, theModelPackageImpl.getString(), "texts", null, 1, -1, Structure.class,
+                           false, false, false);
+
         createXSDMetaData(theModelPackageImpl);
     }
-      
-    protected void createXSDMetaData(ModelFactoryImpl theModelPackageImpl)
-    {
+
+    protected void createXSDMetaData(ModelFactoryImpl theModelPackageImpl) {
         super.initXSD();
-        
-        addXSDMapping
-          (structureType,
-                 new String[] {
-                     "name", "Structure",
-                     "kind", "elementOnly"
-                 });
-    
-        addXSDMapping
-                (getLocalProperty(structureType, 0),
-                 new String[] {
-                     "kind", "element",
-                     "name", "text",
-                     "namespace", "##targetNamespace"
-                 });
-    
-        addXSDMapping
-                (getLocalProperty(structureType, 1),
-                 new String[] {
-                     "kind", "element",
-                     "name", "int",
-                     "namespace", "##targetNamespace"
-                 });
-    
-        addXSDMapping
-                (getLocalProperty(structureType, 2),
-                 new String[] {
-                     "kind", "element",
-                     "name", "dbl",
-                     "namespace", "##targetNamespace"
-                 });
-    
-        addXSDMapping
-                (getLocalProperty(structureType, 3),
-                 new String[] {
-                     "kind", "element",
-                     "name", "texts",
-                     "namespace", "##targetNamespace"
-                 });
-      }
-    
-    
-    
-} //SdoFactoryImpl
-//CHECKSTYLE:ON
\ No newline at end of file
+
+        addXSDMapping(structureType, new String[] {"name", "Structure", "kind", "elementOnly"});
+
+        addXSDMapping(getLocalProperty(structureType, 0), new String[] {"kind", "element", "name", "text",
+                                                                        "namespace", "##targetNamespace"});
+
+        addXSDMapping(getLocalProperty(structureType, 1), new String[] {"kind", "element", "name", "int",
+                                                                        "namespace", "##targetNamespace"});
+
+        addXSDMapping(getLocalProperty(structureType, 2), new String[] {"kind", "element", "name", "dbl",
+                                                                        "namespace", "##targetNamespace"});
+
+        addXSDMapping(getLocalProperty(structureType, 3), new String[] {"kind", "element", "name", "texts",
+                                                                        "namespace", "##targetNamespace"});
+    }
+
+} // SdoFactoryImpl

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java Wed Dec  1 18:39:37 2010
@@ -30,217 +30,214 @@ import commonj.sdo.Type;
 //CHECKSTYLE:OFF
 public class StructureImpl extends DataObjectBase implements Structure {
 
-    public final static int TEXT = 0;
-    
-    public final static int INT = 1;
-    
-    public final static int DBL = 2;
-    
-    public final static int TEXTS = 3;
-    
-    public final static int SDO_PROPERTY_COUNT = 4;
-    
-    public final static int EXTENDED_PROPERTY_COUNT = 0;
+    public static final int TEXT = 0;
 
+    public static final int INT = 1;
+
+    public static final int DBL = 2;
+
+    public static final int TEXTS = 3;
+
+    public static final int SDO_PROPERTY_COUNT = 4;
+
+    public static final int EXTENDED_PROPERTY_COUNT = 0;
 
     /**
-     * The internal feature id for the '<em><b>Text</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The internal feature id for the '<em><b>Text</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
-     */ 
-    public final static int _INTERNAL_TEXT = 0;
-    
+     */
+    public static final int _INTERNAL_TEXT = 0;
+
     /**
-     * The internal feature id for the '<em><b>Int</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The internal feature id for the '<em><b>Int</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
-     */ 
-    public final static int _INTERNAL_INT = 1;
-    
+     */
+    public static final int _INTERNAL_INT = 1;
+
     /**
-     * The internal feature id for the '<em><b>Dbl</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The internal feature id for the '<em><b>Dbl</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
-     */ 
-    public final static int _INTERNAL_DBL = 2;
-    
+     */
+    public static final int _INTERNAL_DBL = 2;
+
     /**
      * The internal feature id for the '<em><b>Texts</b></em>' attribute list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
-     */ 
-    public final static int _INTERNAL_TEXTS = 3;
-    
+     */
+    public static final int _INTERNAL_TEXTS = 3;
+
     /**
-     * The number of properties for this type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of properties for this type. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
-    public final static int INTERNAL_PROPERTY_COUNT = 4;
-    
+    public static final int INTERNAL_PROPERTY_COUNT = 4;
+
     /**
      * The default value of the '{@link #getText() <em>Text</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getText()
      * @generated
      * @ordered
      */
     protected static final String TEXT_DEFAULT_ = null;
-    
+
     /**
      * The cached value of the '{@link #getText() <em>Text</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getText()
      * @generated
      * @ordered
      */
     protected String text = TEXT_DEFAULT_;
-    
+
     /**
-     * This is true if the Text attribute has been set.
-     * <!-- begin-user-doc -->
+     * This is true if the Text attribute has been set. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     protected boolean text_set_ = false;
-    
+
     /**
-     * The default value of the '{@link #getInt() <em>Int</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getInt() <em>Int</em>}' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getInt()
      * @generated
      * @ordered
      */
     protected static final int INT_DEFAULT_ = 0;
-    
+
     /**
-     * The cached value of the '{@link #getInt() <em>Int</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getInt() <em>Int</em>}' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getInt()
      * @generated
      * @ordered
      */
     protected int int_ = INT_DEFAULT_;
-    
+
     /**
-     * This is true if the Int attribute has been set.
-     * <!-- begin-user-doc -->
+     * This is true if the Int attribute has been set. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     protected boolean int_set_ = false;
-    
+
     /**
-     * The default value of the '{@link #getDbl() <em>Dbl</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getDbl() <em>Dbl</em>}' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getDbl()
      * @generated
      * @ordered
      */
     protected static final double DBL_DEFAULT_ = 0.0;
-    
+
     /**
-     * The cached value of the '{@link #getDbl() <em>Dbl</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getDbl() <em>Dbl</em>}' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getDbl()
      * @generated
      * @ordered
      */
     protected double dbl = DBL_DEFAULT_;
-    
+
     /**
-     * This is true if the Dbl attribute has been set.
-     * <!-- begin-user-doc -->
+     * This is true if the Dbl attribute has been set. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     protected boolean dbl_set_ = false;
-    
+
     /**
-     * The cached value of the '{@link #getTexts() <em>Texts</em>}' attribute list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getTexts() <em>Texts</em>}' attribute
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getTexts()
      * @generated
      * @ordered
      */
-    
+
     protected List texts = null;
-    
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public StructureImpl() {
         super();
     }
-    
-    
+
     protected int internalConvertIndex(int internalIndex) {
         switch (internalIndex) {
-            case _INTERNAL_TEXT: 
-                return TEXT;
-            case _INTERNAL_INT: 
-                return INT;
-            case _INTERNAL_DBL: 
-                return DBL;
-            case _INTERNAL_TEXTS: 
-                return TEXTS;
+        case _INTERNAL_TEXT:
+            return TEXT;
+        case _INTERNAL_INT:
+            return INT;
+        case _INTERNAL_DBL:
+            return DBL;
+        case _INTERNAL_TEXTS:
+            return TEXTS;
         }
         return super.internalConvertIndex(internalIndex);
     }
-    
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public Type getStaticType() {
         return ((SdoFactoryImpl)SdoFactory.INSTANCE).getStructure();
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public int getStaticPropertyCount() {
         return INTERNAL_PROPERTY_COUNT;
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getText() {
         return text;
     }
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setText(String newText) {
@@ -252,10 +249,10 @@ public class StructureImpl extends DataO
             notify(ChangeKind.SET, _INTERNAL_TEXT, oldText, text, !oldText_set_);
         }
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void unsetText() {
@@ -267,27 +264,28 @@ public class StructureImpl extends DataO
             notify(ChangeKind.UNSET, _INTERNAL_TEXT, oldText, TEXT_DEFAULT_, oldText_set_);
         }
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public boolean isSetText() {
         return text_set_;
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public int getInt() {
         return int_;
     }
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setInt(int newInt) {
@@ -299,10 +297,10 @@ public class StructureImpl extends DataO
             notify(ChangeKind.SET, _INTERNAL_INT, oldInt, int_, !oldInt_set_);
         }
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void unsetInt() {
@@ -314,27 +312,28 @@ public class StructureImpl extends DataO
             notify(ChangeKind.UNSET, _INTERNAL_INT, oldInt, INT_DEFAULT_, oldInt_set_);
         }
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public boolean isSetInt() {
         return int_set_;
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public double getDbl() {
         return dbl;
     }
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setDbl(double newDbl) {
@@ -346,10 +345,10 @@ public class StructureImpl extends DataO
             notify(ChangeKind.SET, _INTERNAL_DBL, oldDbl, dbl, !oldDbl_set_);
         }
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void unsetDbl() {
@@ -361,130 +360,143 @@ public class StructureImpl extends DataO
             notify(ChangeKind.UNSET, _INTERNAL_DBL, oldDbl, DBL_DEFAULT_, oldDbl_set_);
         }
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public boolean isSetDbl() {
         return dbl_set_;
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public List getTexts() {
         if (texts == null) {
-          texts = createPropertyList(ListKind.DATATYPE, String.class, TEXTS, 0);
+            texts = createPropertyList(ListKind.DATATYPE, String.class, TEXTS, 0);
         }
         return texts;
     }
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public Object get(int propertyIndex, boolean resolve) {
         switch (propertyIndex) {
-            case TEXT :
-                return getText();
-            case INT :
-                return new Integer(getInt());
-            case DBL :
-                return new Double(getDbl());
-            case TEXTS :
-                return getTexts();
+        case TEXT:
+            return getText();
+        case INT:
+            return new Integer(getInt());
+        case DBL:
+            return new Double(getDbl());
+        case TEXTS:
+            return getTexts();
         }
         return super.get(propertyIndex, resolve);
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @SuppressWarnings("unchecked")
     public void set(int propertyIndex, Object newValue) {
         switch (propertyIndex) {
-            case TEXT :
-                setText((String)newValue);
-                return;
-            case INT :
-                setInt(((Integer)newValue).intValue());
-                return;
-            case DBL :
-                setDbl(((Double)newValue).doubleValue());
-                return;
-            case TEXTS :
-                getTexts().clear();
-                getTexts().addAll((Collection)newValue);
+        case TEXT:
+            setText((String)newValue);
+            return;
+        case INT:
+            setInt(((Integer)newValue).intValue());
+            return;
+        case DBL:
+            setDbl(((Double)newValue).doubleValue());
+            return;
+        case TEXTS:
+            getTexts().clear();
+            getTexts().addAll((Collection)newValue);
             return;
         }
         super.set(propertyIndex, newValue);
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void unset(int propertyIndex) {
         switch (propertyIndex) {
-            case TEXT :
-                unsetText();
-                return;
-            case INT :
-                unsetInt();
-                return;
-            case DBL :
-                unsetDbl();
-                return;
-            case TEXTS :
-                getTexts().clear();
-                return;
+        case TEXT:
+            unsetText();
+            return;
+        case INT:
+            unsetInt();
+            return;
+        case DBL:
+            unsetDbl();
+            return;
+        case TEXTS:
+            getTexts().clear();
+            return;
         }
         super.unset(propertyIndex);
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public boolean isSet(int propertyIndex) {
         switch (propertyIndex) {
-            case TEXT :
-                return isSetText();
-            case INT :
-                return isSetInt();
-            case DBL :
-                return isSetDbl();
-            case TEXTS :
-                return texts != null && !texts.isEmpty();
+        case TEXT:
+            return isSetText();
+        case INT:
+            return isSetInt();
+        case DBL:
+            return isSetDbl();
+        case TEXTS:
+            return texts != null && !texts.isEmpty();
         }
         return super.isSet(propertyIndex);
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String toString() {
         if (isProxy(this)) {
             return super.toString();
         }
-    
+
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (text: ");
-        if (text_set_) result.append(text); else result.append("<unset>");
+        if (text_set_) {
+            result.append(text);
+        } else {
+            result.append("<unset>"); 
+        }
         result.append(", int: ");
-        if (int_set_) result.append(int_); else result.append("<unset>");
+        if (int_set_) {
+            result.append(int_);
+        } else {
+            result.append("<unset>");
+        }
         result.append(", dbl: ");
-        if (dbl_set_) result.append(dbl); else result.append("<unset>");
+        if (dbl_set_) {
+            result.append(dbl);
+        } else {
+            result.append("<unset>");
+        }
         result.append(", texts: ");
         result.append(texts);
         result.append(')');
@@ -492,4 +504,6 @@ public class StructureImpl extends DataO
     }
 
 }
-//CHECKSTYLE:ON
\ No newline at end of file
+//CHECKSTYLE:ON
+
+

Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/SdoFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/SdoFactoryImpl.java?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/SdoFactoryImpl.java (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/SdoFactoryImpl.java Wed Dec  1 18:39:37 2010
@@ -182,4 +182,3 @@ public class SdoFactoryImpl extends Fact
     
     
 } //SdoFactoryImpl
-//CHECKSTYLE:ON
\ No newline at end of file

Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java Wed Dec  1 18:39:37 2010
@@ -30,217 +30,214 @@ import commonj.sdo.Type;
 //CHECKSTYLE:OFF
 public class StructureImpl extends DataObjectBase implements Structure {
 
-    public final static int TEXT = 0;
-    
-    public final static int INT = 1;
-    
-    public final static int DBL = 2;
-    
-    public final static int TEXTS = 3;
-    
-    public final static int SDO_PROPERTY_COUNT = 4;
-    
-    public final static int EXTENDED_PROPERTY_COUNT = 0;
+    public static final int TEXT = 0;
 
+    public static final int INT = 1;
+
+    public static final int DBL = 2;
+
+    public static final int TEXTS = 3;
+
+    public static final int SDO_PROPERTY_COUNT = 4;
+
+    public static final int EXTENDED_PROPERTY_COUNT = 0;
 
     /**
-     * The internal feature id for the '<em><b>Text</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The internal feature id for the '<em><b>Text</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
-     */ 
-    public final static int _INTERNAL_TEXT = 0;
-    
+     */
+    public static final int _INTERNAL_TEXT = 0;
+
     /**
-     * The internal feature id for the '<em><b>Int</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The internal feature id for the '<em><b>Int</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
-     */ 
-    public final static int _INTERNAL_INT = 1;
-    
+     */
+    public static final int _INTERNAL_INT = 1;
+
     /**
-     * The internal feature id for the '<em><b>Dbl</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The internal feature id for the '<em><b>Dbl</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
-     */ 
-    public final static int _INTERNAL_DBL = 2;
-    
+     */
+    public static final int _INTERNAL_DBL = 2;
+
     /**
      * The internal feature id for the '<em><b>Texts</b></em>' attribute list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
-     */ 
-    public final static int _INTERNAL_TEXTS = 3;
-    
+     */
+    public static final int _INTERNAL_TEXTS = 3;
+
     /**
-     * The number of properties for this type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of properties for this type. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
-    public final static int INTERNAL_PROPERTY_COUNT = 4;
-    
+    public static final int INTERNAL_PROPERTY_COUNT = 4;
+
     /**
      * The default value of the '{@link #getText() <em>Text</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getText()
      * @generated
      * @ordered
      */
     protected static final String TEXT_DEFAULT_ = null;
-    
+
     /**
      * The cached value of the '{@link #getText() <em>Text</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getText()
      * @generated
      * @ordered
      */
     protected String text = TEXT_DEFAULT_;
-    
+
     /**
-     * This is true if the Text attribute has been set.
-     * <!-- begin-user-doc -->
+     * This is true if the Text attribute has been set. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     protected boolean text_set_ = false;
-    
+
     /**
-     * The default value of the '{@link #getInt() <em>Int</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getInt() <em>Int</em>}' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getInt()
      * @generated
      * @ordered
      */
     protected static final int INT_DEFAULT_ = 0;
-    
+
     /**
-     * The cached value of the '{@link #getInt() <em>Int</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getInt() <em>Int</em>}' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getInt()
      * @generated
      * @ordered
      */
     protected int int_ = INT_DEFAULT_;
-    
+
     /**
-     * This is true if the Int attribute has been set.
-     * <!-- begin-user-doc -->
+     * This is true if the Int attribute has been set. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     protected boolean int_set_ = false;
-    
+
     /**
-     * The default value of the '{@link #getDbl() <em>Dbl</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getDbl() <em>Dbl</em>}' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getDbl()
      * @generated
      * @ordered
      */
     protected static final double DBL_DEFAULT_ = 0.0;
-    
+
     /**
-     * The cached value of the '{@link #getDbl() <em>Dbl</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getDbl() <em>Dbl</em>}' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getDbl()
      * @generated
      * @ordered
      */
     protected double dbl = DBL_DEFAULT_;
-    
+
     /**
-     * This is true if the Dbl attribute has been set.
-     * <!-- begin-user-doc -->
+     * This is true if the Dbl attribute has been set. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     protected boolean dbl_set_ = false;
-    
+
     /**
-     * The cached value of the '{@link #getTexts() <em>Texts</em>}' attribute list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getTexts() <em>Texts</em>}' attribute
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getTexts()
      * @generated
      * @ordered
      */
-    
+
     protected List texts = null;
-    
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public StructureImpl() {
         super();
     }
-    
-    
+
     protected int internalConvertIndex(int internalIndex) {
         switch (internalIndex) {
-            case _INTERNAL_TEXT: 
-                return TEXT;
-            case _INTERNAL_INT: 
-                return INT;
-            case _INTERNAL_DBL: 
-                return DBL;
-            case _INTERNAL_TEXTS: 
-                return TEXTS;
+        case _INTERNAL_TEXT:
+            return TEXT;
+        case _INTERNAL_INT:
+            return INT;
+        case _INTERNAL_DBL:
+            return DBL;
+        case _INTERNAL_TEXTS:
+            return TEXTS;
         }
         return super.internalConvertIndex(internalIndex);
     }
-    
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public Type getStaticType() {
         return ((SdoFactoryImpl)SdoFactory.INSTANCE).getStructure();
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public int getStaticPropertyCount() {
         return INTERNAL_PROPERTY_COUNT;
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getText() {
         return text;
     }
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setText(String newText) {
@@ -252,10 +249,10 @@ public class StructureImpl extends DataO
             notify(ChangeKind.SET, _INTERNAL_TEXT, oldText, text, !oldText_set_);
         }
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void unsetText() {
@@ -267,27 +264,28 @@ public class StructureImpl extends DataO
             notify(ChangeKind.UNSET, _INTERNAL_TEXT, oldText, TEXT_DEFAULT_, oldText_set_);
         }
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public boolean isSetText() {
         return text_set_;
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public int getInt() {
         return int_;
     }
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setInt(int newInt) {
@@ -299,10 +297,10 @@ public class StructureImpl extends DataO
             notify(ChangeKind.SET, _INTERNAL_INT, oldInt, int_, !oldInt_set_);
         }
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void unsetInt() {
@@ -314,27 +312,28 @@ public class StructureImpl extends DataO
             notify(ChangeKind.UNSET, _INTERNAL_INT, oldInt, INT_DEFAULT_, oldInt_set_);
         }
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public boolean isSetInt() {
         return int_set_;
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public double getDbl() {
         return dbl;
     }
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setDbl(double newDbl) {
@@ -346,10 +345,10 @@ public class StructureImpl extends DataO
             notify(ChangeKind.SET, _INTERNAL_DBL, oldDbl, dbl, !oldDbl_set_);
         }
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void unsetDbl() {
@@ -361,130 +360,143 @@ public class StructureImpl extends DataO
             notify(ChangeKind.UNSET, _INTERNAL_DBL, oldDbl, DBL_DEFAULT_, oldDbl_set_);
         }
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public boolean isSetDbl() {
         return dbl_set_;
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public List getTexts() {
         if (texts == null) {
-          texts = createPropertyList(ListKind.DATATYPE, String.class, TEXTS, 0);
+            texts = createPropertyList(ListKind.DATATYPE, String.class, TEXTS, 0);
         }
         return texts;
     }
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public Object get(int propertyIndex, boolean resolve) {
         switch (propertyIndex) {
-            case TEXT :
-                return getText();
-            case INT :
-                return new Integer(getInt());
-            case DBL :
-                return new Double(getDbl());
-            case TEXTS :
-                return getTexts();
+        case TEXT:
+            return getText();
+        case INT:
+            return new Integer(getInt());
+        case DBL:
+            return new Double(getDbl());
+        case TEXTS:
+            return getTexts();
         }
         return super.get(propertyIndex, resolve);
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @SuppressWarnings("unchecked")
     public void set(int propertyIndex, Object newValue) {
         switch (propertyIndex) {
-            case TEXT :
-                setText((String)newValue);
-                return;
-            case INT :
-                setInt(((Integer)newValue).intValue());
-                return;
-            case DBL :
-                setDbl(((Double)newValue).doubleValue());
-                return;
-            case TEXTS :
-                getTexts().clear();
-                getTexts().addAll((Collection)newValue);
+        case TEXT:
+            setText((String)newValue);
+            return;
+        case INT:
+            setInt(((Integer)newValue).intValue());
+            return;
+        case DBL:
+            setDbl(((Double)newValue).doubleValue());
+            return;
+        case TEXTS:
+            getTexts().clear();
+            getTexts().addAll((Collection)newValue);
             return;
         }
         super.set(propertyIndex, newValue);
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void unset(int propertyIndex) {
         switch (propertyIndex) {
-            case TEXT :
-                unsetText();
-                return;
-            case INT :
-                unsetInt();
-                return;
-            case DBL :
-                unsetDbl();
-                return;
-            case TEXTS :
-                getTexts().clear();
-                return;
+        case TEXT:
+            unsetText();
+            return;
+        case INT:
+            unsetInt();
+            return;
+        case DBL:
+            unsetDbl();
+            return;
+        case TEXTS:
+            getTexts().clear();
+            return;
         }
         super.unset(propertyIndex);
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public boolean isSet(int propertyIndex) {
         switch (propertyIndex) {
-            case TEXT :
-                return isSetText();
-            case INT :
-                return isSetInt();
-            case DBL :
-                return isSetDbl();
-            case TEXTS :
-                return texts != null && !texts.isEmpty();
+        case TEXT:
+            return isSetText();
+        case INT:
+            return isSetInt();
+        case DBL:
+            return isSetDbl();
+        case TEXTS:
+            return texts != null && !texts.isEmpty();
         }
         return super.isSet(propertyIndex);
     }
-    
+
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String toString() {
         if (isProxy(this)) {
             return super.toString();
         }
-    
+
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (text: ");
-        if (text_set_) result.append(text); else result.append("<unset>");
+        if (text_set_) {
+            result.append(text);
+        } else {
+            result.append("<unset>");
+        }
         result.append(", int: ");
-        if (int_set_) result.append(int_); else result.append("<unset>");
+        if (int_set_) {
+            result.append(int_);
+        } else {
+            result.append("<unset>");
+        }
         result.append(", dbl: ");
-        if (dbl_set_) result.append(dbl); else result.append("<unset>");
+        if (dbl_set_) {
+            result.append(dbl);
+        } else {
+            result.append("<unset>");
+        }
         result.append(", texts: ");
         result.append(texts);
         result.append(')');
@@ -492,4 +504,6 @@ public class StructureImpl extends DataO
     }
 
 }
-//CHECKSTYLE:ON
\ No newline at end of file
+//CHECKSTYLE:ON
+
+

Modified: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceUnwrap.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceUnwrap.java?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceUnwrap.java (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceUnwrap.java Wed Dec  1 18:39:37 2010
@@ -26,21 +26,23 @@ import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
 import javax.xml.ws.WebServiceFeature;
 
-//CHECKSTYLE:OFF
 @WebServiceClient(name = "AddNumbersService", 
                   wsdlLocation = "/wsdl/addNumbers.wsdl",
                   targetNamespace = "http://apache.org/handlers") 
 public class AddNumbersServiceUnwrap extends Service {
 
-    public final static URL WSDL_LOCATION;
-    public final static QName SERVICE = new QName("http://apache.org/handlers", "AddNumbersService");
-    public final static QName AddNumbersPort = new QName("http://apache.org/handlers", "AddNumbersPort");
+    public static final URL WSDL_LOCATION;
+    public static final QName SERVICE = new QName("http://apache.org/handlers",
+                                                  "AddNumbersService");
+    public static final QName ADD_NUMBERS_PORT = new QName("http://apache.org/handlers",
+                                                         "AddNumbersPort");
     static {
         URL url = null;
         try {
             url = new URL("/wsdl/addNumbers.wsdl");
         } catch (MalformedURLException e) {
-            System.err.println("Can not initialize the default wsdl from file:/home/sberyozkin/work/cxf/trunk/testutils/src/main/resources/wsdl/addNumbers.wsdl");
+            System.err.println("Can not initialize the default wsdl "
+                               + "from file:testutils/src/main/resources/wsdl/addNumbers.wsdl");
             // e.printStackTrace();
         }
         WSDL_LOCATION = url;
@@ -66,20 +68,21 @@ public class AddNumbersServiceUnwrap ext
      */
     @WebEndpoint(name = "AddNumbersPort")
     public AddNumbersUnwrap getAddNumbersPort() {
-        return super.getPort(AddNumbersPort, AddNumbersUnwrap.class);
+        return super.getPort(ADD_NUMBERS_PORT, AddNumbersUnwrap.class);
     }
 
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the 
+     *     proxy.  Supported features not in the <code>features</code> parameter 
+     *     will have their default values.
      * @return
      *     returns AddNumbers
      */
     @WebEndpoint(name = "AddNumbersPort")
     public AddNumbersUnwrap getAddNumbersPort(WebServiceFeature... features) {
-        return super.getPort(AddNumbersPort, AddNumbersUnwrap.class, features);
+        return super.getPort(ADD_NUMBERS_PORT, AddNumbersUnwrap.class, features);
     }
 
 }
-//CHECKSTYLE:ON
\ No newline at end of file

Modified: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersUnwrap.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersUnwrap.java?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersUnwrap.java (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersUnwrap.java Wed Dec  1 18:39:37 2010
@@ -42,4 +42,4 @@ public interface AddNumbersUnwrap {
         int arg1
     );
 }
-//CHECKSTYLE:ON
\ No newline at end of file
+//CHECKSTYLE:ON

Modified: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbers.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbers.java?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbers.java (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbers.java Wed Dec  1 18:39:37 2010
@@ -90,4 +90,4 @@ public class AddNumbers {
     }
 
 }
-//CHECKSTYLE:ON
\ No newline at end of file
+//CHECKSTYLE:ON

Modified: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbersResponse.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbersResponse.java?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbersResponse.java (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbersResponse.java Wed Dec  1 18:39:37 2010
@@ -74,4 +74,4 @@ public class AddNumbersResponse {
     }
 
 }
-//CHECKSTYLE:ON
\ No newline at end of file
+//CHECKSTYLE:ON

Modified: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/package-info.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/package-info.java?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/package-info.java (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/package-info.java Wed Dec  1 18:39:37 2010
@@ -1,4 +1,21 @@
-//CHECKSTYLE:OFF
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://apache.org/handlers/types", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+/**
+ * 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.
+ */
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://apache.org/handlers/types", 
+                                     elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.apache.cxf.systest.handlers.types;
-//CHECKSTYLE:ON
\ No newline at end of file

Modified: cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customer.java?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customer.java (original)
+++ cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customer.java Wed Dec  1 18:39:37 2010
@@ -38,4 +38,4 @@ public class Customer {
         this.name = name;
     }
 }
-// END SNIPPET: bean
\ No newline at end of file
+// END SNIPPET: bean

Modified: cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customers.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customers.java?rev=1041122&r1=1041121&r2=1041122&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customers.java (original)
+++ cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customers.java Wed Dec  1 18:39:37 2010
@@ -36,4 +36,5 @@ public class Customers {
         this.customers = c;
     }
 }
-// END SNIPPET: bean
\ No newline at end of file
+// END SNIPPET: bean
+



Mime
View raw message