You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by sc...@apache.org on 2014/02/09 22:55:47 UTC
svn commit: r1566442 - in
/wookie/trunk/wookie-server/src/main/java/org/apache/wookie:
queues/impl/PreferenceQueueConsumer.java
queues/impl/SharedDataQueueConsumer.java server/ContextListener.java
server/MainFilter.java server/Start.java
Author: scottbw
Date: Sun Feb 9 21:55:47 2014
New Revision: 1566442
URL: http://svn.apache.org/r1566442
Log:
Removed all remaining JPA hooks from server
Modified:
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/queues/impl/PreferenceQueueConsumer.java
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/queues/impl/SharedDataQueueConsumer.java
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/ContextListener.java
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/MainFilter.java
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/Start.java
Modified: wookie/trunk/wookie-server/src/main/java/org/apache/wookie/queues/impl/PreferenceQueueConsumer.java
URL: http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/queues/impl/PreferenceQueueConsumer.java?rev=1566442&r1=1566441&r2=1566442&view=diff
==============================================================================
--- wookie/trunk/wookie-server/src/main/java/org/apache/wookie/queues/impl/PreferenceQueueConsumer.java (original)
+++ wookie/trunk/wookie-server/src/main/java/org/apache/wookie/queues/impl/PreferenceQueueConsumer.java Sun Feb 9 21:55:47 2014
@@ -18,7 +18,6 @@ import java.util.concurrent.BlockingQueu
import org.apache.log4j.Logger;
import org.apache.wookie.auth.AuthToken;
import org.apache.wookie.auth.AuthTokenUtils;
-import org.apache.wookie.beans.util.PersistenceManagerFactory;
import org.apache.wookie.controller.PropertiesController;
import org.apache.wookie.queues.beans.IQueuedBean;
/**
@@ -51,7 +50,6 @@ public class PreferenceQueueConsumer ext
logger.error("("+queueIdentifer+ " to " +bean.getValue() + ")(Error setting preference: "+ ex, ex);
}
finally{
- PersistenceManagerFactory.closePersistenceManager();
}
//logger.info("("+queueIdentifer+")CONSUME END PreferenceQueueConsumer" + bean.getKey()+ "' TO '" + bean.getValue()+"'");
}
Modified: wookie/trunk/wookie-server/src/main/java/org/apache/wookie/queues/impl/SharedDataQueueConsumer.java
URL: http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/queues/impl/SharedDataQueueConsumer.java?rev=1566442&r1=1566441&r2=1566442&view=diff
==============================================================================
--- wookie/trunk/wookie-server/src/main/java/org/apache/wookie/queues/impl/SharedDataQueueConsumer.java (original)
+++ wookie/trunk/wookie-server/src/main/java/org/apache/wookie/queues/impl/SharedDataQueueConsumer.java Sun Feb 9 21:55:47 2014
@@ -19,7 +19,6 @@ import org.apache.log4j.Logger;
import org.apache.wookie.auth.AuthToken;
import org.apache.wookie.auth.AuthTokenUtils;
import org.apache.wookie.beans.SharedContext;
-import org.apache.wookie.beans.util.PersistenceManagerFactory;
import org.apache.wookie.queues.beans.IQueuedBean;
/**
* Implementation of the shareddata Queue consumer
@@ -53,7 +52,6 @@ public class SharedDataQueueConsumer ext
logger.error("("+queueIdentifer+ " to " +bean.getValue() + ")(Error setting SharedData: "+ ex, ex);
}
finally{
- PersistenceManagerFactory.closePersistenceManager();
}
//logger.info("("+queueIdentifer+")CONSUME END SharedDataQueueConsumer" + bean.getKey()+ "' TO '" + bean.getValue()+"'");
}
Modified: wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/ContextListener.java
URL: http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/ContextListener.java?rev=1566442&r1=1566441&r2=1566442&view=diff
==============================================================================
--- wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/ContextListener.java (original)
+++ wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/ContextListener.java Sun Feb 9 21:55:47 2014
@@ -29,7 +29,6 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.log4j.Logger;
import org.apache.wookie.Messages;
-import org.apache.wookie.beans.util.PersistenceManagerFactory;
import org.apache.wookie.feature.Features;
import org.apache.wookie.helpers.WidgetFactory;
import org.apache.wookie.helpers.WidgetRuntimeHelper;
@@ -105,11 +104,6 @@ public class ContextListener implements
}
/*
- * Initialize persistence manager factory now, not on first request
- */
- PersistenceManagerFactory.initialize(configuration);
-
- /*
* Initialise the locale handler
*/
LocaleHandler.getInstance().initialize(configuration);
@@ -230,9 +224,5 @@ public class ContextListener implements
}
public void contextDestroyed(ServletContextEvent event){
- /*
- * Terminate persistence manager factory
- */
- PersistenceManagerFactory.terminate();
}
}
Modified: wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/MainFilter.java
URL: http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/MainFilter.java?rev=1566442&r1=1566441&r2=1566442&view=diff
==============================================================================
--- wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/MainFilter.java (original)
+++ wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/MainFilter.java Sun Feb 9 21:55:47 2014
@@ -23,10 +23,6 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.wookie.beans.util.IPersistenceManager;
-import org.apache.wookie.beans.util.PersistenceCommitException;
-import org.apache.wookie.beans.util.PersistenceManagerFactory;
-
/**
* Filter to set DB transactions
*/
@@ -47,8 +43,6 @@ public class MainFilter implements Filte
// attempts or guarantee sequential operation order.
boolean retryChainInvocation = false;
do {
- // get persistence manager for this thread
- IPersistenceManager persistenceManager = PersistenceManagerFactory.getPersistenceManager();
try {
// reset response and pause on retry to help ensure success
if (retryChainInvocation) {
@@ -58,34 +52,19 @@ public class MainFilter implements Filte
} catch (InterruptedException ie) {
}
}
- // start and commit transaction around servlet invocation
- persistenceManager.begin();
chain.doFilter(request, response);
- persistenceManager.commit();
// terminate retry attempts on success
retryChainInvocation = false;
} catch (ServletException se) {
// rollback transaction on exception
- persistenceManager.rollback();
throw se;
} catch (IOException ioe) {
// rollback transaction on exception
- persistenceManager.rollback();
throw ioe;
- } catch (PersistenceCommitException pce) {
- // rollback and retry on commit exception if response not committed
- persistenceManager.rollback();
- retryChainInvocation = (!retryChainInvocation && !response.isCommitted());
- if (!retryChainInvocation) {
- throw new RuntimeException("Persistence commit exception caught for transaction: "+pce, pce);
- }
} catch (Throwable t) {
// rollback transaction on exception
- persistenceManager.rollback();
throw new RuntimeException("Exception caught for transaction: "+t, t);
} finally {
- // close thread persistence manager
- PersistenceManagerFactory.closePersistenceManager();
}
} while (retryChainInvocation);
}
Modified: wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/Start.java
URL: http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/Start.java?rev=1566442&r1=1566441&r2=1566442&view=diff
==============================================================================
--- wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/Start.java (original)
+++ wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/Start.java Sun Feb 9 21:55:47 2014
@@ -21,8 +21,6 @@ import java.net.ServerSocket;
import java.net.Socket;
import org.apache.log4j.Logger;
-import org.apache.wookie.beans.util.IModule;
-import org.apache.wookie.beans.util.PersistenceManagerFactory;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.security.HashUserRealm;
import org.mortbay.jetty.security.UserRealm;
@@ -37,11 +35,9 @@ public class Start {
public static final String PERSISTENCE_MANAGER_TYPE_JPA = "jpa";
public static final String PERSISTENCE_MANAGER_TYPE_JCR = "jcr";
- private static String persistenceManagerType;
private static Server server;
public static void main(String[] args) throws Exception {
- boolean initDB = true;
for (int i = 0; i < args.length; i++) {
String arg = args[i];
logger.info("Runtime argument: " + arg);
@@ -50,24 +46,11 @@ public class Start {
} else if (arg.startsWith("shutdownport=")) {
shutdownPort = new Integer(arg.substring(13));
logger.info("Shutdown port set:to "+shutdownPort);
- } else if (arg.startsWith("initDB=")) {
- initDB = !arg.substring(7).toLowerCase().equals("false");
} else {
logger.info("argument UNRECOGNISED - ignoring");
}
}
- // load configuration from environment
- persistenceManagerType = getSystemProperty(PERSISTENCE_MANAGER_TYPE_PROPERTY_NAME, PERSISTENCE_MANAGER_TYPE_JPA);
-
- // Configure system properties specific to the persistence implementation
- IModule module = getModule();
- module.configure();
-
- if (initDB) {
- System.setProperty(PersistenceManagerFactory.PERSISTENCE_MANAGER_INITIALIZE_STORE_PROPERTY_NAME, "true");
- }
-
// configure and start server
configureServer();
startServer();
@@ -103,9 +86,6 @@ public class Start {
"org.mortbay.jetty.webapp.JettyWebXmlConfiguration",
"org.mortbay.jetty.webapp.TagLibConfiguration"});
- IModule module = getModule();
- module.setup();
-
// configure embedded jetty web application handler
server.addHandler(context);
@@ -160,23 +140,4 @@ public class Start {
String value = System.getProperty(name);
return (((value != null) && (value.length() > 0) && !value.startsWith("$")) ? value : defaultValue);
}
-
- /**
- * Get persistence module.
- * TODO use a more reliable and extensible approach than fixed class names
- * @return a persistence module
- */
- private static IModule getModule(){
- IModule module = null;
- try {
- if (persistenceManagerType.equals(PERSISTENCE_MANAGER_TYPE_JCR)){
- module = (IModule) Class.forName("org.apache.wookie.beans.jcr.JCRModule").newInstance();
- } else {
- module = (IModule) Class.forName("org.apache.wookie.beans.jpa.JPAModule").newInstance();
- }
- } catch (Exception e) {
- logger.error("Could not load persistence module", e);
- }
- return module;
- }
}