diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-07-28 10:58:07 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-07-28 10:58:07 +0000 |
commit | 04dcd09976ecc5aa2948993b9a9a2d90d239ee44 (patch) | |
tree | f3d3148a4c4ae6d56185cbd55333aaf119532d26 /sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src | |
parent | 19aadc9a267456fe8b84a9a4d3afca74ba9ef969 (diff) |
Delete old beta3 branch as its going to be recreated from the current trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1151789 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src')
12 files changed, 0 insertions, 541 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java b/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java deleted file mode 100644 index d9abd288ea..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java +++ /dev/null @@ -1,35 +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.node.manager; - -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface DomainCompositeResource { - - @GET - @Path("{domainURI}") - String getDomainComposite(@PathParam("domainURI") @DefaultValue("default") String domainURI); -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/impl/DomainCompositeResourceImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/impl/DomainCompositeResourceImpl.java deleted file mode 100644 index 9cb91e2917..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/impl/DomainCompositeResourceImpl.java +++ /dev/null @@ -1,100 +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.node.manager.impl; - -import java.io.ByteArrayOutputStream; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import javax.ws.rs.WebApplicationException; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLOutputFactory; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.extensibility.NodeActivator; -import org.apache.tuscany.sca.node.extensibility.NodeExtension; -import org.apache.tuscany.sca.node.manager.DomainCompositeResource; - -public class DomainCompositeResourceImpl implements NodeActivator, DomainCompositeResource { - private static Map<String, NodeExtension> nodeMap = new ConcurrentHashMap<String,NodeExtension>(); - - public void nodeStarted(Node node) { - NodeExtension nodeExtension = (NodeExtension) node; - nodeMap.put(nodeExtension.getDomainURI(), nodeExtension); - } - - public void nodeStopped(Node node) { - NodeExtension nodeExtension = (NodeExtension) node; - nodeMap.remove(nodeExtension.getDomainURI()); - } - - public String getDomainComposite(String domainURI) { - if( ! nodeMap.containsKey(domainURI)) { - throw new WebApplicationException(404); - } - - NodeExtension node = nodeMap.get(domainURI); - Composite composite = node.getDomainComposite(); - - //set name, as it's empty by default - composite.setName(new QName("", "Domain")); - - ExtensionPointRegistry registry = node.getExtensionPointRegistry(); - StAXArtifactProcessorExtensionPoint xmlProcessors = - registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - StAXArtifactProcessor<Composite> compositeProcessor = - xmlProcessors.getProcessor(Composite.class); - - return writeComposite(composite, registry, compositeProcessor); - } - - - private String writeComposite(Composite composite, ExtensionPointRegistry registry, StAXArtifactProcessor<Composite> compositeProcessor){ - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - XMLOutputFactory outputFactory = - registry.getExtensionPoint(FactoryExtensionPoint.class) - .getFactory(XMLOutputFactory.class); - - try { - compositeProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), new ProcessorContext(registry)); - } catch(Exception ex) { - return ex.toString(); - } - - String result = bos.toString(); - - // write out and nested composites - for (Component component : composite.getComponents()) { - if (component.getImplementation() instanceof Composite) { - result += "\n<!-- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -->\n" + - writeComposite((Composite)component.getImplementation(), registry, - compositeProcessor); - } - } - return result; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.extensibility.NodeActivator b/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.extensibility.NodeActivator deleted file mode 100644 index 76ecb610ff..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.extensibility.NodeActivator +++ /dev/null @@ -1,18 +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. -# Implementation class for the ModuleActivator -org.apache.tuscany.sca.node.manager.impl.DomainCompositeResourceImpl;ranking=100 diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java b/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java deleted file mode 100644 index da50dca604..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java +++ /dev/null @@ -1,80 +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.node.manager; - -import java.net.Socket; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -import com.meterware.httpunit.GetMethodWebRequest; -import com.meterware.httpunit.WebConversation; -import com.meterware.httpunit.WebRequest; -import com.meterware.httpunit.WebResponse; - -@Ignore -public class DomainCompositeResourceTestCase { - private static final String SERVICE_URL = "http://localhost:8080/domain"; - - private static Node node; - - @BeforeClass - public static void init() throws Exception { - try { - String contribution = ContributionLocationHelper.getContributionLocation(DomainCompositeResourceTestCase.class); - node = NodeFactory.newInstance().createNode("node-manager-test.composite", new Contribution("node-manager", contribution)); - node.start(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @AfterClass - public static void destroy() throws Exception { - if (node != null) { - node.stop(); - } - } - - @Test - public void testPing() throws Exception { - new Socket("127.0.0.1", 8080); - //System.in.read(); - } - - @Test - public void testDefaultDomainCompositeResource() throws Exception { - String url = SERVICE_URL + "/default"; - WebConversation wc = new WebConversation(); - WebRequest request = new GetMethodWebRequest(url); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - System.out.println(">>>" + response.getText()); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/node-manager-test.composite b/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/node-manager-test.composite deleted file mode 100644 index 6f107a392d..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/node-manager-test.composite +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://node-manager" - name="NodeManager"> - - <component name="NodeManagerUI"> - <tuscany:implementation.widget location="ui/index.html" /> - <service name="Widget"> - <tuscany:binding.rest uri="/manager/ui" /> - </service> - </component> - - <component name="NodeManagerComponent"> - <implementation.java class="org.apache.tuscany.sca.node.manager.impl.DomainCompositeResourceImpl"/> - <service name="DomainCompositeResource"> - <tuscany:binding.rest uri="/domain"> - <tuscany:operationSelector.jaxrs /> - </tuscany:binding.rest> - </service> - </component> -</composite> diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/component.gif b/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/component.gif Binary files differdeleted file mode 100644 index 46b8963f4c..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/component.gif +++ /dev/null diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/composite.gif b/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/composite.gif Binary files differdeleted file mode 100644 index 6749240e15..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/composite.gif +++ /dev/null diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/index.html b/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/index.html deleted file mode 100644 index 4405422c53..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/index.html +++ /dev/null @@ -1,268 +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. ---> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Tuscany SCA Domain Components</title> - -<script type="text/javascript" src="/dojo/dojo.js"></script> - -<style type="text/css"> -body,html { - font-family: helvetica, arial, sans-serif; - font-size: 90%; -} - -.componentIcon { - margin-left: 16px; - width: 16px; - height: 16px; - background: url('component.gif') no-repeat; -} - -.serviceIcon { - margin-left: 16px; - width: 16px; - height: 16px; - background: url('service.gif') no-repeat; -} - -.referenceIcon { - margin-left: 16px; - width: 16px; - height: 16px; - background: url('reference.gif') no-repeat; -} -</style> - -</head> - -<body> - <div id="header" style="border-bottom: solid 1px silver; overflow: hidden;"> - <img src="http://tuscany.apache.org/images/TuscanyLogo.jpg" style="float:right;"/> - <h1>Tuscany SCA Domain</h1> - </div> <!-- end header div --> - - <div id="container" style="border:1px solid silver"> - <div id="navigation" style="position:absolute; float:left; width:30%; height:80%; padding:10px; border:1px solid silver"> - <div id="treeDomain" /> </div> - </div> <!-- end navigation div --> - - <div id="images" style="position:absolute; float:left; width:60%; height:80%; left:35%; padding:10px; border:1px solid silver"> - - <table style="margin-left:auto; margin-right:auto;" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td><a href="javascript:updatePage(-1)">prev</a></td> - <td><a href="javascript:updatePage(1)">next</a></td> - </tr> - <tr> - <td colspan="4"> - <table id="tableImageThumb" style="margin-left:auto; margin-right:auto;" border="0" cellspacing="0" cellpadding="1"></table> - - </td> - </tr> - </table> - </div> <!-- end images div --> - - </div> <!-- end container div --> - -</body> - -<script type="text/javascript"> - dojo.require("dojo.data.ItemFileWriteStore"); - dojo.require("dijit.Tree"); - dojo.require("dojox.xml.parser"); - dojo.require("tuscany.RestService"); - //dojo.require("tuscany.Composite"); - - var restClient; - - var store; - var treeModel; - var treeControl; - - var composite; - - - function prepare() { - store = new dojo.data.ItemFileWriteStore({ - data: { - identifier: 'id', - label: 'label', - type: 'type', - items: [ ] - } - }); - treeModel = new dijit.tree.ForestStoreModel({ - store: store - }); - - treeControl = new dijit.Tree({ - model: treeModel, - showRoot: false, - getIconClass: function(/*dojo.data.Item*/ item, /*Boolean*/ opened) { - console.log("##" + item.type); - if(item.type != undefined) { - if(item.type == 'component') { - return "componentIcon"; - } else if(item.type == 'service' || item.type == 'service-binding') { - return "serviceIcon"; - } else if(item.type == 'reference' || item.type == 'reference-binding') { - return "referenceIcon"; - } - } - return "serviceIcon"; - }, - onClick: showArtifactDocumentation, - _createTreeNode: function(/*Object*/ args) { - var tnode = new dijit._TreeNode(args); - tnode.labelNode.innerHTML = args.label; - return tnode; - } - },"treeDomain"); - - restClient = new tuscany.RestService("/domain","text/plain"); - - showDomainArtifacts(); - } - - - function composite_getResponse(xmlResponse, exception) { - if(exception){ - alert(exception.message); - return; - } - - var componentNode = xmlResponse.getElementsByTagName ("component"); - //loop trough all components - for (c = 0; c < componentNode.length; c++) { - var componentAttributes = componentNode[c].attributes; - var componentItem = store.newItem({id:componentAttributes['uri'].value, label:componentAttributes['name'].value, type:'component'}); - - //loop trough all services - var serviceNode = componentNode[c].getElementsByTagName ("service"); - for(s = 0; s < serviceNode.length; s++) { - var serviceAttributes = serviceNode[s].attributes; - var serviceId = componentAttributes['uri'].value + "/" + serviceAttributes['name'].value; - - var parentInfo={ - parent: componentItem, - attribute: "children" - }; - - var serviceItem = store.newItem({id:serviceId, label:serviceAttributes['name'].value, type:'service'}, parentInfo); - - //loop trough children to find bindings - for(b=0; b < serviceNode[s].childNodes.length; b ++) { - var childNode = serviceNode[s].childNodes[b]; - if(childNode.nodeName.indexOf('binding') == 0) { - var bindingId = serviceId + "/" + childNode.nodeName; - - var parentInfo={ - parent: serviceItem, - attribute: "children" - }; - - var bindingItem = store.newItem({id:bindingId, label:childNode.nodeName, type:'service-binding'}, parentInfo); - } - } - } - - - //loop trough all references - var referenceNode = componentNode[c].getElementsByTagName ("reference"); - for(r = 0; r < referenceNode.length; r++) { - var referenceAttributes = referenceNode[r].attributes; - var referenceId = componentAttributes['uri'].value + "/" + referenceAttributes['name'].value; - - var parentInfo={ - parent: componentItem, - attribute: "children" - }; - - var referenceItem = store.newItem({id:serviceId, label:referenceAttributes['name'].value, type:'reference'}, parentInfo); - - //loop trough children to find bindings - for(b=0; b < referenceNode[s].childNodes.length; b ++) { - var childNode = referenceNode[s].childNodes[b]; - if(childNode.nodeName.indexOf('binding') == 0) { - var bindingId = serviceId + "/" + childNode.nodeName; - - var parentInfo={ - parent: serviceItem, - attribute: "children" - }; - - var bindingItem = store.newItem({id:bindingId, label:childNode.nodeName, type:'reference-binding'}, parentInfo); - } - } - - - } - - } - - //var composite = new tuscany.Composite(xmlResponse); - - - /* - var itemTags = xmlResponse.getElementsByTagName ("component"); - for (i = 0; i < itemTags.length; i++) { - var attributes = itemTags[i].attributes; - alert(attributes[0].name); - var recordNode = itemTags[i].getElementsByTagName ("name")[0]; - if (recordNode.textContent != undefined) { - alert(recordNode.textContent); - } - else { - alert(recordNode.text); - } - } - */ - - compositeXML = dojox.xml.parser.innerXML(xmlResponse); - - - //alert(compositeXML); - - } - - function showDomainArtifacts() { - restClient.get("default").addCallback(composite_getResponse); - } - - function showArtifactDocumentation(/*dojo.data.Item*/ item) { - alert('showing documentation for' + item.id); - } - - function guidGenerator() { - var S4 = function() { - return (((1+Math.random())*0x10000)|0).toString(16).substring(1); - }; - return (S4()+S4()+"-"+S4()+"-"+S4()+"-"+S4()+"-"+S4()+S4()+S4()); - } - - - dojo.addOnLoad(prepare); -</script> - -</body> - -</html> diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/interface.gif b/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/interface.gif Binary files differdeleted file mode 100644 index 1d11c37913..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/interface.gif +++ /dev/null diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/property.gif b/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/property.gif Binary files differdeleted file mode 100644 index 354ad64645..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/property.gif +++ /dev/null diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/reference.gif b/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/reference.gif Binary files differdeleted file mode 100644 index b3e2c80188..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/reference.gif +++ /dev/null diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/service.gif b/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/service.gif Binary files differdeleted file mode 100644 index 9b986e3788..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/node-manager/src/test/resources/ui/service.gif +++ /dev/null |