summaryrefslogtreecommitdiffstats
path: root/branches/das-java-beta2/samples/customer/src
diff options
context:
space:
mode:
authordims <dims@13f79535-47bb-0310-9956-ffa450edef68>2008-06-17 00:23:01 +0000
committerdims <dims@13f79535-47bb-0310-9956-ffa450edef68>2008-06-17 00:23:01 +0000
commitbdd0a41aed7edf21ec2a65cfa17a86af2ef8c48a (patch)
tree38a92061c0793434c4be189f1d70c3458b6bc41d /branches/das-java-beta2/samples/customer/src
Move Tuscany from Incubator to top level.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@668359 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/das-java-beta2/samples/customer/src')
-rw-r--r--branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerClient.java197
-rw-r--r--branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerDatabaseInitializer.java92
-rw-r--r--branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetup.java206
-rw-r--r--branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java209
-rw-r--r--branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java211
-rw-r--r--branches/das-java-beta2/samples/customer/src/main/resources/CustomersConfig.xml53
-rw-r--r--branches/das-java-beta2/samples/customer/src/main/resources/META-INF/LICENSE353
-rw-r--r--branches/das-java-beta2/samples/customer/src/main/resources/META-INF/NOTICE32
-rw-r--r--branches/das-java-beta2/samples/customer/src/main/resources/META-INF/README35
-rw-r--r--branches/das-java-beta2/samples/customer/src/main/resources/log4j.properties36
10 files changed, 1424 insertions, 0 deletions
diff --git a/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerClient.java b/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerClient.java
new file mode 100644
index 0000000000..ca66c5bf4f
--- /dev/null
+++ b/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerClient.java
@@ -0,0 +1,197 @@
+/*
+ * 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.samples.das.customer;
+
+import java.io.InputStream;
+import java.util.List;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
+
+import commonj.sdo.DataObject;
+
+public class CustomerClient {
+ private static final String DEFAULT_CUSTOMER_CONFIG = "CustomersConfig.xml";
+
+ private DAS das = null;
+ private final String configFile;
+
+ /**
+ * Default constructor
+ *
+ */
+ public CustomerClient(){
+ this.configFile = DEFAULT_CUSTOMER_CONFIG;
+ }
+
+ /**
+ * Constructor receiving the das config file to be used
+ * @param configFile DAS configuration file
+ */
+ public CustomerClient(String configFile) {
+ this.configFile = configFile;
+ }
+
+ /**
+ * Helper method to get a stream from the customer config file
+ * @param fileName
+ * @return
+ */
+ protected InputStream getConfig(String fileName) {
+ return getClass().getClassLoader().getResourceAsStream(fileName);
+ }
+
+ /**
+ * Get a reference to DAS, initialize it if necessary
+ * @return DAS reference
+ */
+ protected DAS getDAS() {
+ if (this.das == null ) {
+ this.das = DAS.FACTORY.createDAS(getConfig(this.configFile));
+ }
+ return this.das;
+ }
+
+
+ /**
+ * select
+ * @return
+ */
+ public final List getCustomers() {
+ Command read = this.getDAS().getCommand("AllCustomers");
+ DataObject root = read.executeQuery();
+ return root.getList("CUSTOMER");
+ }
+
+ /**
+ * insert
+ *
+ */
+ public final void addCustomer() {
+ Command read = this.getDAS().getCommand("AllCustomers");
+ DataObject root = read.executeQuery();
+
+ DataObject newCustomer = root.createDataObject("CUSTOMER");
+ newCustomer.setInt("ID", 5);
+ newCustomer.setString("LASTNAME", "Jenny");
+ newCustomer.setString("ADDRESS", "USA");
+
+ das.applyChanges(root);
+ }
+
+ /**
+ * delete
+ *
+ */
+ public final void deleteCustomer() {
+ Command readAll = this.getDAS().getCommand("AllCustomers");
+ DataObject root = readAll.executeQuery();
+
+ List allCustomers = root.getList("CUSTOMER");
+
+ DataObject lastCustomer = (DataObject)allCustomers.get(allCustomers.size()-1);
+ if(lastCustomer != null){
+ System.out.println("Deleting customer named: " + lastCustomer.getString("LASTNAME"));
+ lastCustomer.delete();
+ }
+
+ das.applyChanges(root);
+ }
+
+ /**
+ * update
+ *
+ */
+ public final void changeFirstCustomerName() {
+ Command readAll = this.getDAS().getCommand("AllCustomers");
+ DataObject root = readAll.executeQuery();
+
+ DataObject firstCustomer = root.getDataObject("CUSTOMER[1]");
+ firstCustomer.set("LASTNAME", "BlueBerry");
+
+ das.applyChanges(root);
+ }
+
+ /**
+ * display result
+ * @param customers
+ */
+ public static void printList(List customers){
+ for(int i=0; i<customers.size(); i++){
+ System.out.println(" ID:"+(((DataObject)customers.get(i)).getInt("ID"))+
+ " LASTNAME:"+(((DataObject)customers.get(i)).getString("LASTNAME"))+
+ " ADDRESS:"+(((DataObject)customers.get(i)).getString("ADDRESS")));
+ }
+ }
+
+ /**
+ * cleanup
+ *
+ */
+ public void releaseResources() {
+ das.releaseResources();
+ }
+
+ /**
+ * Main customer application
+ */
+ public static void main(String[] args){
+ String customerConfigFile = "CustomersConfig.xml"; //this can be from input params too as below
+
+ if(args != null && args.length >0){
+ customerConfigFile = args[0];
+ }
+
+
+ //initialize customer database using helper class
+ CustomerDatabaseInitializer dbInitializer = new CustomerDatabaseInitializer(customerConfigFile);
+ try {
+ dbInitializer.Initialize();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return;
+ }
+
+
+ //perform customer operations using DAS
+ CustomerClient customerClient = new CustomerClient(customerConfigFile);
+ //test select
+ System.out.println();
+ System.out.println("Result:select all customers");
+ printList(customerClient.getCustomers());
+
+ //test insert
+ System.out.println();
+ System.out.println("Result:insert new customer");
+ customerClient.addCustomer();
+ printList(customerClient.getCustomers());
+
+ //test update
+ System.out.println();
+ System.out.println("Result:update first customer");
+ customerClient.changeFirstCustomerName();
+ printList(customerClient.getCustomers());
+
+ //test delete
+ System.out.println();
+ System.out.println("Result:delete last customer");
+ customerClient.deleteCustomer();
+ printList(customerClient.getCustomers());
+ }
+} \ No newline at end of file
diff --git a/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerDatabaseInitializer.java b/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerDatabaseInitializer.java
new file mode 100644
index 0000000000..260fc330fd
--- /dev/null
+++ b/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerDatabaseInitializer.java
@@ -0,0 +1,92 @@
+/*
+ * 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.samples.das.customer;
+
+import org.apache.tuscany.das.rdb.config.Config;
+import org.apache.tuscany.das.rdb.util.ConfigUtil;
+import org.apache.tuscany.samples.das.databaseSetup.DerbySetup;
+import org.apache.tuscany.samples.das.databaseSetup.MySQLSetup;
+
+public class CustomerDatabaseInitializer {
+ public static final String DERBY = "derby";
+ public static final String MYSQL = "mysql";
+
+ private final Config config;
+
+ private final String dbType;
+ private final String dbURL;
+ private final String user;
+ private final String password;
+
+
+
+ public CustomerDatabaseInitializer(String configFile) {
+ this.config = ConfigUtil.loadConfig(this.getClass().getClassLoader().getResourceAsStream(configFile));
+
+ if(config.getConnectionInfo().getConnectionProperties().getDriverClass().indexOf(DERBY) != -1) {
+ dbType = DERBY;
+ } else if(config.getConnectionInfo().getConnectionProperties().getDriverClass().indexOf(MYSQL) != -1) {
+ dbType = MYSQL;
+ } else {
+ dbType = null;
+ }
+
+ //get connection info from config
+ dbURL = config.getConnectionInfo().getConnectionProperties().getDatabaseURL();
+ user = config.getConnectionInfo().getConnectionProperties().getUserName();
+ password = config.getConnectionInfo().getConnectionProperties().getPassword();
+ }
+
+
+
+ /**
+ * If database is present connect to it and create necessary tables, procedures, data etc.
+ * If database is not present create database and then create the above elements. Create database
+ * is implemented for MySQL and Derby.
+ */
+ public void Initialize() {
+
+ //display DB configuration iformation
+ DisplayDatabaseConfiguration();
+
+ //initialize DB
+ try {
+ if(dbType.equals(DERBY)){
+ new DerbySetup(dbURL+"-"+user+"-"+password);
+ }
+
+ if(dbType.equals(MYSQL)){
+ new MySQLSetup(dbURL+"-"+user+"-"+password);
+ }
+
+ } catch(Exception e){
+ throw new RuntimeException("Error initializing database !", e);
+ }
+ }
+
+ public void DisplayDatabaseConfiguration() {
+
+ System.out.println("************* Initializing database *************");
+ System.out.println("** DB type : " + dbType );
+ System.out.println("** Database : " + dbURL );
+ System.out.println("** User : " + user );
+ System.out.println("** Password : " + password);
+ System.out.println("************************************************");
+ }
+}
diff --git a/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetup.java b/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetup.java
new file mode 100644
index 0000000000..4195dbcac7
--- /dev/null
+++ b/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetup.java
@@ -0,0 +1,206 @@
+/*
+ * 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.samples.das.databaseSetup;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+public class DatabaseSetup{
+ protected Statement s;
+ protected String platformName = "Not initialized";
+ protected String driverName = "Not initialized";
+ protected String databaseURL = "Not initialized";
+ protected String databaseName = null;
+ protected String userName;
+ protected String password;
+
+ // Data Types
+ public static final String stringType = "VARCHAR";
+ public static final String integerType = "INT";
+ public static final String timestampType = "TIMESTAMP";
+ public static final String floatType = "FLOAT";
+ public static final String decimalType = "DECIMAL";
+ protected Connection connection;
+
+ //database types
+ public static final String DERBY = "derby";
+ public static final String MYSQL = "mysql";
+ public static final String DB2 = "db2";
+
+ public DatabaseSetup(String databaseInfo){
+ StringTokenizer strTok = new StringTokenizer(databaseInfo, "-");
+
+ if(strTok.hasMoreTokens()){
+ databaseName = strTok.nextToken();
+ }
+
+ if(strTok.hasMoreTokens()){
+ userName = strTok.nextToken();
+ }
+
+ if(strTok.hasMoreTokens()){
+ password = strTok.nextToken();
+ }
+
+ initConnectionProtocol(databaseName);
+ initConnection();
+ try{
+ this.setUp();
+ }catch(Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ protected void initConnectionProtocol( String databaseName){
+ }
+
+ private void initConnection() {
+
+ try {
+ Class.forName(driverName).newInstance();
+ Properties props = new Properties();
+ //System.out.println("platform name:"+this.platformName);
+
+ if(this.platformName.equals(DERBY)){
+ if (userName != null) {
+ //System.out.println("derby trying for "+userName+","+password+","+databaseURL);
+ connection = DriverManager.getConnection(databaseURL, userName, password);
+ } else {
+ //System.out.println("derby trying for "+databaseURL);
+ connection = DriverManager.getConnection(databaseURL);
+ }
+ }
+ if(this.platformName.equals(DB2)){
+ if (userName != null && password != null) {
+ props.put("user", userName);
+ props.put("password", password);
+
+ //System.out.println("db2 trying for "+databaseURL+"user,pwd"+userName+","+password);
+ connection = DriverManager.getConnection(databaseURL, props);
+ }else{
+ //System.out.println("db2 trying for "+databaseURL);
+ connection = DriverManager.getConnection(databaseURL);
+ }
+ }
+ if(this.platformName.equals(MYSQL)){
+ databaseURL=databaseURL+"?user="+userName+"&password="+password+"&createDatabaseIfNotExist="+"true";
+ //System.out.println("mysql trying for "+userName+","+password+","+databaseURL);
+ connection = DriverManager.getConnection(databaseURL, props);
+ }
+
+ connection.setAutoCommit(true);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ if (e.getNextException() != null) {
+ e.getNextException().printStackTrace();
+ } else {
+ e.printStackTrace();
+ }
+
+ throw new RuntimeException(e);
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ } catch (InstantiationException e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ }
+
+ public Connection getConnection(){
+ return this.connection;
+ }
+
+ protected void setUp() throws Exception {
+ System.out.println("Setting up for " + platformName + " run!");
+ }
+
+ private void insertData(){
+ }
+
+ private void dropTables() {
+ }
+
+ protected void dropTriggers() {
+ }
+
+ protected void createTriggers() {
+ }
+
+ protected void dropSequences() {
+ }
+
+ protected void createSequences() {
+ }
+
+ protected void dropProcedures() {
+ }
+
+ private void createTables() {
+ }
+
+ protected void createProcedures() {
+ }
+
+ //
+ // This section povides methods that return strings for table creation.
+ // Platform-specific sublcasses
+ // can override these as necessary
+ //
+
+ protected String getCreateCustomer() {
+ return null;
+ }
+ // /////////////////
+
+ protected String getForeignKeyConstraint(String pkTable, String pkColumn, String foreignKey) {
+ return null;
+ }
+
+ protected String getStringColumn(String name, int length) {
+ return null;
+ }
+
+ protected String getIntegerColumn(String name) {
+ return null;
+ }
+
+ protected String getGeneratedKeyClause() {
+ return null;
+ }
+
+ protected String getDecimalColumn(String name, int size1, int size2) {
+ return null;
+ }
+
+ protected String getFloatColumn(String name) {
+ return null;
+ }
+
+ protected String getTimestampColumn(String name) {
+ return null;
+ }
+} \ No newline at end of file
diff --git a/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java b/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java
new file mode 100644
index 0000000000..339cac3587
--- /dev/null
+++ b/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java
@@ -0,0 +1,209 @@
+/*
+ * 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.samples.das.databaseSetup;
+
+import java.sql.SQLException;
+
+public class DerbySetup extends DatabaseSetup {
+
+ public DerbySetup(String databaseInfo){
+ super(databaseInfo);
+ }
+
+ protected void initConnectionProtocol(String databaseURL){
+ this.platformName=DERBY;
+ this.driverName = "org.apache.derby.jdbc.EmbeddedDriver";
+ this.databaseURL = databaseURL;
+ }
+
+ public void setUp(){
+ try{
+ super.setUp();
+
+ try {
+ s = connection.createStatement();
+
+ dropTriggers();
+ dropSequences();
+ dropTables();
+ dropProcedures();
+
+ createSequences();
+ createTables();
+ createTriggers();
+ createProcedures();
+ connection.commit();
+
+ insertData();
+ connection.commit();
+ } catch (SQLException e) {
+ connection.rollback();
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ }
+
+ System.out.println("Database setup complete!");
+ }
+
+ private void insertData(){
+ System.out.println("Inserting data in tables");
+
+ String[] statements = {"INSERT INTO CUSTOMER VALUES (1,'John','USA')",
+ "INSERT INTO CUSTOMER VALUES (2,'Amita','INDIA')",
+ "INSERT INTO CUSTOMER VALUES (3,'Patrick','UK')",
+ "INSERT INTO CUSTOMER VALUES (4,'Jane','UN')"};
+
+ for (int i = 0; i < statements.length; i++) {
+ try {
+ s.execute(statements[i]);
+ } catch (SQLException e) {
+ // If the table does not exist then ignore the exception on drop
+ if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+ && (!(e.getMessage().indexOf("42704") >= 0))) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ private void dropTables() {
+ System.out.println("Dropping tables");
+ String[] statements = {"DROP TABLE CUSTOMER" };
+
+ for (int i = 0; i < statements.length; i++) {
+ try {
+ s.execute(statements[i]);
+ } catch (SQLException e) {
+ // If the table does not exist then ignore the exception on drop
+ if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+ && (!(e.getMessage().indexOf("42704") >= 0))) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ protected void dropTriggers() {
+
+ }
+
+ protected void createTriggers() {
+
+ }
+
+ protected void dropSequences() {
+
+ }
+
+ protected void createSequences() {
+
+ }
+
+ protected void dropProcedures() {
+
+ System.out.println("Dropping procedures");
+
+ String[] statements = {"DROP PROCEDURE GETNAMEDCUSTOMERS"};
+
+ for (int i = 0; i < statements.length; i++) {
+ try {
+ s.execute(statements[i]);
+ } catch (SQLException e) {
+ // If the proc does not exist then ignore the exception on drop
+ if (!(e.getMessage().indexOf("does not exist") >= 0) && !(e.getMessage().indexOf("42704") >= 0)) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ private void createTables() {
+ System.out.println("Creating tables");
+
+ try {
+ s.execute(getCreateCustomer());
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ protected void createProcedures() {
+
+ System.out.println("Creating procedures");
+ try {
+
+ s.execute("CREATE PROCEDURE GETNAMEDCUSTOMERS(theName VARCHAR(100), OUT theCount INTEGER) "
+ + "PARAMETER STYLE JAVA LANGUAGE JAVA READS SQL DATA DYNAMIC RESULT SETS 1 EXTERNAL NAME "
+ + "'org.apache.tuscany.samples.das.orders.MyStoredProcs.getNamedCustomers'");
+ } catch (SQLException e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ }
+
+ //
+ // This section povides methods that return strings for table creation.
+ // Platform-specific sublcasses
+ // can override these as necessary
+ //
+
+ protected String getCreateCustomer() {
+ return "CREATE TABLE CUSTOMER (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, "
+ + getStringColumn("LASTNAME", 30)
+ + " DEFAULT 'Garfugengheist', " + getStringColumn("ADDRESS", 30) + ")";
+ }
+
+ protected String getForeignKeyConstraint(String pkTable, String pkColumn, String foreignKey) {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("CONSTRAINT FK1 FOREIGN KEY (");
+ buffer.append(foreignKey);
+ buffer.append(") REFERENCES ");
+ buffer.append(pkTable);
+ buffer.append("(");
+ buffer.append(pkColumn);
+ buffer.append(") ON DELETE NO ACTION ON UPDATE NO ACTION");
+ return buffer.toString();
+ }
+
+ protected String getStringColumn(String name, int length) {
+ return name + ' ' + stringType + "(" + new Integer(length).toString() + ")";
+ }
+
+ protected String getIntegerColumn(String name) {
+ return name + ' ' + integerType;
+ }
+
+ protected String getGeneratedKeyClause() {
+ return "GENERATED ALWAYS AS IDENTITY";
+ }
+
+ protected String getDecimalColumn(String name, int size1, int size2) {
+ return name + ' ' + decimalType + "(" + new Integer(size1).toString() + ','
+ + new Integer(size2).toString() + ")";
+ }
+
+ protected String getFloatColumn(String name) {
+ return name + ' ' + floatType;
+ }
+
+ protected String getTimestampColumn(String name) {
+ return name + ' ' + timestampType;
+ }
+}
diff --git a/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java b/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java
new file mode 100644
index 0000000000..f64b16e2db
--- /dev/null
+++ b/branches/das-java-beta2/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java
@@ -0,0 +1,211 @@
+/*
+ * 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.samples.das.databaseSetup;
+
+import java.sql.SQLException;
+
+public class MySQLSetup extends DatabaseSetup {
+
+ public MySQLSetup(String databaseInfo){
+ super(databaseInfo);
+ }
+
+ protected void initConnectionProtocol(String databaseURL){
+ this.platformName=MYSQL;
+ this.driverName = "com.mysql.jdbc.Driver";
+ this.databaseURL = databaseURL;
+ }
+
+ public void setUp(){
+ try{
+ super.setUp();
+
+ try {
+ s = connection.createStatement();
+
+ dropTriggers();
+ dropSequences();
+ dropTables();
+ dropProcedures();
+
+ createSequences();
+ createTables();
+ createTriggers();
+ createProcedures();
+ insertData();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ }
+
+ System.out.println("Database setup complete!");
+ }
+
+ private void insertData(){
+ System.out.println("Inserting data in tables");
+
+ String[] statements = {"INSERT INTO CUSTOMER VALUES (1,'John','USA')",
+ "INSERT INTO CUSTOMER VALUES (2,'Amita','INDIA')",
+ "INSERT INTO CUSTOMER VALUES (3,'Patrick','UK')",
+ "INSERT INTO CUSTOMER VALUES (4,'Jane','UN')"};
+
+ for (int i = 0; i < statements.length; i++) {
+ try {
+ s.execute(statements[i]);
+ } catch (SQLException e) {
+ // If the table does not exist then ignore the exception on drop
+ if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+ && (!(e.getMessage().indexOf("42704") >= 0))) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ private void dropTables() {
+ System.out.println("Dropping tables");
+
+ String[] statements = {"DROP TABLE CUSTOMER"};
+
+ for (int i = 0; i < statements.length; i++) {
+ try {
+ s.execute(statements[i]);
+ } catch (SQLException e) {
+ // If the table does not exist then ignore the exception on drop
+ if ((!(e.getMessage().indexOf("does not exist") >= 0)) && (!(e.getMessage().indexOf("Unknown table") >= 0))
+ && (!(e.getMessage().indexOf("42704") >= 0))) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ protected void dropTriggers() {
+
+ }
+
+ protected void createTriggers() {
+
+ }
+
+ protected void dropSequences() {
+
+ }
+
+ protected void createSequences() {
+
+ }
+
+ protected void dropProcedures() {
+
+ System.out.println("Dropping procedures");
+
+ String[] statements = {"DROP PROCEDURE GETNAMEDCUSTOMERS"};
+
+ for (int i = 0; i < statements.length; i++) {
+ try {
+ s.execute(statements[i]);
+ } catch (SQLException e) {
+ // If the proc does not exist then ignore the exception on drop
+ if (!(e.getMessage().indexOf("does not exist") >= 0) && !(e.getMessage().indexOf("42704") >= 0)) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ private void createTables() {
+ System.out.println("Creating tables");
+
+ try {
+
+ s.execute(getCreateCustomer());
+
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ //
+ // This section povides methods that return strings for table creation.
+ // Platform-specific sublcasses
+ // can override these as necessary
+ //
+
+ protected String getCreateCustomer() {
+ return "CREATE TABLE CUSTOMER (" + getIntegerColumn("ID") + " PRIMARY KEY NOT NULL, "
+ + getStringColumn("LASTNAME", 30)
+ + " DEFAULT 'Garfugengheist', " + getStringColumn("ADDRESS", 30) + ")";
+ }
+
+ // /////////////////
+
+ protected String getForeignKeyConstraint(String pkTable, String pkColumn, String foreignKey) {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("CONSTRAINT FK1 FOREIGN KEY (");
+ buffer.append(foreignKey);
+ buffer.append(") REFERENCES ");
+ buffer.append(pkTable);
+ buffer.append("(");
+ buffer.append(pkColumn);
+ buffer.append(") ON DELETE NO ACTION ON UPDATE NO ACTION");
+ return buffer.toString();
+ }
+
+ protected String getStringColumn(String name, int length) {
+ return name + ' ' + stringType + "(" + new Integer(length).toString() + ")";
+ }
+
+ protected String getIntegerColumn(String name) {
+ return name + ' ' + integerType;
+ }
+
+ protected String getDecimalColumn(String name, int size1, int size2) {
+ return name + ' ' + decimalType + "(" + new Integer(size1).toString() + ','
+ + new Integer(size2).toString() + ")";
+ }
+
+ protected String getFloatColumn(String name) {
+ return name + ' ' + floatType;
+ }
+
+ protected String getTimestampColumn(String name) {
+ return name + ' ' + timestampType;
+ }
+
+ protected void createProcedures() {
+ String createGetNamedCustomers = "CREATE PROCEDURE `dastest`.`GETNAMEDCUSTOMERS`(IN thename VARCHAR(30), "
+ + "OUT theCount INTEGER ) " + " BEGIN "
+ + " SELECT * FROM CUSTOMER AS CUSTOMER WHERE LASTNAME = theName; "
+ + " SET theCount = (SELECT COUNT(*) FROM CUSTOMER WHERE LASTNAME = theName); " + " END ";
+
+ System.out.println("Creating procedures");
+ try {
+ s.execute(createGetNamedCustomers);
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ protected String getGeneratedKeyClause() {
+ return "AUTO_INCREMENT";
+ }
+}
diff --git a/branches/das-java-beta2/samples/customer/src/main/resources/CustomersConfig.xml b/branches/das-java-beta2/samples/customer/src/main/resources/CustomersConfig.xml
new file mode 100644
index 0000000000..41fa03ba2b
--- /dev/null
+++ b/branches/das-java-beta2/samples/customer/src/main/resources/CustomersConfig.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ 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.
+ -->
+ <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd">
+
+ <!--Uncomment below for derby test-->
+ <ConnectionInfo>
+ <ConnectionProperties
+ driverClass="org.apache.derby.jdbc.EmbeddedDriver"
+ databaseURL="jdbc:derby:target/dastest; create = true"
+ loginTimeout="600000"/>
+ </ConnectionInfo>
+
+ <!--Uncomment below for MySQL test-->
+ <!--
+ <ConnectionInfo>
+ <ConnectionProperties
+ driverClass="com.mysql.jdbc.Driver"
+ databaseURL="jdbc:mysql://localhost/dastest"
+ userName="dastest"
+ password="dastest"
+ loginTimeout="600000"/>
+ </ConnectionInfo>
+ -->
+
+ <Command name="AllCustomers" SQL="select * from CUSTOMER" kind="Select"/>
+
+ <Table tableName="CUSTOMER">
+ <Column columnName="ID" primaryKey="true"/>
+ </Table>
+
+ <Command name="NamedCustomers" SQL="{call GETNAMEDCUSTOMERS(?,?)}" kind="procedure">
+ <Parameter direction="IN" index="1" columnType="commonj.sdo.String"/>
+ <Parameter direction="OUT" index="2" columnType="commonj.sdo.IntObject"/>
+ </Command>
+
+</Config>
diff --git a/branches/das-java-beta2/samples/customer/src/main/resources/META-INF/LICENSE b/branches/das-java-beta2/samples/customer/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000000..fb4df3722c
--- /dev/null
+++ b/branches/das-java-beta2/samples/customer/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,353 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+===============================================================================================================
+
+Other components and dependencies under Apache Software License 2.0 :
+
+ log4j-1.2.14.jar - Apache Logging Services
+ derby 10.2.2.0.jar - Apache Derby
+ stax-api-1.0.1.jar - The Streaming API for XML (StAX)
+ wstx-asl-3.2.0.jar - WoodStox StAX implementation
+ standard-1.1.1.jar - The Apache Jackarta Taglibs
+ jstl-1.1.2.jar - The Apache Jackarta Taglibs
+ *.tld - The Apache Jackarta Taglibs
+
+===============================================================================================================
+
+
+Apache Tuscany SDO for Java Subcomponents
+=========================================:
+
+The Tuscany SDO for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
+
+Permission to copy, make derivative works of, and distribute the Service Data Objects
+JavaDoc and Interface Definition Files files in any medium without fee or royalty as part
+of a compliant implementation of the Service Data Objects Specification is hereby granted.
+The Service Data Objects Specification may be found at any of the following locations:
+
+http://dev2dev.bea.com/technologies/commonj/index.jsp
+http://www.ibm.com/developerworks/library/specification/ws-sdo/
+http://oracle.com/technology/webservices/sca
+https://www.sdn.sap.com/
+http://www.xcalia/xdn/specs/sdo
+
+THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES
+ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS
+SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS,
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE
+SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+publicity pertaining to the Service Component Architecture Specification or its contents without specific,
+written prior permission. Title to copyright in the Service Data Objects Specification and the
+JavaDoc and Interface Definition Files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+=================================================================================================================
+
+For the Eclipse EMF components
+(codegen-2.2.3.jar
+codegen-ecore-2.2.3.jar
+common-2.2.3.jar
+ecore-2.2.3.jar
+ecore-change-2.2.3.jar
+ecore-xmi-2.2.3.jar
+xsd-2.2.3.jar)
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+===================================================================================================
diff --git a/branches/das-java-beta2/samples/customer/src/main/resources/META-INF/NOTICE b/branches/das-java-beta2/samples/customer/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000000..c2cf1f95b4
--- /dev/null
+++ b/branches/das-java-beta2/samples/customer/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,32 @@
+Apache Tuscany SDO for Java
+Copyright 2006, 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Web Services PMC. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with other successful
+ASF projects. While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be fully endorsed
+by the ASF.
+
+Unless otherwise indicated, all distribution made available by the Apache Software Foundation
+is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
+A copy of the AL is provided with this distribution as the LICENSE.txt file present in the
+root directory, and is also available at http://www.apache.org/licenses/.
+
+The terms and conditions governing the distribution may refer to the AL or other license
+agreements, notices or terms and conditions. Some of these other license agreements may
+include (but are not limited to):
+
+ . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
+
+It is your obligation to read and accept all such terms and conditions prior to use of the
+distribution. If term or condition is provided, please contact the Apache Software Foundation
+to determine what terms and conditions govern that particular distribution.
+
+This product also includes software developed by the Open Service Oriented Architecture organisation
+(http://osoa.org). The license for this software may be found in the LICENSE.txt file contained in this
+distribution.
diff --git a/branches/das-java-beta2/samples/customer/src/main/resources/META-INF/README b/branches/das-java-beta2/samples/customer/src/main/resources/META-INF/README
new file mode 100644
index 0000000000..d1905ee3e8
--- /dev/null
+++ b/branches/das-java-beta2/samples/customer/src/main/resources/META-INF/README
@@ -0,0 +1,35 @@
+Apache Tuscany M2 build (October, 2006)
+===================================
+
+http://incubator.apache.org/tuscany/
+
+Tuscany is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Web Services PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness or
+stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
+
+
+Support
+-------
+
+Any problem with this release can be reported to the Tuscany mailing list
+or in the JIRA issue tracker.
+
+Mailing list subscription:
+ tuscany-dev-subscribe@ws.apache.org
+
+Jira:
+ http://issues.apache.org/jira/browse/Tuscany
+
+
+Thank you for using Tuscany!
+
+
+The Tuscany Team.
+
diff --git a/branches/das-java-beta2/samples/customer/src/main/resources/log4j.properties b/branches/das-java-beta2/samples/customer/src/main/resources/log4j.properties
new file mode 100644
index 0000000000..ab4ebbb785
--- /dev/null
+++ b/branches/das-java-beta2/samples/customer/src/main/resources/log4j.properties
@@ -0,0 +1,36 @@
+# 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.
+#
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=INFO, NULL
+
+# NULL Appender
+log4j.appender.NULL=org.apache.log4j.varia.NullAppender
+
+log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
+log4j.appender.NULL.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n
+
+# CONSOLE is set to be a ConsoleAppender.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n
+
+
+# Print only messages of level WARN or above in the package com.foo.
+log4j.logger.org.apache.tuscany=NONE \ No newline at end of file