[jboss-svn-commits] JBL Code SVN: r5521 - in labs/jbossesb/branches/refactor/product/core/services: . src/org/jboss/soa/esb/internal/core/objectstore src/org/jboss/soa/esb/services src/org/jboss/soa/esb/services/EJB src/org/jboss/soa/esb/services/msglistener tests/src/org/jboss/soa/esb/services/EJB/test tests/src/org/jboss/soa/esb/services/tests/objectstore

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sun Aug 6 12:28:42 EDT 2006


Author: arvinder
Date: 2006-08-06 12:28:19 -0400 (Sun, 06 Aug 2006)
New Revision: 5521

Modified:
   labs/jbossesb/branches/refactor/product/core/services/build.xml
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoBatchTable.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerFactory.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotificationHandlerFactory.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerFactory.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/msglistener/JbossEsbMessageProcessor.java
   labs/jbossesb/branches/refactor/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/NotificationTest.java
   labs/jbossesb/branches/refactor/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java
   labs/jbossesb/branches/refactor/product/core/services/tests/src/org/jboss/soa/esb/services/tests/objectstore/ObjectStoreFuncTest.java
Log:
sync with trunk: optimise imports as per JBESB-69

Modified: labs/jbossesb/branches/refactor/product/core/services/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/build.xml	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/build.xml	2006-08-06 16:28:19 UTC (rev 5521)
@@ -37,7 +37,7 @@
 			includes="*.jar,*.zip"
 			/>
 	        <fileset dir="${org.jboss.esb.ext.lib.dir}"  
-			includes="jboss-jmx.jar"
+			includes="*.jar"
 			/>
 	    	<fileset dir="${org.jboss.esb.ejb3.dir}"  
 				includes="*.jar"

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -22,13 +22,18 @@
 
 package org.jboss.soa.esb.internal.core.objectstore;
 
+import org.jboss.soa.esb.common.SystemProperties;
+import org.jboss.soa.esb.helpers.DomElement;
+import org.jboss.soa.esb.util.BaseBusinessObject;
+import org.jboss.soa.esb.util.BobjStdDTO;
+import org.jboss.soa.esb.util.Util;
+
 import java.net.URI;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-import org.jboss.soa.esb.common.*;
-import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.util.*;
-
 public class BobjStore {
 	private static String DATASRC_JNDI_NAME;
 
@@ -64,8 +69,9 @@
 
 	static {
 		try {
+			String objectConfigFile = SystemProperties.getObjStoreConfigFile();
 			URI objStoreConfig = URI.create(
-					SystemProperties.getObjStoreConfigFile());
+					objectConfigFile);
 			DomElement oConf = DomElement.fromInputStream(
 					objStoreConfig.toURL().openStream());
 

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoBatchTable.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoBatchTable.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoBatchTable.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -22,11 +22,15 @@
 
 package org.jboss.soa.esb.internal.core.objectstore;
 
-import java.sql.*;
-import org.apache.log4j.*;
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.persist.*;
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.helpers.persist.JdbcCleanConn;
+import org.jboss.soa.esb.helpers.persist.SqlDbTable;
+import org.jboss.soa.esb.util.BobjStdDTO;
+import org.jboss.soa.esb.util.Util;
 
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
 /**
  * Data access object for the SQL table where batches are temporarily stored
  * until they are committed

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -22,11 +22,16 @@
 
 package org.jboss.soa.esb.internal.core.objectstore;
 
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.persist.*;
-import java.sql.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.helpers.persist.JdbcCleanConn;
+import org.jboss.soa.esb.helpers.persist.SqlDbTable;
+import org.jboss.soa.esb.util.BobjStdDTO;
+import org.jboss.soa.esb.util.ObjLocator;
+import org.jboss.soa.esb.util.Util;
 
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
 /**
  * Data access object for all SQL tables that the ROS (Rosetta Object Store)
  * uses as locator tables

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -22,17 +22,20 @@
 
 package org.jboss.soa.esb.internal.core.objectstore;
 
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.common.SystemProperties;
+import org.jboss.soa.esb.helpers.persist.JdbcCleanConn;
+import org.jboss.soa.esb.helpers.persist.SqlDbTable;
+import org.jboss.soa.esb.services.DefaultEncryptionFactory;
+import org.jboss.soa.esb.services.Iencryption;
+import org.jboss.soa.esb.util.BobjStdDTO;
+import org.jboss.soa.esb.util.Util;
+
 import java.lang.reflect.Method;
-import java.sql.*;
-import org.apache.log4j.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 
-import org.jboss.soa.esb.common.*;
-import org.jboss.soa.esb.util.Util;
-import org.jboss.soa.esb.util.BobjStdDTO;
-import org.jboss.soa.esb.helpers.persist.*;
-import org.jboss.soa.esb.services.*;
 
-
 /**
  * Data access object for all SQL tables that the ROS (Rosetta Object Store)
  * uses as snapshot tables

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -23,11 +23,14 @@
 
 package org.jboss.soa.esb.internal.core.objectstore;
 
-import org.jboss.soa.esb.helpers.persist.*;
-import org.jboss.soa.esb.util.*;
-import java.sql.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.helpers.persist.JdbcCleanConn;
+import org.jboss.soa.esb.helpers.persist.SqlDbTable;
+import org.jboss.soa.esb.util.Util;
 
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
 /**
  * Data access object for the SQL table that the Object Store
  * uses to assign Unique Identifiers (UID) to any object in the framework

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -21,11 +21,11 @@
 */
 package org.jboss.soa.esb.services;
 
-import javax.naming.Context;
-
 import org.jboss.soa.esb.common.bizclasses.BatchProcess;
 import org.jboss.soa.esb.services.EJB.BatchHandler;
 
+import javax.naming.Context;
+
 public class BatchHandlerBsDelegateLocal implements IbatchHandler
 {
     private BatchHandler m_oBatchH;
@@ -33,6 +33,7 @@
 	public BatchHandlerBsDelegateLocal(Context p_ctx) throws Exception
 	{
 		m_oBatchH = (BatchHandler) p_ctx.lookup("jbossesb-appl/NotificationHandlerBean/local");
+		m_oBatchH.create();
 	}
 
 	public long newBatch() throws Exception

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -23,11 +23,11 @@
 
 package org.jboss.soa.esb.services;
 
-import javax.naming.*;
-
-import org.jboss.soa.esb.services.EJB.*;
 import org.jboss.soa.esb.common.bizclasses.BatchProcess;
+import org.jboss.soa.esb.services.EJB.BatchHandler;
 
+import javax.naming.Context;
+
 public class BatchHandlerBsDelegateRemote implements IbatchHandler
 {
   private BatchHandler m_oBatchH;
@@ -35,6 +35,7 @@
 	public BatchHandlerBsDelegateRemote(Context p_ctx) throws Exception {
 		m_oBatchH = (BatchHandler) p_ctx
 				.lookup("jbossesb-appl/NotificationHandlerBean/remote");
+        m_oBatchH.create();
 	}
 
 	public long newBatch() throws Exception {

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerFactory.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerFactory.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerFactory.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -21,10 +21,11 @@
 */
 package org.jboss.soa.esb.services;
 
-import java.util.*;
-import javax.naming.*;
+import org.jboss.soa.esb.helpers.AppServerContext;
 
-import org.jboss.soa.esb.helpers.*;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Arrays;
 
 public class BatchHandlerFactory
 {

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -23,14 +23,17 @@
 
 import org.jboss.soa.esb.util.BobjStdDTO;
 
+import javax.ejb.CreateException;
+
 /**
  * @author kstam
  */
 public interface BatchHandler
 {
-   public void finish() throws Exception;
-   public void commitBatch(BobjStdDTO p_oDto ) throws Exception;
-   public long newBatch() throws Exception;
-   public int addToBatch(String p_s) throws Exception;
-   public void remove();
+    public void create() throws CreateException;
+    public void finish() throws Exception;
+    public void commitBatch(BobjStdDTO p_oDto ) throws Exception;
+    public long newBatch() throws Exception;
+    public int addToBatch(String p_s) throws Exception;
+    public void remove();
 }

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -24,17 +24,36 @@
 
 package org.jboss.soa.esb.services.EJB;
 
-import java.sql.*;
-import java.text.*;
-import javax.ejb.*;
-import javax.naming.*;
-import javax.sql.*;
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.common.bizclasses.BatchProcess;
+import org.jboss.soa.esb.helpers.persist.JdbcCleanConn;
+import org.jboss.soa.esb.internal.core.objectstore.BobjStore;
+import org.jboss.soa.esb.internal.core.objectstore.DaoBatchTable;
+import org.jboss.soa.esb.internal.core.objectstore.DaoIndexTable;
+import org.jboss.soa.esb.internal.core.objectstore.DaoSnapTable;
+import org.jboss.soa.esb.internal.core.objectstore.DaoUidTable;
+import org.jboss.soa.esb.internal.core.objectstore.RowBatch;
+import org.jboss.soa.esb.util.BobjStdDTO;
+import org.jboss.soa.esb.util.Util;
 
-import org.apache.log4j.*;
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.persist.*;
-import org.jboss.soa.esb.internal.core.objectstore.*;
-import org.jboss.soa.esb.common.bizclasses.*;
+import javax.ejb.CreateException;
+import javax.ejb.Init;
+import javax.ejb.Local;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateful;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.text.SimpleDateFormat;
 /**
  * @author Esteban
  */
@@ -65,7 +84,7 @@
  * @throws CreateException
  */
   @Init
-  public void ejbCreate() throws CreateException
+  public void create() throws CreateException
   {
     try
     { getResources();
@@ -124,7 +143,7 @@
 
   private DaoUidTable getDaoUid() throws Exception
   { if (null==m_oDaoUid) 
-	  m_oDaoUid = new DaoUidTable(m_oUidConn,BobjStore.getUidTableName());
+	  m_oDaoUid = new DaoUidTable(m_oUidConn, BobjStore.getUidTableName());
     return m_oDaoUid;
   } //__________________________________
 

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -29,5 +29,6 @@
  */
 public interface NotificationHandler
 {
-   public void sendNotifications( String p_sParams, Serializable p_oMsg ) throws Exception;
+	public void create() throws Exception;
+    public void sendNotifications( String p_sParams, Serializable p_oMsg ) throws Exception;
 }

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -24,8 +24,12 @@
 
 package org.jboss.soa.esb.services.EJB;
 
-import java.io.Serializable;
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.helpers.DomElement;
+import org.jboss.soa.esb.notification.NotificationList;
+import org.jboss.soa.esb.util.Util;
 
+import javax.ejb.CreateException;
 import javax.ejb.Init;
 import javax.ejb.Local;
 import javax.ejb.Remote;
@@ -36,12 +40,8 @@
 import javax.ejb.TransactionAttributeType;
 import javax.ejb.TransactionManagement;
 import javax.ejb.TransactionManagementType;
-import javax.naming.*;
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.notification.*;
-
-import org.apache.log4j.*;
+import javax.naming.InitialContext;
+import java.io.Serializable;
 /**
  * @author Esteban
  */
@@ -62,7 +62,7 @@
  * @throws CreateException
  */
   @Init
-  public void ejbCreate() throws Exception
+  public void create() throws Exception
   { try
     { m_oLogger = Util.getDefaultLogger(this.getClass());
 //      Context oCtxInit   =

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -28,15 +28,16 @@
  */
 public interface PersistHandler
 {
+    public void create() throws Exception;
+	
+    public long getUidChunk( int p_iQ ) throws Exception;
 
-   public long getUidChunk( int p_iQ ) throws Exception;
+    public void rmvObject( String p_sClassName,long p_lUid ) throws Exception;
 
-   public void rmvObject( String p_sClassName,long p_lUid ) throws Exception;
+    public long addDTO( BobjStdDTO p_oDto ) throws Exception;
 
-   public long addDTO( BobjStdDTO p_oDto ) throws Exception;
+    public BobjStdDTO getDTO( String p_sClassName,long p_lUid ) throws Exception;
 
-   public BobjStdDTO getDTO( String p_sClassName,long p_lUid ) throws Exception;
+    public void rplDTO( BobjStdDTO p_oDto ) throws Exception;
 
-   public void rplDTO( BobjStdDTO p_oDto ) throws Exception;
-
 }

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -21,6 +21,17 @@
 */
 package org.jboss.soa.esb.services.EJB;
 
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.helpers.persist.JdbcCleanConn;
+import org.jboss.soa.esb.internal.core.objectstore.BobjStore;
+import org.jboss.soa.esb.internal.core.objectstore.DaoIndexTable;
+import org.jboss.soa.esb.internal.core.objectstore.DaoSnapTable;
+import org.jboss.soa.esb.internal.core.objectstore.DaoUidTable;
+import org.jboss.soa.esb.util.BobjStdDTO;
+import org.jboss.soa.esb.util.ObjLocator;
+import org.jboss.soa.esb.util.Util;
+
+import javax.ejb.CreateException;
 import javax.ejb.Init;
 import javax.ejb.Local;
 import javax.ejb.Remote;
@@ -29,19 +40,15 @@
 import javax.ejb.Stateless;
 import javax.ejb.TransactionManagement;
 import javax.ejb.TransactionManagementType;
-import javax.naming.*;
-import java.sql.*;
-import javax.sql.*;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+import java.io.ObjectStreamClass;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.text.SimpleDateFormat;
 
-import java.text.*;
-import java.io.*;
-
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.persist.*;
-import org.jboss.soa.esb.internal.core.objectstore.*;
-
-import org.apache.log4j.*;
-
 /**
  * @author Esteban
  */

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -22,12 +22,12 @@
 
 package org.jboss.soa.esb.services;
 
-import javax.naming.*;
+import org.jboss.soa.esb.helpers.DomElement;
+import org.jboss.soa.esb.services.EJB.NotificationHandler;
+
+import javax.naming.Context;
 import java.io.Serializable;
 
-import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.services.EJB.*;
-
 public class NotifHandlerBsDelegateLocal implements InotificationHandler
 {
     private NotificationHandler m_oNotifH;
@@ -35,6 +35,7 @@
 	public NotifHandlerBsDelegateLocal(Context p_ctx) throws Exception
 	{
 		m_oNotifH = (NotificationHandler) p_ctx.lookup("jbossesb-appl/NotificationHandlerBean/local");
+		m_oNotifH.create();
 	}
 
 	public void sendNotifications(DomElement p_oP, Serializable p_o)

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -23,10 +23,11 @@
 
 package org.jboss.soa.esb.services;
 
-import javax.naming.*;
+import org.jboss.soa.esb.helpers.DomElement;
+import org.jboss.soa.esb.services.EJB.NotificationHandler;
+
+import javax.naming.Context;
 import java.io.Serializable;
-import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.services.EJB.*;
 
 public class NotifHandlerBsDelegateRemote implements InotificationHandler
 {
@@ -35,6 +36,7 @@
 	public NotifHandlerBsDelegateRemote(Context p_ctx) throws Exception
 	{
 		m_oNotifH = (NotificationHandler) p_ctx.lookup("jbossesb-appl/NotificationHandlerBean/remote");
+        m_oNotifH.create();
 	}
 
 	public void sendNotifications(DomElement p_oP, Serializable p_o)

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotificationHandlerFactory.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotificationHandlerFactory.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotificationHandlerFactory.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -23,10 +23,11 @@
 
 package org.jboss.soa.esb.services;
 
-import java.util.*;
+import org.jboss.soa.esb.helpers.AppServerContext;
 
-import javax.naming.*;
-import org.jboss.soa.esb.helpers.*;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Arrays;
 
 
 public class  NotificationHandlerFactory

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -23,11 +23,13 @@
 
 package org.jboss.soa.esb.services;
 
-import javax.naming.*;
-import java.util.*;
+import org.jboss.soa.esb.services.EJB.PersistHandler;
+import org.jboss.soa.esb.util.BaseBusinessObject;
+import org.jboss.soa.esb.util.BobjStdDTO;
+import org.jboss.soa.esb.util.ObjLocator;
 
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.services.EJB.*;
+import javax.naming.Context;
+import java.util.Properties;
 
 
 public class PersistHandlerBsDelegateLocal implements IpersistHandler
@@ -36,6 +38,7 @@
 
 	public PersistHandlerBsDelegateLocal(Context p_ctx) throws Exception {
 		m_oSnapH = (PersistHandler) p_ctx.lookup("jbossesb-appl/PersistHandlerBean/local");
+		m_oSnapH.create();
 	}
 
 	public long getUidChunk(int p_iQ) throws Exception {

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -23,11 +23,13 @@
 
 package org.jboss.soa.esb.services;
 
-import javax.naming.*;
+import org.jboss.soa.esb.services.EJB.PersistHandler;
+import org.jboss.soa.esb.util.BaseBusinessObject;
+import org.jboss.soa.esb.util.BobjStdDTO;
+import org.jboss.soa.esb.util.ObjLocator;
 
-import org.jboss.soa.esb.services.EJB.*;
-import org.jboss.soa.esb.util.*;
-import java.util.*;
+import javax.naming.Context;
+import java.util.Properties;
 
 
 public class PersistHandlerBsDelegateRemote implements IpersistHandler
@@ -37,6 +39,7 @@
   public PersistHandlerBsDelegateRemote(Context p_ctx) throws Exception
   {
 	  m_oSnapH = (PersistHandler) p_ctx.lookup("jbossesb-appl/PersistHandlerBean/remote");
+	  m_oSnapH.create();
   }
 
   public long getUidChunk(int p_iQ)                    throws Exception

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerFactory.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerFactory.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerFactory.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -23,10 +23,11 @@
 
 package org.jboss.soa.esb.services;
 
-import java.util.*;
-import javax.naming.*;
+import org.jboss.soa.esb.helpers.AppServerContext;
 
-import org.jboss.soa.esb.helpers.*;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Arrays;
 
 public class PersistHandlerFactory
 {

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -24,14 +24,20 @@
 
 package org.jboss.soa.esb.services.msglistener;
 
-import java.lang.reflect.*;
-import javax.ejb.*;
-import javax.jms.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.helpers.DomElement;
+import org.jboss.soa.esb.parameters.ParamRepository;
+import org.jboss.soa.esb.parameters.ParamRepositoryFactory;
+import org.jboss.soa.esb.util.Util;
 
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.parameters.*;
+import javax.ejb.EJBException;
+import javax.ejb.MessageDrivenBean;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.TextMessage;
+import java.lang.reflect.Constructor;
 
 /**
  * <p>Title: Abstract Jboss ESB Message Driven Bean</p>

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/msglistener/JbossEsbMessageProcessor.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/msglistener/JbossEsbMessageProcessor.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/msglistener/JbossEsbMessageProcessor.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -24,9 +24,10 @@
 
 package org.jboss.soa.esb.services.msglistener;
 
-import javax.jms.*;
-import org.jboss.soa.esb.helpers.*;
+import org.jboss.soa.esb.helpers.DomElement;
 
+import javax.jms.Message;
+
 public class JbossEsbMessageProcessor
 {
 	public void processMessage(Message p_Msg) throws Exception

Modified: labs/jbossesb/branches/refactor/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/NotificationTest.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/NotificationTest.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/NotificationTest.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -21,15 +21,8 @@
 */
 package org.jboss.soa.esb.services.EJB.test;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Hashtable;
-
-import javax.naming.InitialContext;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
 import org.jboss.soa.esb.common.tests.BaseTest;
@@ -42,7 +35,12 @@
 import org.jboss.soa.esb.notification.NotifySqlTable;
 import org.jboss.soa.esb.services.EJB.NotificationHandler;
 
+import javax.naming.InitialContext;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Hashtable;
 
+
 public class NotificationTest extends BaseTest
 {
 	private Logger logger = Logger.getLogger(NotificationTest.class);

Modified: labs/jbossesb/branches/refactor/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -23,7 +23,6 @@
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
 import org.jboss.soa.esb.common.tests.BaseTest;
@@ -40,6 +39,8 @@
 	    	logger.log(Priority.INFO, "PersistHandler Test");
 	    	PersistHandler persistHandlerLocal = (PersistHandler ) EJBContainerSetup.lookup("PersistHandlerBean/remote");
 	    	logger.log(Priority.INFO, "persistHandlerLocal=" + persistHandlerLocal);
+	    	persistHandlerLocal.create();
+	    	persistHandlerLocal.addDTO(null);
     	} catch (Exception e) {
     		logger.log(Priority.ERROR, e.getMessage(), e);
     	}

Modified: labs/jbossesb/branches/refactor/product/core/services/tests/src/org/jboss/soa/esb/services/tests/objectstore/ObjectStoreFuncTest.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/tests/src/org/jboss/soa/esb/services/tests/objectstore/ObjectStoreFuncTest.java	2006-08-06 16:23:24 UTC (rev 5520)
+++ labs/jbossesb/branches/refactor/product/core/services/tests/src/org/jboss/soa/esb/services/tests/objectstore/ObjectStoreFuncTest.java	2006-08-06 16:28:19 UTC (rev 5521)
@@ -21,11 +21,8 @@
 */
 package org.jboss.soa.esb.services.tests.objectstore;
 
-import org.jboss.soa.esb.common.SystemProperties;
-import org.jboss.soa.esb.common.tests.bizclasses.PersonUnitTest;
 import org.jboss.soa.esb.common.tests.BaseTest;
-import org.jboss.soa.esb.common.bizclasses.*;
-import org.jboss.soa.esb.services.*;
+import org.jboss.soa.esb.services.IpersistHandler;
 
 // DON'T FORGET !!
 // The Rosetta Application server has to be up and running 




More information about the jboss-svn-commits mailing list