Author: jsdelfino
Date: Sun Sep 16 14:47:14 2007
New Revision: 576183
URL: http://svn.apache.org/viewvc?rev=576183&view=rev
Log:
Minor cleanup of the node-api API. Changed getUri to getURI and getUrl to
getURL.
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomain.java
incubator/tuscany/branches/sca-java-1.0/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeManagerServiceImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java?rev=576183&r1=576182&r2=576183&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
Sun Sep 16 14:47:14 2007
@@ -129,7 +129,7 @@
// The binding URI might be null in the case where this
reference is completely
// dynamic, for example, in the case of callbacks
if (binding.getURI() != null) {
- String serviceUrl =
serviceDiscovery.findServiceEndpoint(domain.getDomainUri(),
+ String serviceUrl =
serviceDiscovery.findServiceEndpoint(domain.getDomainURI(),
binding.getURI(),
SCABinding.class.getName());
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java?rev=576183&r1=576182&r2=576183&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
Sun Sep 16 14:47:14 2007
@@ -144,7 +144,7 @@
// the service URL will likely be completely
different to that
// calculated by the ws binding so replace it with
the node url
// The node url will have been set via init
parameters in the web app
- URL nodeUrl = domain.getNodeUrl();
+ URL nodeUrl = domain.getNodeURL();
if (nodeUrl != null){
newHost = nodeUrl.getHost();
@@ -169,16 +169,16 @@
componentServiceUrlString =
componentServiceUrlString.replace(originalHost, newHost);
try {
-
domainService.registerServiceEndpoint(domain.getDomainUri(),
-
domain.getNodeUri(),
+
domainService.registerServiceEndpoint(domain.getDomainURI(),
+
domain.getNodeURI(),
componentServiceName,
SCABinding.class.getName(),
componentServiceUrlString);
} catch(Exception ex) {
logger.log(Level.WARNING,
"Unable to register service: " +
- domain.getDomainUri() + " " +
- domain.getNodeUri() + " " +
+ domain.getDomainURI() + " " +
+ domain.getNodeURI() + " " +
componentServiceName + " " +
SCABinding.class.getName() + " " +
componentServiceUrlString);
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java?rev=576183&r1=576182&r2=576183&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
Sun Sep 16 14:47:14 2007
@@ -127,20 +127,20 @@
}
- public String getNodeUri(){
+ public String getNodeURI(){
return nodeName;
}
- public String getDomainUri(){
+ public String getDomainURI(){
return domainURI;
}
- public URL getNodeUrl(){
+ public URL getNodeURL(){
return null;
}
- public URL getDomainUrl(){
+ public URL getDomainURL(){
return null;
}
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java?rev=576183&r1=576182&r2=576183&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
Sun Sep 16 14:47:14 2007
@@ -104,7 +104,7 @@
SCADomainService serviceDiscovery = domain.getDomainService();
String serviceUrl =
- serviceDiscovery.findServiceEndpoint(domain.getDomainUri(),
+ serviceDiscovery.findServiceEndpoint(domain.getDomainURI(),
binding.getURI(),
SCABinding.class.getName());
if ((serviceUrl == null) || serviceUrl.equals("")) {
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomain.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomain.java?rev=576183&r1=576182&r2=576183&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomain.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomain.java
Sun Sep 16 14:47:14 2007
@@ -39,14 +39,14 @@
*
* @return the domain Uri
*/
- public String getDomainUri();
+ public String getDomainURI();
/**
* Returns the name of this node
*
* @return the node uri
*/
- public String getNodeUri();
+ public String getNodeURI();
/**
* Returns the root url of the domain that this node
@@ -54,14 +54,14 @@
*
* @return the domain Url
*/
- public URL getDomainUrl();
+ public URL getDomainURL();
/**
* Returns the root url of this node
*
* @return the node url
*/
- public URL getNodeUrl();
+ public URL getNodeURL();
/**
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java?rev=576183&r1=576182&r2=576183&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
Sun Sep 16 14:47:14 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.node;
-import org.apache.tuscany.sca.domain.SCADomainService;
import org.osoa.sca.CallableReference;
import org.osoa.sca.ServiceReference;
@@ -37,14 +36,14 @@
*
* @return the domain URI
*/
- public String getDomainUri();
+ public String getDomainURI();
/**
* Returns the name of the name of this node
*
* @return the node name
*/
- public String getNodeUri();
+ public String getNodeURI();
/**
* Return the nodes component manager
@@ -53,10 +52,6 @@
*/
public ComponentManager getComponentManager();
-/*
- public CompositeManager getCompositeManager();
-*/
-
/**
* Return the nodes contribution manager
*
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeManagerServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeManagerServiceImpl.java?rev=576183&r1=576182&r2=576183&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeManagerServiceImpl.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeManagerServiceImpl.java
Sun Sep 16 14:47:14 2007
@@ -44,7 +44,7 @@
private SCANode node;
public String getNodeUri() {
- return node.getNodeUri();
+ return node.getNodeURI();
}
// NodeManagerInitService
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java?rev=576183&r1=576182&r2=576183&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
Sun Sep 16 14:47:14 2007
@@ -355,19 +355,19 @@
}
}
- public String getDomainUri(){
+ public String getDomainURI(){
return domainUri;
}
- public String getNodeUri(){
+ public String getNodeURI(){
return nodeUri;
}
- public URL getDomainUrl(){
+ public URL getDomainURL(){
return domainUrl;
}
- public URL getNodeUrl(){
+ public URL getNodeURL(){
return nodeUrl;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
