diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-16 08:44:44 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-16 08:44:44 +0000 |
commit | 3d3b8834b93b98cc7d7534e693e937179067eb58 (patch) | |
tree | 1c31b939872ea8455118a16009a2abb96179ecf1 /branches/sca-java-1.5/tutorials/store/catalog-webapp | |
parent | 86101a456fb21b25abc09533769805911efd1c7f (diff) |
Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775435 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
5 files changed, 0 insertions, 273 deletions
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-webapp/catalog-web.composite b/branches/sca-java-1.5/tutorials/store/catalog-webapp/catalog-web.composite deleted file mode 100644 index 3ba76da078..0000000000 --- a/branches/sca-java-1.5/tutorials/store/catalog-webapp/catalog-web.composite +++ /dev/null @@ -1,43 +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" - targetNamespace="http://catalog" - name="catalog-web"> - - <component name="WebFruitsCatalog"> - <implementation.java class="services.FruitsCatalogImpl"/> - <service name="Catalog"> - <binding.ws/> - </service> - <property name="currencyCode">USD</property> - <reference name="currencyConverter" target="CurrencyConverterWebService"> - <binding.ws/> - </reference> - </component> - - <component name="LocalFruitsCatalog"> - <implementation.java class="services.FruitsCatalogImpl"/> - <property name="currencyCode">USD</property> - <reference name="currencyConverter" target="CurrencyConverterWebService"> - <binding.ws/> - </reference> - </component> - -</composite> diff --git a/branches/sca-java-1.5/tutorials/store/catalog-webapp/pom.xml b/branches/sca-java-1.5/tutorials/store/catalog-webapp/pom.xml deleted file mode 100644 index 3cbcc1982e..0000000000 --- a/branches/sca-java-1.5/tutorials/store/catalog-webapp/pom.xml +++ /dev/null @@ -1,113 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-tutorial-store</artifactId> - <version>1.5-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tutorial-catalog-webapp</artifactId> - <name>Apache Tuscany SCA Store Tutorial Catalog WAR Contribution</name> - <packaging>war</packaging> - - <repositories> - <repository> - <id>apache.incubator</id> - <url>http://people.apache.org/repo/m2-incubating-repository</url> - </repository> - </repositories> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>1.5-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>1.5-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tutorial-assets</artifactId> - <version>1.5-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher</artifactId> - <version>1.5-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - <sourceDirectory>${basedir}</sourceDirectory> - <resources> - <resource> - <directory>${basedir}</directory> - <excludes> - <exclude>**/*.java</exclude> - <exclude>**/.*/**</exclude> - <exclude>pom.xml</exclude> - <exclude>build.xml</exclude> - <exclude>target/**</exclude> - <exclude>webapp/**</exclude> - <exclude>target/**</exclude> - </excludes> - </resource> - </resources> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <warSourceDirectory>webapp</warSourceDirectory> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-ant-generator</artifactId> - <version>1.5-SNAPSHOT</version> - <executions> - <execution> - <configuration> - <pathToRootDir>../../..</pathToRootDir> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml b/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml deleted file mode 100644 index 7f06dc7ccb..0000000000 --- a/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:c="http://catalog">
- <import.java package="services"/> - <deployable composite="c:catalog-web"/>
-</contribution>
\ No newline at end of file diff --git a/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml b/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml deleted file mode 100644 index e08d617dad..0000000000 --- a/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <display-name>Fruit Catalog</display-name>
- - <filter> - <filter-name>tuscany</filter-name> - <filter-class>org.apache.tuscany.sca.node.launcher.NodeServletFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>tuscany</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <welcome-file-list id="WelcomeFileList">
- <welcome-file>catalog.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/catalog.jsp b/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/catalog.jsp deleted file mode 100644 index dcee7c33f4..0000000000 --- a/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/catalog.jsp +++ /dev/null @@ -1,52 +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 import="org.apache.tuscany.sca.node.SCAClient"%> -<%@ page import="services.Catalog" %> -<%@page import="services.Item"%> - -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - -<% - - SCAClient client = (SCAClient) application.getAttribute("org.apache.tuscany.sca.node.SCAClient"); - - Catalog catalog = (Catalog)client.getService(Catalog.class, "LocalFruitsCatalog"); - Item[] items = catalog.get(); - -%> - -<html> -<head><title>Catalog</title></head> - -<body> -<h1>Catalog</h1> - -<table border="0"> - -<% for (int i = 0, n = items.length; i < n; i++) { %> - - <tr><td><%=items[i].getName() %></td><td><%=items[i].getPrice() %></td></tr> - -<% } %> - -</table> - -</body> -</html>
|