cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r753393 - in /cxf/trunk: distribution/bundle/all/ distribution/bundle/jaxrs/ distribution/bundle/minimal/ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/ rt/databinding/aegis/src/main/java/org/codehaus/xfire/aegis/type/j...
Date Fri, 13 Mar 2009 20:40:35 GMT
Author: dkulp
Date: Fri Mar 13 20:40:08 2009
New Revision: 753393

URL: http://svn.apache.org/viewvc?rev=753393&view=rev
Log:
Remove the ancient and LONG LONG deprecated org.codehaus annotations

Removed:
    cxf/trunk/rt/databinding/aegis/src/main/java/org/codehaus/xfire/aegis/type/java5/
Modified:
    cxf/trunk/distribution/bundle/all/pom.xml
    cxf/trunk/distribution/bundle/jaxrs/pom.xml
    cxf/trunk/distribution/bundle/minimal/pom.xml
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean1.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean2.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean3.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean4.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTestEnum.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java

Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=753393&r1=753392&r2=753393&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Fri Mar 13 20:40:08 2009
@@ -289,7 +289,6 @@
                         </Import-Package>
                         <Export-Package>
                             org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
-                            org.codehaus.xfire.aegis.type.java5.*,
                             '=META-INF.cxf'
                         </Export-Package>
                         <_failok>true</_failok>

Modified: cxf/trunk/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/jaxrs/pom.xml?rev=753393&r1=753392&r2=753393&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/distribution/bundle/jaxrs/pom.xml Fri Mar 13 20:40:08 2009
@@ -139,7 +139,6 @@
                         </Import-Package>
                         <Export-Package>
                             org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
-                            org.codehaus.xfire.aegis.type.java5.*,
                             '=META-INF.cxf'
                         </Export-Package>
                         <_failok>true</_failok>

Modified: cxf/trunk/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/minimal/pom.xml?rev=753393&r1=753392&r2=753393&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/minimal/pom.xml (original)
+++ cxf/trunk/distribution/bundle/minimal/pom.xml Fri Mar 13 20:40:08 2009
@@ -179,7 +179,6 @@
                         </Import-Package>
                         <Export-Package>
                             org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
-                            org.codehaus.xfire.aegis.type.java5.*,
                             '=META-INF.cxf',
                             '=schemas',
                             '=schemas.configuration',

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java?rev=753393&r1=753392&r2=753393&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
Fri Mar 13 20:40:08 2009
@@ -24,7 +24,6 @@
 
 import org.apache.cxf.aegis.type.Type;
 
-@SuppressWarnings("deprecation")
 public class AnnotationReader {
     private static final Class<? extends Annotation> WEB_PARAM = load("javax.jws.WebParam");
     private static final Class<? extends Annotation> WEB_RESULT = load("javax.jws.WebResult");
@@ -38,12 +37,26 @@
             load("javax.xml.bind.annotation.XmlType");
     private static final Class<? extends Annotation> XML_TRANSIENT =
             load("javax.xml.bind.annotation.XmlTransient");
-
+    
+    private static final Class<? extends Annotation> XFIRE_IGNORE_PROPERTY =
+            load("org.codehaus.xfire.aegis.type.java5.IgnoreProperty");            
+    private static final Class<? extends Annotation> XFIRE_XML_ATTRIBUTE =
+        load("org.codehaus.xfire.aegis.type.java5.XmlAttribute");            
+    private static final Class<? extends Annotation> XFIRE_XML_ELEMENT =
+        load("org.codehaus.xfire.aegis.type.java5.XmlElement");            
+    private static final Class<? extends Annotation> XFIRE_XML_TYPE =
+        load("org.codehaus.xfire.aegis.type.java5.XmlType");
+    private static final Class<? extends Annotation> XFIRE_XML_PARAM_TYPE =
+        load("org.codehaus.xfire.aegis.type.java5.XmlParamType");
+    private static final Class<? extends Annotation> XFIRE_XML_RETURN_TYPE =
+        load("org.codehaus.xfire.aegis.type.java5.XmlReturnType");
+    
+    
     @SuppressWarnings("unchecked")
     public boolean isIgnored(AnnotatedElement element) {
         return isAnnotationPresent(element,
                 IgnoreProperty.class,
-                org.codehaus.xfire.aegis.type.java5.IgnoreProperty.class,
+                XFIRE_IGNORE_PROPERTY,
                 XML_TRANSIENT);
     }
 
@@ -51,7 +64,7 @@
     public boolean isAttribute(AnnotatedElement element) {
         return isAnnotationPresent(element,
                 XmlAttribute.class,
-                org.codehaus.xfire.aegis.type.java5.XmlAttribute.class,
+                XFIRE_XML_ATTRIBUTE,
                 XML_ATTRIBUTE);
     }
 
@@ -59,7 +72,7 @@
     public boolean isElement(AnnotatedElement element) {
         return isAnnotationPresent(element,
                 XmlElement.class,
-                org.codehaus.xfire.aegis.type.java5.XmlElement.class,
+                XFIRE_XML_ELEMENT,
                 XML_ELEMENT);
     }
 
@@ -70,7 +83,7 @@
                 element,
                 Boolean.FALSE,
                 XmlElement.class,
-                org.codehaus.xfire.aegis.type.java5.XmlElement.class,
+                XFIRE_XML_ELEMENT,
                 XML_ELEMENT));
     }
 
@@ -81,8 +94,8 @@
                 Type.class,
                 XmlAttribute.class,
                 XmlElement.class,
-                org.codehaus.xfire.aegis.type.java5.XmlAttribute.class,
-                org.codehaus.xfire.aegis.type.java5.XmlElement.class);
+                XFIRE_XML_ATTRIBUTE,
+                XFIRE_XML_ELEMENT);
         // jaxb uses a different default value
         if (value == null) {
             value = (Class) getAnnotationValue("type",
@@ -101,7 +114,7 @@
                 index,
                 Type.class,
                 XmlParamType.class,
-                org.codehaus.xfire.aegis.type.java5.XmlParamType.class);
+                XFIRE_XML_PARAM_TYPE);
     }
 
     @SuppressWarnings("unchecked")
@@ -110,7 +123,7 @@
                 element,
                 Type.class,
                 XmlReturnType.class,
-                org.codehaus.xfire.aegis.type.java5.XmlReturnType.class);
+                XFIRE_XML_RETURN_TYPE);
     }
 
     @SuppressWarnings("unchecked")
@@ -119,11 +132,11 @@
                 element,
                 "",
                 XmlType.class,
-                org.codehaus.xfire.aegis.type.java5.XmlType.class,
+                XFIRE_XML_TYPE,
                 XmlAttribute.class,
-                org.codehaus.xfire.aegis.type.java5.XmlAttribute.class,
+                XFIRE_XML_ATTRIBUTE,
                 XmlElement.class,
-                org.codehaus.xfire.aegis.type.java5.XmlElement.class);
+                XFIRE_XML_ELEMENT);
 
         // jaxb uses a different default value
         if (name == null) {
@@ -144,7 +157,7 @@
                 index,
                 Type.class,
                 XmlParamType.class,
-                org.codehaus.xfire.aegis.type.java5.XmlParamType.class,
+                XFIRE_XML_PARAM_TYPE,
                 WEB_PARAM);
     }
 
@@ -154,7 +167,7 @@
                 element,
                 "",
                 XmlReturnType.class,
-                org.codehaus.xfire.aegis.type.java5.XmlReturnType.class,
+                XFIRE_XML_RETURN_TYPE,
                 WEB_RESULT);
     }
 
@@ -169,11 +182,11 @@
                 element,
                 "",
                 XmlType.class,
-                org.codehaus.xfire.aegis.type.java5.XmlType.class,
+                XFIRE_XML_TYPE,
                 XmlAttribute.class,
-                org.codehaus.xfire.aegis.type.java5.XmlAttribute.class,
+                XFIRE_XML_ATTRIBUTE,
                 XmlElement.class,
-                org.codehaus.xfire.aegis.type.java5.XmlElement.class,
+                XFIRE_XML_ELEMENT,
                 XML_SCHEMA);
 
         // jaxb uses a different default value
@@ -196,7 +209,7 @@
                 index,
                 "",
                 XmlParamType.class,
-                org.codehaus.xfire.aegis.type.java5.XmlParamType.class);
+                XFIRE_XML_PARAM_TYPE);
 
         // JWS annotation field is named targetNamespace
         if (namespace == null) {
@@ -211,7 +224,7 @@
                 element,
                 "",
                 XmlReturnType.class,
-                org.codehaus.xfire.aegis.type.java5.XmlReturnType.class);
+                XFIRE_XML_RETURN_TYPE);
 
         // JWS annotation field is named targetNamespace
         if (namespace == null) {
@@ -226,7 +239,7 @@
                 element,
                 "",
                 XmlElement.class,
-                org.codehaus.xfire.aegis.type.java5.XmlElement.class);
+                XFIRE_XML_ELEMENT);
         if (minOccurs != null) {
             return Integer.parseInt(minOccurs);
         }
@@ -246,7 +259,7 @@
                 element,
                 Boolean.TRUE,
                 XmlType.class,
-                org.codehaus.xfire.aegis.type.java5.XmlType.class);
+                XFIRE_XML_TYPE);
 
         if (extensibleElements == null) {
             return defaultValue;
@@ -260,7 +273,7 @@
                 element,
                 Boolean.TRUE,
                 XmlType.class,
-                org.codehaus.xfire.aegis.type.java5.XmlType.class);
+                XFIRE_XML_TYPE);
 
         if (extensibleAttributes == null) {
             return defaultValue;

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean1.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean1.java?rev=753393&r1=753392&r2=753393&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean1.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean1.java
Fri Mar 13 20:40:08 2009
@@ -18,13 +18,12 @@
  */
 package org.apache.cxf.aegis.type.java5;
 
-@SuppressWarnings("deprecation")
 public class XFireBean1 {
     private String elementProperty;
     private String attributeProperty;
     private String bogusProperty;
 
-    @org.codehaus.xfire.aegis.type.java5.XmlAttribute
+    @XmlAttribute
     public String getAttributeProperty() {
         return attributeProperty;
     }
@@ -41,7 +40,7 @@
         this.bogusProperty = bogusProperty;
     }
 
-    @org.codehaus.xfire.aegis.type.java5.XmlElement(type = CustomStringType.class)
+    @XmlElement(type = CustomStringType.class)
     public String getElementProperty() {
         return elementProperty;
     }

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean2.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean2.java?rev=753393&r1=753392&r2=753393&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean2.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean2.java
Fri Mar 13 20:40:08 2009
@@ -18,13 +18,12 @@
  */
 package org.apache.cxf.aegis.type.java5;
 
-@SuppressWarnings("deprecation")
 public class XFireBean2 {
     private String elementProperty;
     private String attributeProperty;
     private String ignoredProperty;
 
-    @org.codehaus.xfire.aegis.type.java5.XmlAttribute(name = "attribute")
+    @XmlAttribute(name = "attribute")
     public String getAttributeProperty() {
         return attributeProperty;
     }
@@ -33,7 +32,7 @@
         this.attributeProperty = attributeProperty;
     }
 
-    @org.codehaus.xfire.aegis.type.java5.XmlElement(name = "element")
+    @XmlElement(name = "element")
     public String getElementProperty() {
         return elementProperty;
     }
@@ -42,7 +41,7 @@
         this.elementProperty = elementProperty;
     }
 
-    @org.codehaus.xfire.aegis.type.java5.IgnoreProperty
+    @IgnoreProperty
     public String getIgnoredProperty() {
         return ignoredProperty;
     }

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean3.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean3.java?rev=753393&r1=753392&r2=753393&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean3.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean3.java
Fri Mar 13 20:40:08 2009
@@ -18,11 +18,10 @@
  */
 package org.apache.cxf.aegis.type.java5;
 
-@SuppressWarnings("deprecation")
 public class XFireBean3 {
     private String attributeProperty;
 
-    @org.codehaus.xfire.aegis.type.java5.XmlAttribute(name = "attribute")
+    @XmlAttribute(name = "attribute")
     public String getAttributeProperty() {
         return attributeProperty;
     }

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean4.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean4.java?rev=753393&r1=753392&r2=753393&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean4.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireBean4.java
Fri Mar 13 20:40:08 2009
@@ -18,14 +18,13 @@
  */
 package org.apache.cxf.aegis.type.java5;
 
-@SuppressWarnings("deprecation")
-@org.codehaus.xfire.aegis.type.java5.XmlType(extensibleElements = false, extensibleAttributes
= false)
+@XmlType(extensibleElements = false, extensibleAttributes = false)
 public class XFireBean4 {
     private String nillableProperty;
 
     private String minOccursProperty;
 
-    @org.codehaus.xfire.aegis.type.java5.XmlElement(nillable = false)
+    @XmlElement(nillable = false)
     public String getNillableProperty() {
         return nillableProperty;
     }
@@ -34,7 +33,7 @@
         this.nillableProperty = nillableProperty;
     }
 
-    @org.codehaus.xfire.aegis.type.java5.XmlElement(minOccurs = "1")
+    @XmlElement(minOccurs = "1")
     public String getMinOccursProperty() {
         return minOccursProperty;
     }

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTestEnum.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTestEnum.java?rev=753393&r1=753392&r2=753393&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTestEnum.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTestEnum.java
Fri Mar 13 20:40:08 2009
@@ -18,8 +18,7 @@
  */
 package org.apache.cxf.aegis.type.java5;
 
-@SuppressWarnings("deprecation")
-@org.codehaus.xfire.aegis.type.java5.XmlType(namespace = "urn:xfire:foo")
+@XmlType(namespace = "urn:xfire:foo")
 public enum XFireTestEnum {
     VALUE1, VALUE2
 }
\ No newline at end of file

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java?rev=753393&r1=753392&r2=753393&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java
Fri Mar 13 20:40:08 2009
@@ -23,18 +23,17 @@
 import org.w3c.dom.Document;
 
 import org.apache.cxf.aegis.AbstractAegisTest;
-import org.apache.cxf.aegis.type.Configuration;
 import org.apache.cxf.aegis.type.DefaultTypeCreator;
 import org.apache.cxf.aegis.type.DefaultTypeMapping;
 import org.apache.cxf.aegis.type.Type;
 import org.junit.Before;
 import org.junit.Test;
 
-@SuppressWarnings("deprecation")
 public class XFireXmlParamTypeTest extends AbstractAegisTest {
     private DefaultTypeMapping tm;
     private Java5TypeCreator creator;
 
+    @SuppressWarnings("deprecation")
     @Before
     public void setUp() throws Exception {
         super.setUp();
@@ -42,7 +41,7 @@
         tm = new DefaultTypeMapping();
         creator = new Java5TypeCreator();
         creator.setNextCreator(new DefaultTypeCreator());
-        creator.setConfiguration(new Configuration());
+        creator.setConfiguration(new org.apache.cxf.aegis.type.Configuration());
         tm.setTypeCreator(creator);
     }
 
@@ -71,10 +70,9 @@
 
     public class CustomTypeService {
 
-        @org.codehaus.xfire.aegis.type.java5.XmlReturnType(type = CustomStringType.class,

-                                                           namespace = "urn:xfire:foo", name
= "custom")
+        @XmlReturnType(type = CustomStringType.class, namespace = "urn:xfire:foo", name =
"custom")
         public String doFoo(
-                            @org.codehaus.xfire.aegis.type.java5.XmlParamType(type = CustomStringType.class,
+                            @XmlParamType(type = CustomStringType.class,
                                           namespace = "urn:xfire:foo", name = "custom")
                             String s) {
             return null;



Mime
View raw message