Author: sagara
Date: Fri Jun 15 11:01:15 2012
New Revision: 1350570
URL: http://svn.apache.org/viewvc?rev=1350570&view=rev
Log:
AXIS2-5315 - More code cleanups, removed another set of deprecated methods.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/Options.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLDefinitionWrapper.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
Fri Jun 15 11:01:15 2012
@@ -377,138 +377,7 @@ public class EndpointReference implement
}
return buffer.toString();
- }
-
- /**
- * @param eprOMElement
- * @deprecated use {@link EndpointReferenceHelper#fromOM(OMElement)}
instead.
- */
- public void fromOM(OMElement eprOMElement) {
- OMElement addressElement = eprOMElement.getFirstChildWithName(new
QName("Address"));
- setAddress(addressElement.getText());
- Iterator allAddrAttributes = addressElement.getAllAttributes();
- if (addressAttributes == null) {
- addressAttributes = new ArrayList<OMAttribute>();
- }
-
- while (allAddrAttributes.hasNext()) {
- OMAttribute attribute = (OMAttribute) allAddrAttributes.next();
- addressAttributes.add(attribute);
- }
-
-
- OMElement refParamElement = eprOMElement
- .getFirstChildWithName(new
QName(AddressingConstants.EPR_REFERENCE_PARAMETERS));
-
- if (refParamElement != null) {
- Iterator refParams = refParamElement.getChildElements();
- while (refParams.hasNext()) {
- OMElement omElement = (OMElement) refParams.next();
- addReferenceParameter(omElement);
- }
- }
-
-
- OMElement metaDataElement = eprOMElement
- .getFirstChildWithName(new
QName(AddressingConstants.Final.WSA_METADATA));
- if (metaDataElement != null) {
- Iterator children = metaDataElement.getChildren();
- while (children.hasNext()) {
- OMNode omNode = (OMNode) children.next();
- addMetaData(omNode);
- }
- }
-
- setName(eprOMElement.getLocalName());
-
- Iterator allAttributes = eprOMElement.getAllAttributes();
- if (attributes == null) {
- attributes = new ArrayList();
- }
-
- while (allAttributes.hasNext()) {
- OMAttribute attribute = (OMAttribute) allAttributes.next();
- attributes.add(attribute);
- }
-
- Iterator childElements = eprOMElement.getChildElements();
- while (childElements.hasNext()) {
- OMElement eprChildElement = (OMElement) childElements.next();
- String localName = eprChildElement.getLocalName();
- if (!localName.equals("Address") &&
-
!localName.equals(AddressingConstants.EPR_REFERENCE_PARAMETERS) &&
- !localName.equals(AddressingConstants.Final.WSA_METADATA))
{
- addExtensibleElement(eprChildElement);
- }
- }
- }
-
- /**
- * @param nsurl
- * @param localName
- * @param prefix
- * @throws AxisFault
- * @deprecated use {@link EndpointReferenceHelper#toOM(EndpointReference,
QName, String)} instead.
- */
- public OMElement toOM(String nsurl, String localName, String prefix)
throws AxisFault {
- OMFactory fac = OMAbstractFactory.getOMFactory();
- if (prefix != null) {
- OMNamespace wrapNs = fac.createOMNamespace(nsurl, prefix);
- OMElement epr = fac.createOMElement(localName, wrapNs);
- OMNamespace wsaNS =
fac.createOMNamespace(AddressingConstants.Final.WSA_NAMESPACE,
-
AddressingConstants.WSA_DEFAULT_PREFIX);
- OMElement addressE =
fac.createOMElement(AddressingConstants.EPR_ADDRESS, wsaNS, epr);
- addressE.setText(address);
-
- if (addressAttributes != null) {
- Iterator attrIter = addressAttributes.iterator();
- while (attrIter.hasNext()) {
- OMAttribute omAttributes = (OMAttribute) attrIter.next();
- addressE.addAttribute(omAttributes);
- }
- }
-
- if (this.metaData != null) {
- OMElement metadataE =
-
fac.createOMElement(AddressingConstants.Final.WSA_METADATA, wsaNS, epr);
- Iterator metadata = this.metaData.iterator();
- while (metadata.hasNext()) {
- metadataE.addChild((OMNode) metadata.next());
- }
- }
-
- if (this.referenceParameters != null) {
- OMElement refParameterElement =
-
fac.createOMElement(AddressingConstants.EPR_REFERENCE_PARAMETERS,
- wsaNS,
- epr);
- Iterator refParms = referenceParameters.values().iterator();
- while (refParms.hasNext()) {
- refParameterElement.addChild((OMNode) refParms.next());
- }
- }
-
- if (attributes != null) {
- Iterator attrIter = attributes.iterator();
- while (attrIter.hasNext()) {
- OMAttribute omAttributes = (OMAttribute) attrIter.next();
- epr.addAttribute(omAttributes);
- }
- }
-
- // add xs:any
- ArrayList omElements = extensibleElements;
- if (omElements != null) {
- for (int i = 0; i < omElements.size(); i++) {
- epr.addChild((OMElement) omElements.get(i));
- }
- }
-
- return epr;
- } else {
- throw new AxisFault("prefix must be specified");
- }
- }
+ }
/**
* Compares key parts of the state from the current instance of
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
Fri Jun 15 11:01:15 2012
@@ -124,22 +124,7 @@ public class EndpointReferenceHelper {
fromOM(epr, eprOMElement, map, isFinalAddressingNamespace);
return ((QName)
map.get(AddressingConstants.EPR_ADDRESS)).getNamespaceURI();
- }
-
- /**
- * Populates an endpoint reference based on the <code>String</code> that is
- * passed in. If the http://schemas.xmlsoap.org/ws/2004/08/addressing
namespace
- * is in effect then any reference properties will be saved as reference
parameters.
- * Regardless of the addressing namespace in effect, any elements present
in the
- * <code>String</code> that are not recognised are saved as extensibility
elements.
- *
- * @param eprString string from the element of endpoint reference type
- * @throws AxisFault if unable to locate an address element
- * @deprecated use {@link #fromString(String)} instead.
- */
- public static EndpointReference fromOM(String eprString) throws AxisFault {
- return fromString(eprString);
- }
+ }
/**
* Populates an endpoint reference based on the <code>String</code> that is
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/Options.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/Options.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/Options.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/Options.java
Fri Jun 15 11:01:15 2012
@@ -967,60 +967,7 @@ public class Options implements External
*/
public void setTo(EndpointReference to) {
this.to = to;
- }
-
- /**
- * Sets transport information to the call. The scenarios supported are as
- * follows: <blockquote>
- * <p/>
- * <pre>
- * [senderTransport, listenerTransport, useSeparateListener]
- * http, http, true
- * http, http, false
- * http, smtp, true
- * smtp, http, true
- * smtp, smtp, true
- * tcp, tcp, true
- * tcp, tcp, false
- * etc.
- * </pre>
- * <p/>
- * </blockquote>
- *
- * @param senderTransport
- * @param listenerTransport
- * @param useSeparateListener
- * @throws AxisFault
- * @deprecated Use setTransportInProtocol(String) and
- * useSeparateListener(boolean) instead. You do not need to
- * setSenderTransportProtocol(String) as sender transport can
be
- * inferred from the to EPR. But still you can
- * setTransportOut(TransportOutDescription).
- */
- public void setTransportInfo(String senderTransport,
- String listenerTransport, boolean
useSeparateListener)
- throws AxisFault {
-
- // here we check for a legal combination, for and example if the
- // sendertransport is http and listener
- // transport is smtp the invocation must using separate transport
- if (!useSeparateListener) {
- boolean isTransportsEqual = senderTransport
- .equals(listenerTransport);
- boolean isATwoWaytransport = Constants.TRANSPORT_HTTP
- .equals(senderTransport)
- || Constants.TRANSPORT_TCP.equals(senderTransport);
-
- if ((!isTransportsEqual || !isATwoWaytransport)) {
- throw new AxisFault(Messages
- .getMessage("useSeparateListenerLimited",
senderTransport, listenerTransport));
- }
- } else {
- setUseSeparateListener(useSeparateListener);
- }
-
- setTransportInProtocol(listenerTransport);
- }
+ }
/**
* Used to specify whether the two SOAP Messages are be sent over same
@@ -1033,23 +980,7 @@ public class Options implements External
*/
public void setUseSeparateListener(boolean useSeparateListener) {
this.useSeparateListener = Boolean.valueOf(useSeparateListener);
- }
-
- /**
- * Add WS-Addressing ReferenceParameter child element. Multiple child
- * may be used.
- * TODO Add get method, implement handling.
- *
- * @param referenceParameter
- * @deprecated
- */
- public void addReferenceParameter(OMElement referenceParameter) {
- if (referenceParameters == null) {
- referenceParameters = new ArrayList<OMElement>(5);
- }
-
- referenceParameters.add(referenceParameter);
- }
+ }
/**
* Check if session management is enabled.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
Fri Jun 15 11:01:15 2012
@@ -334,18 +334,7 @@ public class ServiceClient {
*/
public Options getOverrideOptions() {
return overrideOptions;
- }
-
- /**
- * Engage a module for this service client.
- *
- * @param moduleName name of the module to engage
- * @throws AxisFault if something goes wrong
- * @deprecated Please use String version instead
- */
- public void engageModule(QName moduleName) throws AxisFault {
- engageModule(moduleName.getLocalPart());
- }
+ }
/**
* Engage a module for this service client.
@@ -368,16 +357,6 @@ public class ServiceClient {
* Disengage a module for this service client
*
* @param moduleName name of Module to disengage
- * @deprecated Please use String version instead
- */
- public void disengageModule(QName moduleName) {
- disengageModule(moduleName.getLocalPart());
- }
-
- /**
- * Disengage a module for this service client
- *
- * @param moduleName name of Module to disengage
*/
public void disengageModule(String moduleName) {
synchronized (this.axisConfig) {
@@ -734,17 +713,7 @@ public class ServiceClient {
*/
public OperationContext getLastOperationContext() {
return serviceContext.getLastOperationContext();
- }
-
- /**
- * Sets whether or not to cache the last OperationContext
- *
- * @param cachingOpContext true if we should hold onto the last active
OperationContext
- * @deprecated
- */
- public void setCachingOperationContext(boolean cachingOpContext) {
- serviceContext.setCachingOperationContext(cachingOpContext);
- }
+ }
/**
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
Fri Jun 15 11:01:15 2012
@@ -175,20 +175,6 @@ public abstract class AxisOperation exte
}
}
- /**
- * To remove module from engage module list
- *
- * @param module module to remove
- * @deprecated please use disengageModule(), this method will disappear
after 1.3
- */
- public void removeFromEngagedModuleList(AxisModule module) {
- try {
- disengageModule(module);
- } catch (AxisFault axisFault) {
- // Can't do much here...
- log.error(axisFault.getMessage(), axisFault);
- }
- }
// Note - removed this method which was dead code.
// private AxisOperation copyOperation(AxisOperation axisOperation) throws
AxisFault {
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
Fri Jun 15 11:01:15 2012
@@ -314,20 +314,6 @@ public class AxisService extends AxisDes
this.endpointMap.put(key, axisEndpoint);
}
- /**
- * @deprecated Use
AddressingHelper.getAddressingRequirementParemeterValue
- */
- public String getWSAddressingFlag() {
- return
AddressingHelper.getAddressingRequirementParemeterValue(this);
- }
-
- /**
- * @deprecated Use
AddressingHelper.setAddressingRequirementParemeterValue
- */
- public void setWSAddressingFlag(String ar) {
- AddressingHelper.setAddressingRequirementParemeterValue(this,
ar);
- }
-
public boolean isSchemaLocationsAdjusted() {
return schemaLocationsAdjusted;
}
@@ -386,22 +372,6 @@ public class AxisService extends AxisDes
dataLocatorClassNames = new HashMap();
}
- /**
- * @return name of the port type
- * @deprecated use AxisService#getEndpointName() instead.
- */
- public String getPortTypeName() {
- return endpointName;
- }
-
- /**
- * @param portTypeName
- * @deprecated use AxisService#setEndpointName() instead
- */
- public void setPortTypeName(String portTypeName) {
- this.endpointName = portTypeName;
- }
-
public String getBindingName() {
return bindingName;
}
@@ -1839,16 +1809,6 @@ public class AxisService extends AxisDes
return 1;
}
- /**
- * Gets the description about the service which is specified in
- * services.xml.
- *
- * @return Returns String.
- * @deprecated Use getDocumentation() instead
- */
- public String getServiceDescription() {
- return getDocumentation();
- }
/**
* Method getClassLoader.
@@ -1881,14 +1841,6 @@ public class AxisService extends AxisDes
return fileName;
}
- /**
- * @deprecated please use getLastUpdate
- * @return
- */
- public long getLastupdate() {
- return lastupdate;
- }
-
public long getLastUpdate() {
return lastupdate;
}
@@ -2081,17 +2033,7 @@ public class AxisService extends AxisDes
}
return operationList;
- }
-
- /**
- * Sets the description about the service which is specified in
services.xml
- *
- * @param documentation
- * @deprecated Use setDocumentation() instead
- */
- public void setServiceDescription(String documentation) {
- setDocumentation(documentation);
- }
+ }
/**
* Method setClassLoader.
@@ -2106,14 +2048,6 @@ public class AxisService extends AxisDes
this.fileName = fileName;
}
- /**
- * Sets the current time as last update time of the service.
- * @deprecated please use setLastUpdate
- */
- public void setLastupdate() {
- lastupdate = new Date().getTime();
- }
-
/**
* Sets the current time as last update time of the service.
*/
@@ -2193,14 +2127,6 @@ public class AxisService extends AxisDes
this.active = active;
}
- /**
- * @deprecated please use getSchemaTargetNamespace
- * @return
- */
- public String getSchematargetNamespace() {
- return schematargetNamespace;
- }
-
public String getSchemaTargetNamespace() {
return schematargetNamespace;
}
@@ -2213,15 +2139,6 @@ public class AxisService extends AxisDes
return schematargetNamespacePrefix;
}
- /**
- * @deprecated please use setSchemaTargetNamespacePrefix
- * @param schematargetNamespacePrefix
- */
- public void setSchematargetNamespacePrefix(
- String schematargetNamespacePrefix) {
- this.schematargetNamespacePrefix = schematargetNamespacePrefix;
- }
-
public void setSchemaTargetNamespacePrefix(
String schematargetNamespacePrefix) {
this.schematargetNamespacePrefix = schematargetNamespacePrefix;
@@ -2677,16 +2594,6 @@ public class AxisService extends AxisDes
* Get the namespace map for this service.
*
* @return a Map of prefix (String) to namespace URI (String)
- * @deprecated please use getNamespaceMap()
- */
- public Map<String, String> getNameSpacesMap() {
- return namespaceMap;
- }
-
- /**
- * Get the namespace map for this service.
- *
- * @return a Map of prefix (String) to namespace URI (String)
*/
public Map getNamespaceMap() {
return namespaceMap;
@@ -2710,13 +2617,6 @@ public class AxisService extends AxisDes
this.importedNamespaces = importedNamespaces;
}
- /**
- * @deprecated please use setNamespaceMap
- * @param nameSpacesMap
- */
- public void setNameSpacesMap(NamespaceMap nameSpacesMap) {
- this.namespaceMap = nameSpacesMap;
- }
public void setNamespaceMap(NamespaceMap namespaceMap) {
this.namespaceMap = namespaceMap;
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
Fri Jun 15 11:01:15 2012
@@ -112,16 +112,6 @@ public class AxisServiceGroup extends Ax
}
/**
- *
- * @param service
- * @throws Exception
- * @deprecated please use addService() instead
- */
- public void addToGroup(AxisService service) throws Exception {
- addService(service);
- }
-
- /**
* When a module gets engaged on a ServiceGroup, we have to engage it for
each Service.
*
* @param module the newly-engaged AxisModule
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Fri Jun 15 11:01:15 2012
@@ -259,14 +259,6 @@ public class WSDL11ToAxisServiceBuilder
this(in, null, null);
}
- /**
- * @deprecated
- * @see setCustomWSDLResolver
- */
- public void setCustomWSLD4JResolver(WSDLLocator customResolver) {
- setCustomWSDLResolver(customResolver);
- }
-
/**
* sets a custom WSDL locator
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Fri Jun 15 11:01:15 2012
@@ -269,17 +269,6 @@ public class AxisConfiguration extends A
}
/**
- * To remove a given module from the system
- *
- * @param module name of module to remove
- * @deprecated Use {@link #removeModule(String,String)}
- */
- public void removeModule(String module) {
- allModules.remove(module);
- // TODO disengage has to be done here
- }
-
- /**
* Remove a module with moduleName & moduleVersion
*
* @param moduleName the name of the module to remove
@@ -571,20 +560,6 @@ public class AxisConfiguration extends A
}
/**
- * Engages the default module version corresponding to the given module
name,
- * or if the module name contains version number in it then it will engage
- * the correct module. Both the below cases are valid : -
- * 1. engageModule("addressing"); 2. engageModule("addressing-1.23");
- *
- * @param moduleref QName of module to engage
- * @throws AxisFault
- * @deprecated Please use the String version instead
- */
- public void engageModule(QName moduleref) throws AxisFault {
- engageModule(moduleref.getLocalPart());
- }
-
- /**
* Engages the default module version corresponding to given module name ,
* or if the module name contains version number in it then it will engage
* the correct module. Both of the below two cases are valid 1.
@@ -972,17 +947,7 @@ public class AxisConfiguration extends A
*/
public HashMap<String, AxisModule> getModules() {
return allModules;
- }
-
- /**
- * Get a list of the global modules
- *
- * @return the global module list. BE CAREFUL, this list is mutable.
- * @deprecated please use addGlobalModule()
- */
- public List<String> getGlobalModules() {
- return globalModuleList;
- }
+ }
/**
* @return Returns ArrayList.
@@ -1566,4 +1531,11 @@ public class AxisConfiguration extends A
}
return axisService;
}
+
+ public boolean isGlobalModulesRegistered(String moduleName) {
+ if (globalModuleList.contains(moduleName)) {
+ return true;
+ }
+ return false;
+ }
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
Fri Jun 15 11:01:15 2012
@@ -122,17 +122,6 @@ public class AxisEngine {
}
return (receiver!=null &&
receiver.getClass().getName().endsWith("JAXWSMessageReceiver"));
}
- /**
- * This method is called to handle any error that occurs at inflow or
outflow. But if the
- * method is called twice, it implies that sending the error handling has
failed, in which case
- * the method logs the error and exists.
- *
- * @deprecated (post 1.1 branch)
- */
- public static MessageContext createFaultMessageContext(MessageContext
processingContext, Throwable e)
- throws AxisFault {
- return
MessageContextBuilder.createFaultMessageContext(processingContext, e);
- }
/**
* This methods represents the inflow of the Axis, this could be either at
the server side or the client side.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
Fri Jun 15 11:01:15 2012
@@ -43,22 +43,7 @@ import java.util.Iterator;
public class DependencyManager {
private static final Log log = LogFactory.getLog(DependencyManager.class);
public final static String SERVICE_INIT_METHOD = "init";
- public final static String SERVICE_DESTROY_METHOD = "destroy";
-
- /**
- * Initialize a new service object. Essentially, check to see if the
object wants to receive
- * an init() call - if so, call it.
- *
- * @param obj the service object
- * @param serviceContext the active ServiceContext
- * @throws AxisFault if there's a problem initializing
- *
- * @deprecated please use initServiceObject()
- */
- public static void initServiceClass(Object obj, ServiceContext
serviceContext)
- throws AxisFault {
- initServiceObject(obj, serviceContext);
- }
+ public final static String SERVICE_DESTROY_METHOD = "destroy";
/**
* Initialize a new service object. Essentially, check to see if the
object wants to receive
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
Fri Jun 15 11:01:15 2012
@@ -20,6 +20,23 @@
package org.apache.axis2.util;
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedExceptionAction;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
@@ -27,8 +44,6 @@ import org.apache.axiom.util.UIDGenerato
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.ServiceObjectSupplier;
-import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
@@ -52,27 +67,12 @@ import org.apache.axis2.engine.Handler;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
+import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.lang.reflect.Modifier;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Enumeration;
-import java.util.Map;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.SocketException;
-import java.net.NetworkInterface;
-import java.net.InetAddress;
-
public class Utils {
private static final Log log = LogFactory.getLog(Utils.class);
@@ -85,16 +85,6 @@ public class Utils {
handlerDesc.setHandler(handler);
flow.addHandler(handlerDesc);
}
-
- /**
- * @see
org.apache.axis2.util.MessageContextBuilder:createOutMessageContext()
- * @deprecated (post1.1branch)
- */
- public static MessageContext createOutMessageContext(MessageContext
inMessageContext)
- throws AxisFault {
- return MessageContextBuilder.createOutMessageContext(inMessageContext);
- }
-
public static AxisService createSimpleService(QName serviceName, String
className, QName opName)
throws AxisFault {
return createSimpleService(serviceName, new
RawXMLINOutMessageReceiver(), className,
@@ -428,18 +418,6 @@ public class Utils {
}
}
- /**
- * Check if a MessageContext property is true.
- *
- * @param messageContext the MessageContext
- * @param propertyName the property name
- * @return true if the property is Boolean.TRUE, "true", 1, etc. or false
otherwise
- * @deprecated please use MessageContext.isTrue(propertyName) instead
- */
- public static boolean isExplicitlyTrue(MessageContext messageContext,
String propertyName) {
- Object flag = messageContext.getProperty(propertyName);
- return JavaUtils.isTrueExplicitly(flag);
- }
/**
* Maps the String URI of the Message exchange pattern to a integer.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLDefinitionWrapper.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLDefinitionWrapper.java?rev=1350570&r1=1350569&r2=1350570&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLDefinitionWrapper.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLDefinitionWrapper.java
Fri Jun 15 11:01:15 2012
@@ -92,19 +92,6 @@ public class WSDLDefinitionWrapper imple
// constructors
//-------------------------------------------------------------------------
- /**
- * Constructor
- *
- * @param def The WSDL Definition
- * @deprecated because this constructor does not provide any guidance for
- * memory usage
- */
- public WSDLDefinitionWrapper(Definition def) {
- if (log.isDebugEnabled() ) {
- log.debug("WSDLDefinitionWrapper(Definition) entry");
- }
- prepare(def, null);
- }
/**
* @param def
@@ -136,21 +123,6 @@ public class WSDLDefinitionWrapper imple
*
* @param def The WSDL Definition
* @param wURL The URL for the wsdl
- * @deprecated use a constructor with a AxisConfiguration or memory limit
parameter
- */
- public WSDLDefinitionWrapper(Definition def, URL wURL) {
- if (log.isDebugEnabled() ) {
- log.debug("WSDLDefinitionWrapper(Definition,URL) entry");
- }
- prepare(def, wURL);
- }
-
-
- /**
- * Constructor
- *
- * @param def The WSDL Definition
- * @param wURL The URL for the wsdl
* @param limitInMemory The setting indicating whether the in-memory WSDL
copy
* should be manipulated to reduce memory footprint
*/
