Return-Path: Delivered-To: apmail-cayenne-dev-archive@www.apache.org Received: (qmail 24474 invoked from network); 19 Nov 2009 12:09:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 19 Nov 2009 12:09:09 -0000 Received: (qmail 40346 invoked by uid 500); 19 Nov 2009 12:09:09 -0000 Delivered-To: apmail-cayenne-dev-archive@cayenne.apache.org Received: (qmail 40321 invoked by uid 500); 19 Nov 2009 12:09:08 -0000 Mailing-List: contact dev-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list dev@cayenne.apache.org Received: (qmail 40311 invoked by uid 99); 19 Nov 2009 12:09:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Nov 2009 12:09:08 +0000 X-ASF-Spam-Status: No, hits=2.2 required=10.0 tests=HTML_MESSAGE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of tkachovaolga@gmail.com designates 74.125.78.150 as permitted sender) Received: from [74.125.78.150] (HELO ey-out-1920.google.com) (74.125.78.150) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Nov 2009 12:08:59 +0000 Received: by ey-out-1920.google.com with SMTP id 4so428728eyg.44 for ; Thu, 19 Nov 2009 04:08:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type; bh=vtQhnEQ6c5zHgC8ZVDQcqnBsTUil+15goMLqBHa/lLw=; b=INeBDn98LGQDFoFzYtsBSAx2bOMD7AySOZWylzZDSXUBwEsgiS3PD8LxyDAI9bsuCv KPegZdbVwVh5dpQnPY1QfqNlkRLI/iqCXF6L9YKBf5t9S2dTQu25UJyoewBOB0nRTxaS YoA47mzeMN3FHXNowgAUf+eYKR88Lt2Sn4JyQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; b=Yp8GTtyjtZm/NYKzQDovQRM1kmKx3TnRXvQpUwffImSQ+guB7i6oGaD1Nyl/PCCO2F LW6iR+HA8HLqPlmFLKF18zWwlZRTQcPQh1Fi8K6M08TvSlj9ds100O1L5m5RHXoq05qh zIzlz0vLgSAhH7RyhmzkWvhbCrG6hVM8ZfecU= MIME-Version: 1.0 Received: by 10.213.23.75 with SMTP id q11mr1376353ebb.74.1258632519508; Thu, 19 Nov 2009 04:08:39 -0800 (PST) In-Reply-To: <3219fff70911190338xc487702vca121aca035a62ac@mail.gmail.com> References: <3219fff70911190338xc487702vca121aca035a62ac@mail.gmail.com> Date: Thu, 19 Nov 2009 14:08:39 +0200 Message-ID: <2ad0f7b30911190408m765fa653x98e8fbd2cd9e725c@mail.gmail.com> Subject: Re: svn commit: r882084 - in /cayenne/main/trunk/framework: cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenn From: =?KOI8-R?B?78zYx8Eg9MvB3sXXwQ==?= To: dev@cayenne.apache.org Content-Type: multipart/alternative; boundary=000e0cdfd9ec3a61410478b838d0 X-Virus-Checked: Checked by ClamAV on apache.org --000e0cdfd9ec3a61410478b838d0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable agree, I see it. 2009/11/19 Andrey Razumovsky > Hi Olga, > > Now single JUnit test cannot be launched separately from Eclipse: > junit.framework.AssertionFailedError: Exception in constructor: test > (java.lang.ExceptionInInitializerError > at > > org.apache.cayenne.unit.CayenneResources.setConnectionKey(CayenneResource= s.java:200) > at > > org.apache.cayenne.unit.CayenneResources.loadResources(CayenneResources.j= ava:86) > at > > org.apache.cayenne.unit.CayenneResources.getResources(CayenneResources.ja= va:104) > at org.apache.cayenne.unit.CayenneCase.(CayenneCase.java:66) > at > > org.apache.cayenne.remote.RemoteCayenneCase.(RemoteCayenneCase.java= :33) > at org.apache.cayenne.remote.PropertyTest.(PropertyTest.java:27) > ... ans so on > Caused by: java.lang.NullPointerException > at > > org.apache.cayenne.unit.ConnectionProperties.loadDefaultProperties(Connec= tionProperties.java:101) > at > > org.apache.cayenne.unit.ConnectionProperties.(ConnectionPropertie= s.java:70) > ... 19 more > > Can we use default values for properties missing? > > 2009/11/19 > > > Author: oltka > > Date: Thu Nov 19 09:05:56 2009 > > New Revision: 882084 > > > > URL: http://svn.apache.org/viewvc?rev=3D882084&view=3Drev > > Log: > > move ConnectionProperties class from src/main/java to > > /src/test/java/org/apache/cayenne/unit/ > > > > Added: > > > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/or= g/apache/cayenne/unit/ConnectionProperties.java > > - copied, changed from r881884, > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org= /apache/cayenne/conf/ConnectionProperties.java > > Removed: > > > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/or= g/apache/cayenne/conf/ConnectionProperties.java > > Modified: > > > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/or= g/apache/cayenne/conf/ConnectionPropertiesTest.java > > > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/or= g/apache/cayenne/unit/CayenneResources.java > > > > > cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/a= pache/cayenne/jpa/Provider.java > > > > Modified: > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org= /apache/cayenne/conf/ConnectionPropertiesTest.java > > URL: > > > http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-= unpublished/src/test/java/org/apache/cayenne/conf/ConnectionPropertiesTest.= java?rev=3D882084&r1=3D882083&r2=3D882084&view=3Ddiff > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org= /apache/cayenne/conf/ConnectionPropertiesTest.java > > (original) > > +++ > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org= /apache/cayenne/conf/ConnectionPropertiesTest.java > > Thu Nov 19 09:05:56 2009 > > @@ -25,6 +25,7 @@ > > > > import org.apache.commons.collections.ExtendedProperties; > > import org.apache.cayenne.conn.DataSourceInfo; > > +import org.apache.cayenne.unit.ConnectionProperties; > > > > /** > > */ > > > > Modified: > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org= /apache/cayenne/unit/CayenneResources.java > > URL: > > > http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-= unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java?rev= =3D882084&r1=3D882083&r2=3D882084&view=3Ddiff > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org= /apache/cayenne/unit/CayenneResources.java > > (original) > > +++ > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org= /apache/cayenne/unit/CayenneResources.java > > Thu Nov 19 09:05:56 2009 > > @@ -29,7 +29,6 @@ > > > > import org.apache.cayenne.CayenneRuntimeException; > > import org.apache.cayenne.access.DataNode; > > -import org.apache.cayenne.conf.ConnectionProperties; > > import org.apache.cayenne.conn.DataSourceInfo; > > import org.apache.cayenne.conn.PoolDataSource; > > import org.apache.cayenne.conn.PoolManager; > > > > Copied: > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org= /apache/cayenne/unit/ConnectionProperties.java > > (from r881884, > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org= /apache/cayenne/conf/ConnectionProperties.java) > > URL: > > > http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-= unpublished/src/test/java/org/apache/cayenne/unit/ConnectionProperties.java= ?p2=3Dcayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java= /org/apache/cayenne/unit/ConnectionProperties.java&p1=3Dcayenne/main/trunk/= framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/= ConnectionProperties.java&r1=3D881884&r2=3D882084&rev=3D882084&view=3Ddiff > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org= /apache/cayenne/conf/ConnectionProperties.java > > (original) > > +++ > > > cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org= /apache/cayenne/unit/ConnectionProperties.java > > Thu Nov 19 09:05:56 2009 > > @@ -17,7 +17,7 @@ > > * under the License. > > ****************************************************************/ > > > > -package org.apache.cayenne.conf; > > +package org.apache.cayenne.unit; > > > > import java.io.BufferedWriter; > > import java.io.File; > > @@ -33,8 +33,6 @@ > > import org.apache.cayenne.conn.DataSourceInfo; > > import org.apache.cayenne.project.CayenneUserDir; > > import org.apache.commons.collections.ExtendedProperties; > > -import org.apache.commons.logging.Log; > > -import org.apache.commons.logging.LogFactory; > > > > /** > > * ConnectionProperties handles a set of DataSourceInfo objects using > > information stored > > @@ -43,7 +41,6 @@ > > */ > > public class ConnectionProperties { > > > > - private static Log logObj =3D > > LogFactory.getLog(ConnectionProperties.class); > > public static final String EMBEDDED_DATASOURCE =3D > > "internal_embedded_datasource"; > > public static final String EMBEDDED_DATASOURCE_DBADAPTER =3D > > "org.apache.cayenne.dba.hsqldb.HSQLDBAdapter"; > > public static final String EMBEDDED_DATASOURCE_USERNAME =3D "sa"; > > @@ -271,7 +268,7 @@ > > /** > > * Creates a DataSourceInfo object from a set of properties. > > */ > > - protected DataSourceInfo buildDataSourceInfo(ExtendedProperties > props) > > { > > + public DataSourceInfo buildDataSourceInfo(ExtendedProperties props= ) > { > > DataSourceInfo dsi =3D new DataSourceInfo(); > > > > String adapter =3D props.getString(ADAPTER_KEY); > > @@ -293,7 +290,7 @@ > > /** > > * Returns a list of connection names configured in the properties > > object. > > */ > > - protected List extractNames(ExtendedProperties props) { > > + public List extractNames(ExtendedProperties props) { > > Iterator it =3D props.getKeys(); > > List list =3D new ArrayList(); > > > > > > Modified: > > > cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/ap= ache/cayenne/jpa/Provider.java > > URL: > > > http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unp= ublished/src/main/java/org/apache/cayenne/jpa/Provider.java?rev=3D882084&r1= =3D882083&r2=3D882084&view=3Ddiff > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- > > > cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/ap= ache/cayenne/jpa/Provider.java > > (original) > > +++ > > > cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/ap= ache/cayenne/jpa/Provider.java > > Thu Nov 19 09:05:56 2009 > > @@ -39,7 +39,6 @@ > > import org.apache.cayenne.access.DbGenerator; > > import org.apache.cayenne.access.dbsync.SkipSchemaUpdateStrategy; > > import org.apache.cayenne.conf.Configuration; > > -import org.apache.cayenne.conf.ConnectionProperties; > > import org.apache.cayenne.conf.ResourceFinder; > > import org.apache.cayenne.dba.AutoAdapter; > > import org.apache.cayenne.dba.DbAdapter; > > @@ -82,17 +81,17 @@ > > public static final String CREATE_SCHEMA_PROPERTY =3D > > "org.apache.cayenne.schema.create"; > > public static final String DATA_SOURCE_FACTORY_PROPERTY =3D > > "org.apache.cayenne.jpa.jpaDataSourceFactory"; > > > > - // ... DataSource > > + // ... DataSource see ConnectionProperties > > public static final String ADAPTER_PROPERTY =3D "org.apache.cayenne= ." > > - + ConnectionProperties.ADAPTER_KEY; > > + + "adapter"; > > public static final String DATA_SOURCE_DRIVER_PROPERTY =3D > > "org.apache.cayenne.datasource." > > - + ConnectionProperties.DRIVER_KEY; > > + + "jdbc.driver"; > > public static final String DATA_SOURCE_URL_PROPERTY =3D > > "org.apache.cayenne.datasource." > > - + ConnectionProperties.URL_KEY; > > + + "jdbc.url"; > > public static final String DATA_SOURCE_USER_NAME_PROPERTY =3D > > "org.apache.cayenne.datasource." > > - + ConnectionProperties.USER_NAME_KEY; > > + + "jdbc.username"; > > public static final String DATA_SOURCE_PASSWORD_PROPERTY =3D > > "org.apache.cayenne.datasource." > > - + ConnectionProperties.PASSWORD_KEY; > > + + "jdbc.password"; > > public static final String DATA_SOURCE_MIN_CONNECTIONS_PROPERTY =3D > > "org.apache.cayenne.datasource.jdbc.minConnections"; > > public static final String DATA_SOURCE_MAX_CONNECTIONS_PROPERTY =3D > > "org.apache.cayenne.datasource.jdbc.maxConnections"; > > > > > > > > > > > -- > Andrey > --=20 Olga Tkacheva --000e0cdfd9ec3a61410478b838d0--