svn commit: r1036097 - /openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java

[ppoddar]

Author: ppoddar
Date: Wed Nov 17 16:24:29 2010
New Revision: 1036097

URL: http://svn.apache.org/viewvc?rev=1036097&view=rev
Log:
OPENJPA-1859: Remove plain vanilla remote access

Modified:
    
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java

Modified: 
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java?rev=1036097&r1=1036096&r2=1036097&view=diff
==============================================================================
--- 
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
 (original)
+++ 
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
 Wed Nov 17 16:24:29 2010
@@ -45,7 +45,6 @@ import org.apache.openjpa.lib.util.Close
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.persistence.criteria.CriteriaBuilderImpl;
 import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder;
-import org.apache.openjpa.persistence.jest.Server;
 import org.apache.openjpa.persistence.meta.MetamodelImpl;
 import org.apache.openjpa.persistence.query.OpenJPAQueryBuilder;
 import org.apache.openjpa.persistence.query.QueryBuilderImpl;
@@ -70,7 +69,6 @@ public class EntityManagerFactoryImpl
     private transient StoreCache _cache = null;
     private transient QueryResultCache _queryCache = null;
     private transient MetamodelImpl _metaModel;
-    private transient Server _remoteAccess = null;
 
     /**
      * Default constructor provided for auto-instantiation.
@@ -98,7 +96,6 @@ public class EntityManagerFactoryImpl
      */
     public void setBrokerFactory(BrokerFactory factory) {
         _factory = new DelegatingBrokerFactory(factory, 
PersistenceExceptions.TRANSLATOR);
-        configureRemoteAccess(getConfiguration());
     }
 
     public OpenJPAConfiguration getConfiguration() {
@@ -273,10 +270,6 @@ public class EntityManagerFactoryImpl
         if (log.isTraceEnabled()) {
             log.trace(this + ".close() invoked.");
         }
-        if (_remoteAccess != null) {
-            _remoteAccess.stop();
-            _remoteAccess = null;
-        }
         _factory.close();
     }
 
@@ -402,40 +395,4 @@ public class EntityManagerFactoryImpl
             }
         }
     }
-    
-    /**
-     * Configures this unit for remote access.
-     */
-    protected void configureRemoteAccess(OpenJPAConfiguration conf) {
-        Value value = conf.getValue("RemoteAccess");
-        if (value == null) {
-            return;
-        }
-        String props = value.getString();
-        if (props == null)
-            return;
-        try {
-            _remoteAccess = new Server();
-            _remoteAccess.setContext(this);
-            Configurations.configureInstance(_remoteAccess, conf, props);
-            conf.removeValue(value);
-            if (!_remoteAccess.start()) {
-                _remoteAccess = null;
-            }
-        } catch (Exception ex) {
-            Log log = 
_factory.getConfiguration().getLog(OpenJPAConfiguration.LOG_RUNTIME);
-            if (log != null) {
-                log.error(_loc.get("remote-start-error"), ex);
-            }
-        }
-    }
-    
-    /**
-     * Affirms if this unit is accessible remotely.
-     */
-    public boolean allowsRemoteAccess() {
-        return _remoteAccess != null;
-    }
-    
-
 }