4:53 p.m.
Author: thomas.diesler(a)jboss.com
Date: 2007-03-10 17:53:00 -0500 (Sat, 10 Mar 2007)
New Revision: 2592
Modified:
branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java
branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java
branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
Log:
Use Object instead of AnnotatedElement, since we neet to support jdk1.4 and this cannot be
retrotranslated
Modified:
branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-03-10
21:59:14 UTC (rev 2591)
+++
branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-03-10
22:53:00 UTC (rev 2592)
@@ -77,7 +77,7 @@
}
else
{
- AnnotatedElement anElement = sref.getAnnotatedElement();
+ AnnotatedElement anElement = (AnnotatedElement)sref.getAnnotatedElement();
ServiceRefHandlerJAXWS handler = new ServiceRefHandlerJAXWS();
handler.setupServiceRef(encCtx, encName, anElement, serviceRef);
}
Modified:
branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java 2007-03-10
21:59:14 UTC (rev 2591)
+++
branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java 2007-03-10
22:53:00 UTC (rev 2592)
@@ -24,7 +24,6 @@
// $Id$
import java.io.Serializable;
-import java.lang.reflect.AnnotatedElement;
import org.w3c.dom.Element;
@@ -40,9 +39,9 @@
public abstract void setServiceRefName(String name);
- public abstract AnnotatedElement getAnnotatedElement();
+ public abstract Object getAnnotatedElement();
- public abstract void setAnnotatedElement(AnnotatedElement anElement);
+ public abstract void setAnnotatedElement(Object anElement);
public abstract boolean isProcessed();
Modified:
branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-03-10
21:59:14 UTC (rev 2591)
+++
branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-03-10
22:53:00 UTC (rev 2592)
@@ -23,12 +23,10 @@
// $Id$
-import java.lang.reflect.AnnotatedElement;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -37,10 +35,8 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.integration.ServiceRefMetaData;
import org.jboss.ws.integration.UnifiedVirtualFile;
-import org.jboss.xb.QNameBuilder;
import org.w3c.dom.Element;
/**
@@ -92,7 +88,9 @@
// Arbitrary proxy properties given by <call-property>
private List<UnifiedCallPropertyMetaData> callProperties = new
ArrayList<UnifiedCallPropertyMetaData>();
- private transient AnnotatedElement anElement;
+ // The JAXWS annotated element. JDK1.4 does not have
java.lang.reflect.AnnotatedElement so we use an untyped Object
+ private transient Object anElement;
+ // A flag that should be set when this service-ref has been bound.
private transient boolean processed;
public UnifiedServiceRefMetaData(UnifiedVirtualFile vfRoot)
@@ -364,12 +362,17 @@
this.handlerChain = handlerChain;
}
- public AnnotatedElement getAnnotatedElement()
+ public Object getAnnotatedElement()
{
return anElement;
}
+ public void setAnnotatedElement(Object anElement)
+ {
+ this.anElement = anElement;
+ }
+
public boolean isProcessed()
{
return processed;
@@ -380,11 +383,6 @@
this.processed = flag;
}
- public void setAnnotatedElement(AnnotatedElement anElement)
- {
- this.anElement = anElement;
- }
-
@Override
public void importStandardXml(Element root)
{