portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl AbstractOJBPersistencePlugin.java OjbLookupCriteria.java OJBODMGPersistencePlugin.java OJBPBPersistencePlugin.java
Date Wed, 04 Feb 2004 21:04:13 GMT
weaver      2004/02/04 13:04:13

  Modified:    plugin/src/java/org/apache/jetspeed/persistence/impl
                        AbstractOJBPersistencePlugin.java
                        OjbLookupCriteria.java
                        OJBODMGPersistencePlugin.java
                        OJBPBPersistencePlugin.java
  Log:
  - Added support for ThreadLocal PersistenceBroker
  - PBs re now self-managed by the AbstractPlugin
  
  Revision  Changes    Path
  1.9       +357 -91   jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl/AbstractOJBPersistencePlugin.java
  
  Index: AbstractOJBPersistencePlugin.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl/AbstractOJBPersistencePlugin.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractOJBPersistencePlugin.java	8 Dec 2003 18:39:16 -0000	1.8
  +++ AbstractOJBPersistencePlugin.java	4 Feb 2004 21:04:13 -0000	1.9
  @@ -58,10 +58,17 @@
   import java.net.URL;
   import java.net.URLClassLoader;
   import java.sql.Connection;
  +import java.sql.DriverManager;
   import java.util.Collection;
  +import java.util.Date;
   import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
  +
  +import javax.naming.Context;
  +import javax.naming.InitialContext;
  +import javax.sql.DataSource;
   
  -import org.apache.commons.beanutils.BeanUtils;
   import org.apache.commons.lang.builder.HashCodeBuilder;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  @@ -69,12 +76,17 @@
   
   import org.apache.jetspeed.persistence.LookupCriteria;
   import org.apache.jetspeed.persistence.PersistencePlugin;
  +import org.apache.jetspeed.persistence.TransactionStateException;
   import org.apache.jetspeed.services.plugin.PluginConfiguration;
   import org.apache.jetspeed.services.plugin.PluginInitializationException;
   import org.apache.jetspeed.services.plugin.util.CauseExtractor;
  -import org.apache.ojb.broker.Identity;
   import org.apache.ojb.broker.PBKey;
  +import org.apache.ojb.broker.PBLifeCycleEvent;
  +import org.apache.ojb.broker.PBLifeCycleListener;
  +import org.apache.ojb.broker.PBStateEvent;
  +import org.apache.ojb.broker.PBStateListener;
   import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.PersistenceBrokerException;
   import org.apache.ojb.broker.PersistenceBrokerFactory;
   import org.apache.ojb.broker.accesslayer.LookupException;
   import org.apache.ojb.broker.metadata.JdbcConnectionDescriptor;
  @@ -85,13 +97,25 @@
   /**
    * This is a implementation of  <code>PersistencePlugin</code> 
    * that is backed by <a href="http://db.apache.org/ojb">ObjectRelationalBridge (OJB)</a>
  + * <p>
  + *   This plugin is self monitoring in that there is no need for client applications to
worry
  + *   about explicitly doing a <code>PersistenceBroker.close()</code> the plug
in itself
  + *   will monitor and reclaim inactive PersistenceBrokers.  This also allows to have a
single
  + *   <code>PersistnceBroker</code> per thread, for that entire threads lifetime
without having
  + *   to worry about resource leakage.
  + * </p>
  + * <p>
  + *   Configuring PersistenceBroker life times:<br\>
  + *   <code>broker.ttl</code> The time the broker will remain open from the
last operation defaults to 15000 millis.<br/>
  + *   <code>broker.check.interval</code> How often we check all registered PersistenceBrokers.
 Defaults to 10000 millis. 
  + * </p>
    * 
    * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
    */
  -public abstract class AbstractOJBPersistencePlugin implements PersistencePlugin
  +public abstract class AbstractOJBPersistencePlugin implements PersistencePlugin, PBLifeCycleListener,
PBStateListener
   {
       protected static final String RESOLVE_DB_ALIAS = "resolveDbAlias";
  -    private static final Log log = LogFactory.getLog(AbstractOJBPersistencePlugin.class);
  +    private static final Log log = LogFactory.getLog("org.apache.jetspeed.persistence");
   
       protected static final JetspeedOJBRuntimeException failure(String message, Throwable
e)
       {
  @@ -101,9 +125,11 @@
   
       protected PluginConfiguration configuration;
   
  -    private HashMap connectionToPBMap;
  +    protected String overrideDefaultJcd;
  +
  +    protected Map brokerActivity = new HashMap();
   
  -    private String overrideDefaultJcd;
  +    protected ThreadLocal TLpb = new ThreadLocal();
   
       /**
        * @see org.apache.jetspeed.services.perisistence.PersistencePlugin#deleteByQuery(java.lang.Object)
  @@ -115,18 +141,14 @@
           {
               Query useQuery = (Query) query;
               pb = getBroker();
  -            
  +
               pb.deleteByQuery(useQuery);
           }
           catch (Throwable e)
           {
               throw failure("Failed to delete by query.", e);
           }
  -        finally
  -        {
  -            // always release the broker
  -            releaseBroker(pb);
  -        }
  +
       }
   
       /**
  @@ -161,23 +183,29 @@
        */
       public PersistenceBroker getBroker()
       {
  -        if (overrideDefaultJcd != null)
  -        {
  -            return getBroker(overrideDefaultJcd);
  -        }
  -        else
  +
  +        PersistenceBroker pb = (PersistenceBroker) TLpb.get();
  +        if (pb == null || pb.isClosed())
           {
  -            return PersistenceBrokerFactory.defaultPersistenceBroker();
  +            if (overrideDefaultJcd != null)
  +            {
  +                log.info("overriding default JDBC Connection Descriptor with " + overrideDefaultJcd);
  +                pb = PersistenceBrokerFactory.createPersistenceBroker(new PBKey(overrideDefaultJcd));
  +            }
  +            else
  +            {
  +                pb = PersistenceBrokerFactory.defaultPersistenceBroker();
  +            }
  +            // Add the plugin as a listener, temporary is fine
  +            pb.addListener(this);
  +            // Set current thread's broker
  +            TLpb.set(pb);
  +            // Set up this broker with a last active time stamp
  +            brokerActivity.put(pb, new Date());
           }
   
  -    }
  +        return pb;
   
  -    /**
  -     * @see org.apache.jetspeed.services.ojb.OJBService#getBroker(java.lang.String)
  -     */
  -    public PersistenceBroker getBroker(String aliasName)
  -    {
  -        return PersistenceBrokerFactory.createPersistenceBroker(new PBKey(aliasName));
       }
   
       /**
  @@ -203,14 +231,9 @@
           }
           catch (Throwable e)
           {
  -            e.printStackTrace();
               throw failure("Failed to retreive Collection", e);
           }
  -        finally
  -        {
  -            // always release the broker
  -            releaseBroker(pb);
  -        }
  +
       }
   
       /**
  @@ -227,14 +250,9 @@
       public String getDbAlias() throws UnsupportedOperationException
       {
           PersistenceBroker pb = getBroker();
  -        try
  -        {
  -            return pb.serviceConnectionManager().getConnectionDescriptor().getDbAlias();
  -        }
  -        finally
  -        {
  -            releaseBroker(pb);
  -        }
  +
  +        return pb.serviceConnectionManager().getConnectionDescriptor().getDbAlias();
  +
       }
   
       /**
  @@ -261,11 +279,6 @@
           {
               throw failure("Failed to retreive Object.", e);
           }
  -        finally
  -        {
  -            // always release the broker
  -            releaseBroker(pb);
  -        }
       }
   
       /**
  @@ -278,13 +291,10 @@
           {
               // Retrieve the SQL Connection assoc. with this broker instance
               Connection connection = pb.serviceConnectionManager().getConnection();
  -            // record the connection to PB relationship so it can be released correctly
  -            connectionToPBMap.put(connection, pb);
               return connection;
           }
           catch (LookupException e)
           {
  -            releaseBroker(pb);
               throw failure("Failed to retreive a SQL connection object.", e);
           }
   
  @@ -308,9 +318,9 @@
       {
   
           this.configuration = configuration;
  -        connectionToPBMap = new HashMap();
   
           String correctPath = configuration.getPathResolver().getRealPath(configuration.getProperty("OJB.path")
+ File.separator);
  +
           File ojbPropsLocation = new File(correctPath);
           URL ojbUrl = null;
           if (ojbPropsLocation.exists())
  @@ -349,24 +359,18 @@
           {
               // run through and test whether or not we were able
               // to get a pb instance.
  -            PersistenceBroker pb = null;
  -            if (overrideDefaultJcd != null)
  -            {
  -                log.info("overriding default JDBC Connection Descriptor with " + overrideDefaultJcd);
  -                pb = getBroker(overrideDefaultJcd);
  -            }
  -            else
  -            {
  -                pb = getBroker();
  -            }
  +
  +            PersistenceBroker pb = getBroker();
   
               // This helps us support RDBMSes that have file system based aliases
               // like HSQL in stand-alone mode
               boolean resolveAlias = new Boolean(configuration.getProperty(RESOLVE_DB_ALIAS,
"false")).booleanValue();
  +            JdbcConnectionDescriptor jcd = pb.serviceConnectionManager().getConnectionDescriptor();
  +
               if (resolveAlias)
               {
                   log.info("Resolving DB alias to absolute path.");
  -                JdbcConnectionDescriptor jcd = pb.serviceConnectionManager().getConnectionDescriptor();
  +
                   if (jcd.getDbAlias() != null)
                   {
                       String truePath = configuration.getPathResolver().getRealPath(jcd.getDbAlias());
  @@ -375,7 +379,34 @@
                   }
               }
   
  -            pb.close();
  +            String protocol = jcd.getProtocol();
  +            String subProtocol = jcd.getSubProtocol();
  +            String testalias = jcd.getDbAlias();
  +            String jdbcDriver = jcd.getDriver();
  +            String jdbcURL = protocol + ":" + subProtocol + ":" + testalias;
  +
  +            // if we are using a datasource, this will not be available
  +
  +            if (jdbcDriver != null)
  +            {
  +
  +                Class.forName(jdbcDriver);
  +
  +                Connection c = DriverManager.getConnection(jdbcURL, jcd.getUserName(),
jcd.getPassWord());
  +                c.close();
  +            }
  +            else if (jcd.getDatasourceName() != null)
  +            {
  +//				InitialContext ctx = new InitialContext();
  +//                DataSource ds = (DataSource) ctx.lookup(jcd.getDatasourceName() );
  +//                if(ds == null)
  +//                {
  +//                	throw new IllegalStateException("Unable to retreive the DataSource:
"+jcd.getDatasourceName() );
  +//                }
  +            }
  +
  +            // We should keep the broker around until we are finished			
  +            // pb.close();
   
               // Allow subclasses to init their own stuff
               postInit();
  @@ -384,12 +415,24 @@
           }
           catch (Exception e)
           {
  -            String cause = CauseExtractor.getCompositeMessage(e);
  -            String message = "Unable create a ojb persistence plugin.  Cause: " + cause;
  +
  +            String message = "Unable create a ojb persistence plugin: " + e.toString();
               log.fatal(message, e);
               throw new PluginInitializationException(message, e);
           }
   
  +        // default to 15 seconds of inactivity, after which the broker is recalimed to
the pool
  +        int ttl = Integer.parseInt(configuration.getProperty("broker.ttl", "15000"));
  +        log.info("PersistenceBroker Time To Live set to " + ttl);
  +        int checkInterval = Integer.parseInt(configuration.getProperty("broker.check.interval",
"10000"));
  +        log.info("PersistenceBrokers will be checked for inactivity every " + (checkInterval
/ 1000) + " seconds.");
  +
  +        InactivityMonitor monitor = new InactivityMonitor(ttl, checkInterval);
  +        monitor.setDaemon(true);
  +        monitor.setPriority(Thread.MIN_PRIORITY);
  +        monitor.setContextClassLoader(Thread.currentThread().getContextClassLoader());
  +        monitor.start();
  +
       }
   
       /**
  @@ -408,15 +451,37 @@
        */
       protected abstract void postInit() throws InitializationException;
   
  +    //    protected void releaseCurrentPB()    
  +    //    {
  +    //        PersistenceBroker pb = (PersistenceBroker) TLpb.get();
  +    //        if (pb != null)
  +    //        {
  +    //            TLpb.set(null);
  +    //            if (!pb.isClosed())
  +    //            {
  +    //                pb.close();
  +    //            }
  +    //        }
  +    //    }
  +
       /**
  -     * @see org.apache.jetspeed.services.ojb.OJBService#releaseBroker(org.apache.ojb.broker.PersistenceBroker)
  +     * Updates the last time the broker was accessed
  +     * @param pb
        */
  -    public void releaseBroker(PersistenceBroker broker)
  +    protected void touchBroker(PersistenceBroker pb)
       
       {
  -        if (broker != null)
  +        Date lastAccessed = (Date) brokerActivity.get(pb);
  +        if (lastAccessed != null)
           {
  -            broker.close();
  +            //update
  +            log.debug("Updating PersistenceBroker " + pb + " last access stamp to now");
  +            lastAccessed.setTime(System.currentTimeMillis());
  +        }
  +        else
  +        {
  +            // Set up this broker with a last active time stamp
  +            brokerActivity.put(pb, new Date());
           }
       }
   
  @@ -425,15 +490,11 @@
        */
       public void releaseSqlConnection(Connection sqlConnection)
       {
  -        PersistenceBroker pb = (PersistenceBroker) connectionToPBMap.get(sqlConnection);
  +        PersistenceBroker pb = getBroker();
           if (pb != null)
           {
               // release the assoc. SQL Connection through the broker
               pb.serviceConnectionManager().releaseConnection();
  -            // relase the broker back to the pool
  -            releaseBroker(pb);
  -            // remove mapping
  -            connectionToPBMap.remove(sqlConnection);
           }
   
       }
  @@ -446,14 +507,8 @@
       {
   
           PersistenceBroker pb = getBroker();
  -        try
  -        {
  -            pb.removeFromCache(obj);
  -        }
  -        finally
  -        {
  -            releaseBroker(pb);
  -        }
  +
  +        pb.removeFromCache(obj);
   
       }
   
  @@ -464,16 +519,9 @@
       {
           PersistenceBroker pb = getBroker();
   
  -        try
  -        {
  -            JdbcConnectionDescriptor jcd = pb.serviceConnectionManager().getConnectionDescriptor();
  -            jcd.setDbAlias(dbAlias);
  -            log.info("DB Alias changed to " + dbAlias + " for the " + configuration.getName()
+ " plugin.");
  -        }
  -        finally
  -        {
  -            releaseBroker(pb);
  -        }
  +        JdbcConnectionDescriptor jcd = pb.serviceConnectionManager().getConnectionDescriptor();
  +        jcd.setDbAlias(dbAlias);
  +        log.info("DB Alias changed to " + dbAlias + " for the " + configuration.getName()
+ " plugin.");
   
       }
   
  @@ -498,8 +546,226 @@
        */
       public void clearCache()
       {
  -        PersistenceBroker broker = getBroker();
  -        broker.clearCache();
  +        getBroker().clearCache();
  +    }
  +
  +    /**
  +     * @see org.apache.jetspeed.persistence.PersistencePlugin#beginTransaction()
  +     */
  +    public void beginTransaction() throws TransactionStateException
  +    {
  +        getBroker();
  +
  +    }
  +
  +    /**
  +     * @see org.apache.jetspeed.persistence.PersistencePlugin#commitTransaction()
  +     */
  +    public void commitTransaction() throws TransactionStateException
  +    {
  +        // nothin
  +    }
  +
  +    /**
  +     * @see org.apache.jetspeed.persistence.PersistencePlugin#rollbackTransaction()
  +     */
  +    public void rollbackTransaction() throws TransactionStateException
  +    {
  +        // nothin
  +    }
  +
  +    protected class InactivityMonitor extends Thread
  +    {
  +        int ttl;
  +        int checkInterval;
  +        boolean started = true;
  +
  +        protected InactivityMonitor(int ttl, int checkInterval)
  +        {
  +            this.ttl = ttl;
  +            this.checkInterval = checkInterval;
  +            setName("Persistence plugin inactivity monitor [TTL:" + ttl + "] [interval:"
+ checkInterval + "]");
  +        }
  +
  +        /**
  +         * @see java.lang.Runnable#run()
  +         */
  +        public void run()
  +        {
  +            while (started)
  +            {
  +                Iterator keys = brokerActivity.keySet().iterator();
  +                while (keys.hasNext())
  +                {
  +                    PersistenceBroker pb = (PersistenceBroker) keys.next();
  +                    Date last = (Date) brokerActivity.get(pb);
  +                    Date now = new Date();
  +                    if ((now.getTime() - last.getTime()) > ttl)
  +                    {
  +                        log.debug("PersistenceBroker " + pb + " has exceeded its TTL, attemting
to close.");
  +                        // broker should now be considered available
  +                        try
  +                        {
  +                            pb.close();
  +                            log.debug("PersistenceBroker successfully closed.");
  +                        }
  +                        catch (Throwable e1)
  +                        {
  +                            log.error("Unable to close PersistenceBroker " + pb, e1);
  +                        }
  +                    }
  +                }
  +
  +                try
  +                {
  +                    sleep(checkInterval);
  +                }
  +                catch (InterruptedException e)
  +                {
  +
  +                }
  +            }
  +        }
  +
  +        public void safeStop()
  +        {
  +            started = false;
  +        }
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBLifeCycleListener#afterDelete(org.apache.ojb.broker.PBLifeCycleEvent)
  +     */
  +    public void afterDelete(PBLifeCycleEvent arg0) throws PersistenceBrokerException
  +    {
  +        // all touches happen "before" the event
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBLifeCycleListener#afterInsert(org.apache.ojb.broker.PBLifeCycleEvent)
  +     */
  +    public void afterInsert(PBLifeCycleEvent arg0) throws PersistenceBrokerException
  +    {
  +        // all touches happen "before" the event
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBLifeCycleListener#afterLookup(org.apache.ojb.broker.PBLifeCycleEvent)
  +     */
  +    public void afterLookup(PBLifeCycleEvent arg0) throws PersistenceBrokerException
  +    {
  +        touchBroker(arg0.getTriggeringBroker());
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBLifeCycleListener#afterUpdate(org.apache.ojb.broker.PBLifeCycleEvent)
  +     */
  +    public void afterUpdate(PBLifeCycleEvent arg0) throws PersistenceBrokerException
  +    {
  +        // all touches happen "before" the event
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBLifeCycleListener#beforeDelete(org.apache.ojb.broker.PBLifeCycleEvent)
  +     */
  +    public void beforeDelete(PBLifeCycleEvent arg0) throws PersistenceBrokerException
  +    {
  +        touchBroker(arg0.getTriggeringBroker());
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBLifeCycleListener#beforeInsert(org.apache.ojb.broker.PBLifeCycleEvent)
  +     */
  +    public void beforeInsert(PBLifeCycleEvent arg0) throws PersistenceBrokerException
  +    {
  +        touchBroker(arg0.getTriggeringBroker());
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBLifeCycleListener#beforeUpdate(org.apache.ojb.broker.PBLifeCycleEvent)
  +     */
  +    public void beforeUpdate(PBLifeCycleEvent arg0) throws PersistenceBrokerException
  +    {
  +        touchBroker(arg0.getTriggeringBroker());
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBStateListener#afterBegin(org.apache.ojb.broker.PBStateEvent)
  +     */
  +    public void afterBegin(PBStateEvent arg0)
  +    {
  +        // all touches happen "before" the event
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBStateListener#afterCommit(org.apache.ojb.broker.PBStateEvent)
  +     */
  +    public void afterCommit(PBStateEvent arg0)
  +    {
  +        // all touches happen "before" the event
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBStateListener#afterOpen(org.apache.ojb.broker.PBStateEvent)
  +     */
  +    public void afterOpen(PBStateEvent arg0)
  +    {
  +        // all touches happen "before" the event
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBStateListener#afterRollback(org.apache.ojb.broker.PBStateEvent)
  +     */
  +    public void afterRollback(PBStateEvent arg0)
  +    {
  +        // all touches happen "before" the event
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBStateListener#beforeBegin(org.apache.ojb.broker.PBStateEvent)
  +     */
  +    public void beforeBegin(PBStateEvent arg0)
  +    {
  +        touchBroker(arg0.getTriggeringBroker());
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBStateListener#beforeClose(org.apache.ojb.broker.PBStateEvent)
  +     */
  +    public void beforeClose(PBStateEvent arg0)
  +    {
  +        // not needed at this point
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBStateListener#beforeCommit(org.apache.ojb.broker.PBStateEvent)
  +     */
  +    public void beforeCommit(PBStateEvent arg0)
  +    {
  +        touchBroker(arg0.getTriggeringBroker());
  +
  +    }
  +
  +    /**
  +     * @see org.apache.ojb.broker.PBStateListener#beforeRollback(org.apache.ojb.broker.PBStateEvent)
  +     */
  +    public void beforeRollback(PBStateEvent arg0)
  +    {
  +        touchBroker(arg0.getTriggeringBroker());
   
       }
   
  
  
  
  1.3       +2 -2      jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl/OjbLookupCriteria.java
  
  Index: OjbLookupCriteria.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl/OjbLookupCriteria.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OjbLookupCriteria.java	8 Dec 2003 18:39:16 -0000	1.2
  +++ OjbLookupCriteria.java	4 Feb 2004 21:04:13 -0000	1.3
  @@ -166,9 +166,9 @@
       /**
        * @see org.apache.ojb.broker.query.Criteria#addOrCriteria(org.apache.ojb.broker.query.Criteria)
        */
  -    public void addOrCriteria(Criteria arg0)
  +    public void addOrCriteria(LookupCriteria arg0)
       {
  -        ojbCriteria.addOrCriteria(arg0);
  +        ojbCriteria.addOrCriteria(((OjbLookupCriteria)arg0).getOjbCriteria());
       }
   
       /**
  
  
  
  1.5       +35 -6     jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl/OJBODMGPersistencePlugin.java
  
  Index: OJBODMGPersistencePlugin.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl/OJBODMGPersistencePlugin.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OJBODMGPersistencePlugin.java	26 Nov 2003 20:53:35 -0000	1.4
  +++ OJBODMGPersistencePlugin.java	4 Feb 2004 21:04:13 -0000	1.5
  @@ -97,6 +97,7 @@
        */
       public void beginTransaction() throws TransactionStateException
       {
  +    	super.beginTransaction();
           if (TLtx == null || TLtx.get() == null)
           {
               if (TLtx == null)
  @@ -144,6 +145,7 @@
               }
   
               tx.commit();
  +			super.commitTransaction();
           }
           catch (Exception e)
           {
  @@ -156,8 +158,7 @@
               if (tx != null)
               {
                   TLtx.set(null);
  -
  -            }
  +            }            
           }
   
       }
  @@ -234,6 +235,10 @@
               }
               throw new TransactionStateException("Unable to rollback transaction " + tx
+ " " + e.toString(), e);
           }
  +        finally
  +        {
  +        	super.rollbackTransaction();
  +        }
       }
   
       protected void initODMG() throws InitializationException
  @@ -255,10 +260,7 @@
               log.error(message, e);
               throw new InitializationException(message, e);
           }
  -        finally
  -        {
  -            releaseBroker(broker);
  -        }
  +  
   
       }
   
  @@ -310,6 +312,33 @@
           	throw new  TransactionStateException("No transaction in progress");
           }
           
  +    }
  +
  +    /**
  +     * @see org.apache.jetspeed.persistence.PersistencePlugin#makePersistent(java.lang.Object)
  +     */
  +    public void makePersistent(Object obj) throws TransactionStateException
  +    {
  +		Transaction tx = null;
  +		if (TLtx == null || TLtx.get() == null)
  +		{
  +			throw new TransactionStateException("You can not make objects persistent before a Transaction
has been started.");
  +		}
  +		else
  +		{
  +			try
  +			{
  +				tx = (Transaction) TLtx.get();
  +				// db.makePersistent(obj);
  +				tx.lock(obj, Transaction.WRITE);
  +			}
  +			catch (Exception e)
  +			{
  +				throw new TransactionStateException("Unable to make object persistent " + e.toString(),
e);
  +			}
  +		}
  +        
  +
       }
   
   }
  
  
  
  1.4       +84 -8     jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl/OJBPBPersistencePlugin.java
  
  Index: OJBPBPersistencePlugin.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl/OJBPBPersistencePlugin.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- OJBPBPersistencePlugin.java	26 Nov 2003 20:53:35 -0000	1.3
  +++ OJBPBPersistencePlugin.java	4 Feb 2004 21:04:13 -0000	1.4
  @@ -54,8 +54,10 @@
   package org.apache.jetspeed.persistence.impl;
   
   import java.util.ArrayList;
  -import java.util.HashMap;
  +import java.util.Collection;
  +import java.util.HashSet;
   import java.util.Iterator;
  +import java.util.List;
   
   import org.apache.fulcrum.InitializationException;
   import org.apache.jetspeed.persistence.TransactionStateException;
  @@ -72,6 +74,10 @@
   public class OJBPBPersistencePlugin extends AbstractOJBPersistencePlugin
   {
   
  +    protected ThreadLocal TLdeletes = new ThreadLocal();
  +    protected ThreadLocal TLupdates = new ThreadLocal();
  +    protected ThreadLocal TLpb = new ThreadLocal();
  +
       /**
        * @see org.apache.jetspeed.services.perisistence.impl.AbstractOJBPersistencePlugin#postInit()
        */
  @@ -85,8 +91,8 @@
        */
       public void beginTransaction() throws TransactionStateException
       {
  -        throw new UnsupportedOperationException("Not Implemented!");
  -        
  +        super.beginTransaction();
  +        getBroker().beginTransaction();
       }
   
       /**
  @@ -94,7 +100,31 @@
        */
       public void commitTransaction() throws TransactionStateException
       {
  -		throw new UnsupportedOperationException("Not Implemented!");
  +        PersistenceBroker pb = getBroker();
  +
  +		Collection updates = (Collection) TLupdates.get();
  +        if (updates != null)
  +        {
  +            Iterator itr = updates.iterator();
  +            while (itr.hasNext())
  +            {
  +                pb.store(itr.next());
  +            }
  +        }
  +
  +		Collection deletes = (Collection) TLdeletes.get();
  +        if (deletes != null)
  +        {
  +            Iterator itr = deletes.iterator();
  +            while (itr.hasNext())
  +            {
  +                pb.delete(itr.next());
  +            }
  +        }
  +
  +        pb.commitTransaction();
  +		super.commitTransaction();
  +        clearTx();
   
       }
   
  @@ -103,7 +133,8 @@
        */
       public Object markDirty(Object obj) throws TransactionStateException
       {
  -		throw new UnsupportedOperationException("Not Implemented!");
  +        prepareForUpdate(obj);
  +        return obj;
       }
   
       /**
  @@ -111,8 +142,14 @@
        */
       public void prepareForDelete(Object obj) throws TransactionStateException
       {
  -		throw new UnsupportedOperationException("Not Implemented!");
  +        HashSet deletes = (HashSet) TLdeletes.get();
  +        if (deletes == null)
  +        {
  +            deletes = new HashSet();
  +            TLdeletes.set(deletes);
  +        }
   
  +        deletes.add(obj);
       }
   
       /**
  @@ -120,7 +157,14 @@
        */
       public void prepareForUpdate(Object obj) throws TransactionStateException
       {
  -		throw new UnsupportedOperationException("Not Implemented!");
  +        List updates = (List) TLupdates.get();
  +        if (updates == null)
  +        {
  +            updates = new ArrayList();
  +            TLupdates.set(updates);
  +        }
  +
  +        updates.add(obj);
   
       }
   
  @@ -129,7 +173,39 @@
        */
       public void rollbackTransaction() throws TransactionStateException
       {
  -		throw new UnsupportedOperationException("Not Implemented!");
  +        PersistenceBroker pb = getBroker();
  +        try
  +        {
  +            pb.abortTransaction();
  +        }
  +        finally
  +        {
  +        	super.rollbackTransaction();
  +            clearTx();
  +        }
  +
  +    }
  +
  +    /**
  +     * @see org.apache.jetspeed.persistence.PersistencePlugin#makePersistent(java.lang.Object)
  +     */
  +    public void makePersistent(Object obj) throws TransactionStateException
  +    {
  +        prepareForUpdate(obj);
  +    }
  +
  +    protected void clearTx()
  +    {
  +		Collection updates = (Collection) TLupdates.get();
  +        if (updates != null)
  +        {
  +            updates.clear();
  +        }
  +		Collection deletes = (Collection) TLdeletes.get();
  +        if (deletes != null)
  +        {
  +            deletes.clear();
  +        }
   
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message