Merging the 1.x delta on top of the equinox based modules

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@718858 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 101 insertions, 0 deletions

diff --git a/java/sca/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java b/java/sca/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
new file mode 100644
index 0000000000..af6155e500
--- /dev/null
+++ b/java/sca/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
@@ -0,0 +1,50 @@
+/*

+ * 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;

+

+import java.io.File;

+

+public class DynamicNodeMain {

+

+    /**

+     * Start an SCA node 

+     * @param args a list of contribution jars for the node to run

+     */

+    public static void main(String[] args) throws Exception {

+

+        SCAContribution[] contributions = new SCAContribution[args.length];

+        for (int i=0; i<args.length; i++) {

+            File f = new File(args[i]);

+            if (!f.exists()) {

+                System.err.println("contribution not found: " + f);

+                System.exit(1);

+            }

+            contributions[i] = new SCAContribution(args[i], f.toURL().toString());

+        }

+

+        SCANode node = SCANodeFactory.newInstance().createSCANode(null, contributions);

+        node.start();

+        

+        System.out.println("Hit enter to stop node...");

+        System.in.read();

+

+        node.stop();

+    }

+}

diff --git a/java/sca/modules/node-dynamic/src/main/resources/log4j.properties b/java/sca/modules/node-dynamic/src/main/resources/log4j.properties
new file mode 100644
index 0000000000..e5b3f8ebfb
--- /dev/null
+++ b/java/sca/modules/node-dynamic/src/main/resources/log4j.properties
@@ -0,0 +1,51 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+#
+# 
+#
+log4j.rootLogger=INFO, stdout, out
+log4j.logger.org.apache.activemq.spring=WARN
+log4j.logger.org.springframework=WARN
+log4j.logger.org.apache.xbean.spring=WARN
+
+# When debugging or reporting problems to the ActiveMQ team,
+# comment out the above lines and uncomment the next.
+
+#log4j.rootLogger=DEBUG, out, stdout
+
+# Or for more fine grained debug logging uncomment one of these
+#log4j.logger.org.apache.activemq=DEBUG
+#log4j.logger.org.apache.camel=DEBUG
+
+
+
+#The logging properties used during tests..
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%-5p %-30.30c{1} - %m%n
+#log4j.appender.stdout.threshold=INFO
+
+# File appender
+log4j.appender.out=org.apache.log4j.RollingFileAppender
+log4j.appender.out.file=${activemq.base}/data/activemq.log
+log4j.appender.out.maxFileSize=1024KB
+log4j.appender.out.maxBackupIndex=5
+log4j.appender.out.append=true
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n