From 61c9466ff91ca40f4b1ebbe670d7848e521131d7 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:08:20 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835130 13f79535-47bb-0310-9956-ffa450edef68 --- .../NodeImplementationDaemonBootstrap.java | 84 ----- .../NodeImplementationLauncherBootstrap.java | 138 -------- .../launcher/NodeImplementationLauncherUtil.java | 51 --- .../node/launcher/NodeProcessCollectionImpl.java | 321 ----------------- .../node/launcher/PingServiceImpl.java | 61 ---- .../node/provider/NodeImplementationInvoker.java | 44 --- .../node/provider/NodeImplementationProvider.java | 62 ---- .../NodeImplementationProviderFactory.java | 49 --- .../node/webapp/NodeWebAppRequestDispatcher.java | 119 ------- .../node/webapp/NodeWebAppServletHost.java | 392 --------------------- ...cany.sca.provider.ImplementationProviderFactory | 19 - .../src/main/resources/NodeDaemon.composite | 39 -- .../node/NodeImplementationTestCase.java | 47 --- .../src/test/resources/TestComposite.composite | 29 -- .../src/test/resources/TestNode.composite | 30 -- 15 files changed, 1485 deletions(-) delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/test/resources/TestComposite.composite delete mode 100644 branches/sca-java-1.3.3/modules/implementation-node-runtime/src/test/resources/TestNode.composite (limited to 'branches/sca-java-1.3.3/modules/implementation-node-runtime/src') diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java deleted file mode 100644 index edf2aefdde..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.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.implementation.node.launcher; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.node.SCANode2; - -/** - * Bootstrap class for the SCA node daemon. - * - * @version $Rev$ $Date$ - */ -public class NodeImplementationDaemonBootstrap { - private SCANode2 node; - - /** - * A node wrappering an instance of a node daemon. - */ - public static class NodeFacade implements SCANode2 { - private ClassLoader threadContextClassLoader; - private ClassLoader runtimeClassLoader; - private SCADomain daemon; - - private NodeFacade() { - runtimeClassLoader = Thread.currentThread().getContextClassLoader(); - } - - public void start() { - threadContextClassLoader = Thread.currentThread().getContextClassLoader(); - boolean started = false; - try { - Thread.currentThread().setContextClassLoader(runtimeClassLoader); - daemon = SCADomain.newInstance("NodeDaemon.composite"); - started = true; - } finally { - if (!started) { - Thread.currentThread().setContextClassLoader(threadContextClassLoader); - } - } - } - - public void stop() { - try { - Thread.currentThread().setContextClassLoader(runtimeClassLoader); - daemon.close(); - } finally { - Thread.currentThread().setContextClassLoader(threadContextClassLoader); - } - } - } - - /** - * Constructs a new daemon bootstrap. - */ - public NodeImplementationDaemonBootstrap() throws Exception { - node = new NodeFacade(); - } - - /** - * Returns the node representing the daemon. - * @return - */ - public SCANode2 getNode() { - return node; - } - -} diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java deleted file mode 100644 index f997d26cac..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java +++ /dev/null @@ -1,138 +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.implementation.node.launcher; - -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode2; -import org.apache.tuscany.sca.node.SCANode2Factory; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; - -/** - * Bootstrap class for standalone SCA nodes. - * - * @version $Rev$ $Date$ - */ -public class NodeImplementationLauncherBootstrap { - - private SCANode2 node; - - /** - * A node facade. - */ - public static class NodeFacade implements SCANode2, SCAClient { - private ClassLoader threadContextClassLoader; - private ClassLoader runtimeClassLoader; - private SCANode2 delegate; - - private NodeFacade(SCANode2 delegate) { - runtimeClassLoader = Thread.currentThread().getContextClassLoader(); - this.delegate = delegate; - } - - public void start() { - threadContextClassLoader = Thread.currentThread().getContextClassLoader(); - boolean started = false; - try { - Thread.currentThread().setContextClassLoader(runtimeClassLoader); - delegate.start(); - started = true; - } finally { - if (!started) { - Thread.currentThread().setContextClassLoader(threadContextClassLoader); - } - } - } - - public void stop() { - try { - Thread.currentThread().setContextClassLoader(runtimeClassLoader); - delegate.stop(); - } finally { - Thread.currentThread().setContextClassLoader(threadContextClassLoader); - } - } - - public > R cast(B target) throws IllegalArgumentException { - return (R)((SCAClient)delegate).cast(target); - } - - public B getService(Class businessInterface, String serviceName) { - return (B)((SCAClient)delegate).getService(businessInterface, serviceName); - } - - public ServiceReference getServiceReference(Class businessInterface, String referenceName) { - return (ServiceReference)((SCAClient)delegate).getServiceReference(businessInterface, referenceName); - } - } - - /** - * Bootstrap a new SCA node. - * - * @param configurationURI - */ - public NodeImplementationLauncherBootstrap(String configurationURI) throws Exception { - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); - node = new NodeFacade(nodeFactory.createSCANodeFromURL(configurationURI)); - } - - /** - * Bootstrap a new SCA node. - * - * @param compositeURI - * @param uris - * @param locations - */ - public NodeImplementationLauncherBootstrap(String compositeURI, String[] uris, String[] locations) throws Exception { - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); - SCAContribution[] contributions = new SCAContribution[uris.length]; - for (int i = 0; i < uris.length; i++) { - contributions[i] = new SCAContribution(uris[i], locations[i]); - } - node = new NodeFacade(nodeFactory.createSCANode(compositeURI, contributions)); - } - - /** - * Bootstrap a new SCA node. - * - * @param compositeURI - * @param uris - * @param locations - */ - public NodeImplementationLauncherBootstrap(String compositeURI, String compositeContent, String[] uris, String[] locations) throws Exception { - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); - SCAContribution[] contributions = new SCAContribution[uris.length]; - for (int i = 0; i < uris.length; i++) { - contributions[i] = new SCAContribution(uris[i], locations[i]); - } - node = new NodeFacade(nodeFactory.createSCANode(compositeURI, compositeContent, contributions)); - } - - /** - * Returns the SCA node. - * - * @return - */ - public SCANode2 getNode() { - return node; - } - -} diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java deleted file mode 100644 index 62a822a85e..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java +++ /dev/null @@ -1,51 +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.implementation.node.launcher; - -/** - * Utility methods for node implementation launchers. - * - * @version $Rev$ $Date$ - */ -public class NodeImplementationLauncherUtil { - - private static final String TUSCANY_DOMAIN = "TUSCANY_DOMAIN"; - private static final String DEFAULT_DOMAIN = "http://localhost:9990"; - - /** - * Determine the URI of a node configuration. The domain URI can be configured - * using a TUSCANY_DOMAIN system property or environment variable. - * - * @param nodeName - * @return - */ - public static String nodeConfigurationURI(String nodeName) { - String domain = System.getProperty(TUSCANY_DOMAIN); - if (domain == null || domain.length() == 0) { - domain = System.getenv(TUSCANY_DOMAIN); - } - if (domain == null || domain.length() ==0) { - domain = DEFAULT_DOMAIN; - } - String nodeConfiguration = domain + "/node-config/" + nodeName; - return nodeConfiguration; - } - -} diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java deleted file mode 100644 index f505593c0d..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java +++ /dev/null @@ -1,321 +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.implementation.node.launcher; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import java.util.logging.Logger; - -import org.apache.tuscany.sca.data.collection.Entry; -import org.apache.tuscany.sca.data.collection.Item; -import org.apache.tuscany.sca.data.collection.ItemCollection; -import org.apache.tuscany.sca.data.collection.LocalItemCollection; -import org.apache.tuscany.sca.data.collection.NotFoundException; -import org.apache.tuscany.sca.node.launcher.NodeLauncher; -import org.osoa.sca.ServiceRuntimeException; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * Implementation of a node process collection service. - * - * @version $Rev$ $Date$ - */ -@Scope("COMPOSITE") -@Service(interfaces={ItemCollection.class, LocalItemCollection.class}) -public class NodeProcessCollectionImpl implements ItemCollection, LocalItemCollection { - - private static final Logger logger = Logger.getLogger(NodeProcessCollectionImpl.class.getName()); - - private List nodeVMs = new ArrayList(); - - /** - * Initialize the component. - */ - @Init - public void initialize() { - } - - public Entry[] getAll() { - logger.fine("getAll"); - - // Return all the running VMs - List> entries = new ArrayList>(); - for (SCANodeVM vm: nodeVMs) { - entries.add(entry(vm)); - } - return entries.toArray(new Entry[entries.size()]); - } - - public Item get(String key) throws NotFoundException { - logger.fine("get " + key); - - // Return the specified VM - SCANodeVM vm = vm(key); - if (vm == null) { - throw new NotFoundException(); - } - - return item(vm); - } - - public String post(String key, Item item) { - logger.fine("post " + key); - - // If the VM is already running just return it - SCANodeVM vm = vm(key); - if (vm != null) { - if (vm.isAlive()) { - return key; - } else { - // Remove dead VM entry - try { - vm.stop(); - } catch (InterruptedException e) { - throw new ServiceRuntimeException(e); - } - nodeVMs.remove(vm); - } - } - - // Start a new VM and add it to the collection - vm = new SCANodeVM(key); - nodeVMs.add(0, vm); - try { - vm.start(); - } catch (IOException e) { - throw new ServiceRuntimeException(e); - } - - return key; - } - - public void put(String key, Item item) throws NotFoundException { - throw new UnsupportedOperationException(); - } - - public void delete(String key) throws NotFoundException { - logger.fine("delete " + key); - - // Stop a VM and remove it from the collection - SCANodeVM vm = vm(key); - if (vm != null) { - try { - vm.stop(); - } catch (InterruptedException e) { - throw new ServiceRuntimeException(e); - } - nodeVMs.remove(vm); - } else { - //throw new NotFoundException(); - } - } - - public Entry[] query(String queryString) { - logger.fine("query " + queryString); - - if (queryString.startsWith("node=")) { - - // Return the log for the specified VM - String key = queryString.substring(queryString.indexOf('=') + 1); - List> entries = new ArrayList>(); - for (SCANodeVM vm: nodeVMs) { - if (vm.getNodeName().equals(key)) { - entries.add(entry(vm)); - } - } - return entries.toArray(new Entry[entries.size()]); - - } else { - throw new UnsupportedOperationException(); - } - } - - /** - * Returns the specified VM. - * - * @param key - * @return - */ - private SCANodeVM vm(String key) { - for (SCANodeVM vm: nodeVMs) { - if (key.equals(vm.getNodeName())) { - return vm; - } - } - return null; - } - - /** - * Returns an entry representing a VM. - * - * @param vm - * @return - */ - private static Entry entry(SCANodeVM vm) { - Entry entry = new Entry(); - entry.setKey(vm.getNodeName()); - entry.setData(item(vm)); - return entry; - } - - /** - * Returns an item representing a VM. - * - * @param vm - * @return - */ - private static Item item(SCANodeVM vm) { - Item item = new Item(); - String key = vm.getNodeName(); - item.setTitle(title(key)); - item.setLink("/node-config/" + vm.getNodeName()); - item.setContents("" + vm.getLog().toString() + ""); - return item; - } - - /** - * Represent a child Java VM running an SCA node. - */ - private static class SCANodeVM { - private String nodeName; - private StringBuffer log; - private Process process; - private Thread monitor; - private int status; - - SCANodeVM(String nodeName) { - log = new StringBuffer(); - this.nodeName =nodeName; - } - - /** - * Starts a node in a new VM. - */ - private void start() throws IOException { - - // Determine the node configuration URI - String nodeConfigurationURI = NodeImplementationLauncherUtil.nodeConfigurationURI(nodeName); - - // Build the Java VM command line - Properties props = System.getProperties(); - String java = props.getProperty("java.home") + "/bin/java"; - String cp = props.getProperty("java.class.path"); - String main = NodeLauncher.class.getName(); - final String[] command = new String[]{ java, "-cp", cp, main , nodeConfigurationURI}; - - logger.info("Starting " + "java " + main + " " + nodeConfigurationURI); - - // Start the VM - ProcessBuilder builder = new ProcessBuilder(command); - builder.redirectErrorStream(true); - process = builder.start(); - - logger.info("Started " + process); - - // Start a thread to monitor the process - final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); - monitor = new Thread(new Runnable() { - public void run() { - try { - for (;;) { - String s = reader.readLine(); - if (s != null) { - logger.info(s); - log.append(s + "
"); - } else { - break; - } - } - status = process.waitFor(); - } catch (IOException e) { - } catch (Exception e) { - throw new RuntimeException(e); - } - } - }); - monitor.start(); - } - - /** - * Returns the composite used to start this VM. - * @return - */ - String getNodeName() { - return nodeName; - } - - /** - * Returns the log for this VM. - * - * @return - */ - StringBuffer getLog() { - return log; - } - - /** - * Returns true if the VM is alive - * - * @return - */ - private boolean isAlive() { - return monitor.isAlive(); - } - - /** - * Returns the VM status code. - * @return - */ - int getStatus() { - return status; - } - - /** - * Stops the VM. - * - * @throws InterruptedException - */ - private void stop() throws InterruptedException { - logger.info("Stopping " + process); - - process.destroy(); - monitor.join(); - - logger.info("Stopped " + process); - } - } - - /** - * Returns a node title. - * - * @param key - * @return - */ - private static String title(String key) { - return key; - } - -} diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java deleted file mode 100644 index 7abb1335cf..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java +++ /dev/null @@ -1,61 +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.implementation.node.launcher; - -import java.io.IOException; -import java.util.logging.Logger; - -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.parsers.ParserConfigurationException; - -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * Implementation of a ping service component. - * - * @version $Rev$ $Date$ - */ -@Scope("COMPOSITE") -@Service(interfaces={Servlet.class}) -public class PingServiceImpl extends HttpServlet { - private static final long serialVersionUID = -3477992129462720901L; - - private static final Logger logger = Logger.getLogger(PingServiceImpl.class.getName()); - - /** - * Initialize the component. - */ - @Init - public void initialize() throws ParserConfigurationException { - } - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - logger.fine("ping"); - response.getWriter().print("OK"); - } - -} diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java deleted file mode 100644 index 5895a8614d..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java +++ /dev/null @@ -1,44 +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.implementation.node.provider; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.invocation.Message; - -/** - * Implements an invoker for node component implementations. - * - * @version $Rev$ $Date$ - */ -class NodeImplementationInvoker implements Invoker { - private Composite composite; - - NodeImplementationInvoker(Composite composite) { - this.composite = composite; - } - - public Message invoke(Message msg) { - //FIXME Implement later - msg.setBody(composite); - return msg; - } - -} diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java deleted file mode 100644 index 6cdb18938e..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java +++ /dev/null @@ -1,62 +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.implementation.node.provider; - -import org.apache.tuscany.sca.implementation.node.NodeImplementation; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.provider.ImplementationProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; - -/** - * An implementation provider for node component implementations. - * - * @version $Rev$ $Date$ - */ -class NodeImplementationProvider implements ImplementationProvider { - - private NodeImplementation implementation; - - /** - * Constructs a new node implementation provider. - * - * @param component - * @param implementation - */ - NodeImplementationProvider(RuntimeComponent component, NodeImplementation implementation) { - this.implementation = implementation; - } - - public Invoker createInvoker(RuntimeComponentService service, Operation operation) { - NodeImplementationInvoker invoker = new NodeImplementationInvoker(implementation.getComposite()); - return invoker; - } - - public boolean supportsOneWayInvocation() { - return false; - } - - public void start() { - } - - public void stop() { - } - -} diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java deleted file mode 100644 index e2a3e4df92..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java +++ /dev/null @@ -1,49 +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.implementation.node.provider; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.implementation.node.NodeImplementation; -import org.apache.tuscany.sca.provider.ImplementationProvider; -import org.apache.tuscany.sca.provider.ImplementationProviderFactory; -import org.apache.tuscany.sca.runtime.RuntimeComponent; - -/** - * Factory for node component implementation providers. - * - * @version $Rev$ $Date$ - */ -public class NodeImplementationProviderFactory implements ImplementationProviderFactory { - - /** - * Constructs a new factory. - * - * @param extensionPoints - */ - public NodeImplementationProviderFactory(ExtensionPointRegistry extensionPoints) { - } - - public ImplementationProvider createImplementationProvider(RuntimeComponent component, NodeImplementation implementation) { - return new NodeImplementationProvider(component, implementation); - } - - public Class getModelType() { - return NodeImplementation.class; - } -} diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java deleted file mode 100644 index f6a601a3cd..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java +++ /dev/null @@ -1,119 +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.implementation.node.webapp; - -import java.io.IOException; -import java.util.StringTokenizer; - -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; - -/** - * A Servlet request dispatcher that can be used to delegate requests to a - * Serlvet registered with the Webapp Servlet host. - * - * @version $Rev$ $Date$ - */ -class NodeWebAppRequestDispatcher implements RequestDispatcher { - private String servletPath; - private Servlet servlet; - - /** - * Constructs a new request dispatcher. - * - * @param mapping - * @param servlet - */ - public NodeWebAppRequestDispatcher(String mapping, Servlet servlet) { - if (mapping.endsWith("*")) { - mapping = mapping.substring(0, mapping.length()-1); - } - if (mapping.endsWith("/")) { - mapping = mapping.substring(0, mapping.length()-1); - } - this.servletPath = mapping; - this.servlet = servlet; - } - - /** - * Returns a request wrapper which will return the correct Servlet path - * and path info. - * - * @param request - * @return - */ - private HttpServletRequest createRequestWrapper(ServletRequest request) { - HttpServletRequest requestWrapper = new HttpServletRequestWrapper((HttpServletRequest)request) { - - @Override - public String getServletPath() { - return servletPath; - } - - @Override - public String getPathInfo() { - String path = super.getServletPath(); - if (path.length() == 0) { - path = super.getPathInfo(); - } - - // TODO: another context path hack, revisit when context path is sorted out - path = fiddlePath(path, servletPath); - - return path; - } - }; - return requestWrapper; - } - - /** - * Remove any path suffix thats part of the Servlet context path. - * - * @param path - * @param servletPath - */ - private static String fiddlePath(String path, String servletPath) { - StringTokenizer st = new StringTokenizer(path, "/"); - String root = ""; - while (st.hasMoreTokens()){ - String s = st.nextToken(); - if (servletPath.endsWith((root + "/" + s))) { - root += "/" + s; - } else { - break; - } - } - String fiddlePath = path.substring(root.length()); - return fiddlePath; - } - - public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException { - servlet.service(createRequestWrapper(request), response); - } - - public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException { - servlet.service(createRequestWrapper(request), response); - } -} diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java deleted file mode 100644 index 47b42c9224..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java +++ /dev/null @@ -1,392 +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.implementation.node.webapp; - -import java.io.IOException; -import java.lang.reflect.Method; -import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.net.UnknownHostException; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; -import java.util.logging.Logger; - -import javax.servlet.Filter; -import javax.servlet.FilterConfig; -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; -import org.apache.tuscany.sca.host.http.ServletMappingException; -import org.apache.tuscany.sca.implementation.node.launcher.NodeImplementationLauncherUtil; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode2; -import org.apache.tuscany.sca.node.SCANode2Factory; - -/** - * ServletHost implementation for use in a Webapp Node environment. - * - * @version $Rev$ $Date$ - */ -public class NodeWebAppServletHost implements ServletHost, Filter { - private static final Logger logger = Logger.getLogger(NodeWebAppServletHost.class.getName()); - - private static final NodeWebAppServletHost servletHost = new NodeWebAppServletHost(); - - private Map servlets = new HashMap(); - private SCANode2 node; - - private String contextPath = "/"; - private int defaultPort = 8080; - - /** - * Constructs a new NodeWebAppServletHost. - */ - private NodeWebAppServletHost() { - } - - /** - * Returns the Servlet host for the current Web app. - * - * @return - */ - public static NodeWebAppServletHost servletHost() { - return servletHost; - } - - /** - * Initialize the Servlet host. - * - * @param filterConfig - * @throws ServletException - */ - public void init(final FilterConfig filterConfig) throws ServletException { - - // Create a Servlet config wrapping the given filter config - ServletConfig servletConfig = servletConfig(filterConfig); - - // Get the Servlet context - ServletContext servletContext = servletConfig.getServletContext(); - - // Initialize the context path - contextPath = contextPath(servletContext); - - // Derive the node name from the Webapp context path - String nodeName = contextPath; - if (nodeName.startsWith("/")) { - nodeName = nodeName.substring(1); - } - if (nodeName.endsWith("/")) { - nodeName = nodeName.substring(0, nodeName.length() - 1); - } - - // Determine the node configuration URI - String nodeConfiguration = NodeImplementationLauncherUtil.nodeConfigurationURI(nodeName); - - // Create the SCA node - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); - node = nodeFactory.createSCANodeFromURL(nodeConfiguration); - - // Register the Servlet host - ServletHostExtensionPoint servletHosts = servletHosts(node); - servletHosts.getServletHosts().clear(); - servletHosts.addServletHost(servletHost); - - // Save the node in the Servlet context - servletContext.setAttribute(SCAClient.class.getName(), node); - - // Start the node - node.start(); - - // Initialize the registered Servlets - for (Servlet servlet : servlets.values()) { - servlet.init(servletConfig); - } - } - - public void addServletMapping(String suri, Servlet servlet) throws ServletMappingException { - URI pathURI = URI.create(suri); - - // Make sure that the path starts with a / - suri = pathURI.getPath(); - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - if (!suri.startsWith(contextPath)) { - suri = contextPath + suri; - } - - // In a webapp just use the given path and ignore the host and port - // as they are fixed by the Web container - servlets.put(suri, servlet); - - logger.info("Added Servlet mapping: " + suri); - } - - public Servlet removeServletMapping(String suri) throws ServletMappingException { - URI pathURI = URI.create(suri); - - // Make sure that the path starts with a / - suri = pathURI.getPath(); - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - if (!suri.startsWith(contextPath)) { - suri = contextPath + suri; - } - - // In a webapp just use the given path and ignore the host and port - // as they are fixed by the Web container - return servlets.remove(suri); - } - - public Servlet getServletMapping(String suri) throws ServletMappingException { - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - if (!suri.startsWith(contextPath)) { - suri = contextPath + suri; - } - - // Get the Servlet mapped to the given path - Servlet servlet = servlets.get(suri); - return servlet; - } - - public URL getURLMapping(String suri) throws ServletMappingException { - URI uri = URI.create(suri); - - // Get the URI scheme and port - String scheme = uri.getScheme(); - if (scheme == null) { - scheme = "http"; - } - int portNumber = uri.getPort(); - if (portNumber == -1) { - portNumber = defaultPort; - } - - // Get the host - String host; - try { - host = InetAddress.getLocalHost().getHostName(); - } catch (UnknownHostException e) { - host = "localhost"; - } - - // Construct the URL - String path = uri.getPath(); - if (!path.startsWith("/")) { - path = '/' + path; - } - - if (contextPath != null && !path.startsWith(contextPath)) { - path = contextPath + path; - } - - URL url; - try { - url = new URL(scheme, host, portNumber, path); - } catch (MalformedURLException e) { - throw new ServletMappingException(e); - } - return url; - } - - public RequestDispatcher getRequestDispatcher(String suri) throws ServletMappingException { - - // Make sure that the path starts with a / - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - suri = contextPath + suri; - - // Get the Servlet mapped to the given path - Servlet servlet = servlets.get(suri); - if (servlet != null) { - return new NodeWebAppRequestDispatcher(suri, servlet); - } - - for (Map.Entry entry : servlets.entrySet()) { - String servletPath = entry.getKey(); - if (servletPath.endsWith("*")) { - servletPath = servletPath.substring(0, servletPath.length() - 1); - if (suri.startsWith(servletPath)) { - return new NodeWebAppRequestDispatcher(entry.getKey(), entry.getValue()); - } else { - if ((suri + "/").startsWith(servletPath)) { - return new NodeWebAppRequestDispatcher(entry.getKey(), entry.getValue()); - } - } - } - } - - // No Servlet found - return null; - } - - /** - * Destroy the Servlet host. - * - * @throws ServletException - */ - public void destroy() { - - // Destroy the registered Servlets - for (Servlet servlet : servlets.values()) { - servlet.destroy(); - } - - // Stop the node - if (node != null) { - node.stop(); - } - } - - public void doFilter(ServletRequest request, ServletResponse response, javax.servlet.FilterChain chain) - throws IOException, ServletException { - - // Get the Servlet path - HttpServletRequest httpRequest = (HttpServletRequest)request; - String path = httpRequest.getPathInfo(); - if (path == null) { - path = httpRequest.getServletPath(); - } - if (path == null) { - path = "/"; - } - - // Get a request dispatcher for the Servlet mapped to that path - RequestDispatcher dispatcher = getRequestDispatcher(path); - if (dispatcher != null) { - - // Let the dispatcher forward the request to the Servlet - dispatcher.forward(request, response); - - } else { - - // Proceed down the filter chain - chain.doFilter(request, response); - } - } - - public void setDefaultPort(int port) { - defaultPort = port; - } - - public int getDefaultPort() { - return defaultPort; - } - - public String getContextPath() { - return contextPath; - } - - public void setContextPath(String path) { - //this.contextPath = path; - } - - /** - * Initializes the contextPath - * The 2.5 Servlet API has a getter for this, for pre 2.5 Servlet - * containers use an init parameter. - */ - private static String contextPath(ServletContext context) { - String contextPath = "/"; - - // The getContextPath() is introduced since Servlet 2.5 - Method m; - try { - // Try to get the method anyway since some ServletContext impl has this method even before 2.5 - m = context.getClass().getMethod("getContextPath", new Class[] {}); - contextPath = (String)m.invoke(context, new Object[] {}); - } catch (Exception e) { - contextPath = context.getInitParameter("contextPath"); - if (contextPath == null) { - logger.warning("Servlet level is: " + context.getMajorVersion() + "." + context.getMinorVersion()); - throw new IllegalStateException( - "'contextPath' init parameter must be set for pre-2.5 servlet container"); - } - } - - logger.info("ContextPath: " + contextPath); - return contextPath; - } - - /** - * Returns the Servlet host extension point used by the given node. - * - * @return - */ - private static ServletHostExtensionPoint servletHosts(SCANode2 node) { - //FIXME Need a clean way to get the extension point registry - // from the node - ExtensionPointRegistry registry; - try { - registry = (ExtensionPointRegistry)node.getClass().getMethod("getExtensionPointRegistry").invoke(node); - } catch (Exception e) { - throw new RuntimeException(e); - } - ServletHostExtensionPoint servletHosts = registry.getExtensionPoint(ServletHostExtensionPoint.class); - return servletHosts; - } - - /** - * Returns a Servlet config wrapping a filter config. - * - * @param filterConfig - * @return - */ - private static ServletConfig servletConfig(final FilterConfig filterConfig) { - ServletConfig servletConfig = new ServletConfig() { - public String getInitParameter(String name) { - return filterConfig.getInitParameter(name); - } - - public Enumeration getInitParameterNames() { - return filterConfig.getInitParameterNames(); - } - - public ServletContext getServletContext() { - return filterConfig.getServletContext(); - } - - public String getServletName() { - return filterConfig.getFilterName(); - } - }; - return servletConfig; - } -} diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory deleted file mode 100644 index 306b53be5b..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory +++ /dev/null @@ -1,19 +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 implementation extension -org.apache.tuscany.sca.implementation.node.provider.NodeImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.node.NodeImplementation diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite deleted file mode 100644 index a019fedd6d..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java deleted file mode 100644 index c25e952b69..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java +++ /dev/null @@ -1,47 +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.implementation.node; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * Test case for node component implementations. - * - * @version $Rev$ $Date$ - */ -public class NodeImplementationTestCase extends TestCase { - - private SCADomain scaDomain; - - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("TestNode.composite"); - } - - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void testNode() { - } - -} diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/test/resources/TestComposite.composite b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/test/resources/TestComposite.composite deleted file mode 100644 index 55644c27e5..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/test/resources/TestComposite.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/test/resources/TestNode.composite b/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/test/resources/TestNode.composite deleted file mode 100644 index d4dc62a42d..0000000000 --- a/branches/sca-java-1.3.3/modules/implementation-node-runtime/src/test/resources/TestNode.composite +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - -- cgit v1.2.3