Creating Java SCA 1.x branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@713805 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 1167 insertions, 0 deletions

diff --git a/branches/sca-java-1.x/modules/data-engine-helper/LICENSE b/branches/sca-java-1.x/modules/data-engine-helper/LICENSE
new file mode 100644
index 0000000000..8aa906c321
--- /dev/null
+++ b/branches/sca-java-1.x/modules/data-engine-helper/LICENSE
@@ -0,0 +1,205 @@
+
+                                 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.
+
+
+
diff --git a/branches/sca-java-1.x/modules/data-engine-helper/NOTICE b/branches/sca-java-1.x/modules/data-engine-helper/NOTICE
new file mode 100644
index 0000000000..fdfa0e9faa
--- /dev/null
+++ b/branches/sca-java-1.x/modules/data-engine-helper/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/branches/sca-java-1.x/modules/data-engine-helper/pom.xml b/branches/sca-java-1.x/modules/data-engine-helper/pom.xml
new file mode 100644
index 0000000000..c8a4689650
--- /dev/null
+++ b/branches/sca-java-1.x/modules/data-engine-helper/pom.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-data-engine-helper</artifactId>
+    <name>Apache Tuscany SCA Data Engine Helper</name>
+
+    <repositories>
+       <repository>
+          <id>apache.incubator</id>
+          <url>http://people.apache.org/repo/m2-incubating-repository</url>
+       </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.das</groupId>
+            <artifactId>tuscany-das-rdb</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-impl</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>  
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>                                      
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>2.2</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.3.1.4</version>
+            <scope>test</scope>
+        </dependency>         
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+
+       <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>${tuscany.version}</Bundle-Version>
+                        <Bundle-SymbolicName>org.apache.tuscany.sca.data.engine.helper</Bundle-SymbolicName>
+                        <Bundle-Description>${pom.name}</Bundle-Description>
+                        <Export-Package>org.apache.tuscany.sca.data.engine*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/ConnectionInfoArtifactProcessor.java b/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/ConnectionInfoArtifactProcessor.java
new file mode 100644
index 0000000000..99709857b8
--- /dev/null
+++ b/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/ConnectionInfoArtifactProcessor.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.sca.data.engine;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
+import org.apache.tuscany.sca.assembly.xml.Constants;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.data.engine.config.ConnectionInfo;
+import org.apache.tuscany.sca.data.engine.config.ConnectionProperties;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+
+/**
+ * Implements a StAX artifact processor for ConnectionInfo.
+ * This processor is shared between implementation.das and implementation.data component type  implementations,
+ * and can be used for other applications that require database connectivity information.
+ * 
+ * The artifact processor is responsible for processing <ConnectionInfo>
+ * elements in SCA assembly XML composite files.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class ConnectionInfoArtifactProcessor implements StAXArtifactProcessor<ConnectionInfo> {
+    public static final QName CONNECTION_INFO = new QName(Constants.SCA10_TUSCANY_NS, "connectionInfo");
+    private static final QName CONNECTION_PROPERTIES = new QName(Constants.SCA10_TUSCANY_NS, "connectionProperties");
+    
+    private Monitor monitor;
+    public ConnectionInfoArtifactProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
+    	this.monitor = monitor;
+    }
+
+    public QName getArtifactType() {
+        // Returns the QName of the XML element processed by this processor
+        return CONNECTION_INFO;
+    }
+    
+    /**
+     * Report a exception.
+     * 
+     * @param problems
+     * @param message
+     * @param model
+     */
+    private void error(String message, Object model, Exception ex) {
+    	 if (monitor != null) {
+	        Problem problem = new ProblemImpl(this.getClass().getName(), "dataengine-helper-validation-messages", Severity.ERROR, model, message, ex);
+	        monitor.problem(problem);
+    	 }
+    }
+
+    public Class<ConnectionInfo> getModelType() {
+        // Returns the type of model processed by this processor
+        return ConnectionInfo.class;
+    }
+
+    /*
+     * <component name="CompanyDataComponent">
+     *   <implementation.data table="company">
+     *
+     *      <connectionInfo>
+     *         <connectionProperties 
+     *          driverClass="org.apache.derby.jdbc.EmbeddedDriver" 
+     *          databaseURL="jdbc:derby:target/test-classes/dastest; create = true" 
+     *          loginTimeout="600000"/>
+     *      </connectionInfo>
+     *
+     *   </implementation.data>
+     * </component>
+     */
+    public ConnectionInfo read(XMLStreamReader reader) throws ContributionReadException {
+        assert CONNECTION_INFO.equals(reader.getName());
+
+        // Create a ConnectionInfo from the component type model
+        ConnectionInfo connectionInfo = new ConnectionInfo();
+
+        /* 
+         *  <connectionInfo dataSource="jdbc:derby:target/test-classes/dastest; create = true"/>
+         */
+        String dataSource = reader.getAttributeValue(null, "datasource"); // exclusive with connection properties
+        if (dataSource != null && dataSource.length() > 0) {
+            connectionInfo.setDataSource(dataSource);
+        } else {
+            try {
+                int event = reader.next();
+                while (event == XMLStreamConstants.CHARACTERS) {
+                    event = reader.next();
+                }
+            } catch (XMLStreamException e) {
+            	ContributionReadException ce = new ContributionReadException(e);
+            	error("ContributionReadException", reader, ce);
+                throw ce;
+            }
+
+            QName element = reader.getName();
+            
+            assert CONNECTION_PROPERTIES.equals(element);
+            
+            /*
+             * <connectionProperties 
+             *  driverClass="org.apache.derby.jdbc.EmbeddedDriver" 
+             *  databaseURL="jdbc:derby:target/test-classes/dastest; create = true"
+             *  username=""
+             *  password="" 
+             *  loginTimeout="600000"/>
+             */
+            
+            String driverClass = reader.getAttributeValue(null, "driverClass");
+            String databaseURL = reader.getAttributeValue(null, "databaseURL");
+            String username = reader.getAttributeValue(null, "username");
+            String password = reader.getAttributeValue(null, "password");
+            String loginTimeout = reader.getAttributeValue(null, "loginTimeout");
+
+            // FIXME: validation sending info to monitor....
+            ConnectionProperties connectionProperties = new ConnectionProperties();
+            connectionProperties.setDriverClass(driverClass);
+            connectionProperties.setDatabaseURL(databaseURL);
+            connectionProperties.setUsername(username);
+            connectionProperties.setPassword(password);
+            if (loginTimeout != null) {
+                connectionProperties.setLoginTimeout(Integer.parseInt(loginTimeout));
+            }
+
+            connectionInfo.setConnectionProperties(connectionProperties);
+        }
+        
+        return connectionInfo;
+    }
+
+    public void resolve(ConnectionInfo impl, ModelResolver resolver) throws ContributionResolveException {
+
+    }
+
+    public void write(ConnectionInfo connectionInfo, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+
+        writer.writeStartElement(CONNECTION_INFO.getNamespaceURI(), CONNECTION_INFO.getLocalPart());
+
+        if (connectionInfo.getDataSource() != null) {
+            writer.writeAttribute("dataSource", connectionInfo.getDataSource());
+        }
+        
+        ConnectionProperties connectionProperties = connectionInfo.getConnectionProperties();
+        if (connectionProperties != null) {
+            writer.writeStartElement(CONNECTION_PROPERTIES.getNamespaceURI(), CONNECTION_PROPERTIES.getLocalPart());
+            
+            if (connectionProperties.getDriverClass() != null) {
+                writer.writeAttribute("driverClass", connectionProperties.getDriverClass());
+            }
+            if (connectionProperties.getDatabaseURL() != null) {
+                writer.writeAttribute("databaseURL", connectionProperties.getDatabaseURL());
+            }
+            if (connectionProperties.getUsername() != null) {
+                writer.writeAttribute("username", connectionProperties.getUsername());
+            }
+            if (connectionProperties.getPassword() != null) {
+                writer.writeAttribute("password", connectionProperties.getPassword());
+            }
+            if (connectionProperties.getLoginTimeout() != null) {
+                writer.writeAttribute("loginTimeout", String.valueOf(connectionProperties.getLoginTimeout()));
+            }
+            
+            writer.writeEndElement();
+        }
+        
+        
+        writer.writeEndElement();
+        
+    }
+}
diff --git a/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngine.java b/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngine.java
new file mode 100644
index 0000000000..aef9ac3261
--- /dev/null
+++ b/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngine.java
@@ -0,0 +1,286 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package org.apache.tuscany.sca.data.engine;

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+

+import org.apache.tuscany.das.rdb.Command;

+import org.apache.tuscany.das.rdb.DAS;

+

+import commonj.sdo.DataObject;

+import commonj.sdo.Property;

+

+/**

+ * Facade to hide DAS implementation details of handling commands

+ * 

+ * @version $Rev$ $Date$

+ */

+public class DataAccessEngine {

+    private final DAS das;

+

+    public DataAccessEngine(DAS das) {

+        this.das = das;

+    }

+

+    public DataObject executeGet(ArrayList keyVals, String table, String key) {//TODO need to consider compound keys

+        try {

+            String sqlQuery = "select * from " + table.toUpperCase();

+            List<String> keys = null;

+            

+            if(key == null) {

+                if(keyVals != null && keyVals.size() == 1) {

+                    sqlQuery += " where ID = " + keyVals.get(0);

+                }            	

+            } else {//can be other than ID , can be compound keys

+            	keys = getKeys(key);

+            	if(keyVals.size() != keys.size()) {

+            		throw new RuntimeException("One or more PK values missing");

+            	}

+            	            	

+            	sqlQuery += " where ";

+            	

+            	for(int i=0; i<keys.size(); i++) {

+            		sqlQuery += keys.get(i)+" = ? AND ";

+            	}

+            	

+            	sqlQuery = sqlQuery.substring(0, sqlQuery.lastIndexOf(" AND "));

+            }

+            

+            Command command = this.das.createCommand(sqlQuery);

+            

+            if(key != null) {

+            	for(int i=1; i<=keyVals.size(); i++) {

+            		command.setParameter(i, keyVals.get(i-1));

+            	}

+            }

+            

+            DataObject returnDO = command.executeQuery();          

+            return returnDO;

+        } catch (Exception e) {

+            //e.printStackTrace();

+            throw new RuntimeException(e);

+        }

+    }

+    

+    /**

+     * 

+     * @param table table'e Type name - should be same as table name

+     * @param key column's Property name - should be same as column name

+     * @return

+     */

+    public Map<Object, DataObject> executeGetAll(String table, String key) {

+        try {

+            String sqlQuery = "select * from " + table.toUpperCase();

+            Command command = this.das.createCommand(sqlQuery);

+            DataObject result = command.executeQuery();

+            List<String> keys = getKeys(key);

+            List<DataObject> resultDataObjects = result.getList(table);

+            

+            return getMappedDataObjects(resultDataObjects, keys);

+        } catch (Exception e) {

+            //e.printStackTrace();

+        	throw new RuntimeException(e);

+        }

+    }

+    

+    public Map<Object, DataObject> executeQuery(String queryString, String table, String key) {

+        try {

+            Command command = this.das.createCommand(queryString);

+            DataObject result = command.executeQuery();

+            List<String> keys = getKeys(key);

+            List<DataObject> resultDataObjects = result.getList(table);

+            

+            return getMappedDataObjects(resultDataObjects, keys);

+        } catch (Exception e) {

+            //e.printStackTrace();

+        	throw new RuntimeException(e);

+        }

+    }

+    

+    //origDataObject should be with change summary. table, pk is already known to DAS, so no need to have these here

+    public void executePut(DataObject origDataObject) {

+    	this.das.applyChanges(origDataObject);

+    	return;

+    }

+    

+    //return PK/s

+    public ArrayList executePost(DataObject origDataObject, String table, String key){

+    	//TODO check that PKs are present before insert - this is not correct for auto incr PKs, so let it be upto user whether to send PK or not

+    	/*List<String> keys = getKeys(key);

+    	for(int i=0; i<keys.size(); i++) {

+    		String currentKey = keys.get(i);

+    		Object currentKeyValue = origDataObject.get(currentKey);

+    		if(currentKeyValue == null) {

+    			throw new RuntimeException("PK missing during INSERT");

+    		}

+    	}*/

+    	

+    	String sqlString = "insert into "+table+" (";

+    	List props = origDataObject.getType().getProperties();

+    	if(props.size() != 0) {

+	    	for(int i=0; i<props.size(); i++) {

+	    		String currPropName = ((Property)props.get(i)).getName();

+	    		if(origDataObject.get(currPropName) != null) {

+	    			sqlString += currPropName+",";

+	    		}

+	    	}

+	    	sqlString = sqlString.substring(0, sqlString.length()-1);

+	    	sqlString += ") values (";

+	    	for(int i=0; i<props.size(); i++) {

+	    		String currPropName = ((Property)props.get(i)).getName();

+	    		if(origDataObject.get(currPropName) != null) {

+	    			sqlString += "?,";

+	    		}

+	    	}

+

+	    	sqlString = sqlString.substring(0, sqlString.length()-1);

+	    	sqlString += ")";

+	    	

+	    	Command insertCommand = this.das.createCommand(sqlString);

+	    	int paramIdx = 1;

+	    	for(int i=1; i<=props.size(); i++) {

+	    		String currPropName = ((Property)props.get(i-1)).getName();

+	    		if(origDataObject.get(currPropName) != null) {

+	    			insertCommand.setParameter(paramIdx, origDataObject.get(currPropName));

+	    			paramIdx++;

+	    		}

+	    	}

+	    	

+	    	insertCommand.execute();

+	    	

+	    	//there can be different possibilities

+	    	//1- there is autogen key - insertCommand.getGeneratedKey() will return value and not exception

+	    	//2- there is no autogen key - insertCommand.getGeneratedKey() will return exception and value needs to be taken from origDataObject

+	    	//for 2 it is straight forward to know the column name same as property name

+	    	//for 1 it is possible for only 1 column so no question of compound PK

+

+	    	//now get the PK/s to be returned

+	    	ArrayList pks = new ArrayList();

+

+	    	try {

+	    		int newId = insertCommand.getGeneratedKey();

+	    		pks.add(newId);

+	    		return pks;

+	    	} catch(Exception e) {

+		    	List<String> keys = getKeys(key);

+		    	for(int i=0; i<keys.size(); i++) {

+		    		String currentKey = keys.get(i);

+		    		Object currentKeyValue = origDataObject.get(currentKey);

+		    		if(currentKeyValue == null) {

+		    			throw new RuntimeException("PK missing during INSERT");

+		    		}

+		    		pks.add(currentKeyValue);

+		    	}

+		    	return pks;

+	    	}

+

+    	}

+    	return null;

+    }

+    

+    //when keyVal is null can be used as deleteAll

+    public void executeDelete(ArrayList keyVals, String table, String key) {

+        try {

+            String sqlQuery = "select * from " + table.toUpperCase();

+            List<String> keys = null;

+            

+            if(key == null) {

+                if(keyVals != null && keyVals.size() == 1) {

+                    sqlQuery += " where ID = " + keyVals.get(0);

+                }            	

+            } else {//can be other than ID , can be compound keys

+            	keys = getKeys(key);

+            	if(keyVals.size() != keys.size()) {

+            		throw new RuntimeException("One or more PK values missing");

+            	}

+            	            	

+            	sqlQuery += " where ";

+            	

+            	for(int i=0; i<keys.size(); i++) {

+            		sqlQuery += keys.get(i)+" = ? AND ";

+            	}

+            	

+            	sqlQuery = sqlQuery.substring(0, sqlQuery.lastIndexOf(" AND "));

+            }

+            

+            Command command = this.das.createCommand(sqlQuery);

+            

+            if(key != null) {

+            	for(int i=1; i<=keyVals.size(); i++) {

+            		command.setParameter(i, keyVals.get(i-1));

+            	}

+            }

+            

+            DataObject result = command.executeQuery();

+            List<DataObject> resultDOs = result.getList(table);

+            if(resultDOs != null) {

+            	for(int i=0; i<resultDOs.size(); i++) {

+            		((DataObject)resultDOs.get(i)).delete();

+            	}

+            }

+            this.das.applyChanges(result);

+        } catch (Exception e) {

+            //e.printStackTrace();

+            throw new RuntimeException(e);

+        }

+    }

+    

+    public Map<Object, DataObject> getMappedDataObjects(List<DataObject> resultDataObjects, List<String> keys) {

+    	Map<Object, DataObject> resultMap = new HashMap<Object, DataObject>();

+    	ArrayList<Object> keyCols = null;

+        for(int j=0; j<resultDataObjects.size(); j++) {

+        	DataObject currentDO = resultDataObjects.get(j);

+        	

+            keyCols = new ArrayList<Object>();

+        	for(int i=0; i<keys.size(); i++) {

+        		String currentKey = keys.get(i);

+        		Object currentKeyValue = currentDO.get(currentKey);

+        		keyCols.add(currentKeyValue);

+        	}

+        	

+        	resultMap.put(keyCols, currentDO);          	

+        }

+        return resultMap;

+    }

+    

+    public static List<String> getKeys(String key) {

+    	String[] keys = key.split(",");

+    	return Arrays.asList(keys);

+    }

+    

+    public DataObject executeCommand(String commandName) {

+        try {

+            Command command = this.das.getCommand(commandName);

+            return command.executeQuery();

+        } catch (Exception e) {

+            e.printStackTrace();

+            return null;

+        }

+    }

+

+    public DataObject executeCommand(String commandName, String xPath) {

+        DataObject root = executeCommand(commandName);

+        return root.getDataObject(xPath);

+    }

+}

diff --git a/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngineManager.java b/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngineManager.java
new file mode 100644
index 0000000000..572c190037
--- /dev/null
+++ b/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngineManager.java
@@ -0,0 +1,141 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package org.apache.tuscany.sca.data.engine;

+

+import java.io.InputStream;

+import java.util.List;

+

+import org.apache.tuscany.das.rdb.ConfigHelper;

+import org.apache.tuscany.das.rdb.DAS;

+import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;

+import org.apache.tuscany.sca.data.engine.config.ConnectionInfo;

+

+/**

+ * The DataAccessEngineManager acts like a registry and factory for DAS instances

+ * It holds DAS by it's config file name, reusing the same DAS for all components 

+ * using the same config file.

+ * 

+ * @version $Rev$ $Date$

+ */

+public class DataAccessEngineManager {

+    //private final Map<String, DAS> registry = new HashMap<String, DAS>();

+    

+    public DataAccessEngineManager() {

+        super();

+    }

+    

+    protected DAS initializeDAS(String config, ConnectionInfo connectionInfo, String table, String pkColumns) throws MissingConfigFileException {

+        //load the config file

+        //System.out.println("Initializing DAS");

+        

+        ConfigHelper configHelper;

+        

+        if(config == null) {

+            //no config information

+            configHelper = new ConfigHelper();    

+        } else {

+            //initialize the config helper by loading config file

+            configHelper = new ConfigHelper(this.getConfigStream(config));

+        }

+        

+        //add additional connectionInfo if provided in the SCA Composite file

+        if( connectionInfo != null) {

+            String dataSource = connectionInfo.getDataSource();

+            if(dataSource != null && dataSource.length() > 0) {

+                configHelper.addConnectionInfo(dataSource);

+            } else {

+                String driverClass = connectionInfo.getConnectionProperties().getDriverClass();

+                String connectionURL = connectionInfo.getConnectionProperties().getDatabaseURL();

+                String userName = connectionInfo.getConnectionProperties().getUsername();

+                String password = connectionInfo.getConnectionProperties().getPassword();

+                int loginTimeout = connectionInfo.getConnectionProperties().getLoginTimeout();

+

+                configHelper.addConnectionInfo(driverClass, connectionURL, userName, password, loginTimeout);

+            }

+            

+        }

+        

+        if(table != null && pkColumns != null) {

+            MappingWrapper configWrapper = new MappingWrapper(configHelper.getConfig());

+            List<String> pkColsList = DataAccessEngine.getKeys(pkColumns);

+            for(int i=0; i<pkColsList.size(); i++) {

+            	configWrapper.addPrimaryKey(table+"."+pkColsList.get(i), pkColsList.get(i));

+            }                	

+        }

+        

+        DAS das = DAS.FACTORY.createDAS(configHelper.getConfig());

+        

+        return das;    	

+    }

+    

+/*

+    public DAS getDAS(String config) throws MissingConfigFileException {

+        //DAS das = registry.get(config);

+        //if ( das == null) {

+        //    das = this.initializeDAS(config);

+        //    this.registry.put(config, das);

+        //}

+        return initializeDAS(config, null);

+    }

+

+    public DAS getDAS(ConnectionInfo connectionInfo) {

+        assert connectionInfo != null;

+        

+        //FIXME: cache the das, we need to define the keys to use (datasource and databaseurl + hashed(username + password))

+        DAS das = null;

+        try {

+            das =  initializeDAS(null, connectionInfo);

+        }catch (MissingConfigFileException e) {

+            //this should never happen, as configFile == null

+        }

+        

+        return das;

+    }

+*/

+    public DAS getDAS(String config, ConnectionInfo connectionInfo) throws MissingConfigFileException {

+        assert connectionInfo != null;

+        

+        //FIXME: cache the das, we need to define the keys to use (datasource and databaseurl + hashed(username + password))

+        

+        return initializeDAS(config, connectionInfo, null, null);

+    }

+    

+    public DAS getDAS(String config, ConnectionInfo connectionInfo, String table, String pkColumns) throws MissingConfigFileException {

+        assert connectionInfo != null;

+        

+        //FIXME: cache the das, we need to define the keys to use (datasource and databaseurl + hashed(username + password))

+        

+        return initializeDAS(config, connectionInfo, table, pkColumns);

+    }

+    

+    protected InputStream getConfigStream(String config) throws MissingConfigFileException{

+        InputStream configStream = null;

+        

+        try {

+            configStream = this.getClass().getClassLoader().getResourceAsStream(config); 

+        } catch (Exception e) {

+            throw new MissingConfigFileException(config); 

+        }

+        

+        return configStream;

+    }

+    

+

+}

diff --git a/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/MissingConfigFileException.java b/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/MissingConfigFileException.java
new file mode 100644
index 0000000000..a010e089e9
--- /dev/null
+++ b/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/MissingConfigFileException.java
@@ -0,0 +1,44 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+package org.apache.tuscany.sca.data.engine;

+

+import org.apache.tuscany.sca.contribution.service.ContributionReadException;

+

+

+/**

+ * Exception to be used when DAS configuration side file is not available

+ * 

+ * @version $Rev$ $Date$

+ */

+public class MissingConfigFileException extends ContributionReadException {

+

+    private static final long serialVersionUID = -2616590185174691724L;

+

+    public MissingConfigFileException(String message) {

+        super(message);

+    }

+

+    public MissingConfigFileException(String message, Throwable cause) {

+        super(message, cause);

+    }

+

+    public MissingConfigFileException(Throwable cause) {

+        super(cause);

+    }

+}

diff --git a/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionInfo.java b/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionInfo.java
new file mode 100644
index 0000000000..c72308f733
--- /dev/null
+++ b/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionInfo.java
@@ -0,0 +1,47 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.sca.data.engine.config;

+

+/**

+ * Database connection information to be used for implementation.data

+ * 

+ * @version $Rev$ $Date$

+ */

+public class ConnectionInfo {

+    private ConnectionProperties connectionProperties;

+

+    private String dataSource;

+

+    public String getDataSource() {

+        return this.dataSource;

+    }

+

+    public void setDataSource(String dataSource) {

+        this.dataSource = dataSource;

+    }

+

+    public ConnectionProperties getConnectionProperties() {

+        return this.connectionProperties;

+    }

+

+    public void setConnectionProperties(ConnectionProperties connectionProperties) {

+        this.connectionProperties = connectionProperties;

+    }

+

+}

diff --git a/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionProperties.java b/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionProperties.java
new file mode 100644
index 0000000000..df08a970b3
--- /dev/null
+++ b/branches/sca-java-1.x/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionProperties.java
@@ -0,0 +1,78 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.sca.data.engine.config;

+

+/**

+ * Database connection properties to be used for implementation.data

+ * 

+ * @version $Rev$ $Date$

+ */

+public class ConnectionProperties {

+

+    private String driverClass;

+

+    private String databaseURL;

+

+    private String userName;

+

+    private String password;

+

+    private Integer loginTimeOut;

+

+    public String getDriverClass() {

+        return this.driverClass;

+    }

+

+    public void setDriverClass(String driverClass) {

+        this.driverClass = driverClass;

+    }

+

+    public String getDatabaseURL() {

+        return this.databaseURL;

+    }

+

+    public void setDatabaseURL(String databaseURL) {

+        this.databaseURL = databaseURL;

+    }

+

+    public String getUsername() {

+        return this.userName;

+    }

+

+    public void setUsername(String userName) {

+        this.userName = userName;

+    }

+

+    public String getPassword() {

+        return this.password;

+    }

+

+    public void setPassword(String password) {

+        this.password = password;

+    }

+

+    public Integer getLoginTimeout() {

+        return this.loginTimeOut;

+    }

+

+    public void setLoginTimeout(Integer loginTimeOut) {

+        this.loginTimeOut = loginTimeOut;

+    }

+

+}

diff --git a/branches/sca-java-1.x/modules/data-engine-helper/src/main/resources/dataengine-helper-validation-messages.properties b/branches/sca-java-1.x/modules/data-engine-helper/src/main/resources/dataengine-helper-validation-messages.properties
new file mode 100644
index 0000000000..b040d69cc5
--- /dev/null
+++ b/branches/sca-java-1.x/modules/data-engine-helper/src/main/resources/dataengine-helper-validation-messages.properties
@@ -0,0 +1,21 @@
+#
+#
+#    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.
+#
+#
+ContributionReadException = ContributionReadException occured due to : 
\ No newline at end of file