Moving 1.x trunk

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

7 files changed, 0 insertions, 400 deletions

diff --git a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.x/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;

-

-import org.osoa.sca.annotations.Service;

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldServer.java b/branches/sca-java-1.x/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 83dbfe03ff..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldServer.java
+++ /dev/null
@@ -1,65 +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 helloworld;

-

-import java.io.IOException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This server program shows how to create an SCA runtime, and start it which

- * activates the helloworld Web service endpoint.

- */

-public class HelloWorldServer {

-

-	private static final String EPMD_COMMAND = "epmd";

-

-	public static void main(String[] args) {

-		try {

-			Process process = null;

-			try {

-				process = Runtime.getRuntime().exec(EPMD_COMMAND);

-			} catch (Exception e) {

-				System.out

-						.println("Cannot proceed - exception while executing "

-								+ EPMD_COMMAND

-								+ ": "

-								+ e.getMessage()

-								+ ". Valid and working Erlang/OTP distribution is required.");

-			}

-			if (process != null) {

-				System.out.println("EPMD server started");

-				SCADomain scaDomain = SCADomain

-						.newInstance("helloworlderlangservice.composite");

-				System.out

-						.println("HelloWorld server started (press enter to shutdown)");

-				System.in.read();

-				process.destroy();

-				scaDomain.close();

-				System.out.println("EPMD server stopped");

-				System.out.println("HelloWorld server stopped");

-			}

-		} catch (IOException e) {

-			e.printStackTrace();

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-}

diff --git a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-1.x/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 4b019b21bf..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,31 +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 helloworld;

-

-import org.osoa.sca.annotations.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

-

diff --git a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/main/resources/helloworlderlangservice.composite b/branches/sca-java-1.x/samples/helloworld-service-erlang/src/main/resources/helloworlderlangservice.composite
deleted file mode 100644
index 1e0c57c74d..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/main/resources/helloworlderlangservice.composite
+++ /dev/null
@@ -1,35 +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://www.osoa.org/xmlns/sca/1.0"

-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://helloworld"

-	xmlns:hw="http://helloworld"

-    name="helloworld">

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldImpl" />

-	    <service name="HelloWorldService">

-                <interface.java interface="helloworld.HelloWorldService"/>

-                <tuscany:binding.erlang node="HelloNode" module="HelloModule"/>

-        </service>

-    </component>

-

-</composite>

diff --git a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/test/java/helloworld/HelloWorldErlangServerTestCase.java b/branches/sca-java-1.x/samples/helloworld-service-erlang/src/test/java/helloworld/HelloWorldErlangServerTestCase.java
deleted file mode 100644
index 7f7d78c50d..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/test/java/helloworld/HelloWorldErlangServerTestCase.java
+++ /dev/null
@@ -1,68 +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 helloworld;

-

-import static junit.framework.Assert.assertEquals;

-import static junit.framework.Assert.assertNotNull;

-

-import helloworld.dynaignore.IgnorableRunner;

-import helloworld.dynaignore.IgnoreTest;

-

-import java.io.IOException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-

-

-

-/**

- * Tests that the helloworld server is available

- */

-@RunWith(IgnorableRunner.class)

-public class HelloWorldErlangServerTestCase {

-

-	private static final String EPMD_COMMAND = "epmd";

-

-	@Test

-	public void testServiceCall() throws IOException {

-		Process epmdProcess = null;

-		try {

-			epmdProcess = Runtime.getRuntime().exec(EPMD_COMMAND);

-		} catch (Exception e) {

-			System.out

-					.println("Cannot proceed - exception while executing "

-							+ EPMD_COMMAND

-							+ ": "

-							+ e.getMessage()

-							+ ". Valid and working Erlang/OTP distribution is required.");

-			throw new IgnoreTest();

-		}

-		SCADomain scaDomain = SCADomain

-				.newInstance("helloworlderlangservice.composite");

-		HelloWorldService helloWorldService = scaDomain.getService(

-				HelloWorldService.class,

-				"HelloWorldServiceComponent/HelloWorldService");

-		assertNotNull(helloWorldService);

-		assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-		scaDomain.close();

-		epmdProcess.destroy();

-	}

-

-}

diff --git a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnorableRunner.java b/branches/sca-java-1.x/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnorableRunner.java
deleted file mode 100644
index 6943c1df80..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnorableRunner.java
+++ /dev/null
@@ -1,139 +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 helloworld.dynaignore;
-
-import org.junit.runner.Description;
-import org.junit.runner.Result;
-import org.junit.runner.Runner;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunListener;
-import org.junit.runner.notification.RunNotifier;
-import org.junit.runner.notification.StoppedByUserException;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.InitializationError;
-
-/**
- * @version $Rev$ $Date$
- */
-public class IgnorableRunner extends Runner {
-
-	private static final class Notifier extends RunNotifier {
-		private final RunNotifier notifier;
-
-		public Notifier(final RunNotifier notifier) {
-			this.notifier = notifier;
-		}
-
-		public void addFirstListener(final RunListener listener) {
-			notifier.addFirstListener(listener);
-		}
-
-		public void addListener(final RunListener listener) {
-			notifier.addListener(listener);
-		}
-
-		@Override
-		public boolean equals(final Object obj) {
-			return notifier.equals(obj);
-		}
-
-		@Override
-		public void fireTestFailure(final Failure failure) {
-			if (failure.getException().getClass() == IgnoreTest.class) {
-				notifier.fireTestIgnored(failure.getDescription());
-			} else {
-				notifier.fireTestFailure(failure);
-			}
-		}
-
-		@Override
-		public void fireTestFinished(final Description description) {
-			notifier.fireTestFinished(description);
-		}
-
-		@Override
-		public void fireTestIgnored(final Description description) {
-			notifier.fireTestIgnored(description);
-		}
-
-		@Override
-		public void fireTestRunFinished(final Result result) {
-			notifier.fireTestRunFinished(result);
-		}
-
-		@Override
-		public void fireTestRunStarted(final Description description) {
-			notifier.fireTestRunStarted(description);
-		}
-
-		@Override
-		public void fireTestStarted(final Description description)
-				throws StoppedByUserException {
-			notifier.fireTestStarted(description);
-		}
-
-		@Override
-		public int hashCode() {
-			return notifier.hashCode();
-		}
-
-		@Override
-		public void pleaseStop() {
-			notifier.pleaseStop();
-		}
-
-		@Override
-		public void removeListener(final RunListener listener) {
-			notifier.removeListener(listener);
-		}
-
-		public void testAborted(final Description description,
-				final Throwable cause) {
-			((Notifier) notifier).testAborted(description, cause);
-		}
-
-		@Override
-		public String toString() {
-			return notifier.toString();
-		}
-
-	}
-
-	Runner runner = null;
-
-	public IgnorableRunner(Class<?> testClass) {
-		try {
-			runner = new BlockJUnit4ClassRunner(testClass);
-		} catch (InitializationError e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public Description getDescription() {
-		return runner.getDescription();
-	}
-
-	@Override
-	public void run(RunNotifier notifier) {
-		runner.run(new Notifier(notifier));
-	}
-
-}
diff --git a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnoreTest.java b/branches/sca-java-1.x/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnoreTest.java
deleted file mode 100644
index 99d961bdea..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnoreTest.java
+++ /dev/null
@@ -1,29 +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 helloworld.dynaignore;
-
-/**
- * @version $Rev$ $Date$
- */
-public final class IgnoreTest extends Error {
-
-	private static final long serialVersionUID = 1L;
-
-}