Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 26920 invoked from network); 2 Oct 2004 01:41:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 2 Oct 2004 01:41:57 -0000 Received: (qmail 15298 invoked by uid 500); 2 Oct 2004 01:41:55 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 15253 invoked by uid 500); 2 Oct 2004 01:41:55 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 15240 invoked by uid 99); 2 Oct 2004 01:41:54 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 01 Oct 2004 18:41:54 -0700 Received: (qmail 26881 invoked by uid 65534); 2 Oct 2004 01:41:53 -0000 Date: 2 Oct 2004 01:41:53 -0000 Message-ID: <20041002014153.26873.qmail@minotaur.apache.org> From: dain@apache.org To: scm@geronimo.apache.org Subject: svn commit: rev 51781 - in geronimo/trunk/modules/derby: . src/java/org/apache/geronimo/derby src/test/org/apache/geronimo/derby X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: dain Date: Fri Oct 1 18:41:51 2004 New Revision: 51781 Modified: geronimo/trunk/modules/derby/ (props changed) geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystem.java geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/DerbySystemGBeanTest.java Log: Disabled Derby tests since Derby does not run on Mac OS X and FreeBSD Added default svn:ignore property Added license header Cleaned up imports Modified: geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java ============================================================================== --- geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java (original) +++ geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java Fri Oct 1 18:41:51 2004 @@ -16,15 +16,15 @@ */ package org.apache.geronimo.derby; +import java.net.InetAddress; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.derby.drda.NetworkServerControl; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoFactory; import org.apache.geronimo.gbean.GBeanLifecycle; import org.apache.geronimo.gbean.WaitingException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.net.InetAddress; /** * A GBean that manages remote network access to the embedded Derby server. Modified: geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystem.java ============================================================================== --- geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystem.java (original) +++ geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystem.java Fri Oct 1 18:41:51 2004 @@ -1,11 +1,24 @@ +/** + * + * 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; /** - * Created by IntelliJ IDEA. - * User: jboynes - * Date: Oct 1, 2004 - * Time: 11:25:52 AM - * To change this template use File | Settings | File Templates. + * @version $Rev$ $Date$ */ public interface DerbySystem { } Modified: geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java ============================================================================== --- geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java (original) +++ geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java Fri Oct 1 18:41:51 2004 @@ -17,17 +17,16 @@ package org.apache.geronimo.derby; -import org.apache.geronimo.gbean.GBeanLifecycle; -import org.apache.geronimo.gbean.WaitingException; +import java.sql.DriverManager; +import java.sql.SQLException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoFactory; +import org.apache.geronimo.gbean.GBeanLifecycle; +import org.apache.geronimo.gbean.WaitingException; import org.apache.geronimo.system.serverinfo.ServerInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -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 Modified: geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/DerbySystemGBeanTest.java ============================================================================== --- geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/DerbySystemGBeanTest.java (original) +++ geronimo/trunk/modules/derby/src/test/org/apache/geronimo/derby/DerbySystemGBeanTest.java Fri Oct 1 18:41:51 2004 @@ -17,9 +17,6 @@ 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; @@ -27,13 +24,20 @@ import java.sql.SQLException; import java.util.Properties; +import junit.framework.TestCase; +import org.apache.geronimo.system.serverinfo.ServerInfo; + /** * @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 { + public void testNothing() { + } + + // DISABLED: Derby does not run on Mac OS X or FreeBSD + public void XtestCreateSystemUsingServerInfo() throws Exception { ServerInfo serverInfo = new ServerInfo(systemDir.toString()); String derbyDir = "var/dbderby"; DerbySystemGBean gbean = new DerbySystemGBean(serverInfo, derbyDir);