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 2013/07/28 17:26:49 UTC
svn commit: r1507803 -
/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/
Author: aadamchik
Date: Sun Jul 28 15:26:48 2013
New Revision: 1507803
URL: http://svn.apache.org/r1507803
Log:
Java 1.6 @Override for interface methods
Modified:
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataContextFactory.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DomainDataChannelProvider.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java?rev=1507803&r1=1507802&r2=1507803&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java Sun Jul 28 15:26:48 2013
@@ -48,6 +48,7 @@ public class DBCPDataSourceFactory imple
@Inject
protected ResourceLocator resourceLocator;
+ @Override
public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {
String location = nodeDescriptor.getParameters();
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataContextFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataContextFactory.java?rev=1507803&r1=1507802&r2=1507803&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataContextFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataContextFactory.java Sun Jul 28 15:26:48 2013
@@ -52,10 +52,12 @@ public class DataContextFactory implemen
@Inject
protected QueryCache queryCache;
+ @Override
public ObjectContext createContext() {
return createdFromDataDomain(dataDomain);
}
+ @Override
public ObjectContext createContext(DataChannel parent) {
// this switch may go away once we figure out clean property configuration...
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java?rev=1507803&r1=1507802&r2=1507803&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java Sun Jul 28 15:26:48 2013
@@ -100,6 +100,7 @@ public class DataDomainProvider implemen
@Inject
protected RuntimeProperties runtimeProperties;
+ @Override
public DataDomain get() throws ConfigurationException {
try {
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java?rev=1507803&r1=1507802&r2=1507803&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java Sun Jul 28 15:26:48 2013
@@ -63,6 +63,7 @@ public class DefaultDbAdapterFactory imp
this.detectors = detectors;
}
+ @Override
public DbAdapter createAdapter(DataNodeDescriptor nodeDescriptor, final DataSource dataSource) throws Exception {
String adapterType = null;
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java?rev=1507803&r1=1507802&r2=1507803&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java Sun Jul 28 15:26:48 2013
@@ -63,6 +63,7 @@ public class DelegatingDataSourceFactory
managedDataSources = new ConcurrentHashMap<DataSource, ScopeEventListener>();
}
+ @Override
public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {
DataSource dataSource = getDataSourceFactory(nodeDescriptor).getDataSource(
nodeDescriptor);
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DomainDataChannelProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DomainDataChannelProvider.java?rev=1507803&r1=1507802&r2=1507803&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DomainDataChannelProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/DomainDataChannelProvider.java Sun Jul 28 15:26:48 2013
@@ -34,6 +34,7 @@ public class DomainDataChannelProvider i
@Inject
protected DataDomain dataDomain;
+ @Override
public DataChannel get() {
return dataDomain;
}
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java?rev=1507803&r1=1507802&r2=1507803&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java Sun Jul 28 15:26:48 2013
@@ -42,6 +42,7 @@ public class JNDIDataSourceFactory imple
@Inject
protected JdbcEventLogger jdbcEventLogger;
+ @Override
public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {
String location = nodeDescriptor.getParameters();
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java?rev=1507803&r1=1507802&r2=1507803&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java Sun Jul 28 15:26:48 2013
@@ -53,6 +53,7 @@ public class PropertyDataSourceFactory i
@Inject
protected JdbcEventLogger jdbcEventLogger;
+ @Override
public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {
String suffix = "."
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java?rev=1507803&r1=1507802&r2=1507803&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java Sun Jul 28 15:26:48 2013
@@ -45,6 +45,7 @@ public class XMLPoolingDataSourceFactory
@Inject
protected JdbcEventLogger jdbcEventLogger;
+ @Override
public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {
DataSourceInfo dataSourceDescriptor = nodeDescriptor.getDataSourceDescriptor();