From 3b7a9c51b93925c567b6b84450410b2737cc565e Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 16 Feb 2012 15:41:20 +0000 Subject: Delete old RC tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1245037 13f79535-47bb-0310-9956-ffa450edef68 --- .../tomcat/testing/download-tomcat/pom.xml | 82 ------------ .../testing/helloworld-client-webapp/pom.xml | 47 ------- .../src/main/java/testing/HelloworldService.java | 30 ----- .../src/main/webapp/WEB-INF/web.composite | 30 ----- .../src/main/webapp/WEB-INF/web.xml | 31 ----- .../src/main/webapp/hello.jsp | 36 ----- .../helloworld-reference-contribution/pom.xml | 45 ------- .../src/main/java/testing/HelloworldRefImpl.java | 38 ------ .../src/main/java/testing/HelloworldService.java | 28 ---- .../main/resources/META-INF/sca-contribution.xml | 23 ---- .../src/main/resources/helloworld.composite | 29 ---- .../testing/helloworld-scaclient-jsp/pom.xml | 48 ------- .../src/main/java/testing/HelloworldService.java | 28 ---- .../src/main/webapp/META-INF/sca-contribution.xml | 28 ---- .../src/main/webapp/WEB-INF/web.xml | 31 ----- .../src/main/webapp/hello.jsp | 41 ------ .../testing/helloworld-scaclient-servlet/pom.xml | 53 -------- .../src/main/java/testing/HelloworldService.java | 28 ---- .../src/main/java/testing/HelloworldServlet.java | 64 --------- .../src/main/webapp/META-INF/sca-contribution.xml | 28 ---- .../src/main/webapp/WEB-INF/web.xml | 41 ------ .../src/main/webapp/hello.html | 52 -------- .../helloworld-service-contribution/pom.xml | 45 ------- .../src/main/java/testing/HelloworldImpl.java | 38 ------ .../src/main/java/testing/HelloworldService.java | 28 ---- .../main/resources/META-INF/sca-contribution.xml | 23 ---- .../src/main/resources/helloworld.composite | 28 ---- .../tomcat/testing/legal-checks/pom.xml | 42 ------ .../src/test/java/itest/JarsInLICENSETestCase.java | 147 --------------------- .../distribution/tomcat/testing/pom.xml | 42 ------ 30 files changed, 1254 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/download-tomcat/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldRefImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/helloworld.composite delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/java/testing/HelloworldService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/hello.html delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/legal-checks/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/pom.xml (limited to 'sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing') diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/download-tomcat/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/download-tomcat/pom.xml deleted file mode 100644 index 24013c0d90..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/download-tomcat/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-distribution-tomcat-testing - 2.0-Beta1 - ../pom.xml - - - download-tomcat - war - Apache Tuscany SCA Tomcat Integration Testing Download Tomcat - - - 6.0.18 - - - - - - - - - org.codehaus.mojo - tomcat-maven-plugin - 1.0-beta-1 - - - - org.codehaus.mojo - wagon-maven-plugin - 1.0-beta-1 - - - download-tomcat - pre-integration-test - - download-single - - - http://archive.apache.org - dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip - download - - - - - - - - - - - - - download/apache-tomcat-6.0.18.zip - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/pom.xml deleted file mode 100644 index c1b6d194e3..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-distribution-tomcat-testing - 2.0-Beta1 - ../pom.xml - - - helloworld-client-webapp - war - Apache Tuscany SCA Tomcat Integration Testing Helloworld Client Webapp - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-Beta1 - provided - - - - - ${artifactId} - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java deleted file mode 100644 index 0be22979c2..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java +++ /dev/null @@ -1,30 +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 testing; - -// TODO: should the webapp need to include the service interface? - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index d6db86cf64..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 411d8a3146..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - jsp-client-webapp - - - hello.jsp - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp deleted file mode 100644 index d520375993..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp +++ /dev/null @@ -1,36 +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. ---%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %> - - - - - - -

jsp-client-webapp

- - Calling HelloworldService sayHello("world") returns: - -

- - <%= service.sayHello("world") %> - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml deleted file mode 100644 index 64df6e65e5..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-distribution-tomcat-testing - 2.0-Beta1 - ../pom.xml - - - helloworld-reference-contribution - Apache Tuscany SCA Tomcat Integration Testing Helloworld Reference Contribution - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-Beta1 - provided - - - - - - ${artifactId} - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldRefImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldRefImpl.java deleted file mode 100644 index c2d0bcb4dc..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldRefImpl.java +++ /dev/null @@ -1,38 +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 testing; - -import org.oasisopen.sca.annotation.Service; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.EagerInit; - -@Service(HelloworldService.class) -public class HelloworldRefImpl implements HelloworldService { - - @Reference - public HelloworldService service; - - public String sayHello(String name) { - if (service == null) { - return "ERROR, @Reference is null!"; - } else { - return "Hello ref says: " + service.sayHello(name); - } - } -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldService.java deleted file mode 100644 index b035a772be..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldService.java +++ /dev/null @@ -1,28 +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 testing; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 693325c13d..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/helloworld.composite deleted file mode 100644 index b07cf6078c..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/helloworld.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml deleted file mode 100644 index 500af6b92b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-distribution-tomcat-testing - 2.0-Beta1 - ../pom.xml - - - helloworld-scaclient-jsp - war - Apache Tuscany SCA Tomcat Integration Testing Helloworld Webapp Using SCAClient in a JSP - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-Beta1 - provided - - - - - ${artifactId} - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/java/testing/HelloworldService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/java/testing/HelloworldService.java deleted file mode 100644 index b035a772be..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/java/testing/HelloworldService.java +++ /dev/null @@ -1,28 +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 testing; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/META-INF/sca-contribution.xml deleted file mode 100644 index 7839933b3a..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/META-INF/sca-contribution.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index f2e3441d5e..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - jsp-client-webapp - - - hello.jsp - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp deleted file mode 100644 index 45ae96cb82..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp +++ /dev/null @@ -1,41 +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. ---%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - -<%@ page import="org.oasisopen.sca.client.SCAClientFactory"%> -<%@ page import="testing.HelloworldService" %> -<%@ page import="java.net.URI" %> - -<% - HelloworldService service = SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, "HelloworldComponent"); -%> - - - - -

helloworld-scaclient-jsp

- - Calling HelloworldService sayHello("world") returns: - -

- - <%= service.sayHello("world") %> - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml deleted file mode 100644 index b045d7c7da..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-distribution-tomcat-testing - 2.0-Beta1 - ../pom.xml - - - helloworld-scaclient-servlet - war - Apache Tuscany SCA Tomcat Integration Testing Helloworld Webapp Using SCAClient in a Servlet - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-Beta1 - provided - - - javax.servlet - servlet-api - 2.5 - provided - - - - - ${artifactId} - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldService.java deleted file mode 100644 index b035a772be..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldService.java +++ /dev/null @@ -1,28 +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 testing; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java deleted file mode 100644 index 5be51fab61..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java +++ /dev/null @@ -1,64 +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 testing; - -import java.io.IOException; -import java.io.Writer; -import java.net.URI; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - */ -public class HelloworldServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - - @Override - protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException { - try { - - String component = request.getParameter("component"); - HelloworldService service = SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, component); - - String name = request.getParameter("name"); - String greeting = service.sayHello(name); - - Writer out = response.getWriter(); - out.write("Apache Tuscany Helloworld Servlet Sample"); - out.write("

Apache Tuscany Helloworld Servlet Sample

"); - out.write("
Component " + component + " says: " + greeting); - out.write(""); - out.flush(); - out.close(); - - } catch (NoSuchDomainException e) { - e.printStackTrace(); - } catch (NoSuchServiceException e) { - e.printStackTrace(); - } - } -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/META-INF/sca-contribution.xml deleted file mode 100644 index 7839933b3a..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/META-INF/sca-contribution.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index d424d4b71b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - helloworld-scaclient2-webapp - - - HelloworldServlet - testing.HelloworldServlet - - - - HelloworldServlet - /HelloworldServlet - - - - hello.html - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/hello.html b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/hello.html deleted file mode 100644 index 5398cb5274..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/hello.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - -helloworld-scaclient2-webapp - - - - -

helloworld-scaclient-servlet

- -
- - - - - - - - - - - -
Enter your name: - -
- -
-
- - - \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/pom.xml deleted file mode 100644 index 09cd8fe3d3..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-distribution-tomcat-testing - 2.0-Beta1 - ../pom.xml - - - helloworld-service-contribution - Apache Tuscany SCA Tomcat Integration Testing Helloworld Service Contribution - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-Beta1 - provided - - - - - - ${artifactId} - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java deleted file mode 100644 index 564b2e332f..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java +++ /dev/null @@ -1,38 +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 testing; - -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.Service; -import org.oasisopen.sca.annotation.EagerInit; - -@Service(HelloworldService.class) -@Scope("COMPOSITE") @EagerInit -public class HelloworldImpl implements HelloworldService { - - public String sayHello(String name) { - return "Hello " + name; - } - - @Init - public void init() { - System.out.println("HelloworldImpl eager init: " + sayHello("world")); - } -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java deleted file mode 100644 index eec9d63da8..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java +++ /dev/null @@ -1,28 +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 testing; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 4e0eca6068..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite deleted file mode 100644 index 82b2cc7ce7..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/legal-checks/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/legal-checks/pom.xml deleted file mode 100644 index 4bffcf355e..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/legal-checks/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-distribution-tomcat-testing - 2.0-Beta1 - ../pom.xml - - war-legal-checks - Apache Tuscany SCA WAR Distribution Legal Checks - - - - junit - junit - 4.8.1 - compile - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java deleted file mode 100644 index 04e6a0bc5c..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java +++ /dev/null @@ -1,147 +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 itest; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; - -import org.junit.Test; - -/** - * Checks that all jar files included in the distribution are mentioned in the LICENSE file - * and that all jars mentioned in the LICENSE are in the distribution. - */ -public class JarsInLICENSETestCase { - - @Test - public void testJars() throws Exception { - File distroRoot = getUnzipedDistroRoot(); - - File licenseFile = new File(distroRoot, "LICENSE"); - if (!licenseFile.exists()) { - throw new IllegalStateException("can't find LICENSE file at: " + licenseFile.getAbsoluteFile().toString()); - } - - File libDirectory = distroRoot; - if (!libDirectory.exists()) { - throw new IllegalStateException("can't find modules folder at: " + libDirectory.getAbsoluteFile().toString()); - } - - List jars = getJarsInDistro(libDirectory); - - List bad2 = getLICENSEJarsNotInDistro(licenseFile, jars); - if (bad2.size() > 0) { - System.err.println("Jars in LICENSE but not in Distribution: " + bad2); - } - - List bad1 = getJarsNotInLICENSE(jars, licenseFile); - if (bad1.size() > 0) { - System.err.println("Jars in distribution but not in LICENSE: " + bad1); - } - - if (bad1.size() > 0 || bad2.size() > 0) { - throw new IllegalStateException("LICENSE problems, check log"); - } - } - - private List getLICENSEJarsNotInDistro(File licenseFile, List jars) throws IOException { - List badJars = new ArrayList(); - BufferedReader reader = new BufferedReader(new FileReader(licenseFile)); - String line = null; - while ((line = reader.readLine()) != null) { - line = line.trim(); - if (line.contains(".jar")) { - StringTokenizer st = new StringTokenizer(line); - while (st.hasMoreTokens()) { - String s = st.nextToken(); - if (s.contains(".jar")) { - if (s.startsWith("(")) { - s = s.substring(1); - } - if (s.endsWith(",") || s.endsWith(":")) { - s = s.substring(0, s.length()-1); - } - if (s.endsWith(")")) { - s = s.substring(0, s.length()-1); - } - if (!jars.contains(s) && !s.startsWith("tuscany-")) { - badJars.add(s); - } - } - } - } - } - return badJars; - } - - private List getJarsNotInLICENSE(List jars, File licenseFile) throws IOException { - List badJars = new ArrayList(); - String licenseText = readLICENSE(licenseFile); - for (String jar : jars) { - if (!licenseText.contains(jar)) { - if (jar.startsWith("tuscany-")) { - // ignore tuscany jars as they're not mentioned in the LICENSE file - } else { - badJars.add(jar); - } - } - } - return badJars; - } - - private List getJarsInDistro(File directory) { - List jars = new ArrayList(); - for (String fn : directory.list()){ - if (fn.endsWith(".jar")) { - jars.add(fn); - } else { - File f = new File(directory, fn); - if (f.isDirectory()) { - jars.addAll(getJarsInDistro(f)); - } - } - } - return jars; - } - - private File getUnzipedDistroRoot() { - return new File("../../tomcat-war/target/tuscany"); - } - - private static String readLICENSE(File licenseFile) throws java.io.IOException { - StringBuffer fileData = new StringBuffer(); - BufferedReader reader = new BufferedReader(new FileReader(licenseFile)); - char[] buf = new char[1024]; - int numRead = 0; - while ((numRead = reader.read(buf)) != -1) { - String readData = String.valueOf(buf, 0, numRead); - fileData.append(readData); - buf = new char[1024]; - } - reader.close(); - return fileData.toString(); - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/pom.xml deleted file mode 100644 index 0bd1b45487..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/distribution/tomcat/testing/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-distribution-tomcat - ../pom.xml - 2.0-Beta1 - - org.apache.tuscany.sca - tuscany-distribution-tomcat-testing - pom - Apache Tuscany SCA Distribution Tomcat Testing - - - helloworld-service-contribution - helloworld-reference-contribution - helloworld-scaclient-jsp - helloworld-scaclient-servlet - helloworld-client-webapp - legal-checks - - - -- cgit v1.2.3