You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2006/07/14 02:34:12 UTC
svn commit: r421766 - in
/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core: ./ proxy/
Author: danj
Date: Thu Jul 13 17:34:10 2006
New Revision: 421766
URL: http://svn.apache.org/viewvc?rev=421766&view=rev
Log:
Remaining String -> URI changes from MUSE-28 ( http://svn.apache.org/viewvc?view=rev&revision=421765 )
Modified:
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractCapability.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractEnvironment.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractResourceClient.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Capability.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/CapabilityContainer.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Environment.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Messages.properties
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/SimpleResourceManager.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/AbstractProxyHandler.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/ProxyHandler.java
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractCapability.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractCapability.java?rev=421766&r1=421765&r2=421766&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractCapability.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractCapability.java Thu Jul 13 17:34:10 2006
@@ -23,8 +23,6 @@
import java.util.Map;
import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-
import org.apache.muse.core.routing.MessageHandler;
import org.apache.muse.ws.addressing.soap.SoapFault;
@@ -48,7 +46,7 @@
private Environment _environment = null;
- private Map _handlersByOpName = new HashMap();
+ private Map _handlersByAction = new HashMap();
private boolean _hasBeenInitialized = false;
@@ -91,14 +89,14 @@
return _log;
}
- public MessageHandler getMessageHandler(QName operationName)
+ public MessageHandler getMessageHandler(String action)
{
- return (MessageHandler)_handlersByOpName.get(operationName);
+ return (MessageHandler)_handlersByAction.get(action);
}
- public Collection getOperationNames()
+ public Collection getActions()
{
- return Collections.unmodifiableSet(_handlersByOpName.keySet());
+ return Collections.unmodifiableSet(_handlersByAction.keySet());
}
public Resource getResource()
@@ -156,7 +154,7 @@
protected void setMessageHandler(MessageHandler handler)
{
- _handlersByOpName.put(handler.getRequestName(), handler);
+ _handlersByAction.put(handler.getAction(), handler);
}
public void setMessageHandlers(Collection handlers)
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractEnvironment.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractEnvironment.java?rev=421766&r1=421765&r2=421766&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractEnvironment.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractEnvironment.java Thu Jul 13 17:34:10 2006
@@ -76,7 +76,7 @@
// guaranteed to be correct (since an endpoint may have multiple URIs
// that map to it), but it's better than nothing.
//
- private URI _defaultURI = null;
+ private String _defaultURI = null;
//
// The SOAP proxy used to make requests throughout the application
@@ -135,7 +135,7 @@
initialize(classLoader, createSoapClient);
}
- public synchronized void addContext(Object context)
+ public synchronized void addAddressingContext(MessageHeaders context)
{
_contextByThread.put(Thread.currentThread(), context);
}
@@ -164,9 +164,9 @@
return _classLoader;
}
- public synchronized Object getContext()
+ public synchronized MessageHeaders getAddressingContext()
{
- return _contextByThread.get(Thread.currentThread());
+ return (MessageHeaders)_contextByThread.get(Thread.currentThread());
}
public URL getDataResource(String path)
@@ -197,22 +197,22 @@
protected EndpointReference getDefaultEPR()
{
- URI defaultURI = getDefaultURI();
+ String defaultURI = getDefaultURI();
if (defaultURI == null)
throw new IllegalStateException(_MESSAGES.get("NoDefaultURI"));
- return new EndpointReference(defaultURI);
+ return new EndpointReference(URI.create(defaultURI));
}
- public URI getDefaultURI()
+ public String getDefaultURI()
{
return _defaultURI;
}
/**
*
- * @param uri
+ * @param uriString
*
* @return The URI being targeted by the current request. This URI
* includes an IP address rather than a host name, because
@@ -224,8 +224,10 @@
* includes our endpoint's machine.
*
*/
- protected URI getDeploymentURI(URI uri)
+ protected String getDeploymentURI(String uriString)
{
+ URI uri = URI.create(uriString);
+
String ip = null;
try
@@ -240,19 +242,21 @@
try
{
- return new URI(uri.getScheme(),
- uri.getUserInfo(),
+ uri = new URI(uri.getScheme(),
+ uri.getUserInfo(),
ip,
- uri.getPort(),
- uri.getPath(),
- uri.getQuery(),
- uri.getFragment());
+ uri.getPort(),
+ uri.getPath(),
+ uri.getQuery(),
+ uri.getFragment());
}
catch (URISyntaxException error)
{
throw new RuntimeException(error.getMessage(), error);
}
+
+ return uri.toString();
}
public Document getDocument(String path)
@@ -287,7 +291,7 @@
public EndpointReference getTargetEPR()
{
- MessageHeaders headers = (MessageHeaders)getContext();
+ MessageHeaders headers = getAddressingContext();
if (headers == null)
throw new IllegalStateException(_MESSAGES.get("NoRequestContext"));
@@ -311,12 +315,12 @@
_soapClient = createSoapClient();
}
- public synchronized void removeContext()
+ public synchronized void removeAddressingContext()
{
_contextByThread.remove(Thread.currentThread());
}
- public void setDefaultURI(URI defaultURI)
+ public void setDefaultURI(String defaultURI)
{
_defaultURI = defaultURI;
}
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractResourceClient.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractResourceClient.java?rev=421766&r1=421765&r2=421766&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractResourceClient.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/AbstractResourceClient.java Thu Jul 13 17:34:10 2006
@@ -17,7 +17,6 @@
package org.apache.muse.core;
import java.io.PrintWriter;
-import java.net.URI;
import org.w3c.dom.Element;
@@ -199,7 +198,7 @@
* serialize the parameters (and deserialize the response) before
* calling invoke(URI, Element).
*
- * @see #invoke(URI, Element)
+ * @see #invoke(String, Element)
*
*/
public Object invoke(ProxyHandler handler, Object[] parameters)
@@ -208,7 +207,7 @@
if (handler == null)
throw new NullPointerException(_MESSAGES.get("NullProxyHandler"));
- URI action = handler.getAction();
+ String action = handler.getAction();
Element body = handler.toXML(parameters);
Element response = invoke(action, body);
@@ -231,7 +230,7 @@
* no response.
*
*/
- public Element invoke(URI action, Element soapBody)
+ public Element invoke(String action, Element soapBody)
throws SoapFault
{
SoapClient soap = getSoapClient();
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Capability.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Capability.java?rev=421766&r1=421765&r2=421766&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Capability.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Capability.java Thu Jul 13 17:34:10 2006
@@ -20,8 +20,6 @@
import java.util.Map;
import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-
import org.apache.muse.core.routing.MessageHandler;
import org.apache.muse.ws.addressing.soap.SoapFault;
@@ -81,27 +79,27 @@
/**
*
- * @param operationName
+ * @param action
*
* @return This method is called as part of the containing Resource's
* method invocation process; it allows the capability to
* specify the handler that will parse the request/response
* for the method.
*
- * @see #getOperationNames()
+ * @see #getActions()
*
*/
- MessageHandler getMessageHandler(QName operationName);
+ MessageHandler getMessageHandler(String action);
/**
*
- * @return All of the operation names for which the capability has
+ * @return All of the WS-A Action URIs for which the capability has
* a MessageHandler
*
- * @see #getMessageHandler(QName)
+ * @see #getMessageHandler(String)
*
*/
- Collection getOperationNames();
+ Collection getActions();
/**
*
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/CapabilityContainer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/CapabilityContainer.java?rev=421766&r1=421765&r2=421766&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/CapabilityContainer.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/CapabilityContainer.java Thu Jul 13 17:34:10 2006
@@ -18,8 +18,6 @@
import java.util.Collection;
-import javax.xml.namespace.QName;
-
/**
*
* CapabilityContainer is a sub-interface used by components that aggregate
@@ -39,6 +37,4 @@
Collection getCapabilityURIs();
boolean hasCapability(String capabilityURI);
-
- boolean hasOperation(QName operationName);
}
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Environment.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Environment.java?rev=421766&r1=421765&r2=421766&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Environment.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Environment.java Thu Jul 13 17:34:10 2006
@@ -18,12 +18,12 @@
import java.io.File;
import java.io.InputStream;
-import java.net.URI;
import java.net.URL;
import org.w3c.dom.Document;
import org.apache.muse.ws.addressing.EndpointReference;
+import org.apache.muse.ws.addressing.MessageHeaders;
import org.apache.muse.ws.addressing.soap.SoapClient;
/**
@@ -50,7 +50,7 @@
* and which is thread-unique or thread-safe.
*
*/
- void addContext(Object context);
+ void addAddressingContext(MessageHeaders context);
/**
*
@@ -74,7 +74,7 @@
* @return The context object for the current request.
*
*/
- Object getContext();
+ MessageHeaders getAddressingContext();
/**
*
@@ -112,7 +112,7 @@
* from an incoming request.
*
*/
- URI getDefaultURI();
+ String getDefaultURI();
/**
*
@@ -169,7 +169,7 @@
* Removes the context object for the current request.
*
*/
- void removeContext();
+ void removeAddressingContext();
/**
*
@@ -178,7 +178,7 @@
* is no request data to provide it.
*
*/
- void setDefaultURI(URI defaultURI);
+ void setDefaultURI(String defaultURI);
/**
*
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Messages.properties
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Messages.properties?rev=421766&r1=421765&r2=421766&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Messages.properties (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/Messages.properties Thu Jul 13 17:34:10 2006
@@ -1,3 +1,4 @@
CapabilityInitialized = The resource at 'XXX' has initialized capability 'XXX'.
ResourceInitialized = The resource at 'XXX' has been initialized.
ResourceDestroyed = The resource at 'XXX' has been destroyed.
+ActionNotSupported = The resource at 'XXX' does not expose an operation named 'XXX' through any of its capabilities.
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/SimpleResourceManager.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/SimpleResourceManager.java?rev=421766&r1=421765&r2=421766&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/SimpleResourceManager.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/SimpleResourceManager.java Thu Jul 13 17:34:10 2006
@@ -162,7 +162,7 @@
// add a "fake" context based on the default EPR. we need
// some basic WS-A data to create these resources.
//
- env.addContext(context);
+ env.addAddressingContext(context);
Iterator i = getResourceContextPaths().iterator();
@@ -199,7 +199,7 @@
//
finally
{
- env.removeContext();
+ env.removeAddressingContext();
}
}
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/AbstractProxyHandler.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/AbstractProxyHandler.java?rev=421766&r1=421765&r2=421766&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/AbstractProxyHandler.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/AbstractProxyHandler.java Thu Jul 13 17:34:10 2006
@@ -16,8 +16,6 @@
package org.apache.muse.core.proxy;
-import java.net.URI;
-
import javax.xml.namespace.QName;
import org.apache.muse.util.messages.Messages;
@@ -45,7 +43,7 @@
// The WS-A Action URI - can be used for building SOAP messages or
// uniquely identifying the handler
//
- private URI _action = null;
+ private String _action = null;
//
// The names of the individual parameters (inside the request element)
@@ -85,7 +83,7 @@
//
private Class _returnType = null;
- public URI getAction()
+ public String getAction()
{
return _action;
}
@@ -125,7 +123,7 @@
return _returnType;
}
- public void setAction(URI action)
+ public void setAction(String action)
{
if (action == null)
throw new NullPointerException(_MESSAGES.get("NullAction"));
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/ProxyHandler.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/ProxyHandler.java?rev=421766&r1=421765&r2=421766&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/ProxyHandler.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/ProxyHandler.java Thu Jul 13 17:34:10 2006
@@ -16,8 +16,6 @@
package org.apache.muse.core.proxy;
-import java.net.URI;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
@@ -81,7 +79,7 @@
* @return The WS-Addressing Action URI for the target operation.
*
*/
- URI getAction();
+ String getAction();
/**
*
@@ -157,7 +155,7 @@
* cannot be null.
*
*/
- void setAction(URI action);
+ void setAction(String action);
/**
*
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org