Author: aadamchik
Date: Thu Jul  5 20:25:59 2012
New Revision: 1357877

URL: http://svn.apache.org/viewvc?rev=1357877&view=rev
Log:
CAY-1718 Remove everything deprecated in 3.1

in progress

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ClientServerChannel.java
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ClientServerChannel.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ClientServerChannel.java?rev=1357877&r1=1357876&r2=1357877&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ClientServerChannel.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ClientServerChannel.java
 Thu Jul  5 20:25:59 2012
@@ -39,14 +39,6 @@ public class ClientServerChannel impleme
     protected DataContext serverContext;
 
     /**
-     * @deprecated since 3.1 as context creation is now factory based.
-     */
-    @Deprecated
-    public ClientServerChannel(DataDomain domain) {
-        this(domain.createDataContext());
-    }
-
-    /**
      * Creates a ClientServerChannel that wraps a specified DataContext.
      * 
      * @since 3.0

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java?rev=1357877&r1=1357876&r2=1357877&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java
 Thu Jul  5 20:25:59 2012
@@ -29,7 +29,6 @@ import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.Persistent;
 import org.apache.cayenne.QueryResponse;
-import org.apache.cayenne.event.DefaultEventManager;
 import org.apache.cayenne.event.EventBridge;
 import org.apache.cayenne.event.EventManager;
 import org.apache.cayenne.event.EventSubject;
@@ -61,38 +60,6 @@ public class ClientChannel implements Da
     EventBridge remoteChannelListener;
 
     /**
-     * Creates a new channel accessing remote server via provided connection. 
Channel
-     * created using this constructor will post no events of its own and 
provide its users
-     * with a multithreaded EventManager.
-     * 
-     * @deprecated since 3.1 use
-     *             {@link #ClientChannel(ClientConnection, boolean, 
EventManager, boolean)}
-     */
-    @Deprecated
-    public ClientChannel(ClientConnection connection) {
-        this(connection, false);
-    }
-
-    /**
-     * @deprecated since 3.1 use
-     *             {@link #ClientChannel(ClientConnection, boolean, 
EventManager, boolean)}
-     */
-    @Deprecated
-    public ClientChannel(ClientConnection connection, boolean 
channelEventsEnabled) {
-        this(connection, channelEventsEnabled, new DefaultEventManager(2));
-    }
-
-    /**
-     * @deprecated since 3.1 use
-     *             {@link #ClientChannel(ClientConnection, boolean, 
EventManager, boolean)}
-     */
-    @Deprecated
-    public ClientChannel(ClientConnection connection, boolean 
channelEventsEnabled,
-            EventManager eventManager) throws CayenneRuntimeException {
-        this(connection, channelEventsEnabled, eventManager, false);
-    }
-
-    /**
      * @param remoteEventsOptional if true, failure to start an EventBridge 
will not
      *            result in an exception.
      * @since 3.0


Reply via email to