svn commit: r657330 - in /cxf/trunk/rt/databinding/aegis/src: main/java/org/apache/cxf/aegis/AegisElementDataWriter.java test/java/org/apache/cxf/aegis/services/AttributeBean.java

[bi...@apache.org]

Author: bimargulies
Date: Sat May 17 04:16:23 2008
New Revision: 657330

URL: http://svn.apache.org/viewvc?rev=657330&view=rev
Log:
Remove wrongheaded start on qualification control for Aegis. Add bean
for use in future unit test.

Added:
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AttributeBean.java   (with props)
Modified:
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java?rev=657330&r1=657329&r2=657330&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java Sat May 17 04:16:23 2008
@@ -19,7 +19,6 @@
 
 package org.apache.cxf.aegis;
 
-import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.namespace.QName;
 import org.w3c.dom.Element;
 
@@ -42,10 +41,6 @@
     public void write(Object obj, QName elementName, boolean optional, Element output, Type aegisType)
         throws Exception {
         W3CDOMStreamWriter swriter = new W3CDOMStreamWriter(output);
-        QName elementNameToWrite = elementName;
-        if (aegisContext.getElementForm() == XmlNsForm.UNQUALIFIED) {
-            elementNameToWrite = new QName(elementName.getLocalPart());
-        }
-        writer.write(obj, elementNameToWrite, optional, swriter, aegisType);
+        writer.write(obj, elementName, optional, swriter, aegisType);
     }
 }

Added: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AttributeBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AttributeBean.java?rev=657330&view=auto
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AttributeBean.java (added)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AttributeBean.java Sat May 17 04:16:23 2008
@@ -0,0 +1,59 @@
+/**
+ * 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.services;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+/**
+ * Test class for attribute forms.
+ */
+public class AttributeBean {
+    private String attrPlainString = "attrPlain";
+    private String attrXmlString = "attrXml";
+    private String attrExplicitString = "attrExplicit";
+
+    @XmlAttribute (namespace = "")
+    public String getAttrPlainString() {
+        return attrPlainString;
+    }
+
+    public void setAttrPlainString(String plainString) {
+        this.attrPlainString = plainString;
+    }
+
+    public String getAttrXmlString() {
+        return attrXmlString;
+    }
+
+    public void setAttrXmlString(String attrXmlString) {
+        this.attrXmlString = attrXmlString;
+    }
+
+    @XmlAttribute (namespace = "urn:xyzzy")
+    public String getAttrExplicitString() {
+        return attrExplicitString;
+    }
+
+    public void setAttrExplicitString(String attrExplicitString) {
+        this.attrExplicitString = attrExplicitString;
+    }
+    
+
+}

Propchange: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AttributeBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AttributeBean.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date