Author: lresende
Date: Wed Oct 31 14:17:06 2007
New Revision: 590836
URL: http://svn.apache.org/viewvc?rev=590836&view=rev
Log:
Cleaning up these the company-das samples
Added:
incubator/tuscany/java/sca/samples/company-das-webapp/company.sql
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/company.xml
- copied, changed from r589717,
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/CompanyConfig.xml
incubator/tuscany/java/sca/samples/company-das/build.xml (with props)
incubator/tuscany/java/sca/samples/company-das/company.sql
incubator/tuscany/java/sca/samples/company-das/src/main/java/das/DASServiceClient.java
(with props)
incubator/tuscany/java/sca/samples/company-das/src/main/resources/company.xml
(with props)
incubator/tuscany/java/sca/samples/company-das/src/main/resources/log4j.properties
(with props)
incubator/tuscany/java/sca/samples/company-das/src/test/resources/company.xml
- copied, changed from r589717,
incubator/tuscany/java/sca/samples/company-das/src/test/resources/CompanyConfig.xml
incubator/tuscany/java/sca/samples/company-das/src/test/resources/log4j.properties
(with props)
Removed:
incubator/tuscany/java/sca/samples/company-das-webapp/dastest/
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/CompanyConfig.xml
incubator/tuscany/java/sca/samples/company-das/src/test/resources/CompanyConfig.xml
incubator/tuscany/java/sca/samples/company-das/src/test/resources/dastest/
Modified:
incubator/tuscany/java/sca/samples/company-das-webapp/pom.xml
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/dasservice.composite
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/webapp/Company.jsp
incubator/tuscany/java/sca/samples/company-das/pom.xml
incubator/tuscany/java/sca/samples/company-das/src/main/java/das/DASServiceImpl.java
incubator/tuscany/java/sca/samples/company-das/src/main/resources/dasservice.composite
incubator/tuscany/java/sca/samples/company-das/src/test/java/das/DASServiceTestCase.java
Added: incubator/tuscany/java/sca/samples/company-das-webapp/company.sql
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das-webapp/company.sql?rev=590836&view=auto
==============================================================================
--- incubator/tuscany/java/sca/samples/company-das-webapp/company.sql (added)
+++ incubator/tuscany/java/sca/samples/company-das-webapp/company.sql Wed Oct
31 14:17:06 2007
@@ -0,0 +1,40 @@
+DROP TABLE EMPLOYEE;
+DROP TABLE DEPARTMENT;
+DROP TABLE COMPANY;
+
+CREATE TABLE COMPANY (
+ ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY,
+ NAME VARCHAR(30));
+
+CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS
IDENTITY,
+ NAME VARCHAR(30),
+ LOCATION VARCHAR(30),
+ DEPNUMBER VARCHAR(10),
+ COMPANYID INT);
+
+CREATE TABLE EMPLOYEE (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS
IDENTITY,
+ NAME VARCHAR(30),
+ SN VARCHAR(10),
+ MANAGER SMALLINT,
+ DEPARTMENTID INT);
+
+
+INSERT INTO COMPANY (NAME) VALUES('ACME Publishing');
+INSERT INTO COMPANY (NAME) VALUES('Do-rite plumbing');
+INSERT INTO COMPANY (NAME) VALUES('MegaCorp');
+
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Advanced
Technologies','NY','123', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 2','','', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 3','','', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 4','','', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 5','','', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 6','','', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 7','','', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 8','','', 1);
+
+INSERT INTO EMPLOYEE (NAME, SN, MANAGER, DEPARTMENTID) VALUES('John
Jones','E0001', 0, 1);
+INSERT INTO EMPLOYEE (NAME, SN, MANAGER, DEPARTMENTID) VALUES('Mary
Smith','E0002', 1, null);
+INSERT INTO EMPLOYEE (NAME, SN, MANAGER, DEPARTMENTID) VALUES('Jane
Doe','E0003', 0, 1);
+INSERT INTO EMPLOYEE (NAME, SN, MANAGER, DEPARTMENTID) VALUES('Al
Smith','E0004', 1, 1);
+
+
Modified: incubator/tuscany/java/sca/samples/company-das-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das-webapp/pom.xml?rev=590836&r1=590835&r2=590836&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/company-das-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/company-das-webapp/pom.xml Wed Oct 31
14:17:06 2007
@@ -82,5 +82,57 @@
<directory>src/main/resources</directory>
</resource>
</resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <!-- 1.1 due to MOJO-619 -->
+ <version>1.1-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.2.1</version>
+ </dependency>
+ </dependencies>
+
+ <executions>
+ <execution>
+ <id>create-db</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+
<url>jdbc:derby:${pom.basedir}/target/classes/company_db;create=true</url>
+ <autocommit>true</autocommit>
+ <onError>continue</onError>
+ <onConnectionError>skip</onConnectionError>
+ <delimiter>;</delimiter>
+ <srcFiles>
+ <srcFile>${pom.basedir}/company.sql</srcFile>
+ </srcFiles>
+ </configuration>
+ </execution>
+
+ <!-- Shutdown DB in order to be able to run unit tests -->
+ <execution>
+ <id>shutdown-database-sothat-test-can-run</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+
<url>jdbc:derby:${pom.basedir}/target/classes/company_db;shutdown=true</url>
+
<skipOnConnectionError>true</skipOnConnectionError>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified:
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java?rev=590836&r1=590835&r2=590836&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java
Wed Oct 31 14:17:06 2007
@@ -30,7 +30,7 @@
@Scope("COMPOSITE")
public class DASServiceImpl implements DASService {
- protected DAS das = null;
+ private DAS das = null;
/**
Copied:
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/company.xml
(from r589717,
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/CompanyConfig.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/company.xml?p2=incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/company.xml&p1=incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/CompanyConfig.xml&r1=589717&r2=590836&rev=590836&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/CompanyConfig.xml
(original)
+++
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/company.xml
Wed Oct 31 14:17:06 2007
@@ -19,7 +19,7 @@
-->
<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <ConnectionInfo dataSource="java:comp/env/jdbc/dastest"/>
+ <ConnectionInfo dataSource="java:comp/env/jdbc/company_db"/>
<Command name="all companies" SQL="select * from COMPANY" kind="Select"/>
Modified:
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/dasservice.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/dasservice.composite?rev=590836&r1=590835&r2=590836&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/dasservice.composite
(original)
+++
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/resources/dasservice.composite
Wed Oct 31 14:17:06 2007
@@ -22,11 +22,6 @@
xmlns:das-service="http://das-service";
name="DASService">
- <service name="DASService" promote="DASServiceComponent">
- <interface.java interface="das.DASService"/>
- <reference>DASServiceComponent</reference>
- </service>
-
<component name="DASServiceComponent">
<implementation.java class="das.DASServiceImpl"/>
</component>
Modified:
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/webapp/Company.jsp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das-webapp/src/main/webapp/Company.jsp?rev=590836&r1=590835&r2=590836&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/webapp/Company.jsp
(original)
+++
incubator/tuscany/java/sca/samples/company-das-webapp/src/main/webapp/Company.jsp
Wed Oct 31 14:17:06 2007
@@ -45,11 +45,15 @@
List companyList = null;
try{
-
dasService.configureService(getClass().getClassLoader().getResourceAsStream("CompanyConfig.xml"));
+
dasService.configureService(this.getClass().getClassLoader().getResourceAsStream("company.xml"));
DataObject root = dasService.executeCommand("all companies",
null);
companyList = root.getList("COMPANY");
+ if(companyList == null) {
+ System.out.println("::NULL::");
+ }
}catch(Exception e){
//TODO: handle case where dasService can't be initiated properly
+ e.printStackTrace();
}
%>
Added: incubator/tuscany/java/sca/samples/company-das/build.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das/build.xml?rev=590836&view=auto
==============================================================================
--- incubator/tuscany/java/sca/samples/company-das/build.xml (added)
+++ incubator/tuscany/java/sca/samples/company-das/build.xml Wed Oct 31
14:17:06 2007
@@ -0,0 +1,116 @@
+<?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 name="sample-company-das" default="compile">
+
+ <target name="compile">
+ <mkdir dir="target/classes"/>
+ <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+ <src path="src\main\java"/>
+ <classpath>
+ <fileset refid="tuscany.jars"/>
+ <fileset refid="3rdparty.jars"/>
+ </classpath>
+ </javac>
+ <copy todir="target/classes">
+ <fileset dir="src\main\resources"/>
+ <fileset dir="."/>
+ </copy>
+ <jar destfile="target/sample-company-das.jar" basedir="target/classes">
+ <manifest>
+ <attribute name="Main-Class" value="das.DASServiceClient"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <target name="run">
+ <java
classname="org.apache.tuscany.samples.das.service.client.DASServiceClient"
fork="true">
+ <classpath>
+ <pathelement location="target/sample-company-das.jar"/>
+ <fileset refid="tuscany.jars"/>
+ <fileset refid="3rdparty.jars"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="clean">
+ <delete includeemptydirs="true">
+ <fileset dir="target"/>
+ </delete>
+ </target>
+
+ <fileset id="tuscany.jars" dir="../../modules">
+ <include
name="tuscany-interface-java-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-implementation-java-runtime-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-implementation-java-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-contribution-java-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-implementation-java-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-contribution-impl-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-spi-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-contribution-namespace-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-api-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-sca-api-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xsd-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-logging-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-core-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-embedded-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-api-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+ </fileset>
+ <fileset id="3rdparty.jars" dir="../../lib">
+ <include name="stax-api-1.0.1.jar"/>
+ <include name="tuscany-das-rdb-1.0-incubating-beta2.jar"/>
+ <include name="xml-apis-1.3.03.jar"/>
+ <include name="wstx-asl-3.2.0.jar"/>
+ <include name="commons-logging-1.1.jar"/>
+ <include name="axiom-impl-1.2.5.jar"/>
+ <include name="xalan-2.7.0.jar"/>
+ <include name="log4j-1.2.14.jar"/>
+ <include name="tuscany-sdo-lib-1.0-incubating.jar"/>
+ <include name="tuscany-sdo-api-r2.1-1.0-incubating.jar"/>
+ <include name="ecore-xmi-2.2.3.jar"/>
+ <include name="neethi-2.0.2.jar"/>
+ <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+ <include name="jaxen-1.1-beta-9.jar"/>
+ <include name="ecore-2.2.3.jar"/>
+ <include name="common-2.2.3.jar"/>
+ <include name="axiom-api-1.2.5.jar"/>
+ <include name="xsd-2.2.3.jar"/>
+ <include name="xercesImpl-2.8.1.jar"/>
+ <include name="cglib-nodep-2.1_3.jar"/>
+ <include name="tuscany-sdo-impl-1.0-incubating.jar"/>
+ <include name="ecore-change-2.2.3.jar"/>
+ </fileset>
+
+</project>
Propchange: incubator/tuscany/java/sca/samples/company-das/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/samples/company-das/build.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/tuscany/java/sca/samples/company-das/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/tuscany/java/sca/samples/company-das/company.sql
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das/company.sql?rev=590836&view=auto
==============================================================================
--- incubator/tuscany/java/sca/samples/company-das/company.sql (added)
+++ incubator/tuscany/java/sca/samples/company-das/company.sql Wed Oct 31
14:17:06 2007
@@ -0,0 +1,40 @@
+DROP TABLE EMPLOYEE;
+DROP TABLE DEPARTMENT;
+DROP TABLE COMPANY;
+
+CREATE TABLE COMPANY (
+ ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY,
+ NAME VARCHAR(30));
+
+CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS
IDENTITY,
+ NAME VARCHAR(30),
+ LOCATION VARCHAR(30),
+ DEPNUMBER VARCHAR(10),
+ COMPANYID INT);
+
+CREATE TABLE EMPLOYEE (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS
IDENTITY,
+ NAME VARCHAR(30),
+ SN VARCHAR(10),
+ MANAGER SMALLINT,
+ DEPARTMENTID INT);
+
+
+INSERT INTO COMPANY (NAME) VALUES('ACME Publishing');
+INSERT INTO COMPANY (NAME) VALUES('Do-rite plumbing');
+INSERT INTO COMPANY (NAME) VALUES('MegaCorp');
+
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Advanced
Technologies','NY','123', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 2','','', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 3','','', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 4','','', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 5','','', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 6','','', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 7','','', 1);
+INSERT INTO DEPARTMENT (NAME, LOCATION, DEPNUMBER, COMPANYID) VALUES('Default
Name 8','','', 1);
+
+INSERT INTO EMPLOYEE (NAME, SN, MANAGER, DEPARTMENTID) VALUES('John
Jones','E0001', 0, 1);
+INSERT INTO EMPLOYEE (NAME, SN, MANAGER, DEPARTMENTID) VALUES('Mary
Smith','E0002', 1, null);
+INSERT INTO EMPLOYEE (NAME, SN, MANAGER, DEPARTMENTID) VALUES('Jane
Doe','E0003', 0, 1);
+INSERT INTO EMPLOYEE (NAME, SN, MANAGER, DEPARTMENTID) VALUES('Al
Smith','E0004', 1, 1);
+
+
Modified: incubator/tuscany/java/sca/samples/company-das/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das/pom.xml?rev=590836&r1=590835&r2=590836&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/company-das/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/company-das/pom.xml Wed Oct 31 14:17:06
2007
@@ -89,11 +89,61 @@
<configuration>
<archive>
<manifest>
-
<mainClass>org.apache.tuscany.samples.das.service.client.DASServiceClient</mainClass>
+
<mainClass>das.DASServiceClient</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <!-- 1.1 due to MOJO-619 -->
+ <version>1.1-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.2.1</version>
+ </dependency>
+ </dependencies>
+
+ <executions>
+ <execution>
+ <id>create-db</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+
<url>jdbc:derby:${pom.basedir}/target/company_db;create=true</url>
+ <autocommit>true</autocommit>
+ <onError>continue</onError>
+ <onConnectionError>skip</onConnectionError>
+ <delimiter>;</delimiter>
+ <srcFiles>
+ <srcFile>${pom.basedir}/company.sql</srcFile>
+ </srcFiles>
+ </configuration>
+ </execution>
+
+ <!-- Shutdown DB in order to be able to run unit tests -->
+ <execution>
+ <id>shutdown-database-sothat-test-can-run</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+
<url>jdbc:derby:${pom.basedir}/target/company_db;shutdown=true</url>
+
<skipOnConnectionError>true</skipOnConnectionError>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Added:
incubator/tuscany/java/sca/samples/company-das/src/main/java/das/DASServiceClient.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das/src/main/java/das/DASServiceClient.java?rev=590836&view=auto
==============================================================================
---
incubator/tuscany/java/sca/samples/company-das/src/main/java/das/DASServiceClient.java
(added)
+++
incubator/tuscany/java/sca/samples/company-das/src/main/java/das/DASServiceClient.java
Wed Oct 31 14:17:06 2007
@@ -0,0 +1,48 @@
+/*
+ * 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 das;
+
+import java.util.List;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+import commonj.sdo.DataObject;
+
+public class DASServiceClient {
+
+ public static void main(String[] args) throws Exception {
+
+ SCADomain scaDomain = SCADomain.newInstance("dasservice.composite");
+ DASService dasService = scaDomain.getService(DASService.class,
"DASServiceComponent");
+
+
+
dasService.configureService(DASServiceClient.class.getClassLoader().getResourceAsStream("company.xml"));
+
+ DataObject root = dasService.executeCommand("all companies", null);
+ List companyList = root.getList("COMPANY");
+
+ for(int i=0; i<companyList.size(); i++){
+ System.out.println("
ID:"+(((DataObject)companyList.get(i)).getInt("ID"))+
+ "
NAME:"+(((DataObject)companyList.get(i)).getString("NAME")));
+ }
+
+ }
+
+}
Propchange:
incubator/tuscany/java/sca/samples/company-das/src/main/java/das/DASServiceClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/samples/company-das/src/main/java/das/DASServiceClient.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/tuscany/java/sca/samples/company-das/src/main/java/das/DASServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das/src/main/java/das/DASServiceImpl.java?rev=590836&r1=590835&r2=590836&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/company-das/src/main/java/das/DASServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/samples/company-das/src/main/java/das/DASServiceImpl.java
Wed Oct 31 14:17:06 2007
@@ -23,6 +23,7 @@
import org.apache.tuscany.das.rdb.Command;
import org.apache.tuscany.das.rdb.DAS;
+import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Scope;
import commonj.sdo.DataObject;
@@ -30,8 +31,7 @@
@Scope("COMPOSITE")
public class DASServiceImpl implements DASService {
- protected DAS das = null;
-
+ private DAS das = null;
/**
* Initialize DAS
@@ -49,6 +49,13 @@
}
this.das = DAS.FACTORY.createDAS(config);
+ }
+
+ @Destroy
+ protected void destroyDAS() {
+ if(das != null) {
+ das.releaseResources();
+ }
}
/**
Added:
incubator/tuscany/java/sca/samples/company-das/src/main/resources/company.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das/src/main/resources/company.xml?rev=590836&view=auto
==============================================================================
---
incubator/tuscany/java/sca/samples/company-das/src/main/resources/company.xml
(added)
+++
incubator/tuscany/java/sca/samples/company-das/src/main/resources/company.xml
Wed Oct 31 14:17:06 2007
@@ -0,0 +1,52 @@
+<?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.
+ -->
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
+
+ <ConnectionInfo>
+ <ConnectionProperties
+ driverClass="org.apache.derby.jdbc.EmbeddedDriver"
+ databaseURL="jdbc:derby:target/company_db;create=true"
+ loginTimeout="600000"/>
+ </ConnectionInfo>
+
+
+ <Command name="all companies" SQL="select * from COMPANY" kind="Select"/>
+
+ <Command name="all companies and departments" SQL="select * from COMPANY
left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID" kind="Select"/>
+
+ <Command name="all departments for company" SQL="select * from COMPANY
inner join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID =
?" kind="Select"/>
+
+ <Command name="company by id with departments" SQL="select * from COMPANY
left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where
COMPANY.ID = ?" kind="Select"/>
+
+
+ <Table tableName="COMPANY">
+ <Column columnName="ID" primaryKey="true" generated="true"/>
+ </Table>
+
+ <Table tableName="DEPARTMENT">
+ <Column columnName="ID" primaryKey="true" generated="true"/>
+ </Table>
+
+ <Relationship name="departments" primaryKeyTable="COMPANY"
foreignKeyTable="DEPARTMENT" many="true">
+ <KeyPair primaryKeyColumn="ID" foreignKeyColumn="COMPANYID"/>
+ </Relationship>
+
+
+</Config>
Propchange:
incubator/tuscany/java/sca/samples/company-das/src/main/resources/company.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/samples/company-das/src/main/resources/company.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sca/samples/company-das/src/main/resources/company.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
incubator/tuscany/java/sca/samples/company-das/src/main/resources/dasservice.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das/src/main/resources/dasservice.composite?rev=590836&r1=590835&r2=590836&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/company-das/src/main/resources/dasservice.composite
(original)
+++
incubator/tuscany/java/sca/samples/company-das/src/main/resources/dasservice.composite
Wed Oct 31 14:17:06 2007
@@ -21,11 +21,6 @@
targetNamespace="http://das-service";
xmlns:das-service="http://das-service";
name="DASService">
-
- <service name="DASService" promote="DASServiceComponent">
- <interface.java interface="das.DASService"/>
- <reference>DASServiceComponent</reference>
- </service>
<component name="DASServiceComponent">
<implementation.java class="das.DASServiceImpl"/>
Added:
incubator/tuscany/java/sca/samples/company-das/src/main/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das/src/main/resources/log4j.properties?rev=590836&view=auto
==============================================================================
---
incubator/tuscany/java/sca/samples/company-das/src/main/resources/log4j.properties
(added)
+++
incubator/tuscany/java/sca/samples/company-das/src/main/resources/log4j.properties
Wed Oct 31 14:17:06 2007
@@ -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
Propchange:
incubator/tuscany/java/sca/samples/company-das/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/samples/company-das/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sca/samples/company-das/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
incubator/tuscany/java/sca/samples/company-das/src/test/java/das/DASServiceTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das/src/test/java/das/DASServiceTestCase.java?rev=590836&r1=590835&r2=590836&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/company-das/src/test/java/das/DASServiceTestCase.java
(original)
+++
incubator/tuscany/java/sca/samples/company-das/src/test/java/das/DASServiceTestCase.java
Wed Oct 31 14:17:06 2007
@@ -28,7 +28,7 @@
public class DASServiceTestCase extends TestCase {
- SCADomain scaDomain;
+ private SCADomain scaDomain;
private DASService dasService;
@Override
@@ -43,7 +43,7 @@
}
public void testDAS() throws Exception{
-
dasService.configureService(getClass().getResourceAsStream("/CompanyConfig.xml"));
+
dasService.configureService(getClass().getResourceAsStream("/company.xml"));
DataObject root = dasService.executeCommand("all companies", null);
List companyList = root.getList("COMPANY");
Copied:
incubator/tuscany/java/sca/samples/company-das/src/test/resources/company.xml
(from r589717,
incubator/tuscany/java/sca/samples/company-das/src/test/resources/CompanyConfig.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das/src/test/resources/company.xml?p2=incubator/tuscany/java/sca/samples/company-das/src/test/resources/company.xml&p1=incubator/tuscany/java/sca/samples/company-das/src/test/resources/CompanyConfig.xml&r1=589717&r2=590836&rev=590836&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/company-das/src/test/resources/CompanyConfig.xml
(original)
+++
incubator/tuscany/java/sca/samples/company-das/src/test/resources/company.xml
Wed Oct 31 14:17:06 2007
@@ -22,7 +22,7 @@
<ConnectionInfo>
<ConnectionProperties
driverClass="org.apache.derby.jdbc.EmbeddedDriver"
-
databaseURL="jdbc:derby:target/test-classes/dastest;create=true"
+ databaseURL="jdbc:derby:target/company_db;create=true"
loginTimeout="600000"/>
</ConnectionInfo>
Added:
incubator/tuscany/java/sca/samples/company-das/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/company-das/src/test/resources/log4j.properties?rev=590836&view=auto
==============================================================================
---
incubator/tuscany/java/sca/samples/company-das/src/test/resources/log4j.properties
(added)
+++
incubator/tuscany/java/sca/samples/company-das/src/test/resources/log4j.properties
Wed Oct 31 14:17:06 2007
@@ -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
Propchange:
incubator/tuscany/java/sca/samples/company-das/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/samples/company-das/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sca/samples/company-das/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
