geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: rev 47629 - in geronimo/trunk/modules: assembly assembly/src/plan assembly/src/var/config derby derby/src derby/src/java derby/src/java/org derby/src/java/org/apache derby/src/java/org/apache/geronimo derby/src/java/org/apache/geronimo/derby derby/src/test derby/src/test/org derby/src/test/org/apache derby/src/test/org/apache/geronimo derby/src/test/org/apache/geronimo/derby
Date Fri, 01 Oct 2004 05:17:29 GMT
Author: jboynes
Date: Thu Sep 30 22:17:28 2004
New Revision: 47629

Added:
   geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
   geronimo/trunk/modules/derby/   (props changed)
   geronimo/trunk/modules/derby/LICENSE.txt
   geronimo/trunk/modules/derby/NOTICE.txt
   geronimo/trunk/modules/derby/derby.iml
   geronimo/trunk/modules/derby/locator.ent
   geronimo/trunk/modules/derby/project.properties
   geronimo/trunk/modules/derby/project.xml
   geronimo/trunk/modules/derby/src/
   geronimo/trunk/modules/derby/src/java/
   geronimo/trunk/modules/derby/src/java/org/
   geronimo/trunk/modules/derby/src/java/org/apache/
   geronimo/trunk/modules/derby/src/java/org/apache/geronimo/
   geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/
   geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
   geronimo/trunk/modules/derby/src/test/
   geronimo/trunk/modules/derby/src/test/org/
   geronimo/trunk/modules/derby/src/test/org/apache/
   geronimo/trunk/modules/derby/src/test/org/apache/geronimo/
   geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/
   geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/DerbySystemGBeanTest.java
Modified:
   geronimo/trunk/modules/assembly/maven.xml
   geronimo/trunk/modules/assembly/project.xml
   geronimo/trunk/modules/assembly/src/var/config/config.list
Log:
New module for Apache Derby embedded database plus a deployment plan to include it

Modified: geronimo/trunk/modules/assembly/maven.xml
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml	(original)
+++ geronimo/trunk/modules/assembly/maven.xml	Thu Sep 30 22:17:28 2004
@@ -240,6 +240,17 @@
             <ant:arg value="${maven.repo.local}/tranql/rars/tranql-connector-${tranql_connector_version}.rar"/>
         </ant:java>
 
+        <!-- building system database configuration-->
+        <ant:echo>Building system database configuration</ant:echo>
+        <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+            <ant:jvmarg value="-ea"/>
+            <ant:arg value="--install"/>
+            <ant:arg value="--plan"/>
+            <ant:arg value="target/plan/system-database-plan.xml"/>
+            <ant:arg value="--module"/>
+            <ant:arg value="${maven.repo.local}/tranql/rars/tranql-connector-${tranql_connector_version}.rar"/>
+        </ant:java>
+
         <!-- build the J2EEServer secure configuration -->
         <ant:echo>Building secure server configuration</ant:echo>
         <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">

Modified: geronimo/trunk/modules/assembly/project.xml
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml	(original)
+++ geronimo/trunk/modules/assembly/project.xml	Thu Sep 30 22:17:28 2004
@@ -204,6 +204,15 @@
 
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-derby</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.currentVersion}</version>
             <properties>
@@ -314,6 +323,15 @@
             <groupId>axion</groupId>
             <artifactId>axion</artifactId>
             <version>&axion-version;</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>&derby-version;</version>
             <properties>
                 <repository>true</repository>
             </properties>

Added: geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml	Thu Sep 30 22:17:28
2004
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    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.
+-->
+
+<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+    version="1.5"
+    configId="org/apache/geronimo/SystemDatabase"
+    parentId="org/apache/geronimo/Server">
+
+    <dependency>
+        <uri>derby/jars/derby-${derby_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-derby-${geronimo_version}.jar</uri>
+    </dependency>
+
+    <resourceadapter>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>SystemDatasource</name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="Driver">org.apache.derby.jdbc.EmbeddedDriver</config-property-setting>
+                    <config-property-setting name="ConnectionURL">jdbc:derby:SystemDatabase;create=true</config-property-setting>
+                    <config-property-setting name="ExceptionSorterClass">org.tranql.connector.NoExceptionsAreFatalSorter</config-property-setting>
+                    <connectionmanager>
+                        <local-transaction/>
+                        <single-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                        </single-pool>
+                    </connectionmanager>
+                    <global-jndi-name>SystemDatasource</global-jndi-name>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+
+    <gbean name="geronimo.server:type=DerbyDatabase,role=SystemDatabase" class="org.apache.geronimo.derby.DerbySystemGBean">
+        <reference name="serverInfo">geronimo.system:role=ServerInfo</reference>
+        <attribute name="derbySystemHome" type="java.lang.String">var/derby</attribute>
+    </gbean>
+<!--
+    <gbean name="geronimo.server:type=ThreadPooledTimer,name=JDBCTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
+        <attribute name="repeatCount" type="int">5</attribute>
+        <reference name="TransactionContextManager">geronimo.server:type=TransactionContextManager</reference>
+        <reference name="ManagedConnectionFactoryWrapper">geronimo.server:J2EEServer=geronimo,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</reference>
+        <reference name="ThreadPool">geronimo.server:type=ThreadPool,name=DefaultThreadPool</reference>
+    </gbean>
+
+    <gbean name="geronimo.server:type=ThreadPooledTimer,name=JDBCNonTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
+        <reference name="ManagedConnectionFactoryWrapper">geronimo.server:J2EEServer=geronimo,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</reference>
+        <reference name="ThreadPool">geronimo.server:type=ThreadPool,name=DefaultThreadPool</reference>
+    </gbean>
+-->
+
+</connector>

Modified: geronimo/trunk/modules/assembly/src/var/config/config.list
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.list	(original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.list	Thu Sep 30 22:17:28 2004
@@ -1,2 +1,3 @@
 org/apache/geronimo/System
 org/apache/geronimo/Server
+org/apache/geronimo/SystemDatabase

Added: geronimo/trunk/modules/derby/LICENSE.txt
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/derby/LICENSE.txt	Thu Sep 30 22:17:28 2004
@@ -0,0 +1,203 @@
+
+                                 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.
+

Added: geronimo/trunk/modules/derby/NOTICE.txt
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/derby/NOTICE.txt	Thu Sep 30 22:17:28 2004
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/trunk/modules/derby/derby.iml
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/derby/derby.iml	Thu Sep 30 22:17:28 2004
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <exclude-output />
+    <exclude-exploded />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="kernel" />
+    <orderEntry type="library" name="derby" level="application" />
+    <orderEntry type="library" name="junit-3.8.1" level="application" />
+    <orderEntry type="module" module-name="system" />
+    <orderEntryProperties />
+  </component>
+</module>
+

Added: geronimo/trunk/modules/derby/locator.ent
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/derby/locator.ent	Thu Sep 30 22:17:28 2004
@@ -0,0 +1,3 @@
+<!ENTITY % versions SYSTEM "file:../../etc/version-info.ent">
+
+

Added: geronimo/trunk/modules/derby/project.properties
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/derby/project.properties	Thu Sep 30 22:17:28 2004
@@ -0,0 +1,5 @@
+##
+## $Rev: 47137 $ $Date: 2004-09-24 00:04:29 -0700 (Fri, 24 Sep 2004) $
+##
+
+maven.repo.remote=http://minotaur.apache.org/~jboynes
\ No newline at end of file

Added: geronimo/trunk/modules/derby/project.xml
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/derby/project.xml	Thu Sep 30 22:17:28 2004
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    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.
+-->
+
+<!DOCTYPE project [
+<!ENTITY % locator SYSTEM "file:locator.ent">
+%locator;
+%versions;
+]>
+
+<!-- $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>${basedir}/../../etc/project.xml</extend>
+
+    <!-- ===================== -->
+    <!-- Module Identification -->
+    <!-- ===================== -->
+
+    <name>Geronimo :: Derby</name>
+    <id>geronimo-derby</id>
+    <shortDescription>Integration with Embedded Derby</shortDescription>
+    <description>Wrapper for using Apache Derby as a bundled database.</description>
+    <url>http://geronimo.apache.org/modules/derby/</url>
+    <siteDirectory>/www/geronimo.apache.org/modules/derby</siteDirectory>
+    <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/derby</distributionDirectory>
+
+    <package>org.apache.geronimo.derby</package>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>&derby-version;</version>
+        </dependency>
+        <dependency>
+            <groupId>derby</groupId>
+            <artifactId>derbynet</artifactId>
+            <version>&derby-version;</version>
+        </dependency>
+    </dependencies>
+
+
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <unitTest>
+            <includes>
+                <include>**/*Test.java</include>
+            </includes>
+            <excludes>
+                <exclude>**/Abstract*.java</exclude>
+            </excludes>
+        </unitTest>
+    </build>
+</project>

Added: geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
Thu Sep 30 22:17:28 2004
@@ -0,0 +1,84 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  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.
+ */
+
+package org.apache.geronimo.derby;
+
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.WaitingException;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+
+import java.io.File;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+/**
+ * A GBean that represents an instance of an Apache Derby system (a system being
+ * a collection of different databases).
+ *
+ * @version $Rev: 47413 $ $Date: 2004-09-28 11:46:39 -0700 (Tue, 28 Sep 2004) $
+ */
+public class DerbySystemGBean implements GBeanLifecycle {
+    private static final String SYSTEM_HOME = "derby.system.home";
+    private static final String SHUTDOWN_ALL = "jdbc:derby:;shutdown=true";
+
+    private final ServerInfo serverInfo;
+    private final String systemHome;
+
+    public DerbySystemGBean(ServerInfo serverInfo, String derbySystemHome) {
+        this.serverInfo = serverInfo;
+        this.systemHome = derbySystemHome;
+    }
+
+    public void doStart() throws WaitingException, Exception {
+        // set up the system property for the database home
+        String actualHome = System.getProperty(SYSTEM_HOME);
+        if (actualHome == null) {
+            actualHome = serverInfo.resolvePath(systemHome);
+        }
+        System.setProperty(SYSTEM_HOME, actualHome);
+        // load the Embedded driver to initialize the home
+        new org.apache.derby.jdbc.EmbeddedDriver();
+    }
+
+    public void doStop() throws WaitingException, Exception {
+        doFail();
+    }
+
+    public void doFail() {
+        try {
+            DriverManager.getConnection(SHUTDOWN_ALL, null, null);
+        } catch (SQLException e) {
+            // SQLException gets thrown on successful shutdown so ignore
+        }
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
+    static {
+        GBeanInfoFactory infoFactory = new GBeanInfoFactory(DerbySystemGBean.class);
+        infoFactory.addAttribute("derbySystemHome", String.class, true);
+        infoFactory.addReference("serverInfo", ServerInfo.class);
+        infoFactory.setConstructor(new String[]{"serverInfo", "derbySystemHome"});
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+}

Added: geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/DerbySystemGBeanTest.java
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/DerbySystemGBeanTest.java
Thu Sep 30 22:17:28 2004
@@ -0,0 +1,80 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  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.
+ */
+
+package org.apache.geronimo.derby;
+
+import junit.framework.TestCase;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
+/**
+ * @version $Rev: 47413 $ $Date: 2004-09-28 11:46:39 -0700 (Tue, 28 Sep 2004) $
+ */
+public class DerbySystemGBeanTest extends TestCase {
+    private File systemDir;
+
+    public void testCreateSystemUsingServerInfo() throws Exception {
+        ServerInfo serverInfo = new ServerInfo(systemDir.toString());
+        String derbyDir = "var/dbderby";
+        DerbySystemGBean gbean = new DerbySystemGBean(serverInfo, derbyDir);
+        try {
+            gbean.doStart();
+            new org.apache.derby.jdbc.EmbeddedDriver();
+            connect();
+            gbean.doStop();
+            assertTrue(new File(systemDir, derbyDir+"/derby.log").exists());
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
+    }
+
+    private void connect() throws SQLException {
+        Connection c = DriverManager.getConnection("jdbc:derby:testdb;create=true");
+        c.close();
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        systemDir = File.createTempFile("derbyTest", ".tmp");
+        systemDir.delete();
+        systemDir.mkdir();
+
+        Properties props = System.getProperties();
+        props.remove("derby.system.home");
+    }
+
+    protected void tearDown() throws Exception {
+        delete(systemDir);
+        super.tearDown();
+    }
+
+    private void delete(File file) throws IOException {
+        File[] files = file.listFiles();
+        if (files != null) {
+            for (int i = 0; i < files.length; i++) {
+                delete(files[i]);
+            }
+        }
+        file.delete();
+    }
+}

Mime
View raw message