From 3ac2d800d840f03618fc364090d786effde84b1f Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:13:16 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835142 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/client/LaunchClient.java | 57 ------------- .../src/main/java/domain/LaunchDomain.java | 33 -------- .../src/main/java/helloworld/HelloWorldImpl.java | 35 -------- .../main/java/helloworld/HelloWorldService.java | 31 ------- .../java/helloworld/HelloWorldServiceClient.java | 42 ---------- .../demos/loadbalancer/rule/RoundRobinRule.java | 96 ---------------------- .../helloworldwsclient.composite | 33 -------- .../src/main/webapp/META-INF/sca-contribution.xml | 24 ------ .../sca-deployables/helloworldws.composite | 32 -------- .../src/main/webapp/WEB-INF/web.xml | 37 --------- 10 files changed, 420 deletions(-) delete mode 100644 branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java delete mode 100644 branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java delete mode 100644 branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java delete mode 100644 branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java delete mode 100644 branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java delete mode 100644 branches/sca-java-20080910/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite delete mode 100644 branches/sca-java-20080910/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-20080910/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite delete mode 100644 branches/sca-java-20080910/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml (limited to 'branches/sca-java-20080910/demos/load-balancing-webapp/src/main') diff --git a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java b/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java deleted file mode 100644 index efa89b4fe9..0000000000 --- a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java +++ /dev/null @@ -1,57 +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 client; - -import java.io.File; - -import helloworld.HelloWorldService; - -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode2; -import org.apache.tuscany.sca.node.SCANode2Factory; -import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution; -import org.osoa.sca.ServiceRuntimeException; - -public class LaunchClient { - public static void main(String[] args) throws Exception { - - SCANode2 node = null; - try { - - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); - node = nodeFactory.createSCANode(new File("src/main/resources/client-contribution/helloworldwsclient.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/client-contribution").toURL().toString())); - - node.start(); - HelloWorldService helloWorldService = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClientComponent"); - - - for (int i=0; i < 10; i++){ - System.out.println(helloWorldService.getGreetings("World " + i)); - } - - node.stop(); - - } catch (Exception e) { - throw new ServiceRuntimeException(e); - } - } -} diff --git a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java b/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java deleted file mode 100644 index 33c37869a3..0000000000 --- a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.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 domain; - -//import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher; - -/** - * This server program that loads a composite to provide simple registry function. - * This server can be replaced with any registry that is appropriate but the components - * in each node that talk to the registry should be replaced also. - */ -public class LaunchDomain { - public static void main(String[] args) throws Exception { - // DomainManagerLauncher.main(args); - } - -} diff --git a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 65dc030d89..0000000000 --- a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,35 +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) { - String message = "Hello " + name; - System.err.println(message); - return message; - } - -} diff --git a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 7245513b2a..0000000000 --- a/branches/sca-java-20080910/demos/load-balancing-webapp/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-20080910/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java b/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java deleted file mode 100644 index f3d2fdb2ed..0000000000 --- a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java +++ /dev/null @@ -1,42 +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; - -/** - * The HelloWorld service implementation - */ -public class HelloWorldServiceClient implements HelloWorldService { - - HelloWorldService helloWorldService; - - public String getGreetings(String name) { - System.out.println("Called getGreetings"); - return helloWorldService.getGreetings(name); - } - - public HelloWorldService getHelloWorldService() { - System.out.println("Got Injected helloWorldService"); - return helloWorldService; - } - - public void setHelloWorldService(HelloWorldService helloWorldService) { - System.out.println("Injected helloWorldService"); - this.helloWorldService = helloWorldService; - } -} \ No newline at end of file diff --git a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java b/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java deleted file mode 100644 index 5dc1b6671b..0000000000 --- a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java +++ /dev/null @@ -1,96 +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.demos.loadbalancer.rule; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.webapp.balancer.rules.BaseRule; - - -public class RoundRobinRule extends BaseRule { - /** - * The number of worker nodes that load will - * be balanced across - */ - private int workerCount; - - private int currentCount = 1; - - - /** - * Sets the worker count. - * - * @param workerCount The worker count - */ - public void setWorkerCount(int workerCount) { - if (workerCount == 0) { - throw new IllegalArgumentException( - "worker count cannot be 0."); - } else { - this.workerCount = workerCount; - } - } - - /** - * Returns the worker count. - * - * @return int The worker count - */ - protected int getWorkerCount() { - return workerCount; - } - - - - /** - * @see org.apache.webapp.balancer.Rule#matches(HttpServletRequest) - */ - public boolean matches(HttpServletRequest request) { - - if (currentCount == workerCount){ - currentCount = 1; - return true; - } else { - currentCount++; - return false; - } - } - - /** - * Returns a String representation of this object. - * - * @return String - */ - public String toString() { - StringBuffer buffer = new StringBuffer(); - - buffer.append("["); - buffer.append(getClass().getName()); - buffer.append(": "); - - buffer.append("Worker count: "); - buffer.append(getWorkerCount()); - buffer.append(" / "); - - buffer.append("Redirect URL: "); - buffer.append(getRedirectUrl()); - - buffer.append("]"); - - return buffer.toString(); - } -} diff --git a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite b/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite deleted file mode 100644 index 9b6052741e..0000000000 --- a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml deleted file mode 100644 index 11347004f9..0000000000 --- a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite deleted file mode 100644 index 1ab78d802d..0000000000 --- a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 8d47ae2207..0000000000 --- a/branches/sca-java-20080910/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - Apache Tuscany Load Balancing Demo - - - tuscany - org.apache.tuscany.sca.host.webapp.TuscanyServletFilter - - - - tuscany - /* - - - -- cgit v1.2.3