You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2012/03/02 11:46:43 UTC
svn commit: r1296127 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src:
main/java/org/apache/cayenne/configuration/
main/java/org/apache/cayenne/configuration/rop/client/
main/java/org/apache/cayenne/configuration/server/ main/java/org/...
Author: aadamchik
Date: Fri Mar 2 10:46:41 2012
New Revision: 1296127
URL: http://svn.apache.org/viewvc?rev=1296127&view=rev
Log:
CAY-1665 Consistent and concise property names aggregated in one place
defining DI collections
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Constants.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultRuntimeProperties.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ToolModule.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/server/DataDomainProvider.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcAdapter.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/h2/H2Adapter.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/hsqldb/HSQLDBNoSchemaAdapter.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/mysql/MySQLAdapter.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/Oracle8Adapter.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/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/server/ROPHessianServletTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
Added: 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=1296127&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Constants.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Constants.java Fri Mar 2 10:46:41 2012
@@ -0,0 +1,72 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.cayenne.configuration;
+
+/**
+ * Defines the names of runtime properties and DI collections used in DI modules used to
+ * configure server and client runtime.
+ *
+ * @since 3.1
+ */
+public interface Constants {
+
+ // DI "collections"
+
+ /**
+ * A DI container key for the properties map used to configure either ROP or server
+ * tiers.
+ */
+ public static final String PROPERTIES_MAP = "cayenne.properties";
+
+ /**
+ * A DI container key for the List<DbAdapterDetector> that contains objects that can
+ * discover the type of current database and install the correct DbAdapter in runtime.
+ */
+ public static final String SERVER_ADAPTER_DETECTORS_LIST = "cayenne.server.adapter_detectors";
+
+ /**
+ * A DI container key for the list storing DataDomain filters.
+ */
+ public static final String SERVER_DOMAIN_FILTERS_LIST = "cayenne.server.domain_filters";
+
+ /**
+ * A DI container key for the list storing locations of the one of more project
+ * configuration files.
+ */
+ public static final String SERVER_PROJECT_LOCATIONS_LIST = "cayenne.server.project_locations";
+
+ /**
+ * A DI container key for the List<ExtendedType> storing default adapter-agnostic
+ * ExtendedTypes.
+ */
+ public static final String SERVER_DEFAULT_TYPES_LIST = "cayenne.server.default_types";
+
+ /**
+ * A DI container key for the List<ExtendedType> storing a user-provided
+ * ExtendedTypes.
+ */
+ public static final String SERVER_USER_TYPES_LIST = "cayenne.server.user_types";
+
+ /**
+ * A DI container key for the List<ExtendedTypeFactory> storing default and
+ * user-provided ExtendedTypeFactories.
+ */
+ public static final String SERVER_TYPE_FACTORIES_LIST = "cayenne.server.type_factories";
+
+}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultRuntimeProperties.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultRuntimeProperties.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultRuntimeProperties.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultRuntimeProperties.java Fri Mar 2 10:46:41 2012
@@ -32,14 +32,9 @@ import org.apache.cayenne.di.Inject;
*/
public class DefaultRuntimeProperties implements RuntimeProperties {
- /**
- * A name of the map created via DI and used to initialize this service.
- */
- public static final String PROPERTIES_MAP = "org.apache.cayenne.configuration.DefaultRuntimeProperties.properties";
-
protected Map<String, String> properties;
- public DefaultRuntimeProperties(@Inject(PROPERTIES_MAP) Map<String, String> properties) {
+ public DefaultRuntimeProperties(@Inject(Constants.PROPERTIES_MAP) Map<String, String> properties) {
this.properties = properties;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ToolModule.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ToolModule.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ToolModule.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ToolModule.java Fri Mar 2 10:46:41 2012
@@ -20,7 +20,6 @@ package org.apache.cayenne.configuration
import org.apache.cayenne.access.jdbc.BatchQueryBuilderFactory;
import org.apache.cayenne.access.jdbc.DefaultBatchQueryBuilderFactory;
-import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Module;
@@ -38,11 +37,11 @@ public class ToolModule implements Modul
public void configure(Binder binder) {
// configure empty global stack properties
- binder.bindMap(DefaultRuntimeProperties.PROPERTIES_MAP);
+ binder.bindMap(Constants.PROPERTIES_MAP);
- binder.bindList(JdbcAdapter.DEFAULT_EXTENDED_TYPE_LIST);
- binder.bindList(JdbcAdapter.USER_EXTENDED_TYPE_LIST);
- binder.bindList(JdbcAdapter.EXTENDED_TYPE_FACTORY_LIST);
+ binder.bindList(Constants.SERVER_DEFAULT_TYPES_LIST);
+ binder.bindList(Constants.SERVER_USER_TYPES_LIST);
+ binder.bindList(Constants.SERVER_TYPE_FACTORIES_LIST);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
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=1296127&r1=1296126&r2=1296127&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:46:41 2012
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.cache.MapQueryCacheProvider;
import org.apache.cayenne.cache.QueryCache;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.ObjectContextFactory;
import org.apache.cayenne.configuration.RuntimeProperties;
@@ -46,7 +47,7 @@ public class ClientModule implements Mod
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";
@@ -65,9 +66,8 @@ public class ClientModule implements Mod
public void configure(Binder binder) {
- // expose this module properties to DefaultRuntimeProperties
- binder.<String> bindMap(DefaultRuntimeProperties.PROPERTIES_MAP).putAll(
- properties);
+ // expose user-provided ROP properties as the main properties map
+ binder.<String> bindMap(Constants.PROPERTIES_MAP).putAll(properties);
binder.bind(ObjectContextFactory.class).to(CayenneContextFactory.class);
binder.bind(ClientConnection.class).toProvider(HessianConnectionProvider.class);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java Fri Mar 2 10:46:41 2012
@@ -32,6 +32,7 @@ import org.apache.cayenne.access.dbsync.
import org.apache.cayenne.cache.NestedQueryCache;
import org.apache.cayenne.cache.QueryCache;
import org.apache.cayenne.configuration.ConfigurationTree;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataChannelDescriptorLoader;
import org.apache.cayenne.configuration.DataChannelDescriptorMerger;
@@ -59,16 +60,6 @@ public class DataDomainProvider implemen
private static Log logger = LogFactory.getLog(DataDomainProvider.class);
- /**
- * A DI key for the list storing DataDomain filters.
- */
- public static final String FILTERS_LIST = "org.apache.cayenne.configuration.server.DataDomainProvider.filters";
-
- /**
- * A DI key for the list storing locations of the DataDomain configuration resources.
- */
- public static final String LOCATIONS_LIST = "org.apache.cayenne.configuration.server.DataDomainProvider.locations";
-
@Inject
protected ResourceLocator resourceLocator;
@@ -90,10 +81,10 @@ public class DataDomainProvider implemen
@Inject
protected AdhocObjectFactory objectFactory;
- @Inject(FILTERS_LIST)
+ @Inject(Constants.SERVER_DOMAIN_FILTERS_LIST)
protected List<DataChannelFilter> filters;
- @Inject(LOCATIONS_LIST)
+ @Inject(Constants.SERVER_PROJECT_LOCATIONS_LIST)
protected List<String> locations;
@Inject
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java Fri Mar 2 10:46:41 2012
@@ -26,6 +26,7 @@ import java.util.List;
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.dba.AutoAdapter;
import org.apache.cayenne.dba.DbAdapter;
@@ -44,8 +45,6 @@ import org.apache.cayenne.log.JdbcEventL
*/
public class DefaultDbAdapterFactory implements DbAdapterFactory {
- public static final String DETECTORS_LIST = "org.apache.cayenne.configuration.server.DefaultDbAdapterFactory.detectors";
-
@Inject
protected Injector injector;
@@ -57,7 +56,7 @@ public class DefaultDbAdapterFactory imp
protected List<DbAdapterDetector> detectors;
public DefaultDbAdapterFactory(
- @Inject(DETECTORS_LIST) List<DbAdapterDetector> detectors) {
+ @Inject(Constants.SERVER_ADAPTER_DETECTORS_LIST) List<DbAdapterDetector> detectors) {
if (detectors == null) {
throw new NullPointerException("Null detectors list");
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java Fri Mar 2 10:46:41 2012
@@ -51,6 +51,7 @@ import org.apache.cayenne.ashwood.Ashwoo
import org.apache.cayenne.cache.MapQueryCacheProvider;
import org.apache.cayenne.cache.QueryCache;
import org.apache.cayenne.configuration.ConfigurationNameMapper;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.DataChannelDescriptorLoader;
import org.apache.cayenne.configuration.DataChannelDescriptorMerger;
import org.apache.cayenne.configuration.DataMapLoader;
@@ -63,7 +64,6 @@ import org.apache.cayenne.configuration.
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.configuration.XMLDataChannelDescriptorLoader;
import org.apache.cayenne.configuration.XMLDataMapLoader;
-import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.db2.DB2Sniffer;
import org.apache.cayenne.dba.derby.DerbySniffer;
import org.apache.cayenne.dba.frontbase.FrontBaseSniffer;
@@ -119,7 +119,7 @@ public class ServerModule implements Mod
public void configure(Binder binder) {
// configure empty global stack properties
- binder.bindMap(DefaultRuntimeProperties.PROPERTIES_MAP);
+ binder.bindMap(Constants.PROPERTIES_MAP);
binder.bind(JdbcEventLogger.class).to(CommonsJdbcEventLogger.class);
@@ -129,7 +129,7 @@ public class ServerModule implements Mod
// configure known DbAdapter detectors in reverse order of popularity. Users can
// add their own to install custom adapters automatically
binder
- .bindList(DefaultDbAdapterFactory.DETECTORS_LIST)
+ .bindList(Constants.SERVER_ADAPTER_DETECTORS_LIST)
.add(new OpenBaseSniffer(objectFactory))
.add(new FrontBaseSniffer(objectFactory))
.add(new IngresSniffer(objectFactory))
@@ -145,11 +145,11 @@ public class ServerModule implements Mod
.add(new MySQLSniffer(objectFactory));
// configure an empty filter chain
- binder.bindList(DataDomainProvider.FILTERS_LIST);
+ binder.bindList(Constants.SERVER_DOMAIN_FILTERS_LIST);
// configure extended types
binder
- .bindList(JdbcAdapter.DEFAULT_EXTENDED_TYPE_LIST)
+ .bindList(Constants.SERVER_DEFAULT_TYPES_LIST)
.add(new VoidType())
.add(new BigDecimalType())
.add(new BigIntegerType())
@@ -169,12 +169,12 @@ public class ServerModule implements Mod
.add(new CalendarType<GregorianCalendar>(GregorianCalendar.class))
.add(new CalendarType<Calendar>(Calendar.class))
.add(new UUIDType());
- binder.bindList(JdbcAdapter.USER_EXTENDED_TYPE_LIST);
- binder.bindList(JdbcAdapter.EXTENDED_TYPE_FACTORY_LIST);
+ binder.bindList(Constants.SERVER_USER_TYPES_LIST);
+ binder.bindList(Constants.SERVER_TYPE_FACTORIES_LIST);
// configure explicit configurations
ListBuilder<Object> locationsListBuilder = binder
- .bindList(DataDomainProvider.LOCATIONS_LIST);
+ .bindList(Constants.SERVER_PROJECT_LOCATIONS_LIST);
for (String location : configurationLocations) {
locationsListBuilder.add(location);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java Fri Mar 2 10:46:41 2012
@@ -38,6 +38,7 @@ import org.apache.cayenne.access.trans.Q
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
import org.apache.cayenne.access.types.ExtendedTypeMap;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.log.JdbcEventLogger;
@@ -62,10 +63,6 @@ public class JdbcAdapter implements DbAd
// defines if database uses case-insensitive collation
public final static String CI_PROPERTY = "cayenne.runtime.db.collation.assume.ci";
- public static final String DEFAULT_EXTENDED_TYPE_LIST = "org.apache.cayenne.dba.JdbcAdapter.defaultExtendedTypes";
- public static final String USER_EXTENDED_TYPE_LIST = "org.apache.cayenne.dba.JdbcAdapter.userExtendedTypes";
- public static final String EXTENDED_TYPE_FACTORY_LIST = "org.apache.cayenne.dba.JdbcAdapter.extendedTypeFactories";
-
final static String DEFAULT_IDENTIFIERS_START_QUOTE = "\"";
final static String DEFAULT_IDENTIFIERS_END_QUOTE = "\"";
@@ -111,9 +108,9 @@ public class JdbcAdapter implements DbAd
* Creates new JdbcAdapter with a set of default parameters.
*/
public JdbcAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
// init defaults
this.setSupportsBatchUpdates(false);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java Fri Mar 2 10:46:41 2012
@@ -34,6 +34,7 @@ import org.apache.cayenne.access.types.C
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
import org.apache.cayenne.access.types.ExtendedTypeMap;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.PkGenerator;
@@ -61,9 +62,9 @@ import org.apache.cayenne.merge.MergerFa
public class DB2Adapter extends JdbcAdapter {
public DB2Adapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
setSupportsGeneratedKeys(true);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java Fri Mar 2 10:46:41 2012
@@ -34,6 +34,7 @@ import org.apache.cayenne.access.types.E
import org.apache.cayenne.access.types.ExtendedTypeFactory;
import org.apache.cayenne.access.types.ExtendedTypeMap;
import org.apache.cayenne.access.types.ShortType;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.PkGenerator;
@@ -70,9 +71,9 @@ public class DerbyAdapter extends JdbcAd
static final String FOR_BIT_DATA_SUFFIX = " FOR BIT DATA";
public DerbyAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
setSupportsGeneratedKeys(true);
setSupportsBatchUpdates(true);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java Fri Mar 2 10:46:41 2012
@@ -30,6 +30,7 @@ import org.apache.cayenne.access.DataNod
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
import org.apache.cayenne.access.types.ExtendedTypeMap;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.PkGenerator;
@@ -64,9 +65,9 @@ import org.apache.cayenne.query.SQLActio
public class FrontBaseAdapter extends JdbcAdapter {
public FrontBaseAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
setSupportsBatchUpdates(true);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java Fri Mar 2 10:46:41 2012
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.di.Inject;
@@ -34,9 +35,9 @@ import org.apache.cayenne.merge.MergerFa
*/
public class H2Adapter extends JdbcAdapter {
public H2Adapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
setSupportsGeneratedKeys(true);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java Fri Mar 2 10:46:41 2012
@@ -28,6 +28,7 @@ import org.apache.cayenne.CayenneRuntime
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.QuotingStrategy;
@@ -55,9 +56,9 @@ import org.apache.cayenne.query.SQLActio
public class HSQLDBAdapter extends JdbcAdapter {
public HSQLDBAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBNoSchemaAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBNoSchemaAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBNoSchemaAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBNoSchemaAdapter.java Fri Mar 2 10:46:41 2012
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.DbEntity;
@@ -37,9 +38,9 @@ import org.apache.cayenne.map.DbEntity;
public class HSQLDBNoSchemaAdapter extends HSQLDBAdapter {
public HSQLDBNoSchemaAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java Fri Mar 2 10:46:41 2012
@@ -32,6 +32,7 @@ import org.apache.cayenne.access.trans.T
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
import org.apache.cayenne.access.types.ExtendedTypeMap;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.PkGenerator;
@@ -60,9 +61,9 @@ public class IngresAdapter extends JdbcA
public static final String TRIM_FUNCTION = "TRIM";
public IngresAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
setSupportsUniqueConstraints(true);
setSupportsGeneratedKeys(true);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java Fri Mar 2 10:46:41 2012
@@ -39,6 +39,7 @@ import org.apache.cayenne.access.types.C
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
import org.apache.cayenne.access.types.ExtendedTypeMap;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.PkGenerator;
@@ -82,9 +83,9 @@ public class MySQLAdapter extends JdbcAd
protected boolean supportsFkConstraints;
public MySQLAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
// init defaults
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java Fri Mar 2 10:46:41 2012
@@ -35,6 +35,7 @@ import org.apache.cayenne.access.types.C
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
import org.apache.cayenne.access.types.ExtendedTypeMap;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.PkGenerator;
@@ -66,9 +67,9 @@ import org.apache.cayenne.query.SQLActio
public class OpenBaseAdapter extends JdbcAdapter {
public OpenBaseAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
// init defaults
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java Fri Mar 2 10:46:41 2012
@@ -28,6 +28,7 @@ import org.apache.cayenne.access.trans.Q
import org.apache.cayenne.access.trans.QueryAssembler;
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.Query;
@@ -48,9 +49,9 @@ public class Oracle8Adapter extends Orac
}
public Oracle8Adapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java Fri Mar 2 10:46:41 2012
@@ -39,6 +39,7 @@ import org.apache.cayenne.access.types.E
import org.apache.cayenne.access.types.ExtendedTypeFactory;
import org.apache.cayenne.access.types.ExtendedTypeMap;
import org.apache.cayenne.access.types.ShortType;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.PkGenerator;
@@ -155,9 +156,9 @@ public class OracleAdapter extends JdbcA
}
public OracleAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
// enable batch updates by default
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java Fri Mar 2 10:46:41 2012
@@ -33,6 +33,7 @@ import org.apache.cayenne.access.types.C
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
import org.apache.cayenne.access.types.ExtendedTypeMap;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.QuotingStrategy;
import org.apache.cayenne.dba.JdbcAdapter;
@@ -63,9 +64,9 @@ import org.apache.cayenne.query.SQLActio
public class PostgresAdapter extends JdbcAdapter {
public PostgresAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
setSupportsBatchUpdates(true);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java Fri Mar 2 10:46:41 2012
@@ -27,6 +27,7 @@ import org.apache.cayenne.access.DataNod
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
import org.apache.cayenne.access.types.ExtendedTypeMap;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.di.Inject;
@@ -54,9 +55,9 @@ import org.apache.cayenne.query.SQLActio
public class SQLiteAdapter extends JdbcAdapter {
public SQLiteAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
this.setSupportsUniqueConstraints(false);
this.setSupportsGeneratedKeys(true);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java Fri Mar 2 10:46:41 2012
@@ -26,6 +26,7 @@ import org.apache.cayenne.access.trans.Q
import org.apache.cayenne.access.trans.QueryAssembler;
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeFactory;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.sybase.SybaseAdapter;
import org.apache.cayenne.di.Inject;
@@ -84,9 +85,9 @@ public class SQLServerAdapter extends Sy
public static final String TRIM_FUNCTION = "RTRIM";
public SQLServerAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
// TODO: i wonder if Sybase supports generated keys...
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java Fri Mar 2 10:46:41 2012
@@ -32,6 +32,7 @@ import org.apache.cayenne.access.types.E
import org.apache.cayenne.access.types.ExtendedTypeFactory;
import org.apache.cayenne.access.types.ExtendedTypeMap;
import org.apache.cayenne.access.types.ShortType;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.PkGenerator;
@@ -47,9 +48,9 @@ public class SybaseAdapter extends JdbcA
final static String MYSQL_QUOTE_SQL_IDENTIFIERS_CHAR_END = "]";
public SybaseAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(DEFAULT_EXTENDED_TYPE_LIST) List<ExtendedType> defaultExtendedTypes,
- @Inject(USER_EXTENDED_TYPE_LIST) List<ExtendedType> userExtendedTypes,
- @Inject(EXTENDED_TYPE_FACTORY_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
+ @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory> extendedTypeFactories) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/server/ROPHessianServletTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/server/ROPHessianServletTest.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/server/ROPHessianServletTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/server/ROPHessianServletTest.java Fri Mar 2 10:46:41 2012
@@ -24,7 +24,7 @@ import java.util.List;
import junit.framework.TestCase;
import org.apache.cayenne.configuration.CayenneRuntime;
-import org.apache.cayenne.configuration.server.DataDomainProvider;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.server.ServerModule;
import org.apache.cayenne.configuration.web.MockModule1;
import org.apache.cayenne.configuration.web.MockModule2;
@@ -57,7 +57,7 @@ public class ROPHessianServletTest exten
assertNotNull(runtime);
List<?> locations = runtime.getInjector().getInstance(
- Key.get(List.class, DataDomainProvider.LOCATIONS_LIST));
+ Key.get(List.class, Constants.SERVER_PROJECT_LOCATIONS_LIST));
assertEquals(
Arrays
.asList("cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml"),
@@ -80,7 +80,7 @@ public class ROPHessianServletTest exten
CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
assertNotNull(runtime);
List<?> locations = runtime.getInjector().getInstance(
- Key.get(List.class, DataDomainProvider.LOCATIONS_LIST));
+ Key.get(List.class, Constants.SERVER_PROJECT_LOCATIONS_LIST));
assertEquals(Arrays.asList(location), locations);
}
@@ -102,7 +102,7 @@ public class ROPHessianServletTest exten
assertNotNull(runtime);
List<?> locations = runtime.getInjector().getInstance(
- Key.get(List.class, DataDomainProvider.LOCATIONS_LIST));
+ Key.get(List.class, Constants.SERVER_PROJECT_LOCATIONS_LIST));
assertEquals(Arrays.asList(name + ".xml"), locations);
assertEquals(2, runtime.getModules().length);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java Fri Mar 2 10:46:41 2012
@@ -38,6 +38,7 @@ import org.apache.cayenne.ashwood.Ashwoo
import org.apache.cayenne.cache.QueryCache;
import org.apache.cayenne.configuration.ConfigurationNameMapper;
import org.apache.cayenne.configuration.ConfigurationTree;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataChannelDescriptorLoader;
import org.apache.cayenne.configuration.DataChannelDescriptorMerger;
@@ -47,7 +48,6 @@ import org.apache.cayenne.configuration.
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.configuration.mock.MockDataSourceFactory;
-import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.db2.DB2Sniffer;
import org.apache.cayenne.dba.derby.DerbySniffer;
import org.apache.cayenne.dba.frontbase.FrontBaseSniffer;
@@ -133,10 +133,10 @@ public class DataDomainProviderTest exte
final AdhocObjectFactory objectFactory = new DefaultAdhocObjectFactory();
binder.bind(AdhocObjectFactory.class).toInstance(objectFactory);
- binder.bindMap(DefaultRuntimeProperties.PROPERTIES_MAP);
+ binder.bindMap(Constants.PROPERTIES_MAP);
binder
- .bindList(DefaultDbAdapterFactory.DETECTORS_LIST)
+ .bindList(Constants.SERVER_ADAPTER_DETECTORS_LIST)
.add(new OpenBaseSniffer(objectFactory))
.add(new FrontBaseSniffer(objectFactory))
.add(new IngresSniffer(objectFactory))
@@ -150,13 +150,13 @@ public class DataDomainProviderTest exte
.add(new OracleSniffer(objectFactory))
.add(new PostgresSniffer(objectFactory))
.add(new MySQLSniffer(objectFactory));
- binder.bindList(DataDomainProvider.FILTERS_LIST);
- binder.bindList(DataDomainProvider.LOCATIONS_LIST).add(testConfigName);
+ binder.bindList(Constants.SERVER_DOMAIN_FILTERS_LIST);
+ binder.bindList(Constants.SERVER_PROJECT_LOCATIONS_LIST).add(testConfigName);
// configure extended types
- binder.bindList(JdbcAdapter.DEFAULT_EXTENDED_TYPE_LIST);
- binder.bindList(JdbcAdapter.USER_EXTENDED_TYPE_LIST);
- binder.bindList(JdbcAdapter.EXTENDED_TYPE_FACTORY_LIST);
+ binder.bindList(Constants.SERVER_DEFAULT_TYPES_LIST);
+ binder.bindList(Constants.SERVER_USER_TYPES_LIST);
+ binder.bindList(Constants.SERVER_TYPE_FACTORIES_LIST);
binder.bind(EventManager.class).toInstance(eventManager);
binder.bind(EntitySorter.class).toInstance(new AshwoodEntitySorter());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java Fri Mar 2 10:46:41 2012
@@ -30,12 +30,12 @@ import java.util.List;
import junit.framework.TestCase;
import org.apache.cayenne.access.jdbc.BatchQueryBuilderFactory;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.AutoAdapter;
import org.apache.cayenne.dba.DbAdapter;
-import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.sybase.SybaseAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Binder;
@@ -97,10 +97,10 @@ public class DefaultDbAdapterFactoryTest
Module testModule = new Module() {
public void configure(Binder binder) {
- binder.bindMap(DefaultRuntimeProperties.PROPERTIES_MAP);
- binder.bindList(JdbcAdapter.DEFAULT_EXTENDED_TYPE_LIST);
- binder.bindList(JdbcAdapter.USER_EXTENDED_TYPE_LIST);
- binder.bindList(JdbcAdapter.EXTENDED_TYPE_FACTORY_LIST);
+ binder.bindMap(Constants.PROPERTIES_MAP);
+ binder.bindList(Constants.SERVER_DEFAULT_TYPES_LIST);
+ binder.bindList(Constants.SERVER_USER_TYPES_LIST);
+ binder.bindList(Constants.SERVER_TYPE_FACTORIES_LIST);
binder.bind(JdbcEventLogger.class).to(CommonsJdbcEventLogger.class);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
@@ -136,10 +136,10 @@ public class DefaultDbAdapterFactoryTest
Module testModule = new Module() {
public void configure(Binder binder) {
- binder.bindMap(DefaultRuntimeProperties.PROPERTIES_MAP);
- binder.bindList(JdbcAdapter.DEFAULT_EXTENDED_TYPE_LIST);
- binder.bindList(JdbcAdapter.USER_EXTENDED_TYPE_LIST);
- binder.bindList(JdbcAdapter.EXTENDED_TYPE_FACTORY_LIST);
+ binder.bindMap(Constants.PROPERTIES_MAP);
+ binder.bindList(Constants.SERVER_DEFAULT_TYPES_LIST);
+ binder.bindList(Constants.SERVER_USER_TYPES_LIST);
+ binder.bindList(Constants.SERVER_TYPE_FACTORIES_LIST);
binder.bind(JdbcEventLogger.class).to(CommonsJdbcEventLogger.class);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeTest.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeTest.java Fri Mar 2 10:46:41 2012
@@ -27,6 +27,7 @@ import org.apache.cayenne.DataChannel;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.QueryResponse;
import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.ObjectContextFactory;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Key;
@@ -42,7 +43,7 @@ public class ServerRuntimeTest extends T
ServerRuntime runtime = new ServerRuntime("xxxx");
List<?> locations = runtime.getInjector().getInstance(
- Key.get(List.class, DataDomainProvider.LOCATIONS_LIST));
+ Key.get(List.class, Constants.SERVER_PROJECT_LOCATIONS_LIST));
assertEquals(Arrays.asList("xxxx"), locations);
@@ -59,7 +60,7 @@ public class ServerRuntimeTest extends T
});
List<?> locations = runtime.getInjector().getInstance(
- Key.get(List.class, DataDomainProvider.LOCATIONS_LIST));
+ Key.get(List.class, Constants.SERVER_PROJECT_LOCATIONS_LIST));
assertEquals(Arrays.asList("xxxx", "yyyy"), locations);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java Fri Mar 2 10:46:41 2012
@@ -24,7 +24,7 @@ import java.util.List;
import junit.framework.TestCase;
import org.apache.cayenne.configuration.CayenneRuntime;
-import org.apache.cayenne.configuration.server.DataDomainProvider;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.server.ServerModule;
import org.apache.cayenne.di.Key;
@@ -53,7 +53,7 @@ public class CayenneFilterTest extends T
assertNotNull(runtime);
List<?> locations = runtime.getInjector().getInstance(
- Key.get(List.class, DataDomainProvider.LOCATIONS_LIST));
+ Key.get(List.class, Constants.SERVER_PROJECT_LOCATIONS_LIST));
assertEquals(Arrays.asList("abc.xml"), locations);
}
@@ -73,7 +73,7 @@ public class CayenneFilterTest extends T
CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
assertNotNull(runtime);
List<?> locations = runtime.getInjector().getInstance(
- Key.get(List.class, DataDomainProvider.LOCATIONS_LIST));
+ Key.get(List.class, Constants.SERVER_PROJECT_LOCATIONS_LIST));
assertEquals(Arrays.asList("xyz"), locations);
}
@@ -94,7 +94,7 @@ public class CayenneFilterTest extends T
CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
assertNotNull(runtime);
List<?> locations = runtime.getInjector().getInstance(
- Key.get(List.class, DataDomainProvider.LOCATIONS_LIST));
+ Key.get(List.class, Constants.SERVER_PROJECT_LOCATIONS_LIST));
assertEquals(Arrays.asList("cayenne-abc.xml"), locations);
assertEquals(2, runtime.getModules().length);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java?rev=1296127&r1=1296126&r2=1296127&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java Fri Mar 2 10:46:41 2012
@@ -47,6 +47,7 @@ import org.apache.cayenne.access.types.T
import org.apache.cayenne.access.types.UUIDType;
import org.apache.cayenne.access.types.UtilDateType;
import org.apache.cayenne.access.types.VoidType;
+import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.DefaultObjectStoreFactory;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.ObjectStoreFactory;
@@ -141,11 +142,11 @@ public class ServerCaseModule implements
IngresUnitDbAdapter.class.getName()).put(
SQLiteAdapter.class.getName(),
SQLiteUnitDbAdapter.class.getName());
- binder.bindMap(DefaultRuntimeProperties.PROPERTIES_MAP);
+ binder.bindMap(Constants.PROPERTIES_MAP);
// configure extended types
binder
- .bindList(JdbcAdapter.DEFAULT_EXTENDED_TYPE_LIST)
+ .bindList(Constants.SERVER_DEFAULT_TYPES_LIST)
.add(new VoidType())
.add(new BigDecimalType())
.add(new BigIntegerType())
@@ -165,8 +166,8 @@ public class ServerCaseModule implements
.add(new CalendarType<GregorianCalendar>(GregorianCalendar.class))
.add(new CalendarType<Calendar>(Calendar.class))
.add(new UUIDType());
- binder.bindList(JdbcAdapter.USER_EXTENDED_TYPE_LIST);
- binder.bindList(JdbcAdapter.EXTENDED_TYPE_FACTORY_LIST);
+ binder.bindList(Constants.SERVER_USER_TYPES_LIST);
+ binder.bindList(Constants.SERVER_TYPE_FACTORIES_LIST);
binder.bind(SchemaBuilder.class).to(SchemaBuilder.class);
binder.bind(JdbcEventLogger.class).to(CommonsJdbcEventLogger.class);