Author: antelder
Date: Sat Dec 1 02:30:13 2007
New Revision: 600078
URL: http://svn.apache.org/viewvc?rev=600078&view=rev
Log:
Change to only start the node at the end of startup
Modified:
incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
Modified:
incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java?rev=600078&r1=600077&r2=600078&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
(original)
+++
incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
Sat Dec 1 02:30:13 2007
@@ -56,19 +56,18 @@
String path = sc.getServletContext().getRealPath("/");
System.out.println(path);
try {
- node.stop();
- node.addContribution(path, new File(path).toURL());
- node.addToDomainLevelComposite((QName)null);
+// node.stop();
+ node.addContribution(path, new File(path +
"WEB-INF/classes").toURL());
} catch (MalformedURLException e) {
e.printStackTrace();
} catch (NodeException e) {
e.printStackTrace();
}
- try {
- node.start();
- } catch (NodeException e) {
- e.printStackTrace();
- }
+// try {
+// node.start();
+// } catch (NodeException e) {
+// e.printStackTrace();
+// }
}
protected void stopContext(Context context) {
Modified:
incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java?rev=600078&r1=600077&r2=600078&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
(original)
+++
incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
Sat Dec 1 02:30:13 2007
@@ -27,12 +27,14 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
+import javax.xml.namespace.QName;
import org.apache.catalina.Container;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Wrapper;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardHost;
+import org.apache.tuscany.sca.node.NodeException;
import org.apache.tuscany.sca.runtime.Launcher;
/**
@@ -58,7 +60,16 @@
public synchronized void start() throws LifecycleException {
startRuntime();
- super.start();
+ try {
+
+ launcher.getSCANode().stop();
+ super.start();
+ launcher.getSCANode().addToDomainLevelComposite((QName)null);
+ launcher.getSCANode().start();
+
+ } catch (NodeException e) {
+ e.printStackTrace();
+ }
}
public synchronized void stop() throws LifecycleException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
