cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [1/2] cxf git commit: [CXF-7196] Removing rt-databindings-sdo
Date Fri, 23 Dec 2016 13:54:58 GMT
Repository: cxf
Updated Branches:
  refs/heads/master fb11380da -> 969a10c9f


http://git-wip-us.apache.org/repos/asf/cxf/blob/969a10c9/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/SDOResource.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/SDOResource.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/SDOResource.java
deleted file mode 100644
index e93c13b..0000000
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/SDOResource.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * 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.systest.jaxrs.sdo;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.apache.cxf.systest.jaxrs.sdo.impl.StructureImpl;
-
-
-@Path("/structures")
-public class SDOResource {
-    
-    @SuppressWarnings("unchecked")
-    @GET
-    @Path("/structure")
-    @Produces({"application/xml", "application/json" })
-    public Structure getStructure() {
-        Structure struct = new StructureImpl();
-        struct.getTexts().add("text1");
-        struct.setText("sdo");
-        struct.setInt(3);
-        struct.setDbl(123.5);
-        return struct;
-    }
-        
-    
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/969a10c9/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/SDOResource2.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/SDOResource2.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/SDOResource2.java
deleted file mode 100644
index 5649648..0000000
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/SDOResource2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * 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.systest.jaxrs.sdo;
-
-import org.apache.cxf.annotations.DataBinding;
-
-@DataBinding(org.apache.cxf.sdo.SDODataBinding.class)
-public class SDOResource2 extends SDOResource {    
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/969a10c9/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/SdoFactory.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/SdoFactory.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/SdoFactory.java
deleted file mode 100644
index e85b693..0000000
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/SdoFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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.systest.jaxrs.sdo;
-
-import commonj.sdo.helper.HelperContext;
-
-public interface SdoFactory {
-
-    SdoFactory INSTANCE = org.apache.cxf.systest.jaxrs.sdo.impl.SdoFactoryImpl.init();
-    Structure createStructure();
-    
-    void register(HelperContext scope);
-}
-

http://git-wip-us.apache.org/repos/asf/cxf/blob/969a10c9/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/Structure.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/Structure.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/Structure.java
deleted file mode 100644
index cde68b9..0000000
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/Structure.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * 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.systest.jaxrs.sdo;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-public interface Structure extends Serializable {
-    String getText();
-    void setText(String value);
-    void unsetText();
-    boolean isSetText();
-    int getInt();
-    void setInt(int value);
-    void unsetInt();
-    boolean isSetInt();
-    double getDbl();
-    void setDbl(double value);
-    void unsetDbl();
-    boolean isSetDbl();
-    @SuppressWarnings("rawtypes")
-    List getTexts();
-}
-

http://git-wip-us.apache.org/repos/asf/cxf/blob/969a10c9/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/SdoFactoryImpl.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/SdoFactoryImpl.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/SdoFactoryImpl.java
deleted file mode 100644
index 83dab96..0000000
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/SdoFactoryImpl.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * 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.systest.jaxrs.sdo.impl;
-
-import org.apache.cxf.systest.jaxrs.sdo.SdoFactory;
-import org.apache.cxf.systest.jaxrs.sdo.Structure;
-import org.apache.tuscany.sdo.helper.HelperContextImpl;
-import org.apache.tuscany.sdo.impl.FactoryBase;
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-
-import commonj.sdo.DataObject;
-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 SdoFactoryImpl() {
-        super(NAMESPACE_URI, NAMESPACE_PREFIX, "org.apache.cxf.systest.jaxrs.sdo");
-    }
-    
-    public void register(HelperContext scope) {
-    if(scope == null) {
-            throw new IllegalArgumentException("Scope can not be 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
-        ModelFactory.INSTANCE.register(scope);
-        }
-        
-        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() {
-        return structureType;
-        }
-                
-        public static SdoFactoryImpl init() {
-            if (instance != null) {
-                return instance;
-            }
-            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.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);
-    
-        property = getLocalProperty(structureType, 1);
-        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);
-    
-        property = getLocalProperty(structureType, 3);
-        initializeProperty(property, theModelPackageImpl.getString(), "texts", null, 1, -1,

-                           Structure.class, false, false, false);
-    
-    
-        createXSDMetaData(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

http://git-wip-us.apache.org/repos/asf/cxf/blob/969a10c9/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
deleted file mode 100644
index 23454df..0000000
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/**
- * 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.systest.jaxrs.sdo.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.cxf.systest.jaxrs.sdo.SdoFactory;
-import org.apache.cxf.systest.jaxrs.sdo.Structure;
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import commonj.sdo.Type;
-
-//CHECKSTYLE:OFF
-public class StructureImpl extends DataObjectBase implements Structure {
-
-    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 -->
-     * 
-     * @generated
-     * @ordered
-     */
-    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 -->
-     * 
-     * @generated
-     * @ordered
-     */
-    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 -->
-     * 
-     * @generated
-     * @ordered
-     */
-    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 -->
-     * 
-     * @generated
-     * @ordered
-     */
-    public static final int _INTERNAL_TEXTS = 3;
-
-    /**
-     * The number of properties for this type. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    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 -->
-     * 
-     * @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 -->
-     * 
-     * @see #getText()
-     * @generated
-     * @ordered
-     */
-    protected String text = TEXT_DEFAULT_;
-
-    /**
-     * 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 -->
-     * 
-     * @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 -->
-     * 
-     * @see #getInt()
-     * @generated
-     * @ordered
-     */
-    protected int int_ = INT_DEFAULT_;
-
-    /**
-     * 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 -->
-     * 
-     * @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 -->
-     * 
-     * @see #getDbl()
-     * @generated
-     * @ordered
-     */
-    protected double dbl = DBL_DEFAULT_;
-
-    /**
-     * 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 -->
-     * 
-     * @see #getTexts()
-     * @generated
-     * @ordered
-     */
-
-    protected List<?> texts = null;
-
-    /**
-     * <!-- 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;
-        }
-        return super.internalConvertIndex(internalIndex);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public Type getStaticType() {
-        return ((SdoFactoryImpl)SdoFactory.INSTANCE).getStructure();
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public int getStaticPropertyCount() {
-        return INTERNAL_PROPERTY_COUNT;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public String getText() {
-        return text;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public void setText(String newText) {
-        String oldText = text;
-        text = newText;
-        boolean oldText_set_ = text_set_;
-        text_set_ = true;
-        if (isNotifying()) {
-            notify(ChangeKind.SET, _INTERNAL_TEXT, oldText, text, !oldText_set_);
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public void unsetText() {
-        String oldText = text;
-        boolean oldText_set_ = text_set_;
-        text = TEXT_DEFAULT_;
-        text_set_ = false;
-        if (isNotifying()) {
-            notify(ChangeKind.UNSET, _INTERNAL_TEXT, oldText, TEXT_DEFAULT_, oldText_set_);
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public boolean isSetText() {
-        return text_set_;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public int getInt() {
-        return int_;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public void setInt(int newInt) {
-        int oldInt = int_;
-        int_ = newInt;
-        boolean oldInt_set_ = int_set_;
-        int_set_ = true;
-        if (isNotifying()) {
-            notify(ChangeKind.SET, _INTERNAL_INT, oldInt, int_, !oldInt_set_);
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public void unsetInt() {
-        int oldInt = int_;
-        boolean oldInt_set_ = int_set_;
-        int_ = INT_DEFAULT_;
-        int_set_ = false;
-        if (isNotifying()) {
-            notify(ChangeKind.UNSET, _INTERNAL_INT, oldInt, INT_DEFAULT_, oldInt_set_);
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public boolean isSetInt() {
-        return int_set_;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public double getDbl() {
-        return dbl;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public void setDbl(double newDbl) {
-        double oldDbl = dbl;
-        dbl = newDbl;
-        boolean oldDbl_set_ = dbl_set_;
-        dbl_set_ = true;
-        if (isNotifying()) {
-            notify(ChangeKind.SET, _INTERNAL_DBL, oldDbl, dbl, !oldDbl_set_);
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public void unsetDbl() {
-        double oldDbl = dbl;
-        boolean oldDbl_set_ = dbl_set_;
-        dbl = DBL_DEFAULT_;
-        dbl_set_ = false;
-        if (isNotifying()) {
-            notify(ChangeKind.UNSET, _INTERNAL_DBL, oldDbl, DBL_DEFAULT_, oldDbl_set_);
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public boolean isSetDbl() {
-        return dbl_set_;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public List<?> getTexts() {
-        if (texts == null) {
-            texts = createPropertyList(ListKind.DATATYPE, String.class, TEXTS, 0);
-        }
-        return texts;
-    }
-
-    /**
-     * <!-- 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();
-        }
-        return super.get(propertyIndex, resolve);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    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();
-            Collection col = (Collection)newValue;
-            List textsList = getTexts();
-            textsList.addAll(col);
-            return;
-        }
-        super.set(propertyIndex, newValue);
-    }
-
-    /**
-     * <!-- 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;
-        }
-        super.unset(propertyIndex);
-    }
-
-    /**
-     * <!-- 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();
-        }
-        return super.isSet(propertyIndex);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public String toString() {
-        if (isProxy(this)) {
-            return super.toString();
-        }
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (text: ");
-        if (text_set_) {
-            result.append(text);
-        } else {
-            result.append("<unset>");
-        }
-        result.append(", int: ");
-        if (int_set_) {
-            result.append(int_);
-        } else {
-            result.append("<unset>");
-        }
-        result.append(", dbl: ");
-        if (dbl_set_) {
-            result.append(dbl);
-        } else {
-            result.append("<unset>");
-        }
-        result.append(", texts: ");
-        result.append(texts);
-        result.append(')');
-        return result.toString();
-    }
-
-}
-//CHECKSTYLE:ON
-
-

http://git-wip-us.apache.org/repos/asf/cxf/blob/969a10c9/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml
index a60cae1..0c8db39 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml
@@ -28,8 +28,6 @@
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
     <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
     <bean class="org.apache.cxf.systest.jaxrs.BookStoreSpring" id="serviceBean"/>
-    <bean class="org.apache.cxf.systest.jaxrs.sdo.SDOResource" id="sdoBean"/>
-    <bean class="org.apache.cxf.systest.jaxrs.sdo.SDOResource2" id="sdoBean2"/>
     <jaxrs:server id="jaxbbook" address="/jaxb">
         <jaxrs:serviceBeans>
             <ref bean="serviceBean"/>
@@ -52,20 +50,5 @@
             </bean>
         </jaxrs:dataBinding>
     </jaxrs:server>
-    <jaxrs:server id="sdo" address="/sdo">
-        <jaxrs:serviceBeans>
-            <ref bean="sdoBean"/>
-        </jaxrs:serviceBeans>
-        <jaxrs:dataBinding>
-            <ref bean="sdoDatabinding"/>
-        </jaxrs:dataBinding>
-    </jaxrs:server>
-    <jaxrs:server id="sdo2" address="/sdo2">
-        <jaxrs:serviceBeans>
-            <ref bean="sdoBean2"/>
-        </jaxrs:serviceBeans>
-    </jaxrs:server>
-    <bean id="sdoDatabinding" class="org.apache.cxf.sdo.SDODataBinding"/>
-    
 </beans>
 <!-- END SNIPPET: beans -->


Mime
View raw message