[jboss-svn-commits] JBL Code SVN: r5517 - in labs/jbossesb/trunk: . product/core/common/src/org/jboss/soa/esb/common product/core/services product/core/services/src/org/jboss/soa/esb/internal/core/objectstore product/core/services/src/org/jboss/soa/esb/services product/core/services/src/org/jboss/soa/esb/services/EJB product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test product/lib/ejb3
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Aug 6 11:56:32 EDT 2006
Author: kurt.stam at jboss.com
Date: 2006-08-06 11:55:01 -0400 (Sun, 06 Aug 2006)
New Revision: 5517
Added:
labs/jbossesb/trunk/product/lib/ejb3/jbossall-client.jar
Modified:
labs/jbossesb/trunk/.classpath
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/SystemProperties.java
labs/jbossesb/trunk/product/core/services/build.xml
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java
Log:
Adding ejb3 support, calling create explicitly
Modified: labs/jbossesb/trunk/.classpath
===================================================================
--- labs/jbossesb/trunk/.classpath 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/.classpath 2006-08-06 15:55:01 UTC (rev 5517)
@@ -13,7 +13,6 @@
<classpathentry kind="lib" path="product/lib/ext/commons-logging.jar"/>
<classpathentry kind="lib" path="product/lib/ext/emma_ant.jar"/>
<classpathentry kind="lib" path="product/lib/ext/emma.jar"/>
- <classpathentry kind="lib" path="product/lib/ext/jbossall-client.jar"/>
<classpathentry kind="lib" path="product/lib/ext/jboss-jmx.jar"/>
<classpathentry kind="lib" path="product/lib/ext/junit.jar"/>
<classpathentry kind="lib" path="product/lib/ext/log4j.jar"/>
@@ -30,5 +29,6 @@
<classpathentry kind="lib" path="product/lib/ejb3_embedded/jboss-ejb3-all.jar"/>
<classpathentry kind="lib" path="product/lib/ejb3_embedded/thirdparty-all.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="product/core/common/tests/resources/conf"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/SystemProperties.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/SystemProperties.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/SystemProperties.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -106,7 +106,8 @@
}
public static String getObjStoreConfigFile() {
- return System.getProperty(OBJECT_STORE_CONFIG_FILE);
+ String property = System.getProperty(OBJECT_STORE_CONFIG_FILE);
+ return property;
}
public static String getEncryptionFactoryClass() {
Modified: labs/jbossesb/trunk/product/core/services/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/build.xml 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/build.xml 2006-08-06 15:55:01 UTC (rev 5517)
@@ -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/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -64,8 +64,9 @@
static {
try {
+ String objectConfigFile = SystemProperties.getObjStoreConfigFile();
URI objStoreConfig = URI.create(
- SystemProperties.getObjStoreConfigFile());
+ objectConfigFile);
DomElement oConf = DomElement.fromInputStream(
objStoreConfig.toURL().openStream());
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -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/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -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/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -21,6 +21,8 @@
*/
package org.jboss.soa.esb.services.EJB;
+import javax.ejb.CreateException;
+
import org.jboss.soa.esb.util.BobjStdDTO;
/**
@@ -28,9 +30,10 @@
*/
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/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -65,7 +65,7 @@
* @throws CreateException
*/
@Init
- public void ejbCreate() throws CreateException
+ public void create() throws CreateException
{
try
{ getResources();
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -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/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -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/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -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/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -23,6 +23,7 @@
import javax.ejb.Init;
import javax.ejb.Local;
+import javax.ejb.PostActivate;
import javax.ejb.Remote;
import javax.ejb.Remove;
import javax.ejb.SessionContext;
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -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/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -35,6 +35,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/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -36,6 +36,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/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -37,6 +37,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/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java 2006-08-06 15:50:05 UTC (rev 5516)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java 2006-08-06 15:55:01 UTC (rev 5517)
@@ -40,6 +40,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);
}
Added: labs/jbossesb/trunk/product/lib/ejb3/jbossall-client.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/lib/ejb3/jbossall-client.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the jboss-svn-commits
mailing list