Author: aadamchik
Date: Wed Nov 20 18:36:23 2013
New Revision: 1543901
URL: http://svn.apache.org/r1543901
Log:
CAY-1886 cayenne-di module reorg, new exceptions
Added:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java
- copied, changed from r1543875,
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/ConfigurationException.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
- copied, changed from r1543875,
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/CayenneException.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
- copied, changed from r1543875,
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ConfigurationException.java
- copied, changed from r1543875,
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/ConfigurationException.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java
- copied, changed from r1543875,
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java
cayenne/main/trunk/cayenne-server/src/main/resources/org/apache/cayenne/cayenne-strings.properties
- copied, changed from r1543875,
cayenne/main/trunk/cayenne-di/src/main/resources/org/apache/cayenne/cayenne-strings.properties
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneExceptionTest.java
- copied, changed from r1543875,
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/CayenneExceptionTest.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java
- copied, changed from r1543875,
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java
Removed:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/CayenneException.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/ConfigurationException.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/util/
cayenne/main/trunk/cayenne-di/src/main/resources/
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/CayenneExceptionTest.java
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java
Modified:
cayenne/main/trunk/cayenne-di/pom.xml
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/BindingBuilder.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/DIBootstrap.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Injector.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/ListBuilder.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/MapBuilder.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Provider.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvider.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/CustomProvidersProvider.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultScopeProvider.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InstanceProvider.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ListProvider.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/MapProvider.java
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ScopeEventBinding.java
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_Provider.java
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java
cayenne/main/trunk/cayenne-server/pom.xml
cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
Modified: cayenne/main/trunk/cayenne-di/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/pom.xml?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-di/pom.xml (original)
+++ cayenne/main/trunk/cayenne-di/pom.xml Wed Nov 20 18:36:23 2013
@@ -29,12 +29,6 @@
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/BindingBuilder.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/BindingBuilder.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/BindingBuilder.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/BindingBuilder.java
Wed Nov 20 18:36:23 2013
@@ -18,7 +18,8 @@
****************************************************************/
package org.apache.cayenne.di;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
+
/**
* A binding builder that helps with fluent binding creation.
@@ -28,15 +29,15 @@ import org.apache.cayenne.ConfigurationE
*/
public interface BindingBuilder<T> {
- BindingBuilder<T> to(Class<? extends T> implementation) throws
ConfigurationException;
+ BindingBuilder<T> to(Class<? extends T> implementation) throws
DIRuntimeException;
- BindingBuilder<T> toInstance(T instance) throws ConfigurationException;
+ BindingBuilder<T> toInstance(T instance) throws DIRuntimeException;
BindingBuilder<T> toProvider(Class<? extends Provider<? extends T>>
providerType)
- throws ConfigurationException;
+ throws DIRuntimeException;
BindingBuilder<T> toProviderInstance(Provider<? extends T> provider)
- throws ConfigurationException;
+ throws DIRuntimeException;
/**
* Sets the scope of a bound instance. This method is used to change the
default scope
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/DIBootstrap.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/DIBootstrap.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/DIBootstrap.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/DIBootstrap.java
Wed Nov 20 18:36:23 2013
@@ -20,7 +20,7 @@ package org.apache.cayenne.di;
import java.util.Collection;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.spi.DefaultInjector;
/**
@@ -34,7 +34,7 @@ public class DIBootstrap {
* Creates and returns an injector instance working with the set of
provided modules.
*/
public static Injector createInjector(Module... modules)
- throws ConfigurationException {
+ throws DIRuntimeException {
return new DefaultInjector(modules);
}
Copied:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java
(from r1543875,
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/ConfigurationException.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java?p2=cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java&p1=cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/ConfigurationException.java&r1=1543875&r2=1543901&rev=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/ConfigurationException.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java
Wed Nov 20 18:36:23 2013
@@ -16,38 +16,37 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-
-package org.apache.cayenne;
+package org.apache.cayenne.di;
/**
- * A runtime exception thrown on failures in Cayenne configuration.
+ * A runtime exception thrown on DI misconfiguration.
+ *
+ * @since 3.2
*/
-public class ConfigurationException extends CayenneRuntimeException {
-
+public class DIRuntimeException extends RuntimeException {
/**
* Creates new <code>ConfigurationException</code> without detail message.
*/
- public ConfigurationException() {
+ public DIRuntimeException() {
}
/**
- * Constructs an exception with the specified message with an optional
list of message
- * formatting arguments. Message formatting rules follow
"String.format(..)"
- * conventions.
+ * Constructs an exception with the specified message with an optional list
+ * of message formatting arguments. Message formatting rules follow
+ * "String.format(..)" conventions.
*/
- public ConfigurationException(String messageFormat, Object... messageArgs)
{
- super(messageFormat, messageArgs);
+ public DIRuntimeException(String messageFormat, Object... messageArgs) {
+ super(String.format(messageFormat, messageArgs));
}
/**
* Constructs an exception wrapping another exception thrown elsewhere.
*/
- public ConfigurationException(Throwable cause) {
+ public DIRuntimeException(Throwable cause) {
super(cause);
}
- public ConfigurationException(String messageFormat, Throwable cause,
- Object... messageArgs) {
- super(messageFormat, cause, messageArgs);
+ public DIRuntimeException(String messageFormat, Throwable cause, Object...
messageArgs) {
+ super(String.format(messageFormat, messageArgs), cause);
}
}
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Injector.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Injector.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Injector.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Injector.java
Wed Nov 20 18:36:23 2013
@@ -18,7 +18,8 @@
****************************************************************/
package org.apache.cayenne.di;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
+
/**
* A facade to the Cayenne DI container. To create an injector use {@link
DIBootstrap}
@@ -30,21 +31,21 @@ public interface Injector {
/**
* Returns a service instance bound in the container for a specific type.
Throws
- *{@link ConfigurationException} if the type is not bound, or an instance
can not be
+ *{@link DIRuntimeException} if the type is not bound, or an instance can
not be
* created.
*/
- <T> T getInstance(Class<T> type) throws ConfigurationException;
+ <T> T getInstance(Class<T> type) throws DIRuntimeException;
/**
* Returns a service instance bound in the container for a specific
binding key.
- * Throws {@link ConfigurationException} if the key is not bound, or an
instance can
+ * Throws {@link DIRuntimeException} if the key is not bound, or an
instance can
* not be created.
*/
- <T> T getInstance(Key<T> key) throws ConfigurationException;
+ <T> T getInstance(Key<T> key) throws DIRuntimeException;
- <T> Provider<T> getProvider(Class<T> type) throws ConfigurationException;
+ <T> Provider<T> getProvider(Class<T> type) throws DIRuntimeException;
- <T> Provider<T> getProvider(Key<T> key) throws ConfigurationException;
+ <T> Provider<T> getProvider(Key<T> key) throws DIRuntimeException;
/**
* Performs field injection on a given object, ignoring constructor
injection. Since
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/ListBuilder.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/ListBuilder.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/ListBuilder.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/ListBuilder.java
Wed Nov 20 18:36:23 2013
@@ -20,7 +20,7 @@ package org.apache.cayenne.di;
import java.util.Collection;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
/**
* A binding builder for list configurations.
@@ -30,11 +30,11 @@ import org.apache.cayenne.ConfigurationE
*/
public interface ListBuilder<T> {
- ListBuilder<T> add(Class<? extends T> interfaceType) throws
ConfigurationException;
+ ListBuilder<T> add(Class<? extends T> interfaceType) throws
DIRuntimeException;
- ListBuilder<T> add(T value) throws ConfigurationException;
+ ListBuilder<T> add(T value) throws DIRuntimeException;
- ListBuilder<T> addAll(Collection<T> values) throws ConfigurationException;
+ ListBuilder<T> addAll(Collection<T> values) throws DIRuntimeException;
void in(Scope scope);
}
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/MapBuilder.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/MapBuilder.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/MapBuilder.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/MapBuilder.java
Wed Nov 20 18:36:23 2013
@@ -20,7 +20,7 @@ package org.apache.cayenne.di;
import java.util.Map;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
/**
* A binding builder for map configurations. Creates a parameterized map of
type <String,
@@ -32,11 +32,11 @@ import org.apache.cayenne.ConfigurationE
public interface MapBuilder<T> {
MapBuilder<T> put(String key, Class<? extends T> interfaceType)
- throws ConfigurationException;
+ throws DIRuntimeException;
- MapBuilder<T> put(String key, T value) throws ConfigurationException;
+ MapBuilder<T> put(String key, T value) throws DIRuntimeException;
- MapBuilder<T> putAll(Map<String, T> map) throws ConfigurationException;
+ MapBuilder<T> putAll(Map<String, T> map) throws DIRuntimeException;
void in(Scope scope);
}
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Provider.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Provider.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Provider.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/Provider.java
Wed Nov 20 18:36:23 2013
@@ -18,7 +18,8 @@
****************************************************************/
package org.apache.cayenne.di;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
+
/**
* A DI object factory interface.
@@ -28,5 +29,5 @@ import org.apache.cayenne.ConfigurationE
*/
public interface Provider<T> {
- T get() throws ConfigurationException;
+ T get() throws DIRuntimeException;
}
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvider.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvider.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvider.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingProvider.java
Wed Nov 20 18:36:23 2013
@@ -22,7 +22,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Type;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.Provider;
@@ -42,7 +42,7 @@ class ConstructorInjectingProvider<T> im
initConstructor(implementation);
if (constructor == null) {
- throw new ConfigurationException(
+ throw new DIRuntimeException(
"Can't find approprate constructor for implementation
class '%s'",
implementation.getName());
}
@@ -97,7 +97,7 @@ class ConstructorInjectingProvider<T> im
}
if (lastMatch == null) {
- throw new ConfigurationException(
+ throw new DIRuntimeException(
"No applicable constructor is found for constructor
injection in class '%s'",
implementation.getName());
}
@@ -138,7 +138,7 @@ class ConstructorInjectingProvider<T> im
Class<?> objectClass = DIUtil.parameterClass(genericTypes[i]);
if (objectClass == null) {
- throw new ConfigurationException(
+ throw new DIRuntimeException(
"Constructor provider parameter %s must be "
+ "parameterized to be usable for
injection",
parameter.getName());
@@ -164,7 +164,7 @@ class ConstructorInjectingProvider<T> im
return constructor.newInstance(args);
}
catch (Exception e) {
- throw new ConfigurationException(
+ throw new DIRuntimeException(
"Error instantiating class '%s'",
e,
constructor.getDeclaringClass().getName());
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/CustomProvidersProvider.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/CustomProvidersProvider.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/CustomProvidersProvider.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/CustomProvidersProvider.java
Wed Nov 20 18:36:23 2013
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.di.spi;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Provider;
/**
@@ -34,7 +34,7 @@ class CustomProvidersProvider<T> impleme
this.providerOfProviders = providerOfProviders;
}
- public T get() throws ConfigurationException {
+ public T get() throws DIRuntimeException {
return providerOfProviders.get().get();
}
}
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
Wed Nov 20 18:36:23 2013
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.cayenne.di.spi;
-import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.di.AdhocObjectFactory;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Provider;
@@ -51,7 +51,7 @@ public class DefaultAdhocObjectFactory i
type = (Class<T>)getJavaClass(className);
}
catch (ClassNotFoundException e) {
- throw new CayenneRuntimeException(
+ throw new DIRuntimeException(
"Invalid class %s of type %s",
e,
className,
@@ -59,7 +59,7 @@ public class DefaultAdhocObjectFactory i
}
if (!superType.isAssignableFrom(type)) {
- throw new CayenneRuntimeException(
+ throw new DIRuntimeException(
"Class %s is not assignable to %s",
className,
superType.getName());
@@ -72,7 +72,7 @@ public class DefaultAdhocObjectFactory i
instance = provider1.get();
}
catch (Exception e) {
- throw new CayenneRuntimeException(
+ throw new DIRuntimeException(
"Error creating instance of class %s of type %s",
e,
className,
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java
Wed Nov 20 18:36:23 2013
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.di.spi;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.BindingBuilder;
import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.Provider;
@@ -38,7 +38,7 @@ class DefaultBindingBuilder<T> implement
}
public BindingBuilder<T> to(Class<? extends T> implementation)
- throws ConfigurationException {
+ throws DIRuntimeException {
Provider<T> provider0 = new ConstructorInjectingProvider<T>(
implementation,
@@ -49,7 +49,7 @@ class DefaultBindingBuilder<T> implement
return this;
}
- public BindingBuilder<T> toInstance(T instance) throws
ConfigurationException {
+ public BindingBuilder<T> toInstance(T instance) throws DIRuntimeException {
Provider<T> provider0 = new InstanceProvider<T>(instance);
Provider<T> provider1 = new FieldInjectingProvider<T>(provider0,
injector);
injector.putBinding(bindingKey, provider1);
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java
Wed Nov 20 18:36:23 2013
@@ -21,7 +21,7 @@ package org.apache.cayenne.di.spi;
import java.util.HashMap;
import java.util.Map;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.Module;
@@ -42,7 +42,7 @@ public class DefaultInjector implements
private InjectionStack injectionStack;
private Scope defaultScope;
- public DefaultInjector(Module... modules) throws ConfigurationException {
+ public DefaultInjector(Module... modules) throws DIRuntimeException {
this.singletonScope = new DefaultScope();
this.noScope = NoScope.INSTANCE;
@@ -71,7 +71,7 @@ public class DefaultInjector implements
return injectionStack;
}
- <T> Binding<T> getBinding(Key<T> key) throws ConfigurationException {
+ <T> Binding<T> getBinding(Key<T> key) throws DIRuntimeException {
if (key == null) {
throw new NullPointerException("Null key");
@@ -93,25 +93,25 @@ public class DefaultInjector implements
Binding<?> binding = bindings.get(bindingKey);
if (binding == null) {
- throw new ConfigurationException("No existing binding for key " +
bindingKey);
+ throw new DIRuntimeException("No existing binding for key " +
bindingKey);
}
binding.changeScope(scope);
}
- public <T> T getInstance(Class<T> type) throws ConfigurationException {
+ public <T> T getInstance(Class<T> type) throws DIRuntimeException {
return getProvider(type).get();
}
- public <T> T getInstance(Key<T> key) throws ConfigurationException {
+ public <T> T getInstance(Key<T> key) throws DIRuntimeException {
return getProvider(key).get();
}
- public <T> Provider<T> getProvider(Class<T> type) throws
ConfigurationException {
+ public <T> Provider<T> getProvider(Class<T> type) throws
DIRuntimeException {
return getProvider(Key.get(type));
}
- public <T> Provider<T> getProvider(Key<T> key) throws
ConfigurationException {
+ public <T> Provider<T> getProvider(Key<T> key) throws DIRuntimeException {
if (key == null) {
throw new NullPointerException("Null key");
@@ -120,7 +120,7 @@ public class DefaultInjector implements
Binding<T> binding = (Binding<T>) bindings.get(key);
if (binding == null) {
- throw new ConfigurationException(
+ throw new DIRuntimeException(
"DI container has no binding for key %s",
key);
}
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java
Wed Nov 20 18:36:23 2013
@@ -21,7 +21,7 @@ package org.apache.cayenne.di.spi;
import java.util.Collection;
import java.util.List;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.ListBuilder;
import org.apache.cayenne.di.Provider;
@@ -45,12 +45,12 @@ class DefaultListBuilder<T> implements L
}
public ListBuilder<T> add(Class<? extends T> interfaceType)
- throws ConfigurationException {
+ throws DIRuntimeException {
getListProvider().add(injector.getProvider(interfaceType));
return this;
}
- public ListBuilder<T> add(T value) throws ConfigurationException {
+ public ListBuilder<T> add(T value) throws DIRuntimeException {
Provider<T> provider0 = new InstanceProvider<T>(value);
Provider<T> provider1 = new FieldInjectingProvider<T>(provider0,
injector);
@@ -59,7 +59,7 @@ class DefaultListBuilder<T> implements L
return this;
}
- public ListBuilder<T> addAll(Collection<T> values) throws
ConfigurationException {
+ public ListBuilder<T> addAll(Collection<T> values) throws
DIRuntimeException {
ListProvider listProvider = getListProvider();
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java
Wed Nov 20 18:36:23 2013
@@ -21,7 +21,7 @@ package org.apache.cayenne.di.spi;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.MapBuilder;
import org.apache.cayenne.di.Provider;
@@ -45,14 +45,14 @@ class DefaultMapBuilder<T> implements Ma
}
public MapBuilder<T> put(String key, Class<? extends T> interfaceType)
- throws ConfigurationException {
+ throws DIRuntimeException {
// TODO: andrus 11/15/2009 - report overriding the key??
getMapProvider().put(key, injector.getProvider(interfaceType));
return this;
}
- public MapBuilder<T> put(String key, T value) throws
ConfigurationException {
+ public MapBuilder<T> put(String key, T value) throws DIRuntimeException {
Provider<T> provider0 = new InstanceProvider<T>(value);
Provider<T> provider1 = new FieldInjectingProvider<T>(provider0,
injector);
@@ -62,7 +62,7 @@ class DefaultMapBuilder<T> implements Ma
return this;
}
- public MapBuilder<T> putAll(Map<String, T> map) throws
ConfigurationException {
+ public MapBuilder<T> putAll(Map<String, T> map) throws DIRuntimeException {
MapProvider provider = getMapProvider();
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultScopeProvider.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultScopeProvider.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultScopeProvider.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultScopeProvider.java
Wed Nov 20 18:36:23 2013
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.di.spi;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Provider;
/**
@@ -49,7 +49,7 @@ public class DefaultScopeProvider<T> imp
instance = delegate.get();
if (instance == null) {
- throw new ConfigurationException(
+ throw new DIRuntimeException(
"Underlying provider (%s) returned NULL
instance",
delegate.getClass().getName());
}
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
Wed Nov 20 18:36:23 2013
@@ -20,7 +20,7 @@ package org.apache.cayenne.di.spi;
import java.lang.reflect.Field;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.Provider;
@@ -38,7 +38,7 @@ class FieldInjectingProvider<T> implemen
this.injector = injector;
}
- public T get() throws ConfigurationException {
+ public T get() throws DIRuntimeException {
T object = delegate.get();
injectMembers(object, object.getClass());
return object;
@@ -74,7 +74,7 @@ class FieldInjectingProvider<T> implemen
Class<?> objectClass =
DIUtil.parameterClass(field.getGenericType());
if (objectClass == null) {
- throw new ConfigurationException(
+ throw new DIRuntimeException(
"Provider field %s.%s of type %s must be "
+ "parameterized to be usable for injection",
field.getDeclaringClass().getName(),
@@ -107,7 +107,7 @@ class FieldInjectingProvider<T> implemen
field.getDeclaringClass().getName(),
field.getName(),
fieldType.getName());
- throw new ConfigurationException(message, e);
+ throw new DIRuntimeException(message, e);
}
}
}
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java
Wed Nov 20 18:36:23 2013
@@ -21,7 +21,7 @@ package org.apache.cayenne.di.spi;
import java.util.LinkedList;
import java.util.List;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Key;
/**
@@ -44,7 +44,7 @@ class InjectionStack {
}
}
- void push(Key<?> bindingKey) throws ConfigurationException {
+ void push(Key<?> bindingKey) throws DIRuntimeException {
LinkedList<Key<?>> localStack = stack.get();
if (localStack == null) {
localStack = new LinkedList<Key<?>>();
@@ -52,7 +52,7 @@ class InjectionStack {
}
if (localStack.contains(bindingKey)) {
- throw new ConfigurationException(
+ throw new DIRuntimeException(
"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/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InstanceProvider.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InstanceProvider.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InstanceProvider.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InstanceProvider.java
Wed Nov 20 18:36:23 2013
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.di.spi;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Provider;
/**
@@ -32,7 +32,7 @@ class InstanceProvider<T> implements Pro
this.value = value;
}
- public T get() throws ConfigurationException {
+ public T get() throws DIRuntimeException {
return value;
}
}
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ListProvider.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ListProvider.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ListProvider.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ListProvider.java
Wed Nov 20 18:36:23 2013
@@ -21,7 +21,7 @@ package org.apache.cayenne.di.spi;
import java.util.ArrayList;
import java.util.List;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Provider;
/**
@@ -35,7 +35,7 @@ class ListProvider implements Provider<L
this.providers = new ArrayList<Provider<?>>();
}
- public List<?> get() throws ConfigurationException {
+ public List<?> get() throws DIRuntimeException {
List<Object> list = new ArrayList<Object>(providers.size());
for (Provider<?> provider : providers) {
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/MapProvider.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/MapProvider.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/MapProvider.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/MapProvider.java
Wed Nov 20 18:36:23 2013
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Provider;
/**
@@ -36,7 +36,7 @@ class MapProvider implements Provider<Ma
this.providers = new HashMap<String, Provider<?>>();
}
- public Map<String, ?> get() throws ConfigurationException {
+ public Map<String, ?> get() throws DIRuntimeException {
Map<String, Object> map = new HashMap<String, Object>();
for (Entry<String, Provider<?>> entry : providers.entrySet()) {
Modified:
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ScopeEventBinding.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ScopeEventBinding.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ScopeEventBinding.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ScopeEventBinding.java
Wed Nov 20 18:36:23 2013
@@ -21,7 +21,7 @@ package org.apache.cayenne.di.spi;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
-import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.di.DIRuntimeException;
/**
* A class that wraps an annotated method call of an object, passing it DI
scope events.
@@ -61,7 +61,7 @@ public class ScopeEventBinding {
eventHandlerMethod.invoke(object, invocationArguments(eventArgs));
}
catch (Exception e) {
- throw new CayenneRuntimeException(
+ throw new DIRuntimeException(
"Error invoking event method %s",
e,
eventHandlerMethod.getName());
@@ -75,7 +75,7 @@ public class ScopeEventBinding {
int eventArgWidth = (eventArgs == null) ? 0 : eventArgs.length;
if (argWidth != eventArgWidth) {
- throw new CayenneRuntimeException(
+ throw new DIRuntimeException(
"Event argument list size (%d) is different "
+ "from the handler method argument list size
(%d)",
eventArgWidth,
Modified:
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_Provider.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_Provider.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_Provider.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/di/mock/MockImplementation1_Provider.java
Wed Nov 20 18:36:23 2013
@@ -18,12 +18,12 @@
****************************************************************/
package org.apache.cayenne.di.mock;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Provider;
public class MockImplementation1_Provider implements Provider<MockInterface1> {
- public MockInterface1 get() throws ConfigurationException {
+ public MockInterface1 get() throws DIRuntimeException {
return new MockImplementation1();
}
}
Modified:
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java
(original)
+++
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java
Wed Nov 20 18:36:23 2013
@@ -20,7 +20,7 @@ package org.apache.cayenne.di.spi;
import junit.framework.TestCase;
-import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.di.mock.MockImplementation1_DepOn2;
@@ -52,7 +52,7 @@ public class DefaultInjectorCircularInje
injector.getInstance(MockInterface1.class);
fail("Circular dependency is not detected.");
}
- catch (ConfigurationException e) {
+ catch (DIRuntimeException e) {
// expected
}
catch (StackOverflowError e) {
@@ -95,7 +95,7 @@ public class DefaultInjectorCircularInje
injector.getInstance(MockInterface1.class);
fail("Circular dependency is not detected.");
}
- catch (ConfigurationException e) {
+ catch (DIRuntimeException e) {
// expected
}
catch (StackOverflowError e) {
@@ -121,7 +121,7 @@ public class DefaultInjectorCircularInje
try {
injector.getInstance(MockInterface1.class);
}
- catch (ConfigurationException e) {
+ catch (DIRuntimeException e) {
fail("Circular dependency is detected incorrectly: " +
e.getMessage());
}
}
Modified: cayenne/main/trunk/cayenne-server/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/pom.xml?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/cayenne-server/pom.xml Wed Nov 20 18:36:23 2013
@@ -143,6 +143,12 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
Copied:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
(from r1543875,
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/CayenneException.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java&p1=cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/CayenneException.java&r1=1543875&r2=1543901&rev=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/CayenneException.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneException.java
Wed Nov 20 18:36:23 2013
@@ -21,6 +21,7 @@ package org.apache.cayenne;
import org.apache.cayenne.util.LocalizedStringsHandler;
+
/**
* A generic checked exception that may be thrown by Cayenne framework. All
checked
* exceptions in Cayenne inherit from this class.
Copied:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java
(from r1543875,
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/CayenneRuntimeException.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CayenneRuntimeException.java&p1=cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/CayenneRuntimeException.java&r1=1543875&r2=1543901&rev=1543901&view=diff
==============================================================================
(empty)
Copied:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ConfigurationException.java
(from r1543875,
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/ConfigurationException.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ConfigurationException.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ConfigurationException.java&p1=cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/ConfigurationException.java&r1=1543875&r2=1543901&rev=1543901&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/ConfigurationException.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/ConfigurationException.java
Wed Nov 20 18:36:23 2013
@@ -31,9 +31,9 @@ public class ConfigurationException exte
}
/**
- * Constructs an exception with the specified message with an optional
list of message
- * formatting arguments. Message formatting rules follow
"String.format(..)"
- * conventions.
+ * Constructs an exception with the specified message with an optional list
+ * of message formatting arguments. Message formatting rules follow
+ * "String.format(..)" conventions.
*/
public ConfigurationException(String messageFormat, Object... messageArgs)
{
super(messageFormat, messageArgs);
@@ -46,8 +46,7 @@ public class ConfigurationException exte
super(cause);
}
- public ConfigurationException(String messageFormat, Throwable cause,
- Object... messageArgs) {
+ public ConfigurationException(String messageFormat, Throwable cause,
Object... messageArgs) {
super(messageFormat, cause, messageArgs);
}
}
Copied:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java
(from r1543875,
cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java&p1=cayenne/main/trunk/cayenne-di/src/main/java/org/apache/cayenne/util/LocalizedStringsHandler.java&r1=1543875&r2=1543901&rev=1543901&view=diff
==============================================================================
(empty)
Copied:
cayenne/main/trunk/cayenne-server/src/main/resources/org/apache/cayenne/cayenne-strings.properties
(from r1543875,
cayenne/main/trunk/cayenne-di/src/main/resources/org/apache/cayenne/cayenne-strings.properties)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/resources/org/apache/cayenne/cayenne-strings.properties?p2=cayenne/main/trunk/cayenne-server/src/main/resources/org/apache/cayenne/cayenne-strings.properties&p1=cayenne/main/trunk/cayenne-di/src/main/resources/org/apache/cayenne/cayenne-strings.properties&r1=1543875&r2=1543901&rev=1543901&view=diff
==============================================================================
(empty)
Copied:
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneExceptionTest.java
(from r1543875,
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/CayenneExceptionTest.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneExceptionTest.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneExceptionTest.java&p1=cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/CayenneExceptionTest.java&r1=1543875&r2=1543901&rev=1543901&view=diff
==============================================================================
(empty)
Copied:
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java
(from r1543875,
cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java&p1=cayenne/main/trunk/cayenne-di/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java&r1=1543875&r2=1543901&rev=1543901&view=diff
==============================================================================
(empty)
Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1543901&r1=1543900&r2=1543901&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Wed Nov 20
18:36:23 2013
@@ -26,6 +26,7 @@ CAY-1856 Expression.expWithParameters do
CAY-1860 In-memory matching of DataObjects against ObjectId or int
CAY-1861 Remove runtime relationships
CAY-1883 Clean up Cayenne maven structure
+CAY-1886 cayenne-di module reorg, new exceptions
Bug Fixes:
