Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 248099A4D for ; Fri, 2 Mar 2012 10:51:00 +0000 (UTC) Received: (qmail 88945 invoked by uid 500); 2 Mar 2012 10:51:00 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 88918 invoked by uid 500); 2 Mar 2012 10:51:00 -0000 Mailing-List: contact commits-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 commits@cayenne.apache.org Received: (qmail 88909 invoked by uid 99); 2 Mar 2012 10:51:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 10:51:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 10:50:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8EDBA2388865 for ; Fri, 2 Mar 2012 10:50:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1296128 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src: main/java/org/apache/cayenne/access/ main/java/org/apache/cayenne/cache/ main/java/org/apache/cayenne/configuration/ main/java/org/apache/cayenne/configuration/rop/... Date: Fri, 02 Mar 2012 10:50:33 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120302105034.8EDBA2388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aadamchik Date: Fri Mar 2 10:50:32 2012 New Revision: 1296128 URL: http://svn.apache.org/viewvc?rev=1296128&view=rev Log: CAY-1665 Consistent and concise property names aggregated in one place defining runtime properties Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DefaultObjectMapRetainStrategy.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectMapRetainStrategy.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheProvider.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Constants.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ObjectStoreFactory.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/CayenneContextFactory.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientChannelProvider.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/HessianConnectionProvider.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/client/ClientModuleTest.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DefaultObjectMapRetainStrategy.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DefaultObjectMapRetainStrategy.java?rev=1296128&r1=1296127&r2=1296128&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DefaultObjectMapRetainStrategy.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DefaultObjectMapRetainStrategy.java Fri Mar 2 10:50:32 2012 @@ -20,7 +20,9 @@ package org.apache.cayenne.access; import java.util.Map; +import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.Persistent; +import org.apache.cayenne.configuration.Constants; import org.apache.cayenne.configuration.RuntimeProperties; import org.apache.cayenne.di.Inject; import org.apache.commons.collections.map.AbstractReferenceMap; @@ -32,24 +34,32 @@ import org.apache.commons.collections.ma * @since 3.1 */ public class DefaultObjectMapRetainStrategy implements ObjectMapRetainStrategy { - + + private static final String WEAK_RETAIN_STRATEGY = "weak"; + private static final String SOFT_RETAIN_STRATEGY = "soft"; + private static final String HARD_RETAIN_STRATEGY = "hard"; + protected RuntimeProperties runtimeProperties; - + public DefaultObjectMapRetainStrategy(@Inject RuntimeProperties runtimeProperties) { this.runtimeProperties = runtimeProperties; } public Map createObjectMap() { - String retainStrategy = runtimeProperties.get(MAP_RETAIN_STRATEGY_PROPERTY); - - if (SOFT_RETAIN_STRATEGY.equals(retainStrategy)) { + String strategy = runtimeProperties + .get(Constants.SERVER_OBJECT_RETAIN_STRATEGY_PROPERTY); + + if (strategy == null || WEAK_RETAIN_STRATEGY.equals(strategy)) { + return new ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.WEAK); + } + else if (SOFT_RETAIN_STRATEGY.equals(strategy)) { return new ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.SOFT); } - else if (HARD_RETAIN_STRATEGY.equals(retainStrategy)) { + else if (HARD_RETAIN_STRATEGY.equals(strategy)) { return new ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.HARD); } else { - return new ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.WEAK); + throw new CayenneRuntimeException("Unsupported retain strategy " + strategy); } } } Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectMapRetainStrategy.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectMapRetainStrategy.java?rev=1296128&r1=1296127&r2=1296128&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectMapRetainStrategy.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectMapRetainStrategy.java Fri Mar 2 10:50:32 2012 @@ -23,19 +23,12 @@ import java.util.Map; import org.apache.cayenne.Persistent; /** - * A strategy for retaining objects in {@link ObjectStore}. May be used - * weak, soft or hard references. + * A strategy for retaining objects in {@link ObjectStore}. The strategy can be weak, soft + * or hard references. * * @since 3.1 */ public interface ObjectMapRetainStrategy { - - static final String MAP_RETAIN_STRATEGY_PROPERTY = "org.apache.cayenne.context_object_retain_strategy"; - - static final String WEAK_RETAIN_STRATEGY = "weak"; - static final String SOFT_RETAIN_STRATEGY = "soft"; - static final String HARD_RETAIN_STRATEGY = "hard"; - - Map createObjectMap(); + Map createObjectMap(); } Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheProvider.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheProvider.java?rev=1296128&r1=1296127&r2=1296128&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheProvider.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheProvider.java Fri Mar 2 10:50:32 2012 @@ -19,6 +19,7 @@ package org.apache.cayenne.cache; import org.apache.cayenne.ConfigurationException; +import org.apache.cayenne.configuration.Constants; import org.apache.cayenne.configuration.RuntimeProperties; import org.apache.cayenne.di.Inject; import org.apache.cayenne.di.Provider; @@ -28,8 +29,6 @@ import org.apache.cayenne.di.Provider; */ public class MapQueryCacheProvider implements Provider { - public static final String CACHE_SIZE_PROPERTY = "cayenne.MapQueryCacheFactory.cacheSize"; - protected RuntimeProperties properties; public MapQueryCacheProvider(@Inject RuntimeProperties properties) { @@ -39,7 +38,7 @@ public class MapQueryCacheProvider imple public QueryCache get() throws ConfigurationException { int size = properties.getInt( - CACHE_SIZE_PROPERTY, + Constants.QUERY_CACHE_SIZE_PROPERTY, MapQueryCache.DEFAULT_CACHE_SIZE); return new MapQueryCache(size); } Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Constants.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Constants.java?rev=1296128&r1=1296127&r2=1296128&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Constants.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Constants.java Fri Mar 2 10:50:32 2012 @@ -69,4 +69,53 @@ public interface Constants { */ public static final String SERVER_TYPE_FACTORIES_LIST = "cayenne.server.type_factories"; + // Runtime properties + + public static final String JDBC_DRIVER_PROPERTY = "cayenne.jdbc.driver"; + + public static final String JDBC_URL_PROPERTY = "cayenne.jdbc.url"; + + public static final String JDBC_USERNAME_PROPERTY = "cayenne.jdbc.username"; + + public static final String JDBC_PASSWORD_PROPERTY = "cayenne.jdbc.password"; + + public static final String JDBC_MIN_CONNECTIONS_PROPERTY = "cayenne.jdbc.min_connections"; + + public static final String JDBC_MAX_CONNECTIONS_PROPERTY = "cayenne.jdbc.max_connections"; + + /** + * An integer property defining the maximum number of entries in the query cache. Note + * that not all QueryCache providers may respect this property. MapQueryCache uses it, + * but the rest would use alternative configuration methods. + */ + public static final String QUERY_CACHE_SIZE_PROPERTY = "cayenne.querycache.size"; + + /** + * A boolean property defining whether cross-contexts synchronization is enabled. + * Possible values are "true" or "false". + */ + public static final String SERVER_CONTEXTS_SYNC_PROPERTY = "cayenne.server.contexts_sync_strategy"; + + /** + * A String property that defines how ObjectContexts should retain cached committed + * objects. Possible values are "weak", "soft", "hard". + */ + public static final String SERVER_OBJECT_RETAIN_STRATEGY_PROPERTY = "cayenne.server.object_retain_strategy"; + + public static final String ROP_SERVICE_URL_PROPERTY = "cayenne.rop.service_url"; + + public static final String ROP_SERVICE_USERNAME_PROPERTY = "cayenne.rop.service_username"; + + public static final String ROP_SERVICE_PASSWORD_PROPERTY = "cayenne.rop.service_password "; + + public static final String ROP_SERVICE_SHARED_SESSION_PROPERTY = "cayenne.rop.shared_session_name"; + + public static final String ROP_SERVICE_TIMEOUT_PROPERTY = "cayenne.rop.service.timeout"; + + public static final String ROP_CHANNEL_EVENTS_PROPERTY = "cayenne.rop.channel_events"; + + public static final String ROP_CONTEXT_CHANGE_EVENTS_PROPERTY = "cayenne.rop.context_change_events"; + + public static final String ROP_CONTEXT_LIFECYCLE_EVENTS_PROPERTY = "cayenne.rop.context_lifecycle_events"; + } Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java?rev=1296128&r1=1296127&r2=1296128&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java Fri Mar 2 10:50:32 2012 @@ -40,7 +40,7 @@ public class DefaultObjectStoreFactory i protected ObjectMapRetainStrategy retainStrategy; public ObjectStore createObjectStore(DataRowStore dataRowCache) { - boolean sync = runtimeProperties.getBoolean(SYNC_PROPERTY, true); + boolean sync = runtimeProperties.getBoolean(Constants.SERVER_CONTEXTS_SYNC_PROPERTY, true); return sync ? new ObjectStore(dataRowCache, retainStrategy.createObjectMap()) : new NoSyncObjectStore(dataRowCache, retainStrategy.createObjectMap()); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ObjectStoreFactory.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ObjectStoreFactory.java?rev=1296128&r1=1296127&r2=1296128&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ObjectStoreFactory.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ObjectStoreFactory.java Fri Mar 2 10:50:32 2012 @@ -28,8 +28,6 @@ import org.apache.cayenne.access.ObjectS */ public interface ObjectStoreFactory { - static final String SYNC_PROPERTY = "org.apache.cayenne.sync_contexts"; - /** * Creates an {@link ObjectStore} with provided dataRowCache */ Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/CayenneContextFactory.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/CayenneContextFactory.java?rev=1296128&r1=1296127&r2=1296128&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/CayenneContextFactory.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/CayenneContextFactory.java Fri Mar 2 10:50:32 2012 @@ -23,6 +23,7 @@ import org.apache.cayenne.DataChannel; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.cache.NestedQueryCache; import org.apache.cayenne.cache.QueryCache; +import org.apache.cayenne.configuration.Constants; import org.apache.cayenne.configuration.ObjectContextFactory; import org.apache.cayenne.configuration.RuntimeProperties; import org.apache.cayenne.di.Inject; @@ -48,11 +49,11 @@ public class CayenneContextFactory imple public ObjectContext createContext(DataChannel parent) { boolean changeEvents = properties.getBoolean( - ClientModule.CONTEXT_CHANGE_EVENTS, + Constants.ROP_CONTEXT_CHANGE_EVENTS_PROPERTY, false); boolean lifecycleEvents = properties.getBoolean( - ClientModule.CONTEXT_LIFECYCLE_EVENTS, + Constants.ROP_CONTEXT_LIFECYCLE_EVENTS_PROPERTY, false); CayenneContext context = newInstance(parent, changeEvents, lifecycleEvents); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientChannelProvider.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientChannelProvider.java?rev=1296128&r1=1296127&r2=1296128&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientChannelProvider.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientChannelProvider.java Fri Mar 2 10:50:32 2012 @@ -20,6 +20,7 @@ package org.apache.cayenne.configuration import org.apache.cayenne.ConfigurationException; import org.apache.cayenne.DataChannel; +import org.apache.cayenne.configuration.Constants; import org.apache.cayenne.configuration.RuntimeProperties; import org.apache.cayenne.di.Inject; import org.apache.cayenne.di.Provider; @@ -41,17 +42,9 @@ public class ClientChannelProvider imple public DataChannel get() throws ConfigurationException { boolean channelEvents = properties.getBoolean( - ClientModule.CHANNEL_EVENTS, + Constants.ROP_CHANNEL_EVENTS_PROPERTY, false); - boolean remoteEventsOptional = properties.getBoolean( - ClientModule.CHANNEL_REMOTE_EVENTS_OPTIONAL, - false); - - return new ClientChannel( - connection, - channelEvents, - eventManager, - remoteEventsOptional); + return new ClientChannel(connection, channelEvents, eventManager, channelEvents); } } Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java?rev=1296128&r1=1296127&r2=1296128&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java Fri Mar 2 10:50:32 2012 @@ -40,20 +40,6 @@ import org.apache.cayenne.remote.ClientC */ public class ClientModule implements Module { - public static final String ROP_SERVICE_URL = "cayenne.config.rop.service.url"; - public static final String ROP_SERVICE_USER_NAME = "cayenne.config.rop.service.username"; - public static final String ROP_SERVICE_PASSWORD = "cayenne.config.rop.service.password"; - public static final String ROP_SERVICE_SHARED_SESSION = "cayenne.config.rop.service.shared_session"; - public static final String ROP_SERVICE_TIMEOUT = "cayenne.config.rop.service.timeout"; - - public static final String CHANNEL_EVENTS = "cayenne.config.rop.client.channel.events"; - - // TODO: this property name is exactly the same as CHANNEL_EVENTS... Seems messed up - public static final String CHANNEL_REMOTE_EVENTS_OPTIONAL = "cayenne.config.rop.client.channel.events"; - - public static final String CONTEXT_CHANGE_EVENTS = "cayenne.config.rop.client.context.change_events"; - public static final String CONTEXT_LIFECYCLE_EVENTS = "cayenne.config.rop.client.context.lifecycle_events"; - protected Map properties; public ClientModule(Map properties) { Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/HessianConnectionProvider.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/HessianConnectionProvider.java?rev=1296128&r1=1296127&r2=1296128&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/HessianConnectionProvider.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/HessianConnectionProvider.java Fri Mar 2 10:50:32 2012 @@ -19,6 +19,7 @@ package org.apache.cayenne.configuration.rop.client; import org.apache.cayenne.ConfigurationException; +import org.apache.cayenne.configuration.Constants; import org.apache.cayenne.configuration.RuntimeProperties; import org.apache.cayenne.di.Inject; import org.apache.cayenne.di.Provider; @@ -32,23 +33,26 @@ public class HessianConnectionProvider i public ClientConnection get() throws ConfigurationException { - String url = runtimeProperties.get(ClientModule.ROP_SERVICE_URL); + String url = runtimeProperties.get(Constants.ROP_SERVICE_URL_PROPERTY); if (url == null) { throw new ConfigurationException( "No property defined for '%s', can't initialize HessianConnection", - ClientModule.ROP_SERVICE_URL); + Constants.ROP_SERVICE_URL_PROPERTY); } - String userName = runtimeProperties - .get(ClientModule.ROP_SERVICE_USER_NAME); - String password = runtimeProperties.get(ClientModule.ROP_SERVICE_PASSWORD); + String userName = runtimeProperties.get(Constants.ROP_SERVICE_USERNAME_PROPERTY); + String password = runtimeProperties.get(Constants.ROP_SERVICE_PASSWORD_PROPERTY); String sharedSession = runtimeProperties - .get(ClientModule.ROP_SERVICE_SHARED_SESSION); + .get(Constants.ROP_SERVICE_SHARED_SESSION_PROPERTY); String readTimeoutStr = runtimeProperties - .get(ClientModule.ROP_SERVICE_TIMEOUT); - - HessianConnection result = new HessianConnection(url, userName, password, sharedSession); - + .get(Constants.ROP_SERVICE_TIMEOUT_PROPERTY); + + HessianConnection result = new HessianConnection( + url, + userName, + password, + sharedSession); + if (readTimeoutStr != null && readTimeoutStr.length() != 0) { result.setReadTimeout(Long.parseLong(readTimeoutStr)); } Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java?rev=1296128&r1=1296127&r2=1296128&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java Fri Mar 2 10:50:32 2012 @@ -25,6 +25,7 @@ import java.util.concurrent.ConcurrentHa import javax.sql.DataSource; import org.apache.cayenne.CayenneRuntimeException; +import org.apache.cayenne.configuration.Constants; import org.apache.cayenne.configuration.DataNodeDescriptor; import org.apache.cayenne.configuration.RuntimeProperties; import org.apache.cayenne.di.AdhocObjectFactory; @@ -139,10 +140,10 @@ public class DelegatingDataSourceFactory ? nodeDescriptor.getDataChannelDescriptor().getName() : null; - String driver = properties.get(PropertyDataSourceFactory.JDBC_DRIVER_PROPERTY); + String driver = properties.get(Constants.JDBC_DRIVER_PROPERTY); if (driver == null && channelName != null) { - driver = properties.get(PropertyDataSourceFactory.JDBC_DRIVER_PROPERTY + driver = properties.get(Constants.JDBC_DRIVER_PROPERTY + "." + nodeDescriptor.getDataChannelDescriptor().getName() + "." @@ -153,10 +154,10 @@ public class DelegatingDataSourceFactory return false; } - String url = properties.get(PropertyDataSourceFactory.JDBC_URL_PROPERTY); + String url = properties.get(Constants.JDBC_URL_PROPERTY); if (url == null && channelName != null) { - url = properties.get(PropertyDataSourceFactory.JDBC_URL_PROPERTY + url = properties.get(Constants.JDBC_URL_PROPERTY + "." + nodeDescriptor.getDataChannelDescriptor().getName() + "." Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java?rev=1296128&r1=1296127&r2=1296128&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java Fri Mar 2 10:50:32 2012 @@ -21,6 +21,7 @@ package org.apache.cayenne.configuration import javax.sql.DataSource; import org.apache.cayenne.ConfigurationException; +import org.apache.cayenne.configuration.Constants; import org.apache.cayenne.configuration.DataNodeDescriptor; import org.apache.cayenne.configuration.RuntimeProperties; import org.apache.cayenne.conn.PoolManager; @@ -29,12 +30,11 @@ import org.apache.cayenne.log.JdbcEventL /** * A DataSourceFactrory that creates a DataSource based on system properties. Properties - * can be set per domain/node name or globally, aplying to all nodes without explicit + * can be set per domain/node name or globally, applying to all nodes without explicit * property set. The following properties are supported: *