cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r954459 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src: main/java/org/apache/cayenne/configuration/ main/java/org/apache/cayenne/configuration/rop/client/ main/java/org/apache/cayenne/configuration/rop/server/ main/java/o...
Date Mon, 14 Jun 2010 13:38:25 GMT
Author: aadamchik
Date: Mon Jun 14 13:38:25 2010
New Revision: 954459

URL: http://svn.apache.org/viewvc?rev=954459&view=rev
Log:
CAY-1447 Switch ROP client to dependency injection

* undoing CayenneRuntime renaming to Runtime... Runtime by itself is too confusing
  and conflicted in a few places with java.lang.Runtime

Added:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java
      - copied, changed from r954454, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Runtime.java
Removed:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Runtime.java
Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientRuntime.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/server/ROPHessianServlet.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/web/WebUtil.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/server/ROPHessianServletTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/WebUtilTest.java

Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java
(from r954454, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Runtime.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Runtime.java&r1=954454&r2=954459&rev=954459&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/Runtime.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java
Mon Jun 14 13:38:25 2010
@@ -31,11 +31,11 @@ import org.apache.cayenne.di.Module;
  * Cayenne for a user application. It provides a default Cayenne configuration as well as
  * a way to customize this configuration via a built-in dependency injection (DI)
  * container. In fact implementation-wise, Runtime object is just a convenience thin
- * wrapper around a DI container.
+ * wrapper around a DI {@link Injector}.
  * 
  * @since 3.1
  */
-public abstract class Runtime {
+public abstract class CayenneRuntime {
 
     protected Injector injector;
     protected Module[] modules;
@@ -81,7 +81,7 @@ public abstract class Runtime {
      * Creates a CayenneRuntime with configuration based on the supplied array of DI
      * modules.
      */
-    public Runtime(Module... modules) {
+    public CayenneRuntime(Module... modules) {
 
         if (modules == null) {
             modules = new Module[0];
@@ -95,7 +95,7 @@ public abstract class Runtime {
      * Creates a CayenneRuntime with configuration based on the supplied collection of DI
      * modules.
      */
-    public Runtime(Collection<Module> modules) {
+    public CayenneRuntime(Collection<Module> modules) {
 
         if (modules == null) {
             this.modules = new Module[0];

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java?rev=954459&r1=954458&r2=954459&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java
Mon Jun 14 13:38:25 2010
@@ -19,7 +19,7 @@
 package org.apache.cayenne.configuration;
 
 /**
- * Represents a properties map for a given {@link Runtime}.
+ * Represents a properties map for a given {@link CayenneRuntime}.
  * 
  * @since 3.1
  */

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java?rev=954459&r1=954458&r2=954459&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
Mon Jun 14 13:38:25 2010
@@ -117,15 +117,13 @@ public class XMLDataChannelDescriptorLoa
 
     public ConfigurationTree<DataChannelDescriptor> load(Resource configurationResource)
             throws ConfigurationException {
-        
-      
 
         if (configurationResource == null) {
             throw new NullPointerException("Null configurationResource");
         }
 
         URL configurationURL = configurationResource.getURL();
-        
+
         logger.info("Loading XML configuration resource from " + configurationURL);
 
         DataChannelDescriptor descriptor = new DataChannelDescriptor();
@@ -388,7 +386,7 @@ public class XMLDataChannelDescriptorLoa
                             .equals(DataSourceInfo.PASSWORD_LOCATION_EXECUTABLE)) {
                         if (passwordSource != null) {
                             try {
-                                Process process = java.lang.Runtime.getRuntime().exec(
+                                Process process = Runtime.getRuntime().exec(
                                         passwordSource);
                                 password = passwordFromInputStream(process
                                         .getInputStream());

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientRuntime.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientRuntime.java?rev=954459&r1=954458&r2=954459&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientRuntime.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/client/ClientRuntime.java
Mon Jun 14 13:38:25 2010
@@ -21,7 +21,7 @@ package org.apache.cayenne.configuration
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.cayenne.configuration.Runtime;
+import org.apache.cayenne.configuration.CayenneRuntime;
 import org.apache.cayenne.di.Module;
 import org.apache.cayenne.remote.ClientConnection;
 
@@ -30,7 +30,7 @@ import org.apache.cayenne.remote.ClientC
  * 
  * @since 3.1
  */
-public class ClientRuntime extends Runtime {
+public class ClientRuntime extends CayenneRuntime {
 
     private static Module mainModule(Map<String, String> properties) {
         return new ClientModule(properties);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/server/ROPHessianServlet.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/server/ROPHessianServlet.java?rev=954459&r1=954458&r2=954459&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/server/ROPHessianServlet.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/rop/server/ROPHessianServlet.java
Mon Jun 14 13:38:25 2010
@@ -26,7 +26,7 @@ import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 
 import org.apache.cayenne.DataChannel;
-import org.apache.cayenne.configuration.Runtime;
+import org.apache.cayenne.configuration.CayenneRuntime;
 import org.apache.cayenne.configuration.server.ServerRuntime;
 import org.apache.cayenne.configuration.web.RequestHandler;
 import org.apache.cayenne.configuration.web.WebConfiguration;
@@ -108,7 +108,7 @@ public class ROPHessianServlet extends H
     public void destroy() {
         super.destroy();
 
-        Runtime runtime = WebUtil.getCayenneRuntime(servletContext);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(servletContext);
         if (runtime != null) {
             runtime.shutdown();
         }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java?rev=954459&r1=954458&r2=954459&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
Mon Jun 14 13:38:25 2010
@@ -21,7 +21,7 @@ package org.apache.cayenne.configuration
 import java.util.Collection;
 
 import org.apache.cayenne.access.DataDomain;
-import org.apache.cayenne.configuration.Runtime;
+import org.apache.cayenne.configuration.CayenneRuntime;
 import org.apache.cayenne.configuration.rop.client.ClientRuntime;
 import org.apache.cayenne.di.Module;
 
@@ -34,7 +34,7 @@ import org.apache.cayenne.di.Module;
  * 
  * @since 3.1
  */
-public class ServerRuntime extends Runtime {
+public class ServerRuntime extends CayenneRuntime {
 
     private static Module mainModule(String configurationLocation) {
         return new ServerModule(configurationLocation);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java?rev=954459&r1=954458&r2=954459&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java
Mon Jun 14 13:38:25 2010
@@ -29,7 +29,7 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.apache.cayenne.configuration.Runtime;
+import org.apache.cayenne.configuration.CayenneRuntime;
 import org.apache.cayenne.configuration.server.ServerModule;
 import org.apache.cayenne.configuration.server.ServerRuntime;
 import org.apache.cayenne.di.Module;
@@ -76,7 +76,7 @@ public class CayenneFilter implements Fi
     }
 
     public void destroy() {
-        Runtime runtime = WebUtil.getCayenneRuntime(servletContext);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(servletContext);
 
         if (runtime != null) {
             runtime.shutdown();
@@ -88,7 +88,7 @@ public class CayenneFilter implements Fi
             ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
 
-        Runtime runtime = WebUtil.getCayenneRuntime(servletContext);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(servletContext);
         RequestHandler handler = runtime.getInjector().getInstance(RequestHandler.class);
 
         handler.requestStart(request, response);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/web/WebUtil.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/web/WebUtil.java?rev=954459&r1=954458&r2=954459&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/web/WebUtil.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/web/WebUtil.java
Mon Jun 14 13:38:25 2010
@@ -20,11 +20,11 @@ package org.apache.cayenne.configuration
 
 import javax.servlet.ServletContext;
 
-import org.apache.cayenne.configuration.Runtime;
+import org.apache.cayenne.configuration.CayenneRuntime;
 import org.apache.cayenne.configuration.rop.server.ROPHessianServlet;
 
 /**
- * A helper class to retrieve and store {@link Runtime} in the
+ * A helper class to retrieve and store {@link CayenneRuntime} in the
  * {@link ServletContext}. All Cayenne web configuration objects, such as
  * {@link CayenneFilter} and {@link ROPHessianServlet}, are using this class to access
  * runtime.
@@ -38,18 +38,18 @@ public class WebUtil {
 
     /**
      * Retrieves CayenneRuntime previously stored in provided context via
-     * {@link #setCayenneRuntime(ServletContext, Runtime)}. May return null if no
+     * {@link #setCayenneRuntime(ServletContext, CayenneRuntime)}. May return null if no
      * runtime was stored.
      */
-    public static Runtime getCayenneRuntime(ServletContext context) {
-        return (Runtime) context.getAttribute(CAYENNE_RUNTIME_KEY);
+    public static CayenneRuntime getCayenneRuntime(ServletContext context) {
+        return (CayenneRuntime) context.getAttribute(CAYENNE_RUNTIME_KEY);
     }
 
     /**
-     * Stores {@link Runtime} in the servlet context. It can be later retrieve via
+     * Stores {@link CayenneRuntime} in the servlet context. It can be later retrieve via
      * {@link #getCayenneRuntime(ServletContext)}.
      */
-    public static void setCayenneRuntime(ServletContext context, Runtime runtime) {
+    public static void setCayenneRuntime(ServletContext context, CayenneRuntime runtime)
{
         context.setAttribute(CAYENNE_RUNTIME_KEY, runtime);
     }
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/server/ROPHessianServletTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/server/ROPHessianServletTest.java?rev=954459&r1=954458&r2=954459&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/server/ROPHessianServletTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/server/ROPHessianServletTest.java
Mon Jun 14 13:38:25 2010
@@ -20,7 +20,7 @@ package org.apache.cayenne.configuration
 
 import junit.framework.TestCase;
 
-import org.apache.cayenne.configuration.Runtime;
+import org.apache.cayenne.configuration.CayenneRuntime;
 import org.apache.cayenne.configuration.RuntimeProperties;
 import org.apache.cayenne.configuration.server.ServerModule;
 import org.apache.cayenne.configuration.web.MockModule1;
@@ -49,7 +49,7 @@ public class ROPHessianServletTest exten
         assertNull(WebUtil.getCayenneRuntime(context));
         servlet.init(config);
 
-        Runtime runtime = WebUtil.getCayenneRuntime(context);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
         assertNotNull(runtime);
 
         assertEquals(
@@ -71,7 +71,7 @@ public class ROPHessianServletTest exten
         ROPHessianServlet servlet = new ROPHessianServlet();
         servlet.init(config);
 
-        Runtime runtime = WebUtil.getCayenneRuntime(context);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
         assertNotNull(runtime);
 
         assertEquals(location, runtime
@@ -93,7 +93,7 @@ public class ROPHessianServletTest exten
         ROPHessianServlet servlet = new ROPHessianServlet();
         servlet.init(config);
 
-        Runtime runtime = WebUtil.getCayenneRuntime(context);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
         assertNotNull(runtime);
 
         assertEquals(name + ".xml", runtime.getInjector().getInstance(
@@ -121,7 +121,7 @@ public class ROPHessianServletTest exten
         ROPHessianServlet servlet = new ROPHessianServlet();
         servlet.init(config);
 
-        Runtime runtime = WebUtil.getCayenneRuntime(context);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
         assertNotNull(runtime);
 
         assertEquals(4, runtime.getModules().length);
@@ -148,7 +148,7 @@ public class ROPHessianServletTest exten
         ROPHessianServlet servlet = new ROPHessianServlet();
 
         servlet.init(config);
-        Runtime runtime = WebUtil.getCayenneRuntime(context);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
         assertTrue(runtime.getModules()[2] instanceof ROPHessianServlet_ConfigModule);
 
         assertTrue(RemoteService.class.equals(servlet.getAPIClass()));

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java?rev=954459&r1=954458&r2=954459&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java
Mon Jun 14 13:38:25 2010
@@ -20,7 +20,7 @@ package org.apache.cayenne.configuration
 
 import junit.framework.TestCase;
 
-import org.apache.cayenne.configuration.Runtime;
+import org.apache.cayenne.configuration.CayenneRuntime;
 import org.apache.cayenne.configuration.RuntimeProperties;
 import org.apache.cayenne.configuration.server.ServerModule;
 
@@ -45,7 +45,7 @@ public class CayenneFilterTest extends T
         assertNull(WebUtil.getCayenneRuntime(context));
         filter.init(config);
 
-        Runtime runtime = WebUtil.getCayenneRuntime(context);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
         assertNotNull(runtime);
 
         assertEquals("abc.xml", runtime
@@ -66,7 +66,7 @@ public class CayenneFilterTest extends T
         CayenneFilter filter = new CayenneFilter();
         filter.init(config);
 
-        Runtime runtime = WebUtil.getCayenneRuntime(context);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
         assertNotNull(runtime);
 
         assertEquals("xyz", runtime
@@ -88,7 +88,7 @@ public class CayenneFilterTest extends T
         assertNull(WebUtil.getCayenneRuntime(context));
         filter.init(config);
 
-        Runtime runtime = WebUtil.getCayenneRuntime(context);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
         assertNotNull(runtime);
 
         assertEquals("cayenne-abc.xml", runtime.getInjector().getInstance(
@@ -115,7 +115,7 @@ public class CayenneFilterTest extends T
         CayenneFilter filter = new CayenneFilter();
         filter.init(config);
 
-        Runtime runtime = WebUtil.getCayenneRuntime(context);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
         assertNotNull(runtime);
 
         assertEquals(4, runtime.getModules().length);
@@ -142,7 +142,7 @@ public class CayenneFilterTest extends T
         CayenneFilter filter = new CayenneFilter();
         filter.init(config);
 
-        Runtime runtime = WebUtil.getCayenneRuntime(context);
+        CayenneRuntime runtime = WebUtil.getCayenneRuntime(context);
         CayenneFilter_DispatchRequestHandler handler = (CayenneFilter_DispatchRequestHandler)
runtime
                 .getInjector()
                 .getInstance(RequestHandler.class);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/WebUtilTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/WebUtilTest.java?rev=954459&r1=954458&r2=954459&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/WebUtilTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/WebUtilTest.java
Mon Jun 14 13:38:25 2010
@@ -18,7 +18,7 @@
  ****************************************************************/
 package org.apache.cayenne.configuration.web;
 
-import org.apache.cayenne.configuration.Runtime;
+import org.apache.cayenne.configuration.CayenneRuntime;
 
 import com.mockrunner.mock.web.MockServletContext;
 
@@ -31,13 +31,13 @@ public class WebUtilTest extends TestCas
 
         assertNull(WebUtil.getCayenneRuntime(context));
 
-        Runtime runtime = new Runtime() {
+        CayenneRuntime runtime = new CayenneRuntime() {
         };
 
         WebUtil.setCayenneRuntime(context, runtime);
         assertSame(runtime, WebUtil.getCayenneRuntime(context));
 
-        Runtime runtime1 = new Runtime() {
+        CayenneRuntime runtime1 = new CayenneRuntime() {
         };
 
         WebUtil.setCayenneRuntime(context, runtime1);



Mime
View raw message