Author: antelder
Date: Thu Nov 15 04:05:04 2007
New Revision: 595280
URL: http://svn.apache.org/viewvc?rev=595280&view=rev
Log:
Get node urls including a path working
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/DomainManagerServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/DomainManagerServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/DomainManagerServiceImpl.java?rev=595280&r1=595279&r2=595280&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/DomainManagerServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/DomainManagerServiceImpl.java
Thu Nov 15 04:05:04 2007
@@ -57,6 +57,7 @@
returnValue = domainManager.registerNode(nodeURI, nodeURL);
break;
} catch(UndeclaredThrowableException ex) {
+ ex.printStackTrace();
logger.log(Level.INFO, "Trying to register node " +
nodeURI +
" at endpoint " +
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java?rev=595280&r1=595279&r2=595280&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
Thu Nov 15 04:05:04 2007
@@ -158,7 +158,7 @@
String nodeManagerURL = nodeURI.getScheme()+ "://" +
nodeHost + ":" +
- nodeURI.getPort() +
"/NodeManagerComponent/NodeManagerService";
+ nodeURI.getPort() + nodeURI.getPath()
+ "/NodeManagerComponent/NodeManagerService";
// go out and add this node to the wider domain
domainManagerService.registerNode(nodeImpl.getURI(),nodeManagerURL);
@@ -283,15 +283,14 @@
domainManagementRuntime = nodeImpl.getNodeRuntime();
domainManagementComposite =
domainManagementRuntime.getCompositeActivator().getDomainComposite();
-// TODO: doing this breaks testcase
-// // set the context path for the node
-// String path = URI.create(nodeImpl.getURI()).getPath();
-// if (path != null && path.length() > 0 && !path.equals("/")) {
-// ServletHostExtensionPoint servletHosts =
domainManagementRuntime.getExtensionPointRegistry().getExtensionPoint(ServletHostExtensionPoint.class);
-// for (ServletHost servletHost:
servletHosts.getServletHosts()) {
-// servletHost.setContextPath(path);
-// }
-// }
+ // set the context path for the node
+ String path = URI.create(nodeImpl.getURI()).getPath();
+ if (path != null && path.length() > 0 && !path.equals("/")) {
+ ServletHostExtensionPoint servletHosts =
domainManagementRuntime.getExtensionPointRegistry().getExtensionPoint(ServletHostExtensionPoint.class);
+ for (ServletHost servletHost:
servletHosts.getServletHosts()) {
+ servletHost.setContextPath(path);
+ }
+ }
}
// Find the composite that will configure the domain
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java?rev=595280&r1=595279&r2=595280&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
Thu Nov 15 04:05:04 2007
@@ -149,6 +149,10 @@
ServerSocket socket = new ServerSocket(0);
nodeURI = "http://"; + host + ":" + socket.getLocalPort();
socket.close();
+ } else {
+ if (!nodeURI.endsWith("/")) {
+ nodeURI += "/";
+ }
}
// check whether node uri is an absolute url,
@@ -172,8 +176,7 @@
for (ServletHost servletHost: servletHosts.getServletHosts()) {
servletHost.setDefaultPort(port);
if (path != null && path.length() > 0 && !path.equals("/")) {
-// TODO: doing this breaks testcase
-// servletHost.setContextPath(path);
+ servletHost.setContextPath(path);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
