You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/01/25 15:29:06 UTC
svn commit: r902818 - in /tuscany/sca-java-2.x/trunk:
distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/
distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/
distribution/tomcat/tomcat-hook/src/main/java/or...
Author: antelder
Date: Mon Jan 25 14:29:05 2010
New Revision: 902818
URL: http://svn.apache.org/viewvc?rev=902818&view=rev
Log:
Catch up the tomcat runtime with all the recent domain and node changes
Modified:
tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp
tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java
tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java
tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
Modified: tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp?rev=902818&r1=902817&r2=902818&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp (original)
+++ tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp Mon Jan 25 14:29:05 2010
@@ -23,7 +23,7 @@
<%@ page import="java.net.URI" %>
<%
- HelloworldService service = SCAClientFactory.newInstance(URI.create("tuscany:default")).getService(HelloworldService.class, "HelloworldComponent");
+ HelloworldService service = SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, "HelloworldComponent");
%>
<html>
Modified: tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java?rev=902818&r1=902817&r2=902818&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java (original)
+++ tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java Mon Jan 25 14:29:05 2010
@@ -42,7 +42,7 @@
try {
String component = request.getParameter("component");
- HelloworldService service = SCAClientFactory.newInstance(URI.create("tuscany:default")).getService(HelloworldService.class, component);
+ HelloworldService service = SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, component);
String name = request.getParameter("name");
String greeting = service.sayHello(name);
Modified: tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java?rev=902818&r1=902817&r2=902818&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java (original)
+++ tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java Mon Jan 25 14:29:05 2010
@@ -21,6 +21,8 @@
import java.io.File;
import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.URI;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.logging.Logger;
@@ -158,9 +160,15 @@
ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(tuscanyClassLoader);
- Class<?> domainNodeClass = Class.forName("org.apache.tuscany.sca.domain.node.DomainNode", true, tuscanyClassLoader);
- Constructor<?> domainNodeConstructor = domainNodeClass.getConstructor(new Class[] {String.class, new String[0].getClass()});
- domainNodeConstructor.newInstance(TuscanyLifecycleListener.getDomainURI(), new String[0]);
+ Class<?> nodeFactoryClass = Class.forName("org.apache.tuscany.sca.node.NodeFactory", true, tuscanyClassLoader);
+ Method getInstanceMethod = nodeFactoryClass.getMethod("getInstance", new Class[0]);
+ Object instance = getInstanceMethod.invoke(null);
+ Method createNodeMethod = nodeFactoryClass.getMethod("createNode", new Class[]{URI.class, new String[0].getClass()});
+ URI domainURI = URI.create(TuscanyLifecycleListener.getDomainURI());
+ Object node = createNodeMethod.invoke(instance, new Object[]{domainURI, new String[0]});
+ Class<?> nodeClass = Class.forName("org.apache.tuscany.sca.node.Node", true, tuscanyClassLoader);
+ Method nodeStartMethod = nodeClass.getMethod("start", new Class[0]);
+ nodeStartMethod.invoke(node);
} catch (Exception e) {
throw new RuntimeException(e);
} finally {
Modified: tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java?rev=902818&r1=902817&r2=902818&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java (original)
+++ tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java Mon Jan 25 14:29:05 2010
@@ -195,7 +195,7 @@
"\r\n\r\n <!-- The Tuscany SCA default domain URI.\r\n" +
" Individual contributions may used different domains by having their \r\n" +
" context.xml files overriding this parameter. -->\r\n" +
- " <Parameter name=\"org.apache.tuscany.sca.defaultDomainURI\" value=\"vm:default\"/>";
+ " <Parameter name=\"org.apache.tuscany.sca.defaultDomainURI\" value=\"default\"/>";
private void addTuscanyContextXml() {
File contextXmlFile = new File(catalinaBase, "/conf/context.xml");
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java?rev=902818&r1=902817&r2=902818&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java Mon Jan 25 14:29:05 2010
@@ -85,14 +85,14 @@
if (nodes.containsKey(uri)) {
throw new IllegalArgumentException("contribution already added: " + uri);
}
- NodeConfiguration configuration = NodeFactory.newInstance().createNodeConfiguration();
+ NodeConfiguration configuration = NodeFactory.getInstance().createNodeConfiguration();
if (location != null) {
configuration.addContribution(uri, location);
}
configuration.setDomainRegistryURI(domainRegistryURI);
configuration.setDomainURI(domainName);
configuration.setURI(uri); //???
- Node node = NodeFactory.newInstance().createNode(configuration).start();
+ Node node = NodeFactory.getInstance().createNode(configuration).start();
nodes.put(uri, node);
}
Modified: tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java?rev=902818&r1=902817&r2=902818&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java Mon Jan 25 14:29:05 2010
@@ -48,7 +48,7 @@
public SCAClientFactoryImpl(URI domainURI) throws NoSuchDomainException {
super(domainURI);
- NodeImpl node = (NodeImpl)NodeFactory.newInstance().createNode(domainURI);
+ NodeImpl node = (NodeImpl)NodeFactory.getInstance().createNode(domainURI);
if (node.getExtensionPoints() == null) {
// No local nodes have been started (for this domain?)
// ideally we'll use the Hazelcast client but for now just start a node