summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.5.1/samples/customer-dojo-webapp/src')
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/Customer.java93
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java26
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java101
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java31
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java117
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/launch/Launch.java34
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml51
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml40
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml25
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/customer.composite37
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml23
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml40
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml41
-rw-r--r--branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/customer.jsp80
14 files changed, 0 insertions, 739 deletions
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/Customer.java b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
deleted file mode 100644
index 6d207ea2ef..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
+++ /dev/null
@@ -1,93 +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 customer;
-
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class Customer {
-
- @Id protected int id;
- @Basic protected String name;
- @Basic protected String phone;
- @Basic protected String address;
- @Basic protected String city;
- @Basic protected String state;
- @Basic protected String zip;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getZip() {
- return zip;
- }
-
- public void setZip(String zip) {
- this.zip = zip;
- }
-
-}
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
deleted file mode 100644
index 5ad39aad5c..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
+++ /dev/null
@@ -1,26 +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 customer;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-
-
-public interface CustomerCollection extends Collection<String, Customer> {
-
-}
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
deleted file mode 100644
index c0a2f25f15..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
+++ /dev/null
@@ -1,101 +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 customer;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-
-
-public class CustomerCollectionImpl implements CustomerCollection {
- EntityManagerFactory emf = null;
- EntityManager em = null;
-
- public CustomerCollectionImpl() {
- System.out.println(">>>");
- try {
- emf = Persistence.createEntityManagerFactory("customer-openJPA");
- em = emf.createEntityManager();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void delete(String arg0) throws NotFoundException {
- // TODO Auto-generated method stub
-
- }
-
- public Customer get(String arg0) throws NotFoundException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Entry<String, Customer>[] getAll() {
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- Query q = em.createQuery("SELECT c FROM customer c");
- List results = q.getResultList();
- Iterator iter = results.iterator();
- while (iter.hasNext()) {
- Customer customer = (Customer)iter.next();
-
- System.out.println(customer);
- }
-
- tx.commit();
- } catch(Exception e) {
- e.printStackTrace();
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
-
- em.close();
- }
-
- return null;
- }
-
- public String post(String arg0, Customer arg1) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void put(String arg0, Customer arg1) throws NotFoundException {
- // TODO Auto-generated method stub
-
- }
-
- public Entry<String, Customer>[] query(String arg0) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
deleted file mode 100644
index 7915cc6e77..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.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 customer;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CustomerService {
-
- Customer[] get();
-
- Customer findCustomerByName(String name);
-
-}
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
deleted file mode 100644
index 0cba7d8bc1..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
+++ /dev/null
@@ -1,117 +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 customer;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-
-public class CustomerServiceImpl implements CustomerService {
- EntityManagerFactory emf = null;
- EntityManager em = null;
-
- public CustomerServiceImpl() {
-
- }
-
- @Init
- public void init() {
- System.out.println(">>> Initializing JPA");
- try {
- emf = Persistence.createEntityManagerFactory("customer-openJPA");
- em = emf.createEntityManager();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Destroy
- public void destroy() {
- emf.close();
- }
-
- public Customer[] get() {
- EntityTransaction tx = em.getTransaction();
- List<Customer> customers = new ArrayList<Customer>();
- try {
- tx.begin();
-
- Query q = em.createQuery("SELECT c FROM customer c");
- List results = q.getResultList();
- Iterator iter = results.iterator();
- while (iter.hasNext()) {
- Customer customer = (Customer)iter.next();
- customers.add(customer);
- }
-
- tx.commit();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
-
- em.close();
- }
-
- Customer[] customerArray = new Customer[customers.size()];
- customers.toArray(customerArray);
- return customerArray;
- }
-
- public Customer findCustomerByName(String name) {
- EntityTransaction tx = em.getTransaction();
- Customer customer = null;
-
- try {
- tx.begin();
-
- Query q = em.createQuery("SELECT c FROM customer c WHERE c.name = '" + name + "'");
- List results = q.getResultList();
- Iterator iter = results.iterator();
- while (iter.hasNext()) {
- customer = (Customer)iter.next();
- }
-
- tx.commit();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
-
- em.close();
- }
-
- return customer;
- }
-
-}
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/launch/Launch.java b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
deleted file mode 100644
index d7f88b8dd4..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
+++ /dev/null
@@ -1,34 +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 launch;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class Launch {
- public static void main(String[] args) throws Exception {
- System.out.println("Starting ...");
- SCADomain scaDomain = SCADomain.newInstance("customer.composite");
- System.out.println("store.composite ready for big business !!!");
- System.in.read();
- System.out.println("Stopping ...");
- scaDomain.close();
- System.out.println();
- }
-}
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
deleted file mode 100644
index 64be295302..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
+++ /dev/null
@@ -1,51 +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.
--->
-
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
- version="1.0">
- <entity class="customer.Customer" name="customer">
- <table name="CUSTOMER"/>
- <attributes>
- <id name="id">
- <generated-value strategy="TABLE"/>
- </id>
- <basic name="name">
- <column name="NAME" length="30"/>
- </basic>
- <basic name="phone">
- <column name="PHONE" length="10"/>
- </basic>
- <basic name="address">
- <column name="ADDRESS" length="25"/>
- </basic>
- <basic name="city">
- <column name="CITY" length="15"/>
- </basic>
- <basic name="state">
- <column name="STATE" length="2"/>
- </basic>
- <basic name="zip">
- <column name="ZIP" length="5"/>
- </basic>
- </attributes>
- </entity>
-</entity-mappings> \ No newline at end of file
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 5674dede06..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,40 +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.
--->
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
- http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
-
- <persistence-unit name="customer-openJPA">
- <mapping-file>orm.xml</mapping-file>
- <class>customer.Customer</class>
-
- <properties>
- <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
- <property name="openjpa.ConnectionURL" value="jdbc:derby:/opt/apache-tomcat-6.0.16/webapps/sample-customer-dojo-webapp/WEB-INF/classes/customer-db"/>
- <property name="openjpa.ConnectionUserName" value=""/>
- <property name="openjpa.ConnectionPassword" value=""/>
-
- <property name="openjpa.Log" value="DefaultLevel=TRACE, Tool=TRACE"/>
- </properties>
- </persistence-unit>
-
-</persistence> \ No newline at end of file
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 59840213e4..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +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:sample="http://sample">
- <deployable composite="sample:customer"/>
-</contribution>
-
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/customer.composite b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/customer.composite
deleted file mode 100644
index 8b8a413499..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/resources/customer.composite
+++ /dev/null
@@ -1,37 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="customer">
-
- <service name="CustomerService" promote="CustomerServiceComponent/CustomerService">
- <interface.java interface="customer.CustomerService"/>
- <tuscany:binding.jsonrpc/>
- </service>
-
- <component name="CustomerServiceComponent">
- <implementation.java class="customer.CustomerServiceImpl"/>
- </component>
-
-</composite>
-
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index b390efd009..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
- <deployable composite="sample:customer"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index da7f207e86..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,40 +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.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
- xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <d:environment>
- <d:moduleId>
- <d:groupId>org.apache.tuscany.sca</d:groupId>
- <d:artifactId>sample-customer-dojo-webapp</d:artifactId>
- <d:version>1.5.1-SNAPSHOT</d:version>
- <d:type>war</d:type>
- </d:moduleId>
-
- <!-- TUSCANY-2622 -->
- <d:hidden-classes>
- <d:filter>org.apache.axiom</d:filter>
- <d:filter>org.apache.axis2</d:filter>
- <d:filter>org.apache.commons</d:filter>
- <d:filter>org.jdom</d:filter>
- </d:hidden-classes>
-
- </d:environment>
-</web-app>
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d90b4a7d62..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/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>Apache Tuscany Customer dojo web application sample</display-name>
-
- <filter>
- <filter-name>tuscany</filter-name>
- <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>tuscany</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>customer.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/customer.jsp b/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
deleted file mode 100644
index f7e864053e..0000000000
--- a/branches/sca-java-1.5.1/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
+++ /dev/null
@@ -1,80 +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" %>
-
-<html>
-<head>
- <title>Tuscany Dojo JSON-RPC Customer Example</TITLE>
-
- <style type="text/css">
- @import "dojo/dijit/themes/soria/soria.css";
- @import "dojo/dojo/resources/dojo.css"
- </style>
-
- <script type="text/javascript">
- var djConfig = {
- parseOnLoad: true,
- baseRelativePath: "dojo",
- isDebug: true,
- debugContainerId: "dojoDebug"
- };
- djConfig.usePlainJson=true ;
- //djConfig.debugAtAllCosts = true;
- </script>
-
- <script type="text/javascript" src="dojo/dojo/dojo.js"></script>
- <script type="text/javascript" src="dojo/dijit/dijit.js"></script>
-
- <script type="text/javascript">
- dojo.require("dojo.parser");
- dojo.require("dojo.rpc.JsonService");
- dojo.require("dijit.form.ValidationTextBox");
- dojo.require("dijit.form.Button");
- </script>
-
- <link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-
-<body class="soria">
-
-<h2>Tuscany Dojo JSON-RPC Customer Sample</h2>
-
-Customer Name :<br>
-<input type="text" id="name" size="30" value="Joe Smith" dojoType="dijit.form.TextBox" trim="true" propercase="true" required="true" />
-<input type="button" dojoType="dijit.form.Button" onclick="findCustomerByName()" />
-
-
-<script type="text/javascript">
- function findCustomerByName() {
- var name = document.getElementById("name").value;
- customerService.findCustomerByName(name).addCallback(contentCallBack);;
- }
-
- function contentCallBack(result) {
- alert(result.name);
- //var handlerNode = document.getElementById("ReturnedContent");
- //handlerNode.innerHTML = "<p>" + result + "</p>" ;
- }
-
- var customerService = new dojo.rpc.JsonService("CustomerService?smd");
-</script>
-
-</body>
-</html>