summaryrefslogtreecommitdiffstats
path: root/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig
diff options
context:
space:
mode:
Diffstat (limited to 'das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig')
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/pom.xml99
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/readme.html597
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java56
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConnectionHelper.java165
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBDataHelper.java251
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBHelper.java196
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializer.java154
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DataSourceInitializationException.java40
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DatabaseInitializerException.java40
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/CannedSampleDBConfig.xml47
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/DBConfig.xsd56
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/META-INF/LICENSE345
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/META-INF/NOTICE32
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/META-INF/README35
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/log4j.properties33
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/test/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializerTestCase.java69
-rw-r--r--das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/test/resources/dbConfig.xml47
17 files changed, 0 insertions, 2262 deletions
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/pom.xml b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/pom.xml
deleted file mode 100644
index ac69aa9238..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/pom.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.das.samples</groupId>
- <artifactId>tuscany-das-samples</artifactId>
- <version>1.0-incubating-beta1</version>
- </parent>
-
- <artifactId>tuscany-das-sample-dbconfig</artifactId>
- <packaging>jar</packaging>
- <name>Tuscany DAS Canned DB Initializer Utility</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.das</groupId>
- <artifactId>tuscany-das-rdb</artifactId>
- <version>${das.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.2.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <!-- this will place the java source files inside the jar -->
- <build>
- <finalName>sample-dbconfig</finalName>
- <sourceDirectory>src/main/java</sourceDirectory>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <executions>
- <execution>
- <id>config</id>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/DBConfig.xsd</schemaFile>
- <noNotification>true</noNotification>
- <noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
-
-</project>
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/readme.html b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/readme.html
deleted file mode 100644
index 3c5d7b8b86..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/readme.html
+++ /dev/null
@@ -1,597 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:st1="urn:schemas-microsoft-com:office:smarttags"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 10">
-<meta name=Originator content="Microsoft Word 10">
-<link rel=File-List href="readme_files/filelist.xml">
-<title>Tuscany RDB DAS Database Setup Utility/title&gt;</title>
-<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
- name="City"/>
-<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
- name="state"/>
-<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
- name="place"/>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Author>IBM_USER</o:Author>
- <o:LastAuthor>IBM_User</o:LastAuthor>
- <o:Revision>23</o:Revision>
- <o:TotalTime>58</o:TotalTime>
- <o:Created>2006-10-19T16:54:00Z</o:Created>
- <o:LastSaved>2007-05-17T06:46:00Z</o:LastSaved>
- <o:Pages>1</o:Pages>
- <o:Words>730</o:Words>
- <o:Characters>4167</o:Characters>
- <o:Company>IBM</o:Company>
- <o:Lines>34</o:Lines>
- <o:Paragraphs>9</o:Paragraphs>
- <o:CharactersWithSpaces>4888</o:CharactersWithSpaces>
- <o:Version>10.3501</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:SpellingState>Clean</w:SpellingState>
- <w:GrammarState>Clean</w:GrammarState>
- <w:Compatibility>
- <w:ApplyBreakingRules/>
- <w:UseFELayout/>
- </w:Compatibility>
- <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
- </w:WordDocument>
-</xml><![endif]--><!--[if !mso]><object
- classid="clsid:38481807-CA0E-42D2-BF39-B33AF135CC4D" id=ieooui></object>
-<style>
-st1\:*{behavior:url(#ieooui) }
-</style>
-<![endif]-->
-<style>
-<!--
- /* Font Definitions */
- @font-face
- {font-family:SimSun;
- panose-1:2 1 6 0 3 1 1 1 1 1;
- mso-font-alt:\5B8B\4F53;
- mso-font-charset:134;
- mso-generic-font-family:auto;
- mso-font-pitch:variable;
- mso-font-signature:3 135135232 16 0 262145 0;}
-@font-face
- {font-family:"\@SimSun";
- panose-1:2 1 6 0 3 1 1 1 1 1;
- mso-font-charset:134;
- mso-generic-font-family:auto;
- mso-font-pitch:variable;
- mso-font-signature:3 135135232 16 0 262145 0;}
- /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-h1
- {mso-style-next:Normal;
- margin-top:12.0pt;
- margin-right:0in;
- margin-bottom:3.0pt;
- margin-left:0in;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:1;
- font-size:16.0pt;
- font-family:Arial;
- mso-font-kerning:16.0pt;}
-h3
- {mso-style-next:Normal;
- margin-top:12.0pt;
- margin-right:0in;
- margin-bottom:3.0pt;
- margin-left:0in;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:3;
- font-size:13.0pt;
- font-family:Arial;}
-p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
- {mso-style-noshow:yes;
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-span.MsoFootnoteReference
- {mso-style-noshow:yes;
- vertical-align:super;}
-a:link, span.MsoHyperlink
- {color:blue;
- text-decoration:underline;
- text-underline:single;}
-a:visited, span.MsoHyperlinkFollowed
- {color:purple;
- text-decoration:underline;
- text-underline:single;}
-code
- {font-family:"Courier New";
- mso-ascii-font-family:"Courier New";
- mso-fareast-font-family:"Times New Roman";
- mso-hansi-font-family:"Courier New";
- mso-bidi-font-family:"Courier New";}
-pre
- {margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Courier New";
- mso-fareast-font-family:"Times New Roman";}
-span.codefrag
- {mso-style-name:codefrag;}
-span.SpellE
- {mso-style-name:"";
- mso-spl-e:yes;}
-span.GramE
- {mso-style-name:"";
- mso-gram-e:yes;}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-<!--[if gte mso 10]>
-<style>
- /* Style Definitions */
- table.MsoNormalTable
- {mso-style-name:"Table Normal";
- mso-tstyle-rowband-size:0;
- mso-tstyle-colband-size:0;
- mso-style-noshow:yes;
- mso-style-parent:"";
- mso-padding-alt:0in 5.4pt 0in 5.4pt;
- mso-para-margin:0in;
- mso-para-margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Times New Roman";}
-</style>
-<![endif]--><!--[if gte mso 9]><xml>
- <u1:shapelayout u2:ext="edit">
- <u1:idmap u2:ext="edit" data="1"/>
- </u1:shapelayout>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="5122"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapelayout v:ext="edit">
- <o:idmap v:ext="edit" data="1"/>
- </o:shapelayout></xml><![endif]-->
-</head>
-
-<body lang=EN-US link=blue vlink=purple style='tab-interval:.5in'>
-
-<div class=Section1><!--
-
-
-<p class=MsoNormal><span style="font-size: 9pt">&nbsp;</span></p>
-<pre><a name="header-text">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
-&quot;License&quot;); 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
-&quot;AS IS&quot; 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. </a></pre>
-<p class=MsoNormal><span style="font-size: 9pt"><br>
-&nbsp;</span></p>
-<p class=MsoNormal><span style='font-size:9.0pt'>
-<o:p>&nbsp;</o:p></span></p>
-
--->
-
-<h1><st1:state><st1:place>Tuscany</st1:place></st1:state> RDB DAS Database
-Setup Utility<o:p></o:p></h1>
-
-<p class=MsoNormal><u3:p>&nbsp;</u3:p></p>
-
-<p class=MsoNormal>This utility provides a jar file to be used by RDB DAS
-sample applications (web or standalone) to do database setup.&nbsp; </p>
-
-<p class=MsoNormal><br>
-So far&nbsp; the samples provided canned pre-created Derby database with tables
-and data. &nbsp; There was no convenient way to&nbsp; refresh&nbsp; table&nbsp;
-data&nbsp; during&nbsp; the samples&nbsp; execution.&nbsp; This utility<span
-class=GramE>&nbsp; supports</span> <st1:City><st1:place>Derby</st1:place></st1:City>
-database at present and uses a <span class=SpellE>config</span> file to get the
-setup information.</p>
-
-<p class=MsoNormal><br>
-<b>APIs</b></p>
-
-<div style='border:solid blue 1.0pt;mso-border-alt:solid blue .5pt;padding:
-1.0pt 4.0pt 1.0pt 4.0pt'>
-
-<h1 style='border:none;mso-border-alt:solid blue .5pt;padding:0in;mso-padding-alt:
-1.0pt 4.0pt 1.0pt 4.0pt'><span class=GramE><span style='font-size:12.0pt;
-font-family:"Times New Roman"'>public</span></span><span style='font-size:12.0pt;
-font-family:"Times New Roman"'> <span class=SpellE>DBInitializer</span>()<u3:p></u3:p>
-– uses default provided <span class=SpellE>ConfigFile</span> <span
-class=SpellE>CannedSampleDBConfig.xml</span><o:p></o:p></span></h1>
-
-<h1 style='border:none;mso-border-alt:solid blue .5pt;padding:0in;mso-padding-alt:
-1.0pt 4.0pt 1.0pt 4.0pt'><span class=GramE><span style='font-size:12.0pt;
-font-family:"Times New Roman"'>public</span></span><span style='font-size:12.0pt;
-font-family:"Times New Roman"'> <span class=SpellE>DBInitializer</span>(String <span
-class=SpellE>ConfigFileLocation</span>)<u3:p></u3:p></span></h1>
-
-<h1 style='border:none;mso-border-alt:solid blue .5pt;padding:0in;mso-padding-alt:
-1.0pt 4.0pt 1.0pt 4.0pt'><span class=GramE><span style='font-size:12.0pt;
-font-family:"Times New Roman"'>public</span></span><span style='font-size:12.0pt;
-font-family:"Times New Roman"'> <span class=SpellE>DBInitializer</span> (<span
-class=SpellE>InputStream</span> <span class=SpellE>ConfigFileStream</span>)<u3:p></u3:p></span></h1>
-
-<h1 style='border:none;mso-border-alt:solid blue .5pt;padding:0in;mso-padding-alt:
-1.0pt 4.0pt 1.0pt 4.0pt'><span class=GramE><span style='font-size:12.0pt;
-font-family:"Times New Roman"'>public</span></span><span style='font-size:12.0pt;
-font-family:"Times New Roman"'> void <span class=SpellE>initializeDatabase</span>(<span
-class=SpellE>boolean</span> clean) - Create database tables and fill data. If
-clean=true, all tables will be dropped and recreated.<u3:p></u3:p> </span></h1>
-
-<h1 style='border:none;mso-border-alt:solid blue .5pt;padding:0in;mso-padding-alt:
-1.0pt 4.0pt 1.0pt 4.0pt'><span class=GramE><span style='font-size:12.0pt;
-font-family:"Times New Roman"'>public</span></span><span style='font-size:12.0pt;
-font-family:"Times New Roman"'> void <span class=SpellE>initializeDatabaseData</span>(<span
-class=SpellE>boolean</span> clean) - create database data (with clean=true, if
-a table has pre-existing data, it will be deleted first)<u3:p></u3:p></span></h1>
-
-<h1 style='border:none;mso-border-alt:solid blue .5pt;padding:0in;mso-padding-alt:
-1.0pt 4.0pt 1.0pt 4.0pt'><span class=GramE><span style='font-size:12.0pt;
-font-family:"Times New Roman"'>public</span></span><span style='font-size:12.0pt;
-font-family:"Times New Roman"'> void <span class=SpellE>refreshDatabaseData</span>()
-– calls <span class=SpellE>initializeDatabase</span>(clean=true)</span></h1>
-
-<h1 style='border:none;mso-border-alt:solid blue .5pt;padding:0in;mso-padding-alt:
-1.0pt 4.0pt 1.0pt 4.0pt'><span class=GramE><span style='font-size:12.0pt;
-font-family:"Times New Roman"'>public</span></span><span style='font-size:12.0pt;
-font-family:"Times New Roman"'> <span class=SpellE>boolean</span> <span
-class=SpellE>isDatabaseReady</span>() - will return true, if the tables exist
-in the database<u3:p></u3:p></span></h1>
-
-<h1 style='border:none;mso-border-alt:solid blue .5pt;padding:0in;mso-padding-alt:
-1.0pt 4.0pt 1.0pt 4.0pt'><span class=GramE><span style='font-size:12.0pt;
-font-family:"Times New Roman"'>public</span></span><span style='font-size:12.0pt;
-font-family:"Times New Roman"'> boolean <span class=SpellE>isDatabasePopulated</span>()
-- will return true, if the tables have data<u3:p></u3:p></span><o:p></o:p></h1>
-
-</div>
-
-<p class=MsoNormal><u3:p><o:p>&nbsp;</o:p></p>
-
-<h3>Assumptions:</h3>
-
-<p class=MsoNormal><span style='mso-fareast-font-family:SimSun'>&lt;<span
-class=GramE>table</span>&gt; element lists tables in proper sequence, i.e.
-parent tables first and then child tables. This sequence will be used in
-create,insert,delete,drop <br>
-to take care of referential integrity. <br>
-<br>
-The config file required by utility supports the following features through
-different attributes and elements. Sample xml file is shown at the end.<o:p></o:p></span></p>
-
-<h3>&lt;<span class=SpellE>ConnectionInfo</span>&gt;</h3>
-
-<p class=MsoNormal><span style='mso-fareast-font-family:SimSun'>This element
-provides connection specific information - like vendor specific database URL,
-user name, password etc. If the DataSource is <o:p></o:p></span></p>
-
-<p class=MsoNormal><u3:p>provided by the web container, user needs to only fill
-dataSource attribute in this. In case of standalone J2SE samples, user needs to
-fill ConnectionProperties <br>
-element inside ConnectionInfo. These two ways of connection specification are
-mutually exclusive.<br style='mso-special-character:line-break'>
-<![if !supportLineBreakNewLine]><br style='mso-special-character:line-break'>
-<![endif]><o:p></o:p></p>
-
-<h3></u3:p>&lt;<span class=GramE>table</span>&gt;</h3>
-
-<p class=MsoNormal><span style='mso-fareast-font-family:SimSun'>&nbsp; This
-element needs to specify the table names required by the sample. Only these
-tables will be considered for creation, data population. This <o:p></o:p></span></p>
-
-<p class=MsoNormal><u3:p><span class=GramE>gives</span> flexibility to the user
-to choose the required set of tables based on the sample's requirement. It also
-needs to specify in the attributes, the Create SQL command used to create this
-table. &lt;<span class=GramE>table</span>&gt; has sequence element &lt;row&gt;
-which is used to provide the data to be populated in the table.<br
-style='mso-special-character:line-break'>
-<![if !supportLineBreakNewLine]><br style='mso-special-character:line-break'>
-<![endif]><o:p></o:p></p>
-
-<h3></u3:p>Set Up</h3>
-
-<p class=MsoNormal><span style='mso-fareast-font-family:SimSun'><br>
-To use this utility, include its jar and required database driver's jar in the classpath.
-Provide the config file used by this utility , similar to the example below, in
-the source folder of the sample.<o:p></o:p></span></p>
-
-<h3>DBConfig.xml example</h3>
-
-<p class=MsoNormal><span style='mso-fareast-font-family:SimSun'><o:p>&nbsp;</o:p></span></p>
-
-<div style='border:solid blue 1.0pt;mso-border-alt:solid blue .5pt;padding:
-1.0pt 4.0pt 1.0pt 4.0pt'>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><u3:p></u3:p><span
-class=GramE><u3:p></u3:p><u3:p>&lt;?xml</span> version=&quot;1.0&quot;
-encoding=&quot;ASCII&quot;?&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'>&lt;!--</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span>Licensed to the Apache Software Foundation
-(ASF) under one</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span><span class=GramE>or</span> more contributor
-license agreements.<span style='mso-spacerun:yes'>  </span>See the NOTICE file</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span><span class=GramE>distributed</span> with
-this work for additional information</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span><span class=GramE>regarding</span> copyright
-ownership.<span style='mso-spacerun:yes'>  </span>The ASF licenses this file</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span><span class=GramE>to</span> you under the
-Apache License, Version 2.0 (the</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span>&quot;License&quot;); you may not use this
-file except in compliance</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span><span class=GramE>with</span> the
-License.<span style='mso-spacerun:yes'>  </span>You may obtain a copy of the
-License at</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><o:p>&nbsp;</o:p></p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span>http://www.apache.org/licenses/LICENSE-2.0</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><o:p>&nbsp;</o:p></p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span>Unless required by applicable law or agreed
-to in writing,</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span><span class=GramE>software</span> distributed
-under the License is distributed on an</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span>&quot;AS IS&quot; BASIS, WITHOUT WARRANTIES
-OR CONDITIONS OF ANY</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span><span class=GramE>KIND, either express or
-implied.</span><span style='mso-spacerun:yes'>  </span>See the License for the</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span><span class=GramE>specific</span> language
-governing permissions and limitations</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>  </span><span class=GramE>under</span> the License.</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'> </span>--&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'>&lt;<span class=SpellE>DBConfig</span>
-<span class=SpellE>xmlns</span>=&quot;http:///org.apache.tuscany.das.rdb/dbconfig.xsd&quot;&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-1'>            </span>&lt;<span class=SpellE>ConnectionInfo</span>&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=SpellE>ConnectionProperties</span>
-</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-3'>                                    </span><span class=SpellE><span
-class=GramE>driverClass</span></span>=&quot;<span class=SpellE>org.apache.derby.jdbc.EmbeddedDriver</span>&quot;
-</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-3'>                                    </span><span class=SpellE><span
-class=GramE>databaseURL</span></span>=&quot;<span class=SpellE>jdbc:derby:target/dastest</span>;
-create = true&quot; </p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-3'>                                    </span><span class=SpellE><span
-class=GramE>loginTimeout</span></span>=&quot;600000&quot;/&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-1'>            </span>&lt;/<span class=SpellE>ConnectionInfo</span>&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-1'>            </span>&lt;Table name=&quot;COMPANY&quot; </p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>          </span><span
-style='mso-spacerun:yes'>  </span><span class=SpellE>SQLCreate</span>=&quot;CREATE
-TABLE COMPANY (ID INT PRIMARY KEY NOT NULL, NAME <span class=GramE>VARCHAR(</span>30),
-EOTMID INTEGER)&quot; &gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=GramE>row&gt;</span>51, 'ACME
-Publishing', 0&lt;/row&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=GramE>row&gt;</span>52,
-'Do-rite plumbing', 0&lt;/row&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=GramE>row&gt;</span>53, '<span
-class=SpellE>MegaCorp</span>', 0&lt;/row&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-1'>            </span>&lt;/Table&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-1'>            </span>&lt;Table name=&quot;DEPARTMENT&quot; </p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>              </span><span class=SpellE>SQLCreate</span>=&quot;CREATE
-TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY,
-NAME<span style='mso-spacerun:yes'>   </span></p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>              </span><span class=GramE>VARCHAR(</span>30),LOCATION
-VARCHAR(30), DEPNUMBER VARCHAR(10),COMPANYID INT)&quot; &gt;<span
-style='mso-tab-count:1'>   </span><span style='mso-tab-count:1'>            </span></p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=GramE>row</span>&gt;'Advanced
-Technologies', 'NY', '123', 1&lt;/row&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=GramE>row</span>&gt;'Default
-Name', '', '', 51&lt;/row&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=GramE>row</span>&gt;'Default
-Name', '', '', 51&lt;/row&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=GramE>row</span>&gt;'Default
-Name', '', '', 51&lt;/row&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=GramE>row</span>&gt;'Default
-Name', '', '', 51&lt;/row&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=GramE>row</span>&gt;'Default
-Name', '', '', 51&lt;/row&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=GramE>row</span>&gt;'Default
-Name', '', '', 51&lt;/row&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-1'>            </span>&lt;/Table&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-1'>            </span>&lt;Table name=&quot;EMPLOYEE&quot; </p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>            </span><span class=SpellE>SQLCreate</span>=&quot;CREATE
-TABLE EMPLOYEE (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY<span
-class=GramE>,NAME</span> </p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-style='mso-spacerun:yes'>            </span><span class=GramE>VARCHAR(</span>30),SN
-VARCHAR(10), MANAGER SMALLINT, DEPARTMENTID INT)&quot; &gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=GramE>row</span>&gt;'John
-Jones','E0001',0,12&lt;/row&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span>&lt;<span class=GramE>row</span>&gt;'Mary
-Smith','E0002',1,null&lt;/row&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span style='mso-tab-count:
-2'>                        </span><span lang=IT style='mso-ansi-language:IT'>&lt;row&gt;'Jane
-Doe','E0003',0,12&lt;/row&gt;<o:p></o:p></span></p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=IT
-style='mso-ansi-language:IT'><span style='mso-tab-count:2'>                        </span>&lt;row&gt;'Al
-Smith','E0004',1,12&lt;/row&gt;<o:p></o:p></span></p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang=IT
-style='mso-ansi-language:IT'><span style='mso-tab-count:1'>            </span></span>&lt;/Table&gt;</p>
-
-<p class=MsoNormal style='border:none;mso-border-alt:solid blue .5pt;
-padding:0in;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'>&lt;/<span class=SpellE>DBConfig</span>&gt;</p>
-
-</div>
-
-</div>
-
-</body>
-
-</html>
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java
deleted file mode 100644
index 12e37422eb..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.das.rdb.dbconfig;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.tuscany.sdo.util.SDOUtil;
-
-import commonj.sdo.helper.XMLHelper;
-
-/**
- * Config util provides config-related utilities such as loading a Config
- * instance from an InputStream
- *
- */
-public final class DBConfigUtil {
-
- private DBConfigUtil() {
- }
-
- public static DBConfig loadDBConfig(InputStream dbconfigStream) {
-
- if (dbconfigStream == null) {
- throw new RuntimeException("Cannot load configuration from a null InputStream. "
- + "Possibly caused by an incorrect config xml file name");
- }
-
- SDOUtil.registerStaticTypes(DbconfigFactory.class);
- XMLHelper helper = XMLHelper.INSTANCE;
-
- try {
- return (DBConfig) helper.load(dbconfigStream).getRootObject();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
-}
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConnectionHelper.java b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConnectionHelper.java
deleted file mode 100644
index 55f54f8f69..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConnectionHelper.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.das.rdb.dbconfig;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-
-public class DBConnectionHelper {
- private static final Logger logger = Logger.getLogger(DBConnectionHelper.class);
-
- protected DBConnectionHelper(){
- if(logger.isDebugEnabled()) {
- logger.log(Level.DEBUG, "DBConnectionHelper()");
- }
- }
-
- /**
- * Basic validation of Config for connection information and call to
- * connection helper to establish database connection. Connection using
- * DriverManager or DataSource are supported.
- *
- */
- public static Connection createConnection(ConnectionInfo connectionInfo) {
- if (logger.isDebugEnabled()) {
- logger.log(Level.DEBUG, "DBConnectionHelper.createConnection(ConnectionInfo)");
- }
-
- if (connectionInfo == null ||
- (connectionInfo.getDataSource() == null && connectionInfo.getConnectionProperties() == null)) {
- throw new RuntimeException("No connection has been provided and no data source has been specified");
- }
-
- if(connectionInfo.getDataSource() != null && connectionInfo.getConnectionProperties() != null){
- throw new RuntimeException("Use either dataSource or ConnectionProperties. Can't use both !");
- }
-
- Connection connection = null;
-
- if(connectionInfo.getConnectionProperties() != null){
- connection = initializeDriverManagerConnection(connectionInfo);
- }else{
- connection = initializeDatasourceConnection(connectionInfo);
- }
-
- return connection;
-
- }
- /**
- * Initializes a DB connection on a managed environmet (e.g inside Tomcat)
- */
- private static Connection initializeDatasourceConnection(ConnectionInfo connectionInfo){
- if (logger.isDebugEnabled()) {
- logger.log(Level.DEBUG, "DBConnectionHelper.initializeDatasourceConnection(ConnectionInfo)");
- }
-
- InitialContext ctx;
- Connection connection;
-
- try {
- ctx = new InitialContext();
- } catch (NamingException e) {
- throw new RuntimeException(e);
- }
- try {
- DataSource ds = (DataSource) ctx.lookup(connectionInfo.getDataSource());
- try {
- connection = ds.getConnection();
- if (connection == null) {
- throw new RuntimeException("Could not obtain a Connection from DataSource");
- }
- connection.setAutoCommit(true);
-
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- } catch (NamingException e) {
- throw new RuntimeException(e);
- }
-
- if( logger.isDebugEnabled()) {
- logger.log(Level.DEBUG, "DBConnectionHelper.initializeDatasourceConnection() exit");
- }
- return connection;
- }
-
- /**
- * Initialize a DB connection on a J2SE environment
- * For more info, see http://java.sun.com/j2se/1.3/docs/guide/jdbc/getstart/drivermanager.html
- */
- private static Connection initializeDriverManagerConnection(ConnectionInfo connectionInfo) {
- if (logger.isDebugEnabled()) {
- logger.log(Level.DEBUG, "DBConnectionHelper.initializeDriverManagerConnection(ConnectionInfo)");
- }
-
- if (connectionInfo.getConnectionProperties() == null) {
- throw new DataSourceInitializationException("No existing context and no connection properties");
- }
-
- if (connectionInfo.getConnectionProperties().getDriverClass() == null) {
- throw new DataSourceInitializationException("No jdbc driver class specified!");
- }
-
- Connection connection;
-
- try {
- //initialize driver and register it with DriverManager
- Class.forName(connectionInfo.getConnectionProperties().getDriverClass());
-
- //prepare to initialize connection
- String databaseUrl = connectionInfo.getConnectionProperties().getDatabaseURL();
- String userName = connectionInfo.getConnectionProperties().getUserName();
- String userPassword = connectionInfo.getConnectionProperties().getPassword();
- int loginTimeout = connectionInfo.getConnectionProperties().getLoginTimeout();
-
- DriverManager.setLoginTimeout(loginTimeout);
- if( (userName == null || userName.length() ==0) && (userPassword == null || userPassword.length()==0) ){
- //no username or password suplied
- connection = DriverManager.getConnection(databaseUrl);
- }else{
- connection = DriverManager.getConnection(databaseUrl, userName, userPassword);
- }
-
- if(connection == null){
- throw new DataSourceInitializationException("Error initializing connection : null");
- }
-
- connection.setAutoCommit(true);
- }catch(ClassNotFoundException cnf){
- throw new DataSourceInitializationException("JDBC Driver '" + connectionInfo.getConnectionProperties().getDriverClass() + "' not found", cnf);
- }catch(SQLException sqle){
- throw new DataSourceInitializationException(sqle.getMessage(), sqle);
- }
-
- if (logger.isDebugEnabled()) {
- logger.log(Level.DEBUG, "DBConnectionHelper.initializeDriverManagerConnection() exit");
- }
-
- return connection;
- }
-}
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBDataHelper.java b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBDataHelper.java
deleted file mode 100644
index 2ef25bdf81..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBDataHelper.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.das.rdb.dbconfig;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-
-public class DBDataHelper {
- private static final String CLASS_NAME = "DBDataHelper";
-
- private final Logger logger = Logger.getLogger(DBDataHelper.class);
-
- private final DBConfig dbConfig;
-
- protected DBDataHelper(DBConfig dbConfig) {
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, "DBDataHelper()");
- }
-
- this.dbConfig = dbConfig;
- }
-
- public boolean isDatabasePopulated() {
- boolean isPopulated = true;
-
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".isDatabasePopulated()");
- }
-
- Iterator tableIterator = dbConfig.getTable().iterator();
- while (tableIterator.hasNext()) {
- Table table = (Table) tableIterator.next();
-
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".isDatabasePopulated() calling isTablePopulated() for '" + table.getName() + "'");
- }
-
- isPopulated = this.isTablePopulated(table.getName());
- if (isPopulated == false) {
- break;
- }
- }
- return isPopulated;
- }
-
- /**
- *
- * @param tableName
- * @return Count of rows present in the table specified by tableName
- */
- protected boolean isTablePopulated(String tableName) {
- boolean isPopulated = false;
- Connection dbConnection = null;
- Statement dbStatement = null;
-
- try {
- dbConnection = DBConnectionHelper.createConnection(dbConfig.getConnectionInfo());
- dbStatement = dbConnection.createStatement();
- String sqlString = "select count(*) from " + tableName;
-
- this.logger.log(Level.DEBUG, CLASS_NAME + ".isTablePopulated()=> sqlString => '" + sqlString + "'");
-
- ResultSet rs = dbStatement.executeQuery(sqlString);
- rs.next();
-
- if (rs != null) {
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".isTablePopulated()=> pointer set");
- }
- }
-
- int count = rs.getInt(1);
-
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".isTablePopulated()=> '" + tableName + "' => " + count);
- }
-
- if (count > 0) {
- isPopulated = true;
- }
-
- } catch (SQLException e) {
- // ignore and return false
- } finally {
- try {
- dbStatement.close();
- dbConnection.close();
- } catch (SQLException e1) {
- // ignore and return false
- }
- }
-
- return isPopulated;
- }
-
- protected String generateInsertSQL(Connection dbConnection, String tableName, String rowValues) throws SQLException {
- StringBuffer sqlBuffer = new StringBuffer(50);
-
- Statement dbStatement = dbConnection.createStatement();
- ResultSet dummyRS = dbStatement.executeQuery("SELECT * FROM "+tableName);
- ResultSetMetaData rsMetaData = dummyRS.getMetaData();
-
-
- sqlBuffer.append("INSERT INTO ").append(tableName).append(" (");
-
- int numberOfColumns = rsMetaData.getColumnCount();
- String columnName = null;
- int i;
- for (i = 1; i <= numberOfColumns -1; i++) {
- //get the column's name.
- columnName = rsMetaData.getColumnName(i);
- if(!rsMetaData.isAutoIncrement(i)){
- sqlBuffer.append(columnName).append(",");
- }
- else{
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData()=> auto increment column => " + i + " "+columnName);
- }
- }
- }
- sqlBuffer.append(rsMetaData.getColumnName(i)).append(") ");
- sqlBuffer.append("VALUES (").append(rowValues).append(")");
-
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData()=> SQL Clause => " + sqlBuffer);
- }
-
- return sqlBuffer.toString();
- }
-
- public void initializeDatabaseData() {
- Connection dbConnection = null;
- Statement dbStatement = null;
-
- try {
- dbConnection = DBConnectionHelper.createConnection(dbConfig.getConnectionInfo());
- dbStatement = dbConnection.createStatement();
-
- Iterator tableIterator = dbConfig.getTable().iterator();
- while (tableIterator.hasNext()) {
- Table table = (Table) tableIterator.next();
-
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData()=> INSERT FOR TABLE => '" + table.getName() + "'");
- }
-
- //String columnClause = generateInsertSQL(dbConnection, table.getName());
-
- String tableName = table.getName();
- Iterator dataIterator = table.getRow().iterator();
- while (dataIterator.hasNext()) {
- String tableRow = (String) dataIterator.next();
- String sqlString = generateInsertSQL(dbConnection, tableName, tableRow);
-
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData()=> sqlString => '" + sqlString + "'");
- }
-
- try {
- dbStatement.executeUpdate(sqlString);
- }catch(SQLException e){
- //e.printStackTrace();
- //ignore and jump to new table
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData() - Error inserting table data : " + e.getMessage(), e);
- }
- }
- }
- }
- } catch (SQLException e) {
- // ignore and return false
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData() - Internal error : " + e.getMessage(), e);
- }
- } finally {
- try {
- dbStatement.close();
- dbConnection.close();
- } catch (SQLException e1) {
- // ignore and return false
- }
- }
- }
-
- public void deleteDatabaseData() {
- Connection dbConnection = null;
- Statement dbStatement = null;
-
- try {
- dbConnection = DBConnectionHelper.createConnection(dbConfig.getConnectionInfo());
- dbStatement = dbConnection.createStatement();
- //inverse order - to take care of parent-child
- List tables = dbConfig.getTable();
- for(int i=tables.size()-1; i>-1; i-- ){
- Table table = (Table) tables.get(i);
- String sqlString = "DELETE FROM " + table.getName() ;
-
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".deleteDatabaseData()=> sqlString => '" + sqlString + "'");
- }
-
- try {
- dbStatement.executeQuery(sqlString);
- }catch(SQLException e){
- e.printStackTrace();
- //ignore and jump to new table
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".deleteDatabaseData() - Error inserting table data : " + e.getMessage(), e);
- }
- }
- }
- } catch (SQLException e) {
- // ignore and return false
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + ".initializeDatabaseData() - Internal error : " + e.getMessage(), e);
- }
- } finally {
- try {
- dbStatement.close();
- dbConnection.close();
- } catch (SQLException e1) {
- // ignore and return false
- }
- }
- }
-}
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBHelper.java b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBHelper.java
deleted file mode 100644
index d048f73245..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBHelper.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.das.rdb.dbconfig;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Iterator;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-
-public class DBHelper {
- private static final String CLASS_NAME = "DBHelper";
-
- private final Logger logger = Logger.getLogger(DBHelper.class);
-
- private final DBConfig dbConfig;
-
- /**
- * Constructor
- *
- * @param DBConfig
- */
- protected DBHelper(DBConfig dbConfig) {
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + "()");
- }
- this.dbConfig = dbConfig;
- }
-
- /**
- * Check if tables specified in Config exist
- *
- * @return true if all specified tables exist, false otherwise
- */
- protected boolean isDatabaseReady() {
- boolean bResult = true;
-
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + "isDatabaseReady()");
- }
-
- Connection dbConnection = null;
- DatabaseMetaData dbMetaData = null;
- try {
- dbConnection = DBConnectionHelper.createConnection(dbConfig.getConnectionInfo());
- dbMetaData = dbConnection.getMetaData();
-
- if (dbConfig.getTable() != null && dbConfig.getTable().size() > 0) {
- Iterator tableIterator = dbConfig.getTable().iterator();
- while (tableIterator.hasNext()) {
- Table table = (Table) tableIterator.next();
-
- if (!dbMetaData.getTables(null, null, table.getName(), null).next()) {
- bResult = false;
- }
-
- }
- }
- } catch (SQLException e) {
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, "Error retrieving database metadata", e);
- }
- } finally {
- try {
- dbConnection.close();
- } catch (SQLException e) {
- // ignore here
- }
- }
-
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + "isDatabaseReady() exit");
- }
-
- return bResult;
- }
-
- /**
- * Create the database tables based on dbConfig definition
- */
- protected void initializeDatabase() {
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + "initializeDatabase()");
- }
-
- Connection dbConnection = null;
- Statement dbStatement = null;
- try {
- dbConnection = DBConnectionHelper.createConnection(dbConfig.getConnectionInfo());
- dbStatement = dbConnection.createStatement();
-
- if (dbConfig.getTable() != null && dbConfig.getTable().size() > 0) {
- Iterator tableIterator = dbConfig.getTable().iterator();
- while (tableIterator.hasNext()) {
- Table table = (Table) tableIterator.next();
-
- if (table.getSQLCreate() != null && table.getSQLCreate().length() > 0) {
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, "Creating table '" + table.getName() + "' => " + table.getSQLCreate());
- }
-
- dbStatement.execute(table.getSQLCreate());
- }
- }
- }
- } catch (SQLException e) {
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, "Error retrieving database metadata", e);
- }
- } finally {
- try {
- dbStatement.close();
- dbConnection.close();
- } catch (SQLException e) {
- // ignore here
- }
- }
-
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + "initializeDatabase() exit");
- }
- }
-
- /**
- * Drop the database tables based on dbConfig definition
- */
- protected void dropDatabaseTables() {
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + "dropDatabaseTables()");
- }
-
- Connection dbConnection = null;
- Statement dbStatement = null;
- try {
- dbConnection = DBConnectionHelper.createConnection(dbConfig.getConnectionInfo());
- dbStatement = dbConnection.createStatement();
-
- if (dbConfig.getTable() != null && dbConfig.getTable().size() > 0) {
- Iterator tableIterator = dbConfig.getTable().iterator();
- while (tableIterator.hasNext()) {
- Table table = (Table) tableIterator.next();
-
- if (table.getSQLCreate() != null && table.getSQLCreate().length() > 0) {
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, "Dropping table '" + table.getName() );
- }
-
- try {
- dbStatement.execute("DROP TABLE " + table.getName());
- } catch (SQLException e) {
- //ignore
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, "Error droping table '" + table.getName() + "'", e);
- }
- }
- }
- }
- }
- } catch (SQLException e) {
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, "Error droping table", e);
- }
- } finally {
- try {
- dbStatement.close();
- dbConnection.close();
- } catch (SQLException e) {
- // ignore here
- }
- }
-
- if (logger.isDebugEnabled()) {
- this.logger.log(Level.DEBUG, CLASS_NAME + "dropDatabaseTables() exit");
- }
- }
-}
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializer.java b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializer.java
deleted file mode 100644
index cc6a670dfd..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializer.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.das.rdb.dbconfig;
-
-import java.io.InputStream;
-import java.sql.Connection;
-
-/**
- * This is the master class having public utility APIs exposed for DAS sample creater - for table and data maintainance.
- *
- */
-public class DBInitializer {
- private static final String DEFAULT_CANNED_DB_CONFIGURATION = "CannedSampleDBConfig.xml";
-
- /**
- * Database configuration model
- */
- protected DBConfig dbConfig;
-
- /**
- * Database connection
- */
- protected Connection connection;
-
- /**
- * To manage database connection
- */
- protected DBConnectionHelper dbConnectionHelper;
-
- /**
- * To manage database phisical structure
- */
- protected DBHelper dbHelper;
-
- /**
- * To manage database population
- */
- protected DBDataHelper dbDataHelper;
-
- /**
- * Create instance of DBInitHelper based on default canned database configuration
- *
- * @param dbconfigFileLocation
- * @throws Exception
- */
- public DBInitializer() {
- InputStream dbConfigStream = this.getClass().getClassLoader().getResourceAsStream(DEFAULT_CANNED_DB_CONFIGURATION);
- init(dbConfigStream);
- }
-
- /**
- * Create instance of DBInitHelper based on Config file location
- *
- * @param dbconfigFileLocation
- * @throws Exception
- */
- public DBInitializer(String dbconfigFileLocation) throws Exception {
- InputStream dbConfigStream = this.getClass().getClassLoader().getResourceAsStream(dbconfigFileLocation);
- init(dbConfigStream);
- }
-
- /**
- * Create instance of DBInitHelper based on Config stream
- *
- * @param dbconfigStream
- * @throws Exception
- */
- public DBInitializer(InputStream dbConfigStream) throws Exception {
- init(dbConfigStream);
- }
-
- /**
- * Initialize helper members based on Config
- *
- * @param dbconfigStream
- */
- protected void init(InputStream dbconfigStream) {
- dbConfig = DBConfigUtil.loadDBConfig(dbconfigStream);
-
- dbConnectionHelper = new DBConnectionHelper();
- dbHelper = new DBHelper(dbConfig);
- dbDataHelper = new DBDataHelper(dbConfig);
-
- }
-
- /**
- * Check if the Database and all tables have been created on the database
- *
- * @return return true if tables exist, else return false.
- */
- public boolean isDatabaseReady() {
- return dbHelper.isDatabaseReady();
- }
-
- /**
- *
- * @return - return true if all tables have at least a row, false otherwise
- */
- public boolean isDatabasePopulated() {
- return dbDataHelper.isDatabasePopulated();
- }
-
- /**
- * Create tables and populate data.
- *
- * @param clean - If true, tables will be force dropped and recreated, else it will skip table creation for pre-existing tables.
- * @throws Exception
- */
- public void initializeDatabase(boolean clean) throws DatabaseInitializerException {
- if (clean) {
- dbHelper.dropDatabaseTables();
- }
- dbHelper.initializeDatabase();
- dbDataHelper.initializeDatabaseData();
- }
-
- /**
- * Populate database data
- *
- * @param clean If true, table data will be droped before data is created
- */
- public void initializeDatabaseData(boolean clean) throws DatabaseInitializerException{
- if (clean) {
- dbDataHelper.deleteDatabaseData();
- }
- dbDataHelper.initializeDatabaseData();
- }
-
- /**
- * Refresh data in tables.
- *
- * @throws Exception
- */
- public void refreshDatabaseData() throws DatabaseInitializerException {
- initializeDatabase(true);
- }
-}
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DataSourceInitializationException.java b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DataSourceInitializationException.java
deleted file mode 100644
index ef5bef7761..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DataSourceInitializationException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.das.rdb.dbconfig;
-
-/**
- *
- * Class responsible to throw exception encountered when initializing DataSource.
- *
- */
-public class DataSourceInitializationException extends RuntimeException {
- private static final long serialVersionUID = 302160989411041041L;
-
- public DataSourceInitializationException(String string) {
- super(string);
- }
-
- public DataSourceInitializationException(Throwable e){
- super(e);
- }
-
- public DataSourceInitializationException(String string, Throwable e) {
- super(string, e);
- }
-}
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DatabaseInitializerException.java b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DatabaseInitializerException.java
deleted file mode 100644
index 8c4fd0d71b..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DatabaseInitializerException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.das.rdb.dbconfig;
-
-/**
- *
- * Class responsible to throw exception encountered when initializing DataSource.
- *
- */
-public class DatabaseInitializerException extends RuntimeException {
- private static final long serialVersionUID = 302160989411041041L;
-
- public DatabaseInitializerException(String string) {
- super(string);
- }
-
- public DatabaseInitializerException(Throwable e){
- super(e);
- }
-
- public DatabaseInitializerException(String string, Throwable e) {
- super(string, e);
- }
-}
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/CannedSampleDBConfig.xml b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/CannedSampleDBConfig.xml
deleted file mode 100644
index 2b7b1ba1fd..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/CannedSampleDBConfig.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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.
- -->
-<DBConfig xmlns="http:///org.apache.tuscany.das.rdb/dbconfig.xsd">
- <ConnectionInfo>
- <ConnectionProperties
- driverClass="org.apache.derby.jdbc.EmbeddedDriver"
- databaseURL="jdbc:derby:c:/dastest; create = true"
- loginTimeout="600000"/>
- </ConnectionInfo>
- <Table name="COMPANY" SQLCreate="CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY , NAME VARCHAR(30))" >
- <row>'ACME Publishing'</row>
- <row>'Do-rite plumbing'</row>
- <row>'MegaCorp'</row>
- </Table>
- <Table name="DEPARTMENT" SQLCreate="CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY, NAME VARCHAR(30),LOCATION VARCHAR(30), DEPNUMBER VARCHAR(10),COMPANYID INT)">
- <row>'Advanced Technologies', 'NY', '123', 1</row>
- <row>'Default Name', '', '', 51</row>
- <row>'Default Name', '', '', 51</row>
- <row>'Default Name', '', '', 51</row>
- <row>'Default Name', '', '', 51</row>
- <row>'Default Name', '', '', 51</row>
- <row>'Default Name', '', '', 51</row>
- </Table>
- <Table name="EMPLOYEE" SQLCreate="CREATE TABLE EMPLOYEE (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY,NAME VARCHAR(30),SN VARCHAR(10), MANAGER SMALLINT, DEPARTMENTID INT)">
- <row>'John Jones','E0001',0,12</row>
- <row>'Mary Smith','E0002',1,null</row>
- <row>'Jane Doe','E0003',0,12</row>
- <row>'Al Smith','E0004',1,12</row>
- </Table>
-</DBConfig>
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/DBConfig.xsd b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/DBConfig.xsd
deleted file mode 100644
index 798c88c75c..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/DBConfig.xsd
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<xsd:schema xmlns:DBConfig="http:///org.apache.tuscany.das.rdb/dbconfig.xsd"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- targetNamespace="http:///org.apache.tuscany.das.rdb/dbconfig.xsd">
-
- <xsd:element name="DBConfig" type="DBConfig:DBConfig"/>
-
- <xsd:complexType name="DBConfig">
- <xsd:sequence>
- <xsd:element maxOccurs="1" minOccurs="1" name="ConnectionInfo" type="DBConfig:ConnectionInfo"/>
- <xsd:element maxOccurs="unbounded" minOccurs="1" name="Table" type="DBConfig:Table"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="ConnectionInfo">
- <xsd:sequence>
- <xsd:element maxOccurs="1" minOccurs="0" name="ConnectionProperties" type="DBConfig:ConnectionProperties"/>
- </xsd:sequence>
- <xsd:attribute name="dataSource" type="xsd:string"/>
- </xsd:complexType>
-
- <xsd:complexType name="ConnectionProperties">
- <xsd:attribute name="driverClass" type="xsd:string"/>
- <xsd:attribute name="databaseURL" type="xsd:string"/>
- <xsd:attribute default="" name="userName" type="xsd:string"/>
- <xsd:attribute default="" name="password" type="xsd:string"/>
- <xsd:attribute default="0" name="loginTimeout" type="xsd:int"/>
- </xsd:complexType>
-
- <xsd:complexType name="Table">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="1" name="row" type="xsd:string"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"/>
- <xsd:attribute name="SQLCreate" type="xsd:string"/>
- </xsd:complexType>
-</xsd:schema>
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/META-INF/LICENSE b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index 281ac26753..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,345 +0,0 @@
-
- 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 under Apache Software License 2.0 (log4j-1.2.12.jar, derby 10.1.2.1.jar and stax-api-1.0.1.jar)
-
-===============================================================================================================
-
-
-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.
-
-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.2.jar
-codegen-ecore-2.2.2.jar
-common-2.2.2.jar
-ecore-2.2.2.jar
-ecore-change-2.2.2.jar
-ecore-xmi-2.2.2.jar
-xsd-2.2.2.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/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/META-INF/NOTICE b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index c2cf1f95b4..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,32 +0,0 @@
-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/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/META-INF/README b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/META-INF/README
deleted file mode 100644
index 723f3fd3ab..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/META-INF/README
+++ /dev/null
@@ -1,35 +0,0 @@
-Apache Tuscany M1 build (May, 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/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/log4j.properties b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/log4j.properties
deleted file mode 100644
index 3b0e5074da..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# Set root logger level to DEBUG and its only appender to A1.
-
-log4j.rootLogger=NONE, 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
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-
-# 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
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/test/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializerTestCase.java b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/test/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializerTestCase.java
deleted file mode 100644
index 3bd0bae407..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/test/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializerTestCase.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.das.rdb.dbconfig;
-
-import junit.framework.TestCase;
-
-
-
-/**
- * Tests the Converter framwork
- */
-public class DBInitializerTestCase extends TestCase {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
-
- public void testCreateDatabase() throws Exception {
- DBInitializer dbInitializer = new DBInitializer("dbConfig.xml");
- dbInitializer.initializeDatabase(true);
- }
-
- public void something() throws Exception {
-// try{
-// //DBInitHelper dbInit = new DBInitHelper("DBConfig.xml");
-// DBInitializer dbInit = new DBInitializer(new FileInputStream("c:/DBConfig.xml"));
-// dbInit.initializeDatabase(true);
-//
-// System.out.println("check schema created:"+dbInit.isDatabaseReady());
-// System.out.println("check data created:"+dbInit.isDataCreated());
-//
-// dbInit.deleteData();
-// System.out.println("check data created after deleteData:"+dbInit.isDataCreated());
-//
-// dbInit.deleteSchema();
-// System.out.println("after deleteSchema check schema created:"+dbInit.isDatabaseReady());
-//
-// dbInit.createSchema(false);
-// System.out.println("check schema created after createSchema:"+dbInit.isDatabaseReady());
-//
-// dbInit.refreshData(true);
-// System.out.println("check data created after refreshData:"+dbInit.isDataCreated());
-// }catch(Exception e){
-// e.printStackTrace();
-// }
- }
-}
diff --git a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/test/resources/dbConfig.xml b/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/test/resources/dbConfig.xml
deleted file mode 100644
index 18eb5b429d..0000000000
--- a/das-java/tags/1.0-incubating-beta1-rc1/samples/dbconfig/src/test/resources/dbConfig.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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.
- -->
-<DBConfig xmlns="http:///org.apache.tuscany.das.rdb/dbconfig.xsd">
- <ConnectionInfo>
- <ConnectionProperties
- driverClass="org.apache.derby.jdbc.EmbeddedDriver"
- databaseURL="jdbc:derby:target/dastest; create = true"
- loginTimeout="600000"/>
- </ConnectionInfo>
- <Table name="COMPANY" SQLCreate="CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(30), EOTMID INTEGER)">
- <row>51, 'ACME Publishing', 0</row>
- <row>52, 'Do-rite plumbing', 0</row>
- <row>53, 'MegaCorp', 0</row>
- </Table>
- <Table name="DEPARTMENT" SQLCreate="CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY, NAME VARCHAR(30),LOCATION VARCHAR(30), DEPNUMBER VARCHAR(10),COMPANYID INT)">
- <row>'Advanced Technologies', 'NY', '123', 1</row>
- <row>'Default Name', '', '', 51</row>
- <row>'Default Name', '', '', 51</row>
- <row>'Default Name', '', '', 51</row>
- <row>'Default Name', '', '', 51</row>
- <row>'Default Name', '', '', 51</row>
- <row>'Default Name', '', '', 51</row>
- </Table>
- <Table name="EMPLOYEE" SQLCreate="CREATE TABLE EMPLOYEE (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY,NAME VARCHAR(30),SN VARCHAR(10), MANAGER SMALLINT, DEPARTMENTID INT)">
- <row>'John Jones','E0001',0,12</row>
- <row>'Mary Smith','E0002',1,null</row>
- <row>'Jane Doe','E0003',0,12</row>
- <row>'Al Smith','E0004',1,12</row>
- </Table>
-</DBConfig>