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
- * Microsoft Driver Settings
+ * Cayenne DbAdapter implementation for engine. Microsoft Driver Settings
*
* Sample connection settings to use with MS SQL Server are shown below:
*
*
- * sqlserver.cayenne.adapter = org.apache.cayenne.dba.sqlserver.SQLServerAdapter
* sqlserver.jdbc.username = test
* sqlserver.jdbc.password = secret
* sqlserver.jdbc.url = jdbc:sqlserver://192.168.0.65;databaseName=cayenne;SelectMethod=cursor
* sqlserver.jdbc.driver = com.microsoft.sqlserver.jdbc.SQLServerDriver
*
- *
*
* Note on case-sensitive LIKE: if your application requires case-sensitive LIKE
* support, ask your DBA to configure the database to use a case-senstitive collation (one
@@ -65,17 +61,10 @@ import org.apache.cayenne.query.SQLActio
*
*
*
- *
- *
- *
- * sqlserver.cayenne.adapter = org.apache.cayenne.dba.sqlserver.SQLServerAdapter
* sqlserver.jdbc.username = test
* sqlserver.jdbc.password = secret
* sqlserver.jdbc.url = jdbc:jtds:sqlserver://192.168.0.65/cayenne
* sqlserver.jdbc.driver = net.sourceforge.jtds.jdbc.Driver
- *
- *
- *
*
*
* @since 1.1
@@ -84,18 +73,22 @@ public class SQLServerAdapter extends Sy
public static final String TRIM_FUNCTION = "RTRIM";
- public SQLServerAdapter(@Inject RuntimeProperties runtimeProperties,
+ public SQLServerAdapter(
+ @Inject RuntimeProperties runtimeProperties,
@Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List defaultExtendedTypes,
@Inject(Constants.SERVER_USER_TYPES_LIST) List userExtendedTypes,
@Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List extendedTypeFactories) {
- super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
-
- // TODO: i wonder if Sybase supports generated keys...
+ super(
+ runtimeProperties,
+ defaultExtendedTypes,
+ userExtendedTypes,
+ extendedTypeFactories);
+
+ // TODO: i wonder if Sybase supports generated keys...
// in this case we need to move this to the super.
this.setSupportsGeneratedKeys(true);
this.setSupportsBatchUpdates(true);
}
-
/**
* Uses SQLServerActionBuilder to create the right action.
@@ -104,11 +97,10 @@ public class SQLServerAdapter extends Sy
*/
@Override
public SQLAction getAction(Query query, DataNode node) {
- return query
- .createSQLAction(new SQLServerActionBuilder(this, node.getEntityResolver()));
+ return query.createSQLAction(new SQLServerActionBuilder(this, node
+ .getEntityResolver()));
}
-
/**
* Returns a trimming translator.
*/
@@ -121,7 +113,6 @@ public class SQLServerAdapter extends Sy
return translator;
}
-
/**
* Overrides super implementation to correctly set up identity columns.
*
@@ -129,19 +120,18 @@ public class SQLServerAdapter extends Sy
*/
@Override
public void createTableAppendColumn(StringBuffer sqlBuffer, DbAttribute column) {
-
+
super.createTableAppendColumn(sqlBuffer, column);
-
- if(column.isGenerated()) {
+
+ if (column.isGenerated()) {
// current limitation - we don't allow to set identity parameters...
sqlBuffer.append(" IDENTITY (1, 1)");
}
}
-
+
@Override
public MergerFactory mergerFactory() {
return new SQLServerMergerFactory();
}
-
-
+
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java?rev=1296128&r1=1296127&r2=1296128&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java Fri Mar 2 10:50:32 2012
@@ -19,7 +19,7 @@
package org.apache.cayenne;
-import org.apache.cayenne.configuration.rop.client.ClientModule;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.rop.client.ClientRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.ObjectIdQuery;
@@ -38,7 +38,7 @@ import org.apache.cayenne.unit.di.server
*/
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
@ClientRuntimeProperty({
- ClientModule.CHANNEL_EVENTS, "true"
+ Constants.ROP_CHANNEL_EVENTS_PROPERTY, "true"
})
public class CayenneContextClientChannelEventsTest extends ClientCase {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/client/ClientModuleTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/client/ClientModuleTest.java?rev=1296128&r1=1296127&r2=1296128&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/client/ClientModuleTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/client/ClientModuleTest.java Fri Mar 2 10:50:32 2012
@@ -24,6 +24,7 @@ import java.util.Map;
import junit.framework.TestCase;
import org.apache.cayenne.DataChannel;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.ObjectContextFactory;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.DIBootstrap;
@@ -39,7 +40,7 @@ public class ClientModuleTest extends Te
public void testClientConnection() {
Map properties = new HashMap();
- properties.put(ClientModule.ROP_SERVICE_URL, "http://localhost/YuM");
+ properties.put(Constants.ROP_SERVICE_URL_PROPERTY, "http://localhost/YuM");
ClientModule module = new ClientModule(properties);
Injector injector = DIBootstrap.createInjector(module);
@@ -105,7 +106,7 @@ public class ClientModuleTest extends Te
public void testDataChannel_NoChannelEvents() {
Map properties = new HashMap();
- properties.put(ClientModule.CHANNEL_EVENTS, "true");
+ properties.put(Constants.ROP_CHANNEL_EVENTS_PROPERTY, "true");
ClientModule module = new ClientModule(properties) {
@Override
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java?rev=1296128&r1=1296127&r2=1296128&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java Fri Mar 2 10:50:32 2012
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import junit.framework.TestCase;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.RuntimeProperties;
@@ -101,9 +102,9 @@ public class DefaultDataSourceFactoryLoa
public void testGetDataSourceFactory_Property() throws Exception {
final RuntimeProperties properties = mock(RuntimeProperties.class);
- when(properties.get(PropertyDataSourceFactory.JDBC_DRIVER_PROPERTY)).thenReturn(
+ when(properties.get(Constants.JDBC_DRIVER_PROPERTY)).thenReturn(
"x");
- when(properties.get(PropertyDataSourceFactory.JDBC_URL_PROPERTY)).thenReturn("y");
+ when(properties.get(Constants.JDBC_URL_PROPERTY)).thenReturn("y");
DataChannelDescriptor channelDescriptor = new DataChannelDescriptor();
channelDescriptor.setName("X");
@@ -131,19 +132,19 @@ public class DefaultDataSourceFactoryLoa
assertNotNull(factory);
assertTrue(factory instanceof PropertyDataSourceFactory);
- when(properties.get(PropertyDataSourceFactory.JDBC_URL_PROPERTY))
+ when(properties.get(Constants.JDBC_URL_PROPERTY))
.thenReturn(null);
factory = factoryLoader.getDataSourceFactory(nodeDescriptor);
assertNotNull(factory);
assertFalse(factory instanceof PropertyDataSourceFactory);
- when(properties.get(PropertyDataSourceFactory.JDBC_URL_PROPERTY + ".X.node2"))
+ when(properties.get(Constants.JDBC_URL_PROPERTY + ".X.node2"))
.thenReturn("y");
factory = factoryLoader.getDataSourceFactory(nodeDescriptor);
assertNotNull(factory);
assertFalse(factory instanceof PropertyDataSourceFactory);
- when(properties.get(PropertyDataSourceFactory.JDBC_URL_PROPERTY + ".X.node1"))
+ when(properties.get(Constants.JDBC_URL_PROPERTY + ".X.node1"))
.thenReturn("y");
factory = factoryLoader.getDataSourceFactory(nodeDescriptor);
assertNotNull(factory);