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 2009/12/10 02:51:35 UTC
svn commit: r889057 - in /cayenne/main/trunk/framework:
cayenne-di-unpublished/
cayenne-di-unpublished/src/main/java/org/apache/cayenne/
cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/
cayenne-di-unpublished/src/main/java/org/apache/cayenne...
Author: aadamchik
Date: Thu Dec 10 01:51:33 2009
New Revision: 889057
URL: http://svn.apache.org/viewvc?rev=889057&view=rev
Log:
Cayenne exceptions reorg:
* Moving main Cayenne exceptions to the di module, since it is the "root" of all modules and has no dependencies on anything cayenne
* Moving cayenne-strings.properties to the di module, since it is the "root" of all modules and has no dependencies on anything cayenne
* Removing new DIException, replacing it with existing CayenneConfigurationException
Added:
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/CayenneException.java
- copied, changed from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneException.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
- copied, changed from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/ConfigurationException.java
- copied, changed from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ConfigurationException.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/util/
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java
- copied, changed from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/resources/
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/resources/org/
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/resources/org/apache/
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/resources/org/apache/cayenne/
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/resources/org/apache/cayenne/cayenne-strings.properties
- copied, changed from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/cayenne-strings.properties
cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/CayenneExceptionTest.java
- copied, changed from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneExceptionTest.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java
- copied, changed from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java
Removed:
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/DIException.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneException.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ConfigurationException.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/cayenne-strings.properties
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneExceptionTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java
Modified:
cayenne/main/trunk/framework/cayenne-di-unpublished/.classpath
cayenne/main/trunk/framework/cayenne-di-unpublished/pom.xml
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/BindingBuilder.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/DIBootstrap.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/Injector.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/ListBuilder.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/MapBuilder.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/Provider.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvider.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvidersProvider.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/CustomProvidersProvider.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/InstanceProvider.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ListProvider.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/MapProvider.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/di/mock/MockInterface1Provider.java
cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDbAdapterFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DomainDataChannelProvider.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataContextProvider.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/.classpath
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/.classpath?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/.classpath (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/.classpath Thu Dec 10 01:51:33 2009
@@ -2,6 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/pom.xml?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/pom.xml Thu Dec 10 01:51:33 2009
@@ -18,6 +18,12 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Copied: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/CayenneException.java (from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneException.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/CayenneException.java?p2=cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/CayenneException.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneException.java&r1=888911&r2=889057&rev=889057&view=diff
==============================================================================
(empty)
Copied: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/CayenneRuntimeException.java (from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneRuntimeException.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/CayenneRuntimeException.java?p2=cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/CayenneRuntimeException.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneRuntimeException.java&r1=888911&r2=889057&rev=889057&view=diff
==============================================================================
(empty)
Copied: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/ConfigurationException.java (from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ConfigurationException.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/ConfigurationException.java?p2=cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/ConfigurationException.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ConfigurationException.java&r1=888911&r2=889057&rev=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ConfigurationException.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/ConfigurationException.java Thu Dec 10 01:51:33 2009
@@ -46,7 +46,8 @@
super(cause);
}
- public ConfigurationException(String messageFormat, Throwable cause, Object... messageArgs) {
+ public ConfigurationException(String messageFormat, Throwable cause,
+ Object... messageArgs) {
super(messageFormat, cause, messageArgs);
}
}
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/BindingBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/BindingBuilder.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/BindingBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/BindingBuilder.java Thu Dec 10 01:51:33 2009
@@ -18,6 +18,8 @@
****************************************************************/
package org.apache.cayenne.di;
+import org.apache.cayenne.ConfigurationException;
+
/**
* A binding builder that helps with fluent binding creation.
*
@@ -26,15 +28,15 @@
*/
public interface BindingBuilder<T> {
- BindingBuilder<T> to(Class<? extends T> implementation) throws DIException;
+ BindingBuilder<T> to(Class<? extends T> implementation) throws ConfigurationException;
- BindingBuilder<T> toInstance(T instance) throws DIException;
+ BindingBuilder<T> toInstance(T instance) throws ConfigurationException;
BindingBuilder<T> toProvider(Class<? extends Provider<? extends T>> providerType)
- throws DIException;
+ throws ConfigurationException;
BindingBuilder<T> toProviderInstance(Provider<? extends T> provider)
- throws DIException;
+ throws ConfigurationException;
void in(Scope scope);
}
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/DIBootstrap.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/DIBootstrap.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/DIBootstrap.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/DIBootstrap.java Thu Dec 10 01:51:33 2009
@@ -18,6 +18,7 @@
****************************************************************/
package org.apache.cayenne.di;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.spi.DefaultInjector;
/**
@@ -30,7 +31,8 @@
/**
* Creates and returns an injector instance working with the set of provided modules.
*/
- public static Injector createInjector(Module... modules) throws DIException {
+ public static Injector createInjector(Module... modules)
+ throws ConfigurationException {
return new DefaultInjector(modules);
}
}
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/Injector.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/Injector.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/Injector.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/Injector.java Thu Dec 10 01:51:33 2009
@@ -21,6 +21,8 @@
import java.util.List;
import java.util.Map;
+import org.apache.cayenne.ConfigurationException;
+
/**
* A facade to the Cayenne DI container. To create an injector use {@link DIBootstrap}
* static methods.
@@ -33,13 +35,13 @@
* Returns a service instance bound in the container for a specific type. Throws
* {@link DIException} if the type is not bound, or an instance can not be created.
*/
- <T> T getInstance(Class<T> type) throws DIException;
+ <T> T getInstance(Class<T> type) throws ConfigurationException;
- <T> Provider<T> getProvider(Class<T> type) throws DIException;
+ <T> Provider<T> getProvider(Class<T> type) throws ConfigurationException;
- <T> Map<String, ?> getMapConfiguration(Class<T> type);
+ <T> Map<String, ?> getMapConfiguration(Class<T> type) throws ConfigurationException;
- <T> List<?> getListConfiguration(Class<T> type);
+ <T> List<?> getListConfiguration(Class<T> type) throws ConfigurationException;
/**
* Performs field injection on a given object, ignoring constructor injection. Since
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/ListBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/ListBuilder.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/ListBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/ListBuilder.java Thu Dec 10 01:51:33 2009
@@ -18,6 +18,8 @@
****************************************************************/
package org.apache.cayenne.di;
+import org.apache.cayenne.ConfigurationException;
+
/**
* A binding builder for list configurations.
*
@@ -26,7 +28,7 @@
*/
public interface ListBuilder<T> {
- <E> ListBuilder<T> add(Class<? extends E> interfaceType) throws DIException;
+ <E> ListBuilder<T> add(Class<? extends E> interfaceType) throws ConfigurationException;
- <E> ListBuilder<T> add(E value) throws DIException;
+ <E> ListBuilder<T> add(E value) throws ConfigurationException;
}
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/MapBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/MapBuilder.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/MapBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/MapBuilder.java Thu Dec 10 01:51:33 2009
@@ -18,6 +18,8 @@
****************************************************************/
package org.apache.cayenne.di;
+import org.apache.cayenne.ConfigurationException;
+
/**
* A binding builder for map configurations.
*
@@ -26,7 +28,8 @@
*/
public interface MapBuilder<T> {
- <E> MapBuilder<T> put(String key, Class<? extends E> interfaceType) throws DIException;
+ <E> MapBuilder<T> put(String key, Class<? extends E> interfaceType)
+ throws ConfigurationException;
- <E> MapBuilder<T> put(String key, E value) throws DIException;
+ <E> MapBuilder<T> put(String key, E value) throws ConfigurationException;
}
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/Provider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/Provider.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/Provider.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/Provider.java Thu Dec 10 01:51:33 2009
@@ -18,6 +18,8 @@
****************************************************************/
package org.apache.cayenne.di;
+import org.apache.cayenne.ConfigurationException;
+
/**
* A DI object factory interface.
*
@@ -26,5 +28,5 @@
*/
public interface Provider<T> {
- T get() throws DIException;
+ T get() throws ConfigurationException;
}
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvider.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvider.java Thu Dec 10 01:51:33 2009
@@ -24,7 +24,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
@@ -43,7 +43,7 @@
initConstructor(implementation);
if (constructor == null) {
- throw new DIException(
+ throw new ConfigurationException(
"Can't find approprate constructor for implementation class '%s'",
implementation.getName());
}
@@ -131,9 +131,10 @@
Class<?> objectClass = DIUtil.parameterClass(genericTypes[i]);
if (objectClass == null) {
- throw new DIException("Constructor provider parameter %s must be "
- + "parameterized to be usable for injection", parameter
- .getName());
+ throw new ConfigurationException(
+ "Constructor provider parameter %s must be "
+ + "parameterized to be usable for injection",
+ parameter.getName());
}
args[i] = injector.getProvider(objectClass);
@@ -154,9 +155,10 @@
return constructor.newInstance(args);
}
catch (Exception e) {
- throw new DIException("Error instantiating class '%s'", e, constructor
- .getDeclaringClass()
- .getName());
+ throw new ConfigurationException(
+ "Error instantiating class '%s'",
+ e,
+ constructor.getDeclaringClass().getName());
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvidersProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvidersProvider.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvidersProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvidersProvider.java Thu Dec 10 01:51:33 2009
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.di.spi;
-import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.Provider;
/**
@@ -35,14 +35,16 @@
this.providerType = providerType;
}
- public Provider<? extends T> get() throws DIException {
+ public Provider<? extends T> get() throws ConfigurationException {
try {
// TODO: constructor injection in provider?
return providerType.newInstance();
}
catch (Exception e) {
- throw new DIException("Error instantiating provider '%s'", e, providerType
- .getName());
+ throw new ConfigurationException(
+ "Error instantiating provider '%s'",
+ e,
+ providerType.getName());
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/CustomProvidersProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/CustomProvidersProvider.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/CustomProvidersProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/CustomProvidersProvider.java Thu Dec 10 01:51:33 2009
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.di.spi;
-import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.Provider;
/**
@@ -34,7 +34,7 @@
this.providerOfProviders = providerOfProviders;
}
- public T get() throws DIException {
+ public T get() throws ConfigurationException {
return providerOfProviders.get().get();
}
}
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java Thu Dec 10 01:51:33 2009
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.cayenne.di.spi;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.BindingBuilder;
-import org.apache.cayenne.di.DIException;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.di.Scope;
import org.apache.cayenne.di.Scopes;
@@ -40,7 +40,8 @@
this.key = DIUtil.toKey(interfaceType);
}
- public BindingBuilder<T> to(Class<? extends T> implementation) throws DIException {
+ public BindingBuilder<T> to(Class<? extends T> implementation)
+ throws ConfigurationException {
Provider<T> provider0 = new ConstructorInjectingProvider<T>(
interfaceType,
@@ -50,7 +51,7 @@
return bindInScope(provider1);
}
- public BindingBuilder<T> toInstance(T instance) throws DIException {
+ public BindingBuilder<T> toInstance(T instance) throws ConfigurationException {
Provider<T> provider0 = new InstanceProvider<T>(instance);
Provider<T> provider1 = new FieldInjectingProvider<T>(provider0, injector, key);
return bindInScope(provider1);
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java Thu Dec 10 01:51:33 2009
@@ -22,7 +22,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.di.Provider;
@@ -37,7 +37,7 @@
private Map<String, ListProvider> listConfigurations;
private InjectionStack injectionStack;
- public DefaultInjector(Module... modules) throws DIException {
+ public DefaultInjector(Module... modules) throws ConfigurationException {
this.bindings = new HashMap<String, Provider<?>>();
this.mapConfigurations = new HashMap<String, MapProvider>();
@@ -74,7 +74,7 @@
return listConfigurations;
}
- public <T> T getInstance(Class<T> type) throws DIException {
+ public <T> T getInstance(Class<T> type) throws ConfigurationException {
return getProvider(type).get();
}
@@ -87,7 +87,7 @@
ListProvider provider = listConfigurations.get(key);
if (provider == null) {
- throw new DIException(
+ throw new ConfigurationException(
"Type '%s' has no bound list configuration in the DI container."
+ " Injection stack: %s",
type.getName(),
@@ -106,7 +106,7 @@
MapProvider provider = mapConfigurations.get(key);
if (provider == null) {
- throw new DIException(
+ throw new ConfigurationException(
"Type '%s' has no bound map configuration in the DI container."
+ " Injection stack: %s",
type.getName(),
@@ -116,7 +116,7 @@
return provider.get();
}
- public <T> Provider<T> getProvider(Class<T> type) throws DIException {
+ public <T> Provider<T> getProvider(Class<T> type) throws ConfigurationException {
if (type == null) {
throw new NullPointerException("Null type");
}
@@ -125,8 +125,9 @@
Provider<T> provider = (Provider<T>) bindings.get(key);
if (provider == null) {
- throw new DIException("Type '%s' is not bound in the DI container.", type
- .getName());
+ throw new ConfigurationException(
+ "Type '%s' is not bound in the DI container.",
+ type.getName());
}
return provider;
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java Thu Dec 10 01:51:33 2009
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.di.spi;
-import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.ListBuilder;
/**
@@ -34,7 +34,8 @@
implementationTypeKey = DIUtil.toKey(implementationType);
}
- public <E> ListBuilder<T> add(Class<? extends E> interfaceType) throws DIException {
+ public <E> ListBuilder<T> add(Class<? extends E> interfaceType)
+ throws ConfigurationException {
ListProvider listProvider = injector.getListConfigurations().get(
implementationTypeKey);
@@ -47,7 +48,7 @@
return this;
}
- public <E> ListBuilder<T> add(E value) throws DIException {
+ public <E> ListBuilder<T> add(E value) throws ConfigurationException {
InstanceProvider<E> provider = new InstanceProvider<E>(value);
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java Thu Dec 10 01:51:33 2009
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.di.spi;
-import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.MapBuilder;
/**
@@ -35,7 +35,7 @@
}
public <E> MapBuilder<T> put(String key, Class<? extends E> interfaceType)
- throws DIException {
+ throws ConfigurationException {
MapProvider mapProvider = injector.getMapConfigurations().get(
implementationTypeKey);
@@ -49,7 +49,7 @@
return this;
}
- public <E> MapBuilder<T> put(String key, E value) throws DIException {
+ public <E> MapBuilder<T> put(String key, E value) throws ConfigurationException {
InstanceProvider<E> provider = new InstanceProvider<E>(value);
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java Thu Dec 10 01:51:33 2009
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
@@ -62,7 +62,7 @@
return initInjectionPoints(type.getSuperclass(), injectableFields);
}
- public T get() throws DIException {
+ public T get() throws ConfigurationException {
T object = delegate.get();
injectMembers(object);
return object;
@@ -85,10 +85,12 @@
Class<?> objectClass = DIUtil.parameterClass(field.getGenericType());
if (objectClass == null) {
- throw new DIException("Provider field %s.%s of type %s must be "
- + "parameterized to be usable for injection", field
- .getDeclaringClass()
- .getName(), field.getName(), fieldType.getName());
+ throw new ConfigurationException(
+ "Provider field %s.%s of type %s must be "
+ + "parameterized to be usable for injection",
+ field.getDeclaringClass().getName(),
+ field.getName(),
+ fieldType.getName());
}
value = injector.getProvider(objectClass);
@@ -112,7 +114,7 @@
field.getDeclaringClass().getName(),
field.getName(),
fieldType.getName());
- throw new DIException(message, e);
+ throw new ConfigurationException(message, e);
}
}
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java Thu Dec 10 01:51:33 2009
@@ -21,7 +21,7 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.ConfigurationException;
/**
* A helper object that tracks the injection stack to prevent circular dependencies.
@@ -43,7 +43,7 @@
}
}
- void push(String bindingKey) throws DIException {
+ void push(String bindingKey) throws ConfigurationException {
LinkedList<String> localStack = stack.get();
if (localStack == null) {
localStack = new LinkedList<String>();
@@ -51,7 +51,7 @@
}
if (localStack.contains(bindingKey)) {
- throw new DIException(
+ throw new ConfigurationException(
"Circular dependency detected when binding a key \"%s\". Nested keys: %s"
+ ". To resolve it, you should inject a Provider instead of an object.",
bindingKey,
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/InstanceProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/InstanceProvider.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/InstanceProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/InstanceProvider.java Thu Dec 10 01:51:33 2009
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.di.spi;
-import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.Provider;
/**
@@ -32,7 +32,7 @@
this.value = value;
}
- public T get() throws DIException {
+ public T get() throws ConfigurationException {
return value;
}
}
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ListProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ListProvider.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ListProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/ListProvider.java Thu Dec 10 01:51:33 2009
@@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.Provider;
/**
@@ -35,7 +35,7 @@
this.providers = new ArrayList<Provider<?>>();
}
- public List<?> get() throws DIException {
+ public List<?> get() throws ConfigurationException {
List<Object> list = new ArrayList<Object>(providers.size());
for (Provider<?> provider : providers) {
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/MapProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/MapProvider.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/MapProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/MapProvider.java Thu Dec 10 01:51:33 2009
@@ -22,7 +22,7 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.Provider;
/**
@@ -36,7 +36,7 @@
this.providers = new HashMap<String, Provider<?>>();
}
- public Map<String, ?> get() throws DIException {
+ public Map<String, ?> get() throws ConfigurationException {
Map<String, Object> map = new HashMap<String, Object>();
for (Entry<String, Provider<?>> entry : providers.entrySet()) {
Copied: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java (from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java?p2=cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java&r1=888911&r2=889057&rev=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java Thu Dec 10 01:51:33 2009
@@ -17,21 +17,14 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.util;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import org.apache.cayenne.CayenneRuntimeException;
-
-// TODO: Merge with ModelerStrings (avoid code duplication). Allow
-// customizable bundle location.
-
/**
* Provides access to various modeler resources (mainly strings) obtained via a
* ResourceBundle.
- *
*/
public class LocalizedStringsHandler {
@@ -61,7 +54,9 @@
bundle = ResourceBundle.getBundle(DEFAULT_MESSAGE_BUNDLE);
}
catch (MissingResourceException e) {
- throw new CayenneRuntimeException("Can't load properties: "
+ // do not throw Cayenne exceptions, as they rely on
+ // LocalizedStringsHandler, and we can get into infinite loop
+ throw new RuntimeException("Can't load properties: "
+ DEFAULT_MESSAGE_BUNDLE, e);
}
}
Copied: cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/resources/org/apache/cayenne/cayenne-strings.properties (from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/cayenne-strings.properties)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/resources/org/apache/cayenne/cayenne-strings.properties?p2=cayenne/main/trunk/framework/cayenne-di-unpublished/src/main/resources/org/apache/cayenne/cayenne-strings.properties&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/cayenne-strings.properties&r1=888911&r2=889057&rev=889057&view=diff
==============================================================================
(empty)
Copied: cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/CayenneExceptionTest.java (from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneExceptionTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/CayenneExceptionTest.java?p2=cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/CayenneExceptionTest.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneExceptionTest.java&r1=888911&r2=889057&rev=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneExceptionTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/CayenneExceptionTest.java Thu Dec 10 01:51:33 2009
@@ -21,8 +21,6 @@
import junit.framework.TestCase;
-/**
- */
public class CayenneExceptionTest extends TestCase {
public void testConstructor1() throws Exception {
@@ -41,9 +39,8 @@
Throwable cause = new Throwable();
CayenneException ex = new CayenneException(cause);
assertSame(cause, ex.getCause());
- assertEquals(
- CayenneException.getExceptionLabel() + cause.toString(),
- ex.getMessage());
+ assertEquals(CayenneException.getExceptionLabel() + cause.toString(), ex
+ .getMessage());
}
public void testConstructor4() throws Exception {
@@ -52,12 +49,12 @@
assertSame(cause, ex.getCause());
assertEquals(CayenneException.getExceptionLabel() + "abc", ex.getMessage());
}
-
+
public void testMessageFormatting1() throws Exception {
CayenneException ex = new CayenneException("x%sx%sx", "a", "b");
assertEquals("xaxbx", ex.getUnlabeledMessage());
}
-
+
public void testMessageFormatting2() throws Exception {
Throwable cause = new Throwable();
CayenneException ex = new CayenneException("x%sx%sx", cause, "a", "b");
Copied: cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java (from r888911, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java?p2=cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java&r1=888911&r2=889057&rev=889057&view=diff
==============================================================================
(empty)
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/di/mock/MockInterface1Provider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/di/mock/MockInterface1Provider.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/di/mock/MockInterface1Provider.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/di/mock/MockInterface1Provider.java Thu Dec 10 01:51:33 2009
@@ -18,12 +18,11 @@
****************************************************************/
package org.apache.cayenne.di.mock;
-import org.apache.cayenne.di.DIException;
import org.apache.cayenne.di.Provider;
public class MockInterface1Provider implements Provider<MockInterface1> {
- public MockInterface1 get() throws DIException {
+ public MockInterface1 get() {
return new MockImplementation1();
}
}
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java Thu Dec 10 01:51:33 2009
@@ -20,8 +20,8 @@
import junit.framework.TestCase;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.Binder;
-import org.apache.cayenne.di.DIException;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.di.mock.MockImplementation1_DepOn2;
import org.apache.cayenne.di.mock.MockImplementation1_DepOn2Constructor;
@@ -49,7 +49,7 @@
injector.getInstance(MockInterface1.class);
fail("Circular dependency is not detected.");
}
- catch (DIException e) {
+ catch (ConfigurationException e) {
// expected
}
catch (StackOverflowError e) {
@@ -92,7 +92,7 @@
injector.getInstance(MockInterface1.class);
fail("Circular dependency is not detected.");
}
- catch (DIException e) {
+ catch (ConfigurationException e) {
// expected
}
catch (StackOverflowError e) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml Thu Dec 10 01:51:33 2009
@@ -131,22 +131,6 @@
</dependency>
</dependencies>
<build>
- <resources>
- <!-- don't filter dotemplates -->
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>dotemplates/**</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>dotemplates/**</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDbAdapterFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDbAdapterFactory.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDbAdapterFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDbAdapterFactory.java Thu Dec 10 01:51:33 2009
@@ -30,7 +30,6 @@
import org.apache.cayenne.dba.AutoAdapter;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.JdbcAdapter;
-import org.apache.cayenne.di.DIException;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
@@ -65,7 +64,7 @@
else {
return new AutoAdapter(new Provider<DbAdapter>() {
- public DbAdapter get() throws DIException {
+ public DbAdapter get() {
return detectAdapter(nodeDescriptor, dataSource);
}
});
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DomainDataChannelProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DomainDataChannelProvider.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DomainDataChannelProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DomainDataChannelProvider.java Thu Dec 10 01:51:33 2009
@@ -20,7 +20,6 @@
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.access.DataDomain;
-import org.apache.cayenne.di.DIException;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
@@ -34,8 +33,8 @@
@Inject
protected DataDomain dataDomain;
-
- public DataChannel get() throws DIException {
+
+ public DataChannel get() {
return dataDomain;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/AutoAdapter.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/AutoAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/AutoAdapter.java Thu Dec 10 01:51:33 2009
@@ -48,7 +48,6 @@
import org.apache.cayenne.dba.sqlite.SQLiteSniffer;
import org.apache.cayenne.dba.sqlserver.SQLServerSniffer;
import org.apache.cayenne.dba.sybase.SybaseSniffer;
-import org.apache.cayenne.di.DIException;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
@@ -159,7 +158,7 @@
this.adapterProvider = new Provider<DbAdapter>() {
- public DbAdapter get() throws DIException {
+ public DbAdapter get() {
DbAdapter adapter;
try {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataContextProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataContextProvider.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataContextProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataContextProvider.java Thu Dec 10 01:51:33 2009
@@ -18,9 +18,9 @@
****************************************************************/
package org.apache.cayenne.runtime;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.access.DataDomain;
-import org.apache.cayenne.di.DIException;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
@@ -32,7 +32,7 @@
@Inject
protected DataDomain dataDomain;
- public DataContext get() throws DIException {
+ public DataContext get() throws ConfigurationException {
// TODO: andrus 12.5.2009 - deprecate 'createDataContext' in DataDomain and move
// it to this provider instead
return dataDomain.createDataContext();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java?rev=889057&r1=889056&r2=889057&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java Thu Dec 10 01:51:33 2009
@@ -20,6 +20,7 @@
import javax.sql.DataSource;
+import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.access.DataNode;
@@ -32,7 +33,6 @@
import org.apache.cayenne.configuration.DataSourceFactoryLoader;
import org.apache.cayenne.configuration.DbAdapterFactory;
import org.apache.cayenne.configuration.RuntimeProperties;
-import org.apache.cayenne.di.DIException;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.map.DataMap;
@@ -65,7 +65,7 @@
protected volatile DataDomain dataDomain;
- public DataDomain get() throws DIException {
+ public DataDomain get() throws ConfigurationException {
if (dataDomain == null) {
synchronized (this) {
@@ -74,12 +74,14 @@
try {
createDataChannel();
}
- catch (DIException e) {
+ catch (ConfigurationException e) {
throw e;
}
catch (Exception e) {
- throw new DIException("Error loading DataChannel: '%s'", e, e
- .getMessage());
+ throw new ConfigurationException(
+ "Error loading DataChannel: '%s'",
+ e,
+ e.getMessage());
}
}
}