summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl')
-rw-r--r--branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/DomainManagerServiceImpl.java94
-rw-r--r--branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/NodeInfoImpl.java71
-rw-r--r--branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainServiceImpl.java200
-rw-r--r--branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceInfoImpl.java84
4 files changed, 0 insertions, 449 deletions
diff --git a/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/DomainManagerServiceImpl.java b/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/DomainManagerServiceImpl.java
deleted file mode 100644
index 56a0750d86..0000000000
--- a/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/DomainManagerServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.domain.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.domain.DomainManagerService;
-import org.apache.tuscany.sca.domain.NodeInfo;
-import org.apache.tuscany.sca.domain.SCADomainService;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-
-/**
- * Stores details of services exposed and retrieves details of remote services
- *
- * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
- */
-@Scope("COMPOSITE")
-public class DomainManagerServiceImpl implements DomainManagerService{
-
- private final static Logger logger = Logger.getLogger(DomainManagerServiceImpl.class.getName());
-
- @Reference
- public SCADomainService scaDomainService;
-
- List<NodeInfo> nodes = new ArrayList<NodeInfo>();
-
- public String registerNode(String domainUri, String nodeUri){
- // try and remove it first just in case it's already registered
- removeNode(domainUri, nodeUri);
-
- NodeInfo nodeInfo = new NodeInfoImpl(domainUri, nodeUri);
- nodes.add(nodeInfo);
- logger.log(Level.INFO, "Registered node: " + nodeUri);
- return nodeUri;
- }
-
- public String removeNode(String domainUri, String nodeUri){
-
- List<NodeInfo> nodesToRemove = new ArrayList<NodeInfo>();
-
- for(NodeInfo node : nodes){
- if ( node.match(domainUri, nodeUri)){
- nodesToRemove.add(node);
- }
- }
-
- for(NodeInfo nodeToRemove : nodesToRemove){
- nodes.remove(nodeToRemove);
- logger.log(Level.INFO, "Removed node: " + nodeUri);
- }
-
-
- return nodeUri;
- }
-
- public List<NodeInfo> getNodeInfo(){
-
- // get the nodeManagerUrl for each node
- for(NodeInfo node : nodes){
- String url = scaDomainService.findServiceEndpoint(node.getDomainUri(),
- node.getNodeUri() + "NodeManagerService",
- "");
-
- if (url != null) {
- node.setNodeManagerUrl(url);
- }
- }
-
- return nodes;
- }
-
-}
diff --git a/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/NodeInfoImpl.java b/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/NodeInfoImpl.java
deleted file mode 100644
index c554a82aef..0000000000
--- a/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/NodeInfoImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.domain.impl;
-
-import java.io.Serializable;
-
-import org.apache.tuscany.sca.domain.NodeInfo;
-
-/**
- * Information relating to an exposed service
- *
- * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
- */
-public class NodeInfoImpl implements NodeInfo, Serializable {
-
- private String domainUri;
- private String nodeUri;
- private String nodeManagerUrl;
-
- public NodeInfoImpl(String domainUri, String nodeUri){
- this.domainUri = domainUri;
- this.nodeUri = nodeUri;
- }
-
- public boolean match (String domainUri, String nodeUri){
- return ((this.domainUri.equals(domainUri)) &&
- (this.nodeUri.equals(nodeUri)));
- }
-
- public String getDomainUri(){
- return domainUri;
- }
-
- public String getNodeUri(){
- return nodeUri;
- }
-
- public void setNodeManagerUrl(String nodeManagerUrl){
- this.nodeManagerUrl = nodeManagerUrl;
- }
-
- public String getNodeManagerUrl(){
- return nodeManagerUrl;
- }
-
- @Override
- public String toString (){
- return "[" +
- domainUri + " " +
- nodeUri +
- "]";
- }
-
-}
diff --git a/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainServiceImpl.java b/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainServiceImpl.java
deleted file mode 100644
index 2f73809a89..0000000000
--- a/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainServiceImpl.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.domain.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.domain.SCADomainService;
-import org.apache.tuscany.sca.domain.ServiceInfo;
-import org.osoa.sca.annotations.Scope;
-
-
-/**
- * Stores details of services exposed and retrieves details of remote services
- *
- * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
- */
-@Scope("COMPOSITE")
-public class SCADomainServiceImpl implements SCADomainService {
-
- private final static Logger logger = Logger.getLogger(SCADomainServiceImpl.class.getName());
-
- List<ServiceEndpoint> serviceEndpoints = new ArrayList<ServiceEndpoint>();
-
- public class ServiceEndpoint {
- public String domainUri;
- public String nodeUri;
- public String serviceName;
- public String bindingName;
- public String url;
-
- public ServiceEndpoint(String domainUri, String nodeUri, String serviceName, String bindingName, String URL){
- this.domainUri = domainUri;
- this.nodeUri = nodeUri;
- this.serviceName = serviceName;
- this.bindingName = bindingName;
- this.url = URL;
- }
-
- public boolean match(String domainUri, String serviceName, String bindingName) {
- // trap the case where the we are trying to map
- // ComponentName/Service name with a registered ComponentName - this is OK
- // ComponentName with a registered ComponentName/ServiceName - this should fail
-
- boolean serviceNameMatch = false;
-
- if (this.serviceName.equals(serviceName)) {
- serviceNameMatch = true;
- } else {
- int s = serviceName.indexOf('/');
- if ((s != -1) &&
- (this.serviceName.equals(serviceName.substring(0, s)))){
- serviceNameMatch = true;
- }
- }
-
- return ((this.domainUri.equals(domainUri)) &&
- (serviceNameMatch) &&
- (this.bindingName.equals(bindingName)));
- }
-
- public String getUrl() {
- return url;
- }
-
- @Override
- public String toString (){
- return "[" +
- domainUri + " " +
- nodeUri + " " +
- serviceName + " " +
- bindingName + " " +
- url +
- "]";
- }
- }
-
- /**
- * Accepts information about a service endpoint and holds onto it
- *
- * @param domainUri the string uri for the distributed domain
- * @param nodeUri the string uri for the current node
- * @param serviceName the name of the service that is exposed and the provided endpoint
- * @param bindingName the remote binding that is providing the endpoint
- * @param url the enpoint url
- */
- public String registerServiceEndpoint(String domainUri, String nodeUri, String serviceName, String bindingName, String URL){
- // if the service name ends in a "/" remove it
- String modifiedServiceName = null;
- if ( serviceName.endsWith("/") ) {
- modifiedServiceName = serviceName.substring(0, serviceName.length() - 1);
- } else {
- modifiedServiceName = serviceName;
- }
-
-
- ServiceEndpoint serviceEndpoint = new ServiceEndpoint (domainUri, nodeUri, modifiedServiceName, bindingName, URL);
- serviceEndpoints.add(serviceEndpoint);
- logger.log(Level.INFO, "Registered service: " + serviceEndpoint.toString());
- return "";
- }
-
- /**
- * Removes information about a service endpoint
- *
- * @param domainUri the string uri for the distributed domain
- * @param nodeUri the string uri for the current node
- * @param serviceName the name of the service that is exposed and the provided endpoint
- * @param bindingName the remote binding that is providing the endpoint
- */
- public String removeServiceEndpoint(String domainUri, String nodeUri, String serviceName, String bindingName){
-
- List<ServiceEndpoint> serviceEndpointsToRemove = new ArrayList<ServiceEndpoint>();
-
- for(ServiceEndpoint serviceEndpoint : serviceEndpoints){
- if ( serviceEndpoint.match(domainUri, serviceName, bindingName)){
- serviceEndpointsToRemove.add(serviceEndpoint);
- }
- }
-
- for(ServiceEndpoint serviceEndpointToRemove : serviceEndpointsToRemove){
- serviceEndpoints.remove(serviceEndpointToRemove);
- logger.log(Level.INFO, "Removed service: " + serviceName );
- }
-
- return "";
- }
-
- /**
- * Locates information about a service endpoint
- *
- * @param domainUri the string uri for the distributed domain
- * @param serviceName the name of the service that is exposed and the provided endpoint
- * @param bindingName the remote binding that we want to find an endpoint for
- * @return url the endpoint url
- */
- public String findServiceEndpoint(String domainUri, String serviceName, String bindingName){
- logger.log(Level.INFO, "Finding service: [" +
- domainUri + " " +
- serviceName + " " +
- bindingName +
- "]");
-
- String url = "";
-
- for(ServiceEndpoint serviceEndpoint : serviceEndpoints){
- if ( serviceEndpoint.match(domainUri, serviceName, bindingName)){
- url = serviceEndpoint.getUrl();
- // if you want to temporarily modify the registered port
- // numbers for debugging uncomment this line
- //url = replacePort(url, "8085", "8086");
- logger.log(Level.INFO, "Found service url: " + url);
- }
- }
- return url;
- }
-
- /**
- * Converts a port number to something else to allow for debugging using a
- * HTTP sniffer
- * @param url
- * @param fromPort the port to look for
- * @param toPort the port to replace it with
- * @return the new url
- */
- private String replacePort(String url, String fromPort, String toPort) {
- return url.replace(fromPort, toPort);
- }
-
- public ServiceInfo getServiceInfo(){
-
- ServiceEndpoint serviceEndpoint = serviceEndpoints.get(0);
-
- return new ServiceInfoImpl(serviceEndpoint.domainUri,
- serviceEndpoint.nodeUri,
- serviceEndpoint.serviceName,
- serviceEndpoint.bindingName,
- serviceEndpoint.url);
- }
-
-}
diff --git a/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceInfoImpl.java b/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceInfoImpl.java
deleted file mode 100644
index f49e26c2f6..0000000000
--- a/branches/sca-java-1.0/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceInfoImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.domain.impl;
-
-import java.io.Serializable;
-
-import org.apache.tuscany.sca.domain.ServiceInfo;
-
-/**
- * Information relating to an exposed service
- *
- * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
- */
-public class ServiceInfoImpl implements ServiceInfo, Serializable {
-
- private String domainUri;
- private String nodeUri;
- private String serviceName;
- private String bindingName;
- private String url;
-
- public ServiceInfoImpl(String domainUri, String nodeUri, String serviceName, String bindingName, String URL){
- this.domainUri = domainUri;
- this.nodeUri = nodeUri;
- this.serviceName = serviceName;
- this.bindingName = bindingName;
- this.url = URL;
- }
-
- public boolean match(String domainUri, String serviceName, String bindingName) {
- // trap the case where the we are trying to map
- // ComponentName/Service name with a registered ComponentName - this is OK
- // ComponentName with a registered ComponentName/ServiceName - this should fail
-
- boolean serviceNameMatch = false;
-
- if (this.serviceName.equals(serviceName)) {
- serviceNameMatch = true;
- } else {
- int s = serviceName.indexOf('/');
- if ((s != -1) &&
- (this.serviceName.equals(serviceName.substring(0, s)))){
- serviceNameMatch = true;
- }
- }
-
- return ((this.domainUri.equals(domainUri)) &&
- (serviceNameMatch) &&
- (this.bindingName.equals(bindingName)));
- }
-
- public String getUrl() {
- return url;
- }
-
- @Override
- public String toString (){
- return "[" +
- domainUri + " " +
- nodeUri + " " +
- serviceName + " " +
- bindingName + " " +
- url +
- "]";
- }
-
-}