[jboss-svn-commits] JBL Code SVN: r5483 - in labs/jbossesb/trunk: . product product/core/common/src/org/jboss/soa/esb/helpers product/core/common/src/org/jboss/soa/esb/services product/core/common/tests product/core/common/tests/resources product/core/common/tests/resources/conf product/core/common/tests/src/org/jboss/soa/esb/common/tests product/core/common/tests/src/org/jboss/soa/esb/helpers product/core/listeners/tests product/core/processors/src/org/jboss/soa/esb/processors product/core/processors/tests product/core/services product/core/services/src/META-INF product/core/services/src/org/jboss/soa/esb/services product/core/services/src/org/jboss/soa/esb/services/EJB product/core/services/tests product/core/services/tests/src/org/jboss/soa/esb/services product/core/services/tests/src/org/jboss/soa/esb/services/EJB product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test product/core/services/tests/src/org/jboss/soa/esb/services/tests product/lib product/lib/deploy produ! ct/lib/ejb3 product/lib/ejb3_embedded product/lib/ext
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Aug 4 19:05:40 EDT 2006
Author: kurt.stam at jboss.com
Date: 2006-08-04 19:04:01 -0400 (Fri, 04 Aug 2006)
New Revision: 5483
Added:
labs/jbossesb/trunk/product/core/common/tests/resources/
labs/jbossesb/trunk/product/core/common/tests/resources/conf/
labs/jbossesb/trunk/product/core/common/tests/resources/conf/default.persistence.properties
labs/jbossesb/trunk/product/core/common/tests/resources/conf/ejb3-interceptors-aop.xml
labs/jbossesb/trunk/product/core/common/tests/resources/conf/embedded-jboss-beans.xml
labs/jbossesb/trunk/product/core/common/tests/resources/conf/jboss-jms-beans.xml
labs/jbossesb/trunk/product/core/common/tests/resources/conf/log4j.xml
labs/jbossesb/trunk/product/core/common/tests/resources/conf/login-config.xml
labs/jbossesb/trunk/product/core/common/tests/resources/conf/security-beans.xml
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/NotificationTest.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java
labs/jbossesb/trunk/product/deployment.properties-example
labs/jbossesb/trunk/product/lib/deploy/
labs/jbossesb/trunk/product/lib/deploy/postgresql-8.1-407.jdbc3.jar
labs/jbossesb/trunk/product/lib/ejb3/
labs/jbossesb/trunk/product/lib/ejb3/jboss-annotations-ejb3.jar
labs/jbossesb/trunk/product/lib/ejb3/jboss-ejb3x.jar
labs/jbossesb/trunk/product/lib/ejb3_embedded/
labs/jbossesb/trunk/product/lib/ejb3_embedded/hibernate-all.jar
labs/jbossesb/trunk/product/lib/ejb3_embedded/jboss-ejb3-all.jar
labs/jbossesb/trunk/product/lib/ejb3_embedded/thirdparty-all.jar
Removed:
labs/jbossesb/trunk/product/core/common/tests/resources/conf/
labs/jbossesb/trunk/product/core/common/tests/resources/conf/default.persistence.properties
labs/jbossesb/trunk/product/core/common/tests/resources/conf/ejb3-interceptors-aop.xml
labs/jbossesb/trunk/product/core/common/tests/resources/conf/embedded-jboss-beans.xml
labs/jbossesb/trunk/product/core/common/tests/resources/conf/jboss-jms-beans.xml
labs/jbossesb/trunk/product/core/common/tests/resources/conf/log4j.xml
labs/jbossesb/trunk/product/core/common/tests/resources/conf/login-config.xml
labs/jbossesb/trunk/product/core/common/tests/resources/conf/security-beans.xml
labs/jbossesb/trunk/product/core/services/src/META-INF/ejb-jar.xml
labs/jbossesb/trunk/product/core/services/src/META-INF/jboss.xml
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocalHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocalHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocalHome.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/NotificationTest.java
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/tests/notification/
labs/jbossesb/trunk/product/lib/deploy/postgresql-8.1-407.jdbc3.jar
labs/jbossesb/trunk/product/lib/ejb3/jboss-annotations-ejb3.jar
labs/jbossesb/trunk/product/lib/ejb3/jboss-ejb3x.jar
labs/jbossesb/trunk/product/lib/ejb3_embedded/hibernate-all.jar
labs/jbossesb/trunk/product/lib/ejb3_embedded/jboss-ejb3-all.jar
labs/jbossesb/trunk/product/lib/ejb3_embedded/thirdparty-all.jar
Modified:
labs/jbossesb/trunk/
labs/jbossesb/trunk/product/
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/AppServerContext.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/services/IbatchHandler.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/services/IpersistHandler.java
labs/jbossesb/trunk/product/core/common/tests/
labs/jbossesb/trunk/product/core/common/tests/build.xml
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/FileProcessor.java
labs/jbossesb/trunk/product/core/processors/tests/
labs/jbossesb/trunk/product/core/services/build.xml
labs/jbossesb/trunk/product/core/services/src/META-INF/application.xml
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/BatchHandlerFactory.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/NotificationHandlerFactory.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/src/org/jboss/soa/esb/services/PersistHandlerFactory.java
labs/jbossesb/trunk/product/core/services/tests/
labs/jbossesb/trunk/product/core/services/tests/build.xml
labs/jbossesb/trunk/product/lib/ext/jbossall-client.jar
Log:
merging ejb3 branch into the trunk
Property changes on: labs/jbossesb/trunk
___________________________________________________________________
Name: svn:ignore
-
.settings
.classpath
.project
+
.settings
.classpath
.project
bin
.packaging
build
Property changes on: labs/jbossesb/trunk/product
___________________________________________________________________
Name: svn:ignore
-
build
+
build
deployment.properties
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/AppServerContext.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/AppServerContext.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/AppServerContext.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -80,7 +80,7 @@
oPr.setProperty(Context.INITIAL_CONTEXT_FACTORY,
"org.jnp.interfaces.NamingContextFactory");
oPr.setProperty(Context.URL_PKG_PREFIXES,
- "jboss.naming:org.jnp.interfaces");
+ "org.jboss.naming:org.jnp.interfaces");
boolean bCtxOK = false;
Context oCtx = null;
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/services/IbatchHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/services/IbatchHandler.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/services/IbatchHandler.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -31,6 +31,5 @@
public long newBatch () throws Exception;
public int addToBatch (String p_s) throws Exception;
public void finish () throws Exception;
- public void releaseHandler();
public void commitBatch(BatchProcess p_oBP) throws Exception;
} //____________________________________________________________________________
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/services/IpersistHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/services/IpersistHandler.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/services/IpersistHandler.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -35,5 +35,4 @@
public BaseBusinessObject getObject(Class p_oCls,long p_lUid) throws Exception;
public void rplObject(BaseBusinessObject p_o) throws Exception;
public void rmvObject(Class p_oCls,long p_lUid) throws Exception;
- public void remove() throws Exception;
} //____________________________________________________________________________
Property changes on: labs/jbossesb/trunk/product/core/common/tests
___________________________________________________________________
Name: svn:ignore
+
TESTS-TestSuites.xml
Modified: labs/jbossesb/trunk/product/core/common/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/build.xml 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/tests/build.xml 2006-08-04 23:04:01 UTC (rev 5483)
@@ -8,7 +8,7 @@
<property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
<property name="org.jboss.esb.root.dir" value="../.."/>
<property environment="env"/>
-
+ <property name="org.jboss.esb.ejb3.lib.dir" value="../${org.jboss.esb.root.dir}/lib/ejb3_embedded"/>
<property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
<condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
@@ -17,6 +17,8 @@
<path id="org.jboss.esb.tests.base.classpath">
<fileset dir="../${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
+ <fileset dir="${org.jboss.esb.ejb3.lib.dir}" includes="jboss-ejb3-all.jar hibernate-all.jar thirdparty-all"/>
+
</path>
<target name="org.jboss.esb.tests.init">
Copied: labs/jbossesb/trunk/product/core/common/tests/resources (from rev 5482, labs/jbossesb/branches/ejb3/product/core/common/tests/resources)
Copied: labs/jbossesb/trunk/product/core/common/tests/resources/conf (from rev 5482, labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf)
Deleted: labs/jbossesb/trunk/product/core/common/tests/resources/conf/default.persistence.properties
===================================================================
--- labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/default.persistence.properties 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/tests/resources/conf/default.persistence.properties 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,17 +0,0 @@
-hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
-#hibernate.connection.release_mode=after_statement
-#hibernate.transaction.flush_before_completion=false
-#hibernate.transaction.auto_close_session=false
-#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
-#hibernate.hbm2ddl.auto=create-drop
-#hibernate.hbm2ddl.auto=create
-hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
-# Clustered cache with TreeCache
-#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
-#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
-#hibernate.dialect=org.hibernate.dialect.HSQLDialect
-hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-hibernate.bytecode.use_reflection_optimizer=false
-# I don't think this is honored, but EJB3Deployer uses it
-hibernate.bytecode.provider=javassist
\ No newline at end of file
Copied: labs/jbossesb/trunk/product/core/common/tests/resources/conf/default.persistence.properties (from rev 5482, labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/default.persistence.properties)
Deleted: labs/jbossesb/trunk/product/core/common/tests/resources/conf/ejb3-interceptors-aop.xml
===================================================================
--- labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/ejb3-interceptors-aop.xml 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/tests/resources/conf/ejb3-interceptors-aop.xml 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,376 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
- "-//JBoss//DTD JBOSS AOP 1.0//EN"
- "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
- <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.aspects.security.SecurityClientInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.aspects.tx.ClientTxPropagationInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.remoting.IsLocalInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor" scope="PER_VM"/>
-
- <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
-
- <stack name="ServiceClientInterceptors">
- <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="AsynchronousStatelessSessionClientInterceptors">
- <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="AsynchronousStatefulSessionClientInterceptors">
- <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="StatelessSessionClientInterceptors">
- <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="StatefulSessionClientInterceptors">
- <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="ClusteredStatelessSessionClientInterceptors">
- <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="ClusteredStatefulSessionClientInterceptors">
- <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <interceptor class="org.jboss.ejb3.asynchronous.AsynchronousInterceptor" scope="PER_CLASS"/>
- <interceptor class="org.jboss.ejb3.ENCPropagationInterceptor" scope="PER_VM"/>
- <interceptor name="Basic Authorization" factory="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/>
- <interceptor name="JACC Authorization" factory="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory" scope="PER_CLASS"/>
- <interceptor factory="org.jboss.ejb3.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/>
- <interceptor factory="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/>
- <interceptor class="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.stateful.StatefulInstanceInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.service.ServiceSingletonInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.cache.StatefulReplicationInterceptor" scope="PER_VM"/>
- <interceptor factory="org.jboss.ejb3.stateful.StatefulRemoveFactory" scope="PER_CLASS_JOINPOINT"/>
- <interceptor factory="org.jboss.ejb3.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
- <interceptor factory="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory" scope="PER_CLASS_JOINPOINT"/>
- <interceptor factory="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory" scope="PER_CLASS"/>
- <interceptor class="org.jboss.ejb3.AllowedOperationsInterceptor" scope="PER_VM"/>
- <interceptor factory="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory" scope="PER_CLASS"/>
- <interceptor class="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor" scope="PER_VM"/>
-
- <domain name="Stateless Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="Basic Authorization"/>
- </bind>
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
- <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="JACC Stateless Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="JACC Authorization"/>
- </bind>
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
- <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Base Stateful Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="Basic Authorization"/>
- </bind>
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
- <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
- <interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- </bind>
- <bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
-
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
- <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
- </bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
- <!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
- </annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
- </annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
- </annotation>
-
- <!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
- </annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
- </annotation>
- </domain>
-
- <domain name="JACC Stateful Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="JACC Authorization"/>
- </bind>
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
- <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
- <interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- </bind>
- <bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
-
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
- <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
- </bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- </annotation>
-
- <!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
- </annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
- </annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
- </annotation>
-
- <!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
- </annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
- </annotation>
- </domain>
-
- <domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
- <!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCache.class)
- </annotation>
-
- </domain>
-
- <domain name="Message Driven Bean">
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Message Inflow Driven Bean">
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Consumer Bean">
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..)) AND (has(* *->@org.jboss.annotation.ejb.CurrentMessage(..)) OR hasfield(* *->@org.jboss.annotation.ejb.CurrentMessage))">
- <interceptor-ref name="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Service Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- </bind>
- <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
- <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="Basic Authorization"/>
- </bind>
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- </domain>
-
- <domain name="JACC Service Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- </bind>
- <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
- <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="Basic Authorization"/>
- </bind>
- <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
- <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
- <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- </domain>
-
-
-</aop>
\ No newline at end of file
Copied: labs/jbossesb/trunk/product/core/common/tests/resources/conf/ejb3-interceptors-aop.xml (from rev 5482, labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/ejb3-interceptors-aop.xml)
Deleted: labs/jbossesb/trunk/product/core/common/tests/resources/conf/embedded-jboss-beans.xml
===================================================================
--- labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/embedded-jboss-beans.xml 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/tests/resources/conf/embedded-jboss-beans.xml 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer">
- <bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
-
- <bean name="InitialContextProperties" class="java.util.Hashtable">
- <constructor>
- <parameter class="java.util.Map">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>java.naming.factory.initial</key>
- <value>org.jnp.interfaces.LocalOnlyContextFactory</value>
- </entry>
- <entry>
- <key>java.naming.factory.url.pkgs</key>
- <value>org.jboss.naming:org.jnp.interfaces</value>
- </entry>
- </map>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer">
- <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
- </bean>
-
- <bean name="XidFactory" class="org.jboss.tm.XidFactoryImpl"/>
-
- <bean name="XidFactoryMBean" class="org.jboss.ejb3.embedded.XidFactoryMBean">
- <constructor>
- <parameter class="org.jboss.tm.XidFactoryBase">
- <inject bean="XidFactory"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="TransactionManagerInitializer" class="org.jboss.tm.TransactionManagerInitializer">
- <property name="xidFactory"><inject bean="XidFactory"/></property>
- <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
- </bean>
-
- <bean name="UserTransaction" class="org.jboss.ejb3.embedded.UserTransactionImpl">
- <demand>TransactionManagerInitializer</demand>
- </bean>
-
- <bean name="UserTransactionBinding" class="org.jboss.ejb3.embedded.JndiBinder">
- <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
- <property name="target"><inject bean="UserTransaction"/></property>
- <property name="bindTo">UserTransaction</property>
- <property name="serializable">false</property>
- </bean>
-
-
- <bean name="TransactionManager" class="java.lang.Object">
- <constructor factoryMethod="getTransactionManager">
- <factory bean="TransactionManagerInitializer"/>
- </constructor>
- </bean>
- <bean name="CachedConnectionManager" class="org.jboss.resource.connectionmanager.CachedConnectionManagerReference">
- <property name="transactionManager"><inject bean="TransactionManager"/></property>
- </bean>
-
- <!--
- <bean class="org.jboss.jdbc.HypersonicDatabase"
- name="jboss:service=Hypersonic,database=localDB">
- <property name="database">localDB</property>
- <property name="inProcessMode">true</property>
- <property name="dbDataDir">.</property>
- </bean>
- -->
-
- <bean name="DefaultDSBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
- <property name="driverClass">org.hsqldb.jdbcDriver</property>
- <property name="connectionURL">jdbc:hsqldb:.</property>
- <!-- <property name="connectionURL">jdbc:hsqldb:./hypersonic/localDB</property> -->
- <property name="userName">sa</property>
- <property name="jndiName">java:/DefaultDS</property>
- <property name="minSize">0</property>
- <property name="maxSize">10</property>
- <property name="blockingTimeout">1000</property>
- <property name="idleTimeout">100000</property>
- <property name="transactionManager"><inject bean="TransactionManager"/></property>
- <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
- <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
- </bean>
-
- <bean name="DefaultDS" class="java.lang.Object">
- <constructor factoryMethod="getDatasource">
- <factory bean="DefaultDSBootstrap"/>
- </constructor>
- </bean>
-
-
-</deployment>
\ No newline at end of file
Copied: labs/jbossesb/trunk/product/core/common/tests/resources/conf/embedded-jboss-beans.xml (from rev 5482, labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/embedded-jboss-beans.xml)
Deleted: labs/jbossesb/trunk/product/core/common/tests/resources/conf/jboss-jms-beans.xml
===================================================================
--- labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/jboss-jms-beans.xml 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/tests/resources/conf/jboss-jms-beans.xml 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer">
- <bean name="jboss.mq:service=JMSProviderLoader,name=JMSProvider" class="org.jboss.jms.jndi.JNDIProviderAdapter">
- <property name="factoryRef">java:/XAConnectionFactory</property>
- <property name="queueFactoryRef">java:/XAConnectionFactory</property>
- <property name="topicFactoryRef">java:/XAConnectionFactory</property>
- <property name="properties" class="java.util.Properties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>java.naming.factory.initial</key>
- <value>org.jnp.interfaces.LocalOnlyContextFactory</value>
- </entry>
- <entry>
- <key>java.naming.factory.url.pkgs</key>
- <value>org.jboss.naming:org.jnp.interfaces</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean name="b1" class="org.jboss.ejb3.embedded.JndiBinder">
- <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
- <property name="target"><inject bean="jboss.mq:service=JMSProviderLoader,name=JMSProvider"/></property>
- <property name="bindTo">java:/DefaultJMSProvider</property>
- <property name="serializable">true</property>
- </bean>
-
- <bean name="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool" class="org.jboss.jms.asf.StdServerSessionPoolFactory">
- <property name="name">StdJMSPool</property>
- <property name="xidFactory"><inject bean="XidFactoryMBean"/></property>
- <property name="transactionManager"><inject bean="TransactionManager"/></property>
- </bean>
-
- <bean name="b2" class="org.jboss.ejb3.embedded.JndiBinder">
- <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
- <property name="target"><inject bean="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool"/></property>
- <property name="bindTo">java:/StdJMSPool</property>
- <property name="serializable">false</property>
- </bean>
-
-
- <bean name="jboss.mq:service=PersistenceManager" class="org.jboss.mq.kernel.JDBC2PersistenceManager">
- <property name="transactionManager">
- <inject bean="TransactionManager"/>
- </property>
- <property name="datasource">
- <inject bean="DefaultDS"/>
- </property>
- <property name="sqlProperties">
-
- BLOB_TYPE=OBJECT_BLOB
- INSERT_TX = INSERT INTO JMS_TRANSACTIONS (TXID) values(?)
- INSERT_MESSAGE = INSERT INTO JMS_MESSAGES (MESSAGEID, DESTINATION, MESSAGEBLOB, TXID, TXOP) VALUES(?,?,?,?,?)
- SELECT_ALL_UNCOMMITED_TXS = SELECT TXID FROM JMS_TRANSACTIONS
- SELECT_MAX_TX = SELECT MAX(TXID) FROM JMS_MESSAGES
- SELECT_MESSAGES_IN_DEST = SELECT MESSAGEID, MESSAGEBLOB FROM JMS_MESSAGES WHERE DESTINATION=?
- SELECT_MESSAGE = SELECT MESSAGEID, MESSAGEBLOB FROM JMS_MESSAGES WHERE MESSAGEID=? AND DESTINATION=?
- MARK_MESSAGE = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE MESSAGEID=? AND DESTINATION=?
- UPDATE_MESSAGE = UPDATE JMS_MESSAGES SET MESSAGEBLOB=? WHERE MESSAGEID=? AND DESTINATION=?
- UPDATE_MARKED_MESSAGES = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE TXOP=?
- UPDATE_MARKED_MESSAGES_WITH_TX = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE TXOP=? AND TXID=?
- DELETE_MARKED_MESSAGES_WITH_TX = DELETE FROM JMS_MESSAGES WHERE TXOP=? AND JMS_MESSAGES.TXID IN (SELECT TXID FROM JMS_TRANSACTIONS)
- DELETE_TX = DELETE FROM JMS_TRANSACTIONS WHERE TXID = ?
- DELETE_MARKED_MESSAGES = DELETE FROM JMS_MESSAGES WHERE TXID=? AND TXOP=?
- DELETE_MESSAGE = DELETE FROM JMS_MESSAGES WHERE MESSAGEID=? AND DESTINATION=?
- CREATE_MESSAGE_TABLE = CREATE CACHED TABLE JMS_MESSAGES ( MESSAGEID INTEGER NOT NULL, \
- DESTINATION VARCHAR(255) NOT NULL, TXID INTEGER, TXOP CHAR(1), \
- MESSAGEBLOB OBJECT, PRIMARY KEY (MESSAGEID, DESTINATION) )
- CREATE_IDX_MESSAGE_TXOP_TXID = CREATE INDEX JMS_MESSAGES_TXOP_TXID ON JMS_MESSAGES (TXOP, TXID)
- CREATE_IDX_MESSAGE_DESTINATION = CREATE INDEX JMS_MESSAGES_DESTINATION ON JMS_MESSAGES (DESTINATION)
- CREATE_TX_TABLE = CREATE CACHED TABLE JMS_TRANSACTIONS ( TXID INTEGER, PRIMARY KEY (TXID) )
- CREATE_TABLES_ON_STARTUP = TRUE
- DELETE_TEMPORARY_MESSAGES = DELETE FROM JMS_MESSAGES WHERE TXOP='T'
-
- </property>
- </bean>
-
- <bean name="jboss.mq:service=MessageCache" class="org.jboss.mq.kernel.MessageCache">
- <property name="persistenceManager"><inject bean="jboss.mq:service=PersistenceManager"/></property>
- <property name="highMemoryMark">50</property>
- <property name="maxMemoryMark">60</property>
- </bean>
-
- <bean name="jboss.mq:service=StateManager" class="org.jboss.mq.kernel.JDBCStateManager">
- <property name="transactionManager">
- <inject bean="TransactionManager"/>
- </property>
- <property name="datasource">
- <inject bean="DefaultDS"/>
- </property>
- <property name="sqlProperties">
-
- CREATE_TABLES_ON_STARTUP = TRUE
- CREATE_USER_TABLE = CREATE TABLE JMS_USERS (USERID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, \
- CLIENTID VARCHAR(128), PRIMARY KEY(USERID))
- CREATE_ROLE_TABLE = CREATE TABLE JMS_ROLES (ROLEID VARCHAR(32) NOT NULL, USERID VARCHAR(32) NOT NULL, \
- PRIMARY KEY(USERID, ROLEID))
- CREATE_SUBSCRIPTION_TABLE = CREATE TABLE JMS_SUBSCRIPTIONS (CLIENTID VARCHAR(128) NOT NULL, \
- SUBNAME VARCHAR(128) NOT NULL, TOPIC VARCHAR(255) NOT NULL, \
- SELECTOR VARCHAR(255), PRIMARY KEY(CLIENTID, SUBNAME))
- GET_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
- LOCK_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
- GET_SUBSCRIPTIONS_FOR_TOPIC = SELECT CLIENTID, SUBNAME, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE TOPIC=?
- INSERT_SUBSCRIPTION = INSERT INTO JMS_SUBSCRIPTIONS (CLIENTID, SUBNAME, TOPIC, SELECTOR) VALUES(?,?,?,?)
- UPDATE_SUBSCRIPTION = UPDATE JMS_SUBSCRIPTIONS SET TOPIC=?, SELECTOR=? WHERE CLIENTID=? AND SUBNAME=?
- REMOVE_SUBSCRIPTION = DELETE FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
- GET_USER_BY_CLIENTID = SELECT USERID, PASSWD, CLIENTID FROM JMS_USERS WHERE CLIENTID=?
- GET_USER = SELECT PASSWD, CLIENTID FROM JMS_USERS WHERE USERID=?
- POPULATE.TABLES.01 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('guest', 'guest')
- POPULATE.TABLES.02 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('j2ee', 'j2ee')
- POPULATE.TABLES.03 = INSERT INTO JMS_USERS (USERID, PASSWD, CLIENTID) VALUES ('john', 'needle', 'DurableSubscriberExample')
- POPULATE.TABLES.04 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('nobody', 'nobody')
- POPULATE.TABLES.05 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('dynsub', 'dynsub')
- POPULATE.TABLES.06 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('guest','guest')
- POPULATE.TABLES.07 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('j2ee','guest')
- POPULATE.TABLES.08 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('john','guest')
- POPULATE.TABLES.09 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('subscriber','john')
- POPULATE.TABLES.10 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('publisher','john')
- POPULATE.TABLES.11 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('publisher','dynsub')
- POPULATE.TABLES.12 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('durpublisher','john')
- POPULATE.TABLES.13 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('durpublisher','dynsub')
- POPULATE.TABLES.14 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('noacc','nobody')
-
- </property>
- </bean>
-
-
- <bean name="BasicQueueParameters" class="org.jboss.mq.server.BasicQueueParameters"/>
-
- <bean name="jboss.mq:service=ThreadPool" class="org.jboss.util.threadpool.BasicThreadPool">
- <property name="name">JMSThread</property>
- <property name="threadGroupName">JBossMQ Server Threads</property>
- <!-- The max number of threads in the pool -->
- <property name="maximumPoolSize">10</property>
- <!-- The max number of tasks before the queue is full -->
- <property name="maximumQueueSize">1000</property>
- <!-- The behavior of the pool when a task is added and the queue is full.
- abort - a RuntimeException is thrown
- run - the calling thread executes the task
- wait - the calling thread blocks until the queue has room
- discard - the task is silently discarded without being run
- discardOldest - check to see if a task is about to complete and enque
- the new task if possible, else run the task in the calling thread
- -->
- <property name="blockingModeString">run</property>
- </bean>
-
- <bean name="jboss.mq:service=DestinationManager" class="org.jboss.mq.server.JMSDestinationManager">
- <constructor>
- <parameter class="org.jboss.mq.server.BasicQueueParameters">
- <inject bean="BasicQueueParameters"/>
- </parameter>
- </constructor>
- <property name="persistenceManager"><inject bean="jboss.mq:service=PersistenceManager"/></property>
- <property name="messageCache"><inject bean="jboss.mq:service=MessageCache"/></property>
- <property name="stateManager"><inject bean="jboss.mq:service=StateManager"/></property>
- <property name="threadPool"><inject bean="jboss.mq:service=ThreadPool"/></property>
- <property name="threadGroup"><inject bean="jboss.mq:service=ThreadPool" property="threadGroup"/></property>
- <start method="startServer"/>
- <stop method="stopServer"/>
- </bean>
-
- <bean name="jboss.mq.destination:service=Queue,name=DLQ" class="org.jboss.mq.kernel.Queue">
- <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
- <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
- <property name="destinationName">DLQ</property>
- </bean>
-
- <bean name="jboss.mq:service=Invoker" class="org.jboss.mq.server.JMSServerInvoker">
- <property name="next"><inject bean="jboss.mq:service=DestinationManager"/></property>
- </bean>
-
- <bean name="jboss.mq:service=InvocationLayer,type=JVM" class="org.jboss.mq.kernel.JVMIL">
- <property name="jmsInvoker"><inject bean="jboss.mq:service=Invoker"/></property>
- <property name="connectionFactoryJNDIRef">java:/ConnectionFactory</property>
- <property name="xAConnectionFactoryJNDIRef">java:/XAConnectionFactory</property>
- <property name="pingPeriod">0</property>
- <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
- </bean>
-
-</deployment>
\ No newline at end of file
Copied: labs/jbossesb/trunk/product/core/common/tests/resources/conf/jboss-jms-beans.xml (from rev 5482, labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/jboss-jms-beans.xml)
Deleted: labs/jbossesb/trunk/product/core/common/tests/resources/conf/log4j.xml
===================================================================
--- labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/log4j.xml 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/tests/resources/conf/log4j.xml 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml,v 1.1 2006/01/12 02:44:08 bill Exp $ -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Messagen -->
- <!--
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- -->
- <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L) -%m%n"/>
- </layout>
-</appender>
-
- <root>
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</log4j:configuration>
Copied: labs/jbossesb/trunk/product/core/common/tests/resources/conf/log4j.xml (from rev 5482, labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/log4j.xml)
Deleted: labs/jbossesb/trunk/product/core/common/tests/resources/conf/login-config.xml
===================================================================
--- labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/login-config.xml 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/tests/resources/conf/login-config.xml 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,63 +0,0 @@
-<?xml version='1.0'?>
-
-<!DOCTYPE policy PUBLIC
- "-//JBoss//DTD JBOSS Security Config 3.0//EN"
- "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<!-- The XML based JAAS login configuration read by the
-org.jboss.security.auth.login.XMLLoginConfig mbean. Add
-an application-policy element for each security domain.
-
-The outline of the application-policy is:
-<application-policy name="security-domain-name">
- <authentication>
- <login-module code="login.module1.class.name" flag="control_flag">
- <module-option name = "option1-name">option1-value</module-option>
- <module-option name = "option2-name">option2-value</module-option>
- ...
- </login-module>
-
- <login-module code="login.module2.class.name" flag="control_flag">
- ...
- </login-module>
- ...
- </authentication>
-</application-policy>
-
-$Revision: 1.1 $
--->
-
-<policy>
- <!-- Used by clients within the application server VM such as
- mbeans and servlets that access EJBs.
- -->
- <application-policy name="client-login">
- <authentication>
- <login-module code="org.jboss.security.ClientLoginModule"
- flag="required">
- <!-- Any existing security context will be restored on logout -->
- <module-option name="restore-login-identity">true</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <application-policy name="other">
- <!-- A simple server login module, which can be used when the number
- of users is relatively small. It uses two properties files:
- users.properties, which holds users (key) and their password (value).
- roles.properties, which holds users (key) and a comma-separated list of
- their roles (value).
- The unauthenticatedIdentity property defines the name of the principal
- that will be used when a null username and password are presented as is
- the case for an unuathenticated web client or MDB. If you want to
- allow such users to be authenticated add the property, e.g.,
- unauthenticatedIdentity="nobody"
- -->
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required"/>
- </authentication>
- </application-policy>
-
-</policy>
-
Copied: labs/jbossesb/trunk/product/core/common/tests/resources/conf/login-config.xml (from rev 5482, labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/login-config.xml)
Deleted: labs/jbossesb/trunk/product/core/common/tests/resources/conf/security-beans.xml
===================================================================
--- labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/security-beans.xml 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/tests/resources/conf/security-beans.xml 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer">
-
- <bean class="org.jboss.ejb3.embedded.JaasSecurityManagerService"
- name="jboss.security:service=JaasSecurityManager">
- <property name="initialContextProperties">
- <inject bean="InitialContextProperties"/>
- </property>
- </bean>
-</deployment>
Copied: labs/jbossesb/trunk/product/core/common/tests/resources/conf/security-beans.xml (from rev 5482, labs/jbossesb/branches/ejb3/product/core/common/tests/resources/conf/security-beans.xml)
Modified: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -21,8 +21,11 @@
*/
package org.jboss.soa.esb.common.tests;
+import java.util.HashMap;
+
+import org.apache.log4j.Logger;
+
import junit.framework.TestCase;
-import org.jboss.logging.Logger;
/**
* Base test class for esb test classes, uses jboss logging.
@@ -32,24 +35,60 @@
* $Id:$
*/
public class BaseTest extends TestCase {
+
+ /** The Database driver used for unit tests */
+ public static String DB_DRIVER = "org.jboss.esb.db.driver";
- /**
- * The Logger.
- */
- protected Logger log = Logger.getLogger(getClass());
+ /** The Database connection url used for unit tests */
+ public static String DB_URL = "org.jboss.esb.db.url";
+ /** The Database user name used for unit tests */
+ public static String DB_USERNAME = "org.jboss.esb.db.username";
+
+ /** The Database password used for unit tests */
+ public static String DB_PASSWORD = "org.jboss.esb.db.password";
+
+ /** The Logger. */
+ protected Logger log = Logger.getLogger(getClass());
+
+ /** Contains user and or deployment specific paramater */
+ private static HashMap<String,String> SYSTEM_PARAMETERS;
/**
* Default class constructor.
*/
- public BaseTest() {
- }
+ public BaseTest() {
+ SYSTEM_PARAMETERS = readSystemParameters();
+ }
/**
* Utility constructor.
* @param name The test name.
*/
- public BaseTest(String name) {
+ public BaseTest(String name) {
super(name);
- }
+ SYSTEM_PARAMETERS = readSystemParameters();
+ }
+ /**
+ * Reading system parameter that are set by the ant build when
+ * invoking the junit call. The parameter values should be set in
+ * the deployment.properties file. If the particular parameter is not
+ * found it will receive a default value.
+ */
+ private HashMap<String,String> readSystemParameters()
+ {
+ //Reading system parameter
+ String dbDriver = System.getProperty(DB_DRIVER , "org.postgresql.Driver");
+ String dbUrl = System.getProperty(DB_PASSWORD, "jdbc:postgresql://localhost:5432/jbossesb");
+ String dbUsername = System.getProperty(DB_USERNAME, "postgres");
+ String dbPassword = System.getProperty(DB_PASSWORD, "postgres");
+ //Setting the paremeters in the HashMap
+ HashMap<String,String> systemParameters = new HashMap<String,String>();
+ systemParameters.put(DB_DRIVER, dbDriver);
+ systemParameters.put(DB_URL, dbUrl);
+ systemParameters.put(DB_USERNAME, dbUsername);
+ systemParameters.put(DB_PASSWORD, dbPassword);
+
+ return systemParameters;
+ }
}
Copied: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java (from rev 5482, labs/jbossesb/branches/ejb3/product/core/common/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java)
Modified: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -41,6 +41,6 @@
System.out.println(props);
assertEquals("org.jnp.interfaces.NamingContextFactory", props.get(Context.INITIAL_CONTEXT_FACTORY));
assertEquals("http://localhost:1234", props.get(Context.PROVIDER_URL));
- assertEquals("jboss.naming:org.jnp.interfaces", props.get("java.naming.factory.url.pkgs"));
+ assertEquals("org.jboss.naming:org.jnp.interfaces", props.get("java.naming.factory.url.pkgs"));
}
}
Property changes on: labs/jbossesb/trunk/product/core/listeners/tests
___________________________________________________________________
Name: svn:ignore
+
TESTS-TestSuites.xml
Modified: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -192,12 +192,6 @@
replaceMacros(oaChilds[i1]);
}//_________________________
- protected void release()
- { switch (getOutputType())
- { case TYP_BATCHER: getBatcher().release(); break;
- }
- } //__________________________________
-
protected void finish(BatchProcess p_oBP) throws Exception
{
switch (getOutputType())
@@ -359,11 +353,6 @@
return getBatchHandler().addToBatch(p_o.toString());
} //________________________________
- private void release()
- { try {m_oBHandler.releaseHandler(); }
- catch (Exception e) {}
- } //________________________________
-
private void finish() throws Exception
{ m_olNum = null;
m_oBHandler.finish();
Modified: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/FileProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/FileProcessor.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/FileProcessor.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -96,9 +96,7 @@
m_oLogger.fatal("Input File processor FAILED",e);
throw e;
}
- finally
- { super.release();
- }
+
}
catch (Exception eGen)
{
Property changes on: labs/jbossesb/trunk/product/core/processors/tests
___________________________________________________________________
Name: svn:ignore
+
TESTS-TestSuites.xml
Modified: labs/jbossesb/trunk/product/core/services/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/build.xml 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/build.xml 2006-08-04 23:04:01 UTC (rev 5483)
@@ -23,6 +23,7 @@
</condition>
<property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="org.jboss.esb.ejb3.dir" value="${org.jboss.esb.root.dir}/lib/ejb3"/>
<condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/lib">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
@@ -38,6 +39,9 @@
<fileset dir="${org.jboss.esb.ext.lib.dir}"
includes="jboss-jmx.jar"
/>
+ <fileset dir="${org.jboss.esb.ejb3.dir}"
+ includes="*.jar"
+ />
</path>
<!-- =================================================================== -->
@@ -134,7 +138,7 @@
<!-- =================================================================== -->
<!-- Initialise -->
<!-- =================================================================== -->
- <target name="ejbdoclet" depends="org.jboss.esb.services.initXdoclet">
+ <target name="ejb3doclet" depends="org.jboss.esb.services.initXdoclet">
<echo>+---------------------------------------------------+</echo>
<echo>| |</echo>
@@ -183,22 +187,13 @@
<!-- Jar -->
<!-- =================================================================== -->
<target name="jar" description="Assemble jar files"
- depends="org.jboss.esb.services.compile,ejbdoclet"
+ depends="org.jboss.esb.services.compile"
>
- <jar destfile="${org.jboss.esb.services.dist.dir}/lib/jbossesb-services-client.jar"
+ <jar destfile="${org.jboss.esb.services.dist.dir}/lib/jbossesb-services.jar"
basedir="${org.jboss.esb.services.classes.dir}"
includes="**/*.class"
excludes="**/EJBs/*Bean*"
/>
- <jar destfile="${org.jboss.esb.services.dist.dir}/lib/jbossesb-services.jar"
- basedir="${org.jboss.esb.services.classes.dir}"
- includes="**/EJBs/*.class"
- manifest="${org.jboss.esb.services.metainf.dir}/manifest.server"
- >
- <metainf dir="${org.jboss.esb.services.metainf.dir}" includes="*.xml"
- excludes="application.xml"
- />
- </jar>
<antcall target="-ear"/>
</target>
Modified: labs/jbossesb/trunk/product/core/services/src/META-INF/application.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/META-INF/application.xml 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/META-INF/application.xml 2006-08-04 23:04:01 UTC (rev 5483)
@@ -8,4 +8,13 @@
<module>
<ejb>jbossesb-services.jar</ejb>
</module>
-</application>
+ <module>
+ <java>jbossesb-listeners.jar</java>
+ </module>
+ <module>
+ <java>jbossesb-processors.jar</java>
+ </module>
+ <module>
+ <java>jbossesb-common.jar</java>
+ </module>
+</application>
\ No newline at end of file
Deleted: labs/jbossesb/trunk/product/core/services/src/META-INF/ejb-jar.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/META-INF/ejb-jar.xml 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/META-INF/ejb-jar.xml 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-
-<ejb-jar >
-
- <description><![CDATA[Jboss ESB]]></description>
- <display-name>Generated by XDoclet</display-name>
-
- <enterprise-beans>
-
- <!-- Session Beans -->
- <session >
- <description><![CDATA[NotificationHandler]]></description>
- <display-name>Jboss_Esb_Notification_Handler</display-name>
-
- <ejb-name>NotificationHandler</ejb-name>
-
- <home>org.jboss.soa.esb.services.EJB.NotificationHandlerHome</home>
- <remote>org.jboss.soa.esb.services.EJB.NotificationHandler</remote>
- <local-home>org.jboss.soa.esb.services.EJB.NotificationHandlerLocalHome</local-home>
- <local>org.jboss.soa.esb.services.EJB.NotificationHandlerLocal</local>
- <ejb-class>org.jboss.soa.esb.services.EJB.NotificationHandlerBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
-
- </session>
-
- <session >
- <description><![CDATA[]]></description>
- <display-name>Jboss_ESB_PERSIST_HANDLER</display-name>
-
- <ejb-name>PersistHandler</ejb-name>
-
- <home>org.jboss.soa.esb.services.EJB.PersistHandlerHome</home>
- <remote>org.jboss.soa.esb.services.EJB.PersistHandler</remote>
- <local-home>org.jboss.soa.esb.services.EJB.PersistHandlerLocalHome</local-home>
- <local>org.jboss.soa.esb.services.EJB.PersistHandlerLocal</local>
- <ejb-class>org.jboss.soa.esb.services.EJB.PersistHandlerBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Bean</transaction-type>
-
- </session>
-
- <session >
- <description><![CDATA[]]></description>
- <display-name>Jboss_Esb_Batch_Handler</display-name>
-
- <ejb-name>BatchHandler</ejb-name>
-
- <home>org.jboss.soa.esb.services.EJB.BatchHandlerHome</home>
- <remote>org.jboss.soa.esb.services.EJB.BatchHandler</remote>
- <local-home>org.jboss.soa.esb.services.EJB.BatchHandlerLocalHome</local-home>
- <local>org.jboss.soa.esb.services.EJB.BatchHandlerLocal</local>
- <ejb-class>org.jboss.soa.esb.services.EJB.BatchHandlerBean</ejb-class>
- <session-type>Stateful</session-type>
- <transaction-type>Bean</transaction-type>
-
- </session>
-
- <!--
- To add session beans that you have deployment descriptor info for, add
- a file to your XDoclet merge directory called session-beans.xml that contains
- the <session></session> markup for those beans.
- -->
-
- <!-- Entity Beans -->
- <!--
- To add entity beans that you have deployment descriptor info for, add
- a file to your XDoclet merge directory called entity-beans.xml that contains
- the <entity></entity> markup for those beans.
- -->
-
- <!-- Message Driven Beans -->
- <!--
- To add message driven beans that you have deployment descriptor info for, add
- a file to your XDoclet merge directory called message-driven-beans.xml that contains
- the <message-driven></message-driven> markup for those beans.
- -->
-
- </enterprise-beans>
-
- <!-- Relationships -->
-
- <!-- Assembly Descriptor -->
- <!--
- To specify your own assembly descriptor info here, add a file to your
- XDoclet merge directory called assembly-descriptor.xml that contains
- the <assembly-descriptor></assembly-descriptor> markup.
- -->
-
- <assembly-descriptor >
- <!--
- To specify additional security-role elements, add a file in the merge
- directory called ejb-security-roles.xml that contains them.
- -->
-
- <!-- method permissions -->
- <!--
- To specify additional method-permission elements, add a file in the merge
- directory called ejb-method-permissions.ent that contains them.
- -->
-
- <!-- transactions -->
- <!--
- To specify additional container-transaction elements, add a file in the merge
- directory called ejb-container-transactions.ent that contains them.
- -->
- <container-transaction >
- <method >
- <ejb-name>NotificationHandler</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
-
- <!-- finder transactions -->
-
- <!-- message destinations -->
- <!--
- To specify additional message-destination elements, add a file in the merge
- directory called ejb-message-destinations.ent that contains them.
- -->
-
- <!-- exclude list -->
- <!--
- To specify an exclude-list element, add a file in the merge directory
- called ejb-exclude-list.xml that contains it.
- -->
- </assembly-descriptor>
-
-</ejb-jar>
Deleted: labs/jbossesb/trunk/product/core/services/src/META-INF/jboss.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/META-INF/jboss.xml 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/META-INF/jboss.xml 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
-
-<jboss>
-
- <enterprise-beans>
-
- <!--
- To add beans that you have deployment descriptor info for, add
- a file to your XDoclet merge directory called jboss-beans.xml that contains
- the <session></session>, <entity></entity> and <message-driven></message-driven>
- markup for those beans.
- -->
-
- <session>
- <ejb-name>NotificationHandler</ejb-name>
- <jndi-name>NotificationHandler</jndi-name>
- <local-jndi-name>NotificationHandlerLocal</local-jndi-name>
-
- <method-attributes>
- </method-attributes>
- </session>
- <session>
- <ejb-name>PersistHandler</ejb-name>
- <jndi-name>PersistHandler</jndi-name>
- <local-jndi-name>PersistHandlerLocal</local-jndi-name>
-
- <method-attributes>
- </method-attributes>
- </session>
- <session>
- <ejb-name>BatchHandler</ejb-name>
- <jndi-name>BatchHandler</jndi-name>
- <local-jndi-name>BatchHandlerLocal</local-jndi-name>
-
- <method-attributes>
- </method-attributes>
- </session>
-
- <!--
- write a merge file jboss-webservices.ent for webservice-description
- -->
-
- </enterprise-beans>
-
- <resource-managers>
- </resource-managers>
-
- <!--
- | for container settings, you can merge in jboss-container.xml
- | this can contain <invoker-proxy-bindings/> and <container-configurations/>
- -->
-
-</jboss>
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-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -19,41 +19,39 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-
-
package org.jboss.soa.esb.services;
-import javax.naming.*;
+import javax.naming.Context;
-import org.jboss.soa.esb.services.EJB.*;
import org.jboss.soa.esb.common.bizclasses.BatchProcess;
+import org.jboss.soa.esb.services.EJB.BatchHandler;
public class BatchHandlerBsDelegateLocal implements IbatchHandler
{
- private BatchHandlerLocal m_oBatchH;
+ private BatchHandler m_oBatchH;
- public BatchHandlerBsDelegateLocal(Context p_ctx) throws Exception
- {
- Object ref = p_ctx.lookup("BatchHandlerLocal");
+ public BatchHandlerBsDelegateLocal(Context p_ctx) throws Exception
+ {
+ m_oBatchH = (BatchHandler) p_ctx.lookup("jbossesb-appl/NotificationHandlerBean/local");
+ }
- BatchHandlerLocalHome oHu = (BatchHandlerLocalHome) ref;
- m_oBatchH = oHu.create();
- } //__________________________________
+ public long newBatch() throws Exception
+ {
+ return m_oBatchH.newBatch();
+ }
- public long newBatch () throws Exception
- { return m_oBatchH.newBatch(); }
+ public int addToBatch(String p_s) throws Exception
+ {
+ return m_oBatchH.addToBatch(p_s);
+ }
- public int addToBatch (String p_s) throws Exception
- { return m_oBatchH.addToBatch(p_s); }
+ public void finish() throws Exception
+ {
+ m_oBatchH.finish();
+ }
- public void finish () throws Exception
- { m_oBatchH.finish(); }
-
- public void releaseHandler()
- { try { m_oBatchH.remove(); }
- catch (Exception e) {}
- } //__________________________________
- public void commitBatch(BatchProcess p_oBP) throws Exception
- { m_oBatchH.commitBatch(p_oBP);
- } //__________________________________
-} //____________________________________________________________________________
+ public void commitBatch(BatchProcess p_oBP) throws Exception
+ {
+ m_oBatchH.commitBatch(p_oBP.toDTO());
+ }
+}
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-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -24,34 +24,32 @@
package org.jboss.soa.esb.services;
import javax.naming.*;
-import javax.rmi.*;
import org.jboss.soa.esb.services.EJB.*;
import org.jboss.soa.esb.common.bizclasses.BatchProcess;
public class BatchHandlerBsDelegateRemote implements IbatchHandler
{
- private BatchHandler m_oBatchH;
+ private BatchHandler m_oBatchH;
- public BatchHandlerBsDelegateRemote(Context p_ctx) throws Exception
- {
- Object ref = p_ctx.lookup("BatchHandler");
- Object oNarr = PortableRemoteObject.narrow(ref, BatchHandlerHome.class);
- BatchHandlerHome oHu = (BatchHandlerHome) oNarr;
- m_oBatchH = oHu.create();
- } //__________________________________
+ public BatchHandlerBsDelegateRemote(Context p_ctx) throws Exception {
+ m_oBatchH = (BatchHandler) p_ctx
+ .lookup("jbossesb-appl/NotificationHandlerBean/remote");
+ }
- public long newBatch () throws Exception
- { return m_oBatchH.newBatch(); }
- public int addToBatch (String p_s) throws Exception
- { return m_oBatchH.addToBatch(p_s); }
- public void finish () throws Exception
- { m_oBatchH.finish(); }
- public void releaseHandler()
- { try { m_oBatchH.remove(); }
- catch (Exception e) {}
- } //__________________________________
- public void commitBatch(BatchProcess p_oBP) throws Exception
- { m_oBatchH.commitBatch(p_oBP.toDTO());
- } //__________________________________
-} //____________________________________________________________________________
+ public long newBatch() throws Exception {
+ return m_oBatchH.newBatch();
+ }
+
+ public int addToBatch(String p_s) throws Exception {
+ return m_oBatchH.addToBatch(p_s);
+ }
+
+ public void finish() throws Exception {
+ m_oBatchH.finish();
+ }
+
+ public void commitBatch(BatchProcess p_oBP) throws Exception {
+ m_oBatchH.commitBatch(p_oBP.toDTO());
+ }
+}
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerFactory.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerFactory.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -19,7 +19,6 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-
package org.jboss.soa.esb.services;
import java.util.*;
@@ -29,25 +28,32 @@
public class BatchHandlerFactory
{
- private static final String [] s_saTypes = {"local","remote"};
- private final static int LCL=0;
- private final static int REM=1;
+ private static final String [] s_saTypes = {"local","remote","mock"};
+ private final static int LCL=0;
+ private final static int REM=1;
+ private final static int MOK=2;
+
+ public static IbatchHandler getBatchHandler(String p_sLocRem,
+ String p_sJndiType, String p_sJndiServer) throws Exception
+ {
+ int iIndex = Arrays.binarySearch(s_saTypes, p_sLocRem.toLowerCase());
+ if (iIndex < 0)
+ return null;
+ switch (iIndex) {
+ case LCL:
+ return new BatchHandlerBsDelegateLocal(new InitialContext());
+ case REM:
+ return getBatchHandler(AppServerContext.getServerContext(
+ p_sJndiType, p_sJndiServer));
+ case MOK:
+ return null; //return new MockBatchHandler()
+ }
+ throw new Exception("Invalid Batch Handler Delegate <" + p_sLocRem + ">");
+ }
- public static IbatchHandler getBatchHandler
- (String p_sLocRem, String p_sJndiType, String p_sJndiServer) throws Exception
- {
- int iIndex = Arrays.binarySearch(s_saTypes,p_sLocRem.toLowerCase());
- if (iIndex < 0) return null;
- switch (iIndex)
- {
- case REM: return getBatchHandler
- (AppServerContext.getServerContext(p_sJndiType,p_sJndiServer));
- case LCL: return new BatchHandlerBsDelegateLocal(new InitialContext());
- }
- throw new Exception("Invalid Batch Handler Delegate <" + p_sLocRem + ">");
- } //__________________________________
-
- public static IbatchHandler getBatchHandler(Context p_oCtx) throws Exception
- { return new BatchHandlerBsDelegateRemote(p_oCtx);
- } //__________________________________
-} //____________________________________________________________________________
+ public static IbatchHandler getBatchHandler(Context p_oCtx)
+ throws Exception
+ {
+ return new BatchHandlerBsDelegateRemote(p_oCtx);
+ }
+}
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-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,32 +1,36 @@
/*
- * Generated by XDoclet - Do not edit!
- */
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
package org.jboss.soa.esb.services.EJB;
+import org.jboss.soa.esb.util.BobjStdDTO;
+
/**
- * Remote interface for BatchHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
+ * @author kstam
*/
public interface BatchHandler
- extends javax.ejb.EJBObject
{
-
- public long newBatch( )
- throws java.lang.Exception, java.rmi.RemoteException;
-
- public long getBatchNum( )
- throws java.rmi.RemoteException;
-
- public int addToBatch( java.lang.String p_s )
- throws java.lang.Exception, java.rmi.RemoteException;
-
- public void finish( )
- throws java.lang.Exception, java.rmi.RemoteException;
-
- public void commitBatch( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
- throws java.lang.Exception, java.rmi.RemoteException;
-
+ 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-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -36,17 +36,12 @@
import org.jboss.soa.esb.internal.core.objectstore.*;
import org.jboss.soa.esb.common.bizclasses.*;
/**
- * @ejb.bean
- * name="BatchHandler"
- * display-name="Jboss_Esb_Batch_Handler"
- * type="Stateful"
- * view-type="both"
- * jndi-name="BatchHandler"
- * local-jndi-name="BatchHandlerLocal"
- * transaction-type="Bean"
- * @author
+ * @author Esteban
*/
-public class BatchHandlerBean implements SessionBean
+ at Remote(BatchHandler.class)
+ at Local(BatchHandler.class)
+ at TransactionManagement(TransactionManagementType.BEAN)
+public @Stateful class BatchHandlerBean implements BatchHandler
{
private static final long serialVersionUID = 1L;
SessionContext m_oSessCtx;
@@ -67,9 +62,9 @@
private int m_iSeq;
/**
- * @ejb.create-method
* @throws CreateException
*/
+ @Init
public void ejbCreate() throws CreateException
{
try
@@ -82,6 +77,7 @@
}
} //__________________________________
+ @PostActivate
public void ejbActivate()
{ try
{ getResources();
@@ -92,6 +88,7 @@
}
} //__________________________________
+ @PrePassivate
public void ejbPassivate()
{ m_oLogger.info("EJB Passivated");
releaseResources();
@@ -100,9 +97,11 @@
m_oDataConn = null;
} //__________________________________
- public void ejbRemove()
- { releaseResources();
- m_oLogger.info("EJB Removed");
+ @Remove
+ public void remove()
+ {
+ releaseResources();
+ m_oLogger.info("EJB Removed");
} //__________________________________
private void getResources() throws Exception
@@ -223,8 +222,6 @@
//______________________________________________________________________________
// Public local and remote interface methods
/**
- * @ejb.interface-method
- * view-type="both"
*/
public long newBatch() throws Exception
{ if (m_lBatchNum > 0) throw
@@ -241,8 +238,6 @@
} //__________________________________
/**
- * @ejb.interface-method
- * view-type="both"
* @return
*/
public long getBatchNum()
@@ -250,8 +245,6 @@
} //__________________________________
/**
- * @ejb.interface-method
- * view-type="both"
* @param p_s
* @return
* @throws Exception
@@ -278,8 +271,6 @@
finally { releaseResources(); }
} //__________________________________
/**
- * @ejb.interface-method
- * view-type="both"
* @throws Exception
*/
public void finish() throws Exception
@@ -290,29 +281,27 @@
//______________________________________________________________________________
// Public local interface methods
+///** KS: I'm commenting this out since we are now using the
+// same interface for local and remote calls. If all
+// works this code can be deleted.
+// */
+// public void commitBatch(BatchProcess p_oBO) throws Exception
+// { try { doCommitBatch(p_oBO); m_oDataConn.commit(); }
+// catch (Exception e)
+// { if (null != m_oDataConn) m_oDataConn.rollback();
+// m_oLogger.error("commitBatch(BatchProcess) FAILED ",e);
+// throw e;
+// }
+// finally { releaseResources(); }
+// } //__________________________________
-/**
- * @ejb.interface-method
- * view-type="local"
- */
- public void commitBatch(BatchProcess p_oBO) throws Exception
- { try { doCommitBatch(p_oBO); m_oDataConn.commit(); }
- catch (Exception e)
- { if (null != m_oDataConn) m_oDataConn.rollback();
- m_oLogger.error("commitBatch(BatchProcess) FAILED ",e);
- throw e;
- }
- finally { releaseResources(); }
- } //__________________________________
-
//______________________________________________________________________________
// Public remote interface methods
/**
- * @ejb.interface-method
- * view-type="both"
*/
public void commitBatch(BobjStdDTO p_oDto) throws Exception
- { commitBatch (new BatchProcess(p_oDto));
- } //__________________________________
+ {
+ commitBatch (new BatchProcess(p_oDto).toDTO());
+ }
} //____________________________________________________________________________
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerHome.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerHome.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Home interface for BatchHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface BatchHandlerHome
- extends javax.ejb.EJBHome
-{
- public static final String COMP_NAME="java:comp/env/ejb/BatchHandler";
- public static final String JNDI_NAME="BatchHandler";
-
- public org.jboss.soa.esb.services.EJB.BatchHandler create()
- throws javax.ejb.CreateException,java.rmi.RemoteException;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocal.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocal.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,29 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local interface for BatchHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface BatchHandlerLocal
- extends javax.ejb.EJBLocalObject
-{
-
- public long newBatch( ) throws java.lang.Exception;
-
- public long getBatchNum( ) ;
-
- public int addToBatch( java.lang.String p_s ) throws java.lang.Exception;
-
- public void finish( ) throws java.lang.Exception;
-
- public void commitBatch( org.jboss.soa.esb.common.bizclasses.BatchProcess p_oBO ) throws java.lang.Exception;
-
- public void commitBatch( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocalHome.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocalHome.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local home interface for BatchHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface BatchHandlerLocalHome
- extends javax.ejb.EJBLocalHome
-{
- public static final String COMP_NAME="java:comp/env/ejb/BatchHandlerLocal";
- public static final String JNDI_NAME="BatchHandlerLocal";
-
- public org.jboss.soa.esb.services.EJB.BatchHandlerLocal create()
- throws javax.ejb.CreateException;
-
-}
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-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,22 +1,33 @@
/*
- * Generated by XDoclet - Do not edit!
- */
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
package org.jboss.soa.esb.services.EJB;
import java.io.Serializable;
/**
- * Remote interface for NotificationHandler.
- * @xdoclet-generated at July 24 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
+ * Business interface for NotificationHandler.
+ * @author kstam
*/
public interface NotificationHandler
- extends javax.ejb.EJBObject
{
-
- public void sendNotifications( java.lang.String p_sParams,Serializable p_sMsg )
- throws java.lang.Exception, java.rmi.RemoteException;
-
+ 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-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -25,7 +25,17 @@
package org.jboss.soa.esb.services.EJB;
import java.io.Serializable;
-import javax.ejb.*;
+
+import javax.ejb.Init;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+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.*;
@@ -33,32 +43,26 @@
import org.apache.log4j.*;
/**
- * @ejb.bean description="NotificationHandler"
- * display-name="Notification_Handler"
- * jndi-name="NotificationHandler"
- * local-jndi-name="NotificationHandlerLocal"
- * name="NotificationHandler"
- * type="Stateless"
- * view-type="both"
- * transaction-type="Container"
- * @ejb.transaction type="Required"
- * @author
+ * @author Esteban
*/
-public class NotificationHandlerBean implements SessionBean
+ at Remote(NotificationHandler.class)
+ at Local(NotificationHandler.class)
+ at TransactionManagement(TransactionManagementType.CONTAINER)
+ at TransactionAttribute(TransactionAttributeType.REQUIRED)
+
+public @Stateless class NotificationHandlerBean implements NotificationHandler
{
private static final long serialVersionUID = 1L;
private Logger m_oLogger;
SessionContext m_ctxSess;
- public void ejbActivate() {}
- public void ejbPassivate() {}
public void setSessionContext(SessionContext sessionContext)
{ m_ctxSess = sessionContext; }
/**
- * @ejb.create-method
* @throws CreateException
*/
- public void ejbCreate() throws CreateException
+ @Init
+ public void ejbCreate() throws Exception
{ try
{ m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
// Context oCtxInit =
@@ -68,10 +72,11 @@
}
catch (Exception e)
{ m_oLogger.error("EJB Create Failed <"+e.getMessage()+">");
- throw new CreateException(e.getMessage());
+ throw new Exception(e.getMessage());
}
} //__________________________________
+ @Remove
public void ejbRemove()
{ m_oLogger.info(this.toString()+" Removed");
} //__________________________________
@@ -103,7 +108,6 @@
catch (Exception e) { e.printStackTrace(System.out); }
}
/**
- * @ejb.interface-method
* @param p_sParams
* @param p_sMsg
* @throws Exception
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerHome.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerHome.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Home interface for NotificationHandler.
- * @xdoclet-generated at July 27 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface NotificationHandlerHome
- extends javax.ejb.EJBHome
-{
- public static final String COMP_NAME="java:comp/env/ejb/NotificationHandler";
- public static final String JNDI_NAME="NotificationHandler";
-
- public org.jboss.soa.esb.services.EJB.NotificationHandler create()
- throws javax.ejb.CreateException,java.rmi.RemoteException;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocal.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocal.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,21 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-import java.io.Serializable;
-
-/**
- * Local interface for NotificationHandler.
- * @xdoclet-generated at July 5 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface NotificationHandlerLocal
- extends javax.ejb.EJBLocalObject
-{
-
- public void sendNotifications( java.lang.String p_sParams,Serializable p_sMsg ) throws java.lang.Exception;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocalHome.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocalHome.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local home interface for NotificationHandler.
- * @xdoclet-generated at July 27 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface NotificationHandlerLocalHome
- extends javax.ejb.EJBLocalHome
-{
- public static final String COMP_NAME="java:comp/env/ejb/NotificationHandlerLocal";
- public static final String JNDI_NAME="NotificationHandlerLocal";
-
- public org.jboss.soa.esb.services.EJB.NotificationHandlerLocal create()
- throws javax.ejb.CreateException;
-
-}
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-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,32 +1,42 @@
/*
- * Generated by XDoclet - Do not edit!
- */
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
package org.jboss.soa.esb.services.EJB;
+import org.jboss.soa.esb.util.BobjStdDTO;
+
/**
- * Remote interface for PersistHandler.
- * @xdoclet-generated at July 24 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
+ * @author kstam
*/
public interface PersistHandler
- extends javax.ejb.EJBObject
{
- public long getUidChunk( int p_iQ )
- throws java.lang.Exception, java.rmi.RemoteException;
+ public long getUidChunk( int p_iQ ) throws Exception;
- public void rmvObject( java.lang.String p_sClassName,long p_lUid )
- throws java.lang.Exception, java.rmi.RemoteException;
+ public void rmvObject( String p_sClassName,long p_lUid ) throws Exception;
- public long addDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
- throws java.lang.Exception, java.rmi.RemoteException;
+ public long addDTO( BobjStdDTO p_oDto ) throws Exception;
- public org.jboss.soa.esb.util.BobjStdDTO getDTO( java.lang.String p_sClassName,long p_lUid )
- throws java.lang.Exception, java.rmi.RemoteException;
+ public BobjStdDTO getDTO( String p_sClassName,long p_lUid ) throws Exception;
- public void rplDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
- throws java.lang.Exception, java.rmi.RemoteException;
+ 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-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -19,12 +19,16 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-
-
-
package org.jboss.soa.esb.services.EJB;
-import javax.ejb.*;
+import javax.ejb.Init;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
import javax.naming.*;
import java.sql.*;
import javax.sql.*;
@@ -39,17 +43,12 @@
import org.apache.log4j.*;
/**
- * @ejb.bean
- * name="PersistHandler"
- * display-name="PERSIST_HANDLER"
- * type="Stateless"
- * view-type="both"
- * jndi-name="PersistHandler"
- * local-jndi-name="PersistHandlerLocal"
- * transaction-type="Bean"
* @author Esteban
*/
-public class PersistHandlerBean implements SessionBean
+ at Remote(PersistHandler.class)
+ at Local(PersistHandler.class)
+ at TransactionManagement(TransactionManagementType.BEAN)
+public @Stateless class PersistHandlerBean implements PersistHandler
{
private static final long serialVersionUID = 1L;
private Logger m_oLogger;
@@ -66,15 +65,14 @@
private DaoSnapTable m_oDaoSnap;
private DaoIndexTable[] m_oaDaoIndex;
- public void ejbActivate() {}
- public void ejbPassivate() {}
public void setSessionContext(SessionContext sessionContext)
{ m_ctxSess = sessionContext; }
/**
- * @ejb.create-method
+ * Create method. Should get called to initialize this class.
* @throws CreateException
*/
- public void ejbCreate() throws CreateException
+ @Init
+ public void create() throws Exception
{ try
{ m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
Context oCtxInit = new InitialContext();
@@ -92,14 +90,86 @@
}
catch (Exception e)
{ m_oLogger.error("EJB Create Failed <"+e.getMessage()+">");
- throw new CreateException(e.getMessage());
+ throw new Exception(e.getMessage());
}
} //__________________________________
- public void ejbRemove()
+ @Remove
+ public void remove()
{ m_oLogger.info(this.toString()+" Removed");
} //__________________________________
+
+ /**
+ * @param p_sClassName - String Fully qualified name of class to be retrieved
+ * @param p_lUid
+ * @return
+ * @throws Exception
+ */
+ public BobjStdDTO getDTO (String p_sClassName, long p_lUid) throws Exception
+ { try { return doGetSnapshot(BobjStore.getStore(p_sClassName), p_lUid);}
+ catch (Exception e) { throw e; }
+ finally { releaseResources(); }
+ } //__________________________________
+ /**
+ *
+ * @param p_oDto BobjStdDTO - Serialized BaseBusinessObject that has to be replaced
+ * @throws Exception
+ */
+ public void rplDTO(BobjStdDTO p_oDto) throws Exception
+ { try
+ { doRplSnapshot(p_oDto);
+ m_oDataConn.commit();
+ }
+ catch (Exception e)
+ { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
+ catch (Exception eRoll) {}
+ throw e;
+ }
+ finally { releaseResources(); }
+ } //__________________________________
+
+// ______________________________________________________________________________
+// Public local and remote interface methods
+ /**
+ */
+ public long getUidChunk (int p_iQ) throws Exception
+ { try { return getDaoUid().getUidChunk(DaoUidTable.SEQUENCE_OBJ,p_iQ); }
+ catch (Exception e) { throw e;}
+ finally { releaseResources(); }
+ } //__________________________________
+ /**
+ * @param p_sClassName
+ * @param p_lUid
+ * @throws Exception
+ */
+ public void rmvObject(String p_sClassName, long p_lUid) throws Exception
+ { try { doRmvSnapshot(BobjStore.getStore(p_sClassName), p_lUid); m_oDataConn.commit(); }
+ catch (Exception e)
+ { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
+ catch (Exception eRoll) {}
+ throw e;
+ }
+ finally { releaseResources(); }
+ } //__________________________________
+
+ /**
+ */
+ public long addDTO(BobjStdDTO p_oDto) throws Exception
+ { try
+ { long lRet = doAddSnapshot(p_oDto);
+ m_oDataConn.commit();
+ return lRet;
+ }
+ catch (Exception e)
+ { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
+ catch (Exception eRoll) {}
+ throw e;
+ }
+ finally { releaseResources(); }
+ } //__________________________________
+
+
// Utility Methods
private DaoUidTable getDaoUid() throws Exception
@@ -277,7 +347,7 @@
if (null != m_oUidConn) m_oUidConn.release();
} //__________________________________
- public long doAssignUid() throws Exception
+ private long doAssignUid() throws Exception
{ if (m_iChunkLeft < 1)
{ m_lUid = getDaoUid().getUidChunk(DaoUidTable.SEQUENCE_OBJ, s_iChunkSize);
m_iChunkLeft = s_iChunkSize;
@@ -286,82 +356,6 @@
return ++m_lUid;
} //__________________________________
-//______________________________________________________________________________
-// Public local and remote interface methods
- /**
- * @ejb.interface-method
- * view-type="both"
- */
- public long getUidChunk (int p_iQ) throws Exception
- { try { return getDaoUid().getUidChunk(DaoUidTable.SEQUENCE_OBJ,p_iQ); }
- catch (Exception e) { throw e;}
- finally { releaseResources(); }
- } //__________________________________
-/**
- * @ejb.interface-method
- * view-type="both"
- * @param p_sClassName
- * @param p_lUid
- * @throws Exception
- */
- public void rmvObject(String p_sClassName, long p_lUid) throws Exception
- { try { doRmvSnapshot(BobjStore.getStore(p_sClassName), p_lUid); m_oDataConn.commit(); }
- catch (Exception e)
- { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
- catch (Exception eRoll) {}
- throw e;
- }
- finally { releaseResources(); }
- } //__________________________________
-/**
- * @ejb.interface-method
- * view-type="both"
- */
- public long addDTO(BobjStdDTO p_oDto) throws Exception
- { try
- { long lRet = doAddSnapshot(p_oDto);
- m_oDataConn.commit();
- return lRet;
- }
- catch (Exception e)
- { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
- catch (Exception eRoll) {}
- throw e;
- }
- finally { releaseResources(); }
- } //__________________________________
-/**
- * @ejb.interface-method
- * view-type="both"
- * @param p_sClassName - String Fully qualified name of class to be retrieved
- * @param p_lUid
- * @return
- * @throws Exception
- */
- public BobjStdDTO getDTO (String p_sClassName, long p_lUid) throws Exception
- { try { return doGetSnapshot(BobjStore.getStore(p_sClassName), p_lUid);}
- catch (Exception e) { throw e; }
- finally { releaseResources(); }
- } //__________________________________
-/**
- * @ejb.interface-method
- * view-type="both"
- *
- * @param p_oDto BobjStdDTO - Serialized BaseBusinessObject that has to be replaced
- * @throws Exception
- */
- public void rplDTO(BobjStdDTO p_oDto) throws Exception
- { try
- { doRplSnapshot(p_oDto);
- m_oDataConn.commit();
- }
- catch (Exception e)
- { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
- catch (Exception eRoll) {}
- throw e;
- }
- finally { releaseResources(); }
- } //__________________________________
} //____________________________________________________________________________
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerHome.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerHome.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Home interface for PersistHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface PersistHandlerHome
- extends javax.ejb.EJBHome
-{
- public static final String COMP_NAME="java:comp/env/ejb/PersistHandler";
- public static final String JNDI_NAME="PersistHandler";
-
- public org.jboss.soa.esb.services.EJB.PersistHandler create()
- throws javax.ejb.CreateException,java.rmi.RemoteException;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocal.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocal.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,27 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local interface for PersistHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface PersistHandlerLocal
- extends javax.ejb.EJBLocalObject
-{
-
- public long getUidChunk( int p_iQ ) throws java.lang.Exception;
-
- public void rmvObject( java.lang.String p_sClassName,long p_lUid ) throws java.lang.Exception;
-
- public long addDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
-
- public org.jboss.soa.esb.util.BobjStdDTO getDTO( java.lang.String p_sClassName,long p_lUid ) throws java.lang.Exception;
-
- public void rplDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocalHome.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocalHome.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local home interface for PersistHandler.
- * @xdoclet-generated at July 24 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface PersistHandlerLocalHome
- extends javax.ejb.EJBLocalHome
-{
- public static final String COMP_NAME="java:comp/env/ejb/PersistHandlerLocal";
- public static final String JNDI_NAME="PersistHandlerLocal";
-
- public org.jboss.soa.esb.services.EJB.PersistHandlerLocal create()
- throws javax.ejb.CreateException;
-
-}
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-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -30,19 +30,21 @@
public class NotifHandlerBsDelegateLocal implements InotificationHandler
{
- private NotificationHandlerLocal m_oNotifH;
- public NotifHandlerBsDelegateLocal(Context p_ctx) throws Exception
- {
- Object ref = p_ctx.lookup("NotificationHandlerLocal");
+ private NotificationHandler m_oNotifH;
+
+ public NotifHandlerBsDelegateLocal(Context p_ctx) throws Exception
+ {
+ m_oNotifH = (NotificationHandler) p_ctx.lookup("jbossesb-appl/NotificationHandlerBean/local");
+ }
- NotificationHandlerLocalHome oHu = (NotificationHandlerLocalHome) ref;
- m_oNotifH = oHu.create();
- } //__________________________________
+ public void sendNotifications(DomElement p_oP, Serializable p_o)
+ throws Exception
+ {
+ m_oNotifH.sendNotifications(p_oP.toString(), p_o);
+ }
- public void sendNotifications(DomElement p_oP, Serializable p_o) throws Exception
- { m_oNotifH.sendNotifications(p_oP.toString(),p_o);
- }
- public void sendNotifications(Serializable p_o) throws Exception
- { m_oNotifH.sendNotifications(null,p_o);
- }
-} //____________________________________________________________________________
+ public void sendNotifications(Serializable p_o) throws Exception
+ {
+ m_oNotifH.sendNotifications(null, 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-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -24,27 +24,27 @@
package org.jboss.soa.esb.services;
import javax.naming.*;
-import javax.rmi.*;
import java.io.Serializable;
import org.jboss.soa.esb.helpers.*;
import org.jboss.soa.esb.services.EJB.*;
public class NotifHandlerBsDelegateRemote implements InotificationHandler
{
- private NotificationHandler m_oNotifH;
+ private NotificationHandler m_oNotifH;
- public NotifHandlerBsDelegateRemote(Context p_ctx) throws Exception
- {
- Object ref = p_ctx.lookup("NotificationHandler");
- Object oNarr = PortableRemoteObject.narrow(ref, NotificationHandlerHome.class);
- NotificationHandlerHome oHu = (NotificationHandlerHome) oNarr;
- m_oNotifH = oHu.create();
- } //__________________________________
+ public NotifHandlerBsDelegateRemote(Context p_ctx) throws Exception
+ {
+ m_oNotifH = (NotificationHandler) p_ctx.lookup("jbossesb-appl/NotificationHandlerBean/remote");
+ }
- public void sendNotifications(DomElement p_oP, Serializable p_o) throws Exception
- { m_oNotifH.sendNotifications(p_oP.toString(),p_o);
- } //__________________________________
- public void sendNotifications(Serializable p_o) throws Exception
- { m_oNotifH.sendNotifications(null,p_o);
- }
-} //____________________________________________________________________________
+ public void sendNotifications(DomElement p_oP, Serializable p_o)
+ throws Exception
+ {
+ m_oNotifH.sendNotifications(p_oP.toString(), p_o);
+ }
+
+ public void sendNotifications(Serializable p_o) throws Exception
+ {
+ m_oNotifH.sendNotifications(null, p_o);
+ }
+}
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotificationHandlerFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotificationHandlerFactory.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotificationHandlerFactory.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -31,9 +31,10 @@
public class NotificationHandlerFactory
{
- private static final String [] s_saTypes = {"local","remote"};
+ private static final String [] s_saTypes = {"local","remote","mock"};
private final static int LCL=0;
private final static int REM=1;
+ private final static int MOK=2;
public static InotificationHandler getNotifHandler
(String p_sLocRem, String p_sJndiType, String p_sJndiServer) throws Exception
@@ -42,15 +43,16 @@
if (iIndex < 0) return null;
switch (iIndex)
{
+ case LCL: return new NotifHandlerBsDelegateLocal(new InitialContext());
case REM: return getNotifHandler
(AppServerContext.getServerContext(p_sJndiType,p_sJndiServer));
- case LCL: return new NotifHandlerBsDelegateLocal(new InitialContext());
+ case MOK: return null; //return new MockNotificationHandler();
}
throw new Exception("Invalid Notification Handler Delegate <" + p_sLocRem + ">");
- } //__________________________________
+ }
- public static InotificationHandler getNotifHandler(Context p_oCtx) throws Exception
- { return new NotifHandlerBsDelegateRemote(p_oCtx);
- } //__________________________________
-
-} //____________________________________________________________________________
+ private static InotificationHandler getNotifHandler(Context p_oCtx) throws Exception
+ {
+ return new NotifHandlerBsDelegateRemote(p_oCtx);
+ }
+}
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-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -32,45 +32,45 @@
public class PersistHandlerBsDelegateLocal implements IpersistHandler
{
- private PersistHandlerLocal m_oSnapH;
+ private PersistHandler m_oSnapH;
- public PersistHandlerBsDelegateLocal(Context p_ctx) throws Exception
- {
- Object ref = p_ctx.lookup("PersistHandlerLocal");
+ public PersistHandlerBsDelegateLocal(Context p_ctx) throws Exception {
+ m_oSnapH = (PersistHandler) p_ctx.lookup("jbossesb-appl/PersistHandlerBean/local");
+ }
- PersistHandlerLocalHome oHu = (PersistHandlerLocalHome) ref;
- m_oSnapH = oHu.create();
- } //__________________________________
+ public long getUidChunk(int p_iQ) throws Exception {
+ return m_oSnapH.getUidChunk(p_iQ);
+ }
- public void remove() throws Exception {m_oSnapH.remove(); }
- public long getUidChunk(int p_iQ) throws Exception
- { return m_oSnapH.getUidChunk(p_iQ);
- } //__________________________________
- public long addObject (BobjStdDTO p_oDto) throws Exception
- { return m_oSnapH.addDTO(p_oDto);
- } //__________________________________
- public long addObject (BaseBusinessObject p_oBo) throws Exception
- { p_oBo.setPackage();
- return m_oSnapH.addDTO(p_oBo.toDTO());
- } //__________________________________
- public BaseBusinessObject getObject (Class p_oCls, long p_lUid) throws Exception
- { BobjStdDTO oDto = m_oSnapH.getDTO(p_oCls.getName(), p_lUid);
- return (null==oDto)?null:BaseBusinessObject.getFromDTO(oDto);
- } //__________________________________
- public void rmvObject (Class p_oCls, long p_lUid) throws Exception
- { m_oSnapH.rmvObject(p_oCls.getName(), p_lUid);
- } //__________________________________
- public void rplObject (BaseBusinessObject p_o) throws Exception
- { p_o.setPackage();
- m_oSnapH.rplDTO(p_o.toDTO());
- } //__________________________________
- public ObjLocator[] getLocatorList(Class p_oCls, Properties p_oProp)
- {
- return null;
- } //__________________________________
+ public long addObject(BobjStdDTO p_oDto) throws Exception {
+ return m_oSnapH.addDTO(p_oDto);
+ }
- public ObjLocator[] getLocatorList(Class p_oCls, long[] p_laUids)
- {
- return null;
- } //__________________________________
+ public long addObject(BaseBusinessObject p_oBo) throws Exception {
+ p_oBo.setPackage();
+ return m_oSnapH.addDTO(p_oBo.toDTO());
+ }
+
+ public BaseBusinessObject getObject(Class p_oCls, long p_lUid)
+ throws Exception {
+ BobjStdDTO oDto = m_oSnapH.getDTO(p_oCls.getName(), p_lUid);
+ return (null == oDto) ? null : BaseBusinessObject.getFromDTO(oDto);
+ }
+
+ public void rmvObject(Class p_oCls, long p_lUid) throws Exception {
+ m_oSnapH.rmvObject(p_oCls.getName(), p_lUid);
+ }
+
+ public void rplObject(BaseBusinessObject p_o) throws Exception {
+ p_o.setPackage();
+ m_oSnapH.rplDTO(p_o.toDTO());
+ }
+
+ public ObjLocator[] getLocatorList(Class p_oCls, Properties p_oProp) {
+ return null;
+ } //__________________________________
+
+ public ObjLocator[] getLocatorList(Class p_oCls, long[] p_laUids) {
+ return null;
+ } //__________________________________
} //____________________________________________________________________________
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-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -24,7 +24,6 @@
package org.jboss.soa.esb.services;
import javax.naming.*;
-import javax.rmi.*;
import org.jboss.soa.esb.services.EJB.*;
import org.jboss.soa.esb.util.*;
@@ -33,42 +32,45 @@
public class PersistHandlerBsDelegateRemote implements IpersistHandler
{
- private PersistHandler m_oSnapH;
+ private PersistHandler m_oSnapH;
public PersistHandlerBsDelegateRemote(Context p_ctx) throws Exception
{
- Object ref = p_ctx.lookup("PersistHandler");
- Object oNarr = PortableRemoteObject.narrow(ref, PersistHandlerHome.class);
- PersistHandlerHome oHu = (PersistHandlerHome) oNarr;
- m_oSnapH = oHu.create();
- } //__________________________________
+ m_oSnapH = (PersistHandler) p_ctx.lookup("jbossesb-appl/PersistHandlerBean/remote");
+ }
- public void remove() throws Exception {}
public long getUidChunk(int p_iQ) throws Exception
- { return m_oSnapH.getUidChunk(p_iQ);
- } //__________________________________
- public long addObject (BaseBusinessObject p_oBo) throws Exception
- { if (null==p_oBo) return -1;
+ {
+ return m_oSnapH.getUidChunk(p_iQ);
+ }
+
+ public long addObject (BaseBusinessObject p_oBo) throws Exception
+ {
+ if (null==p_oBo) return -1;
p_oBo.setPackage();
BobjStdDTO oDto = p_oBo.toDTO();
oDto.setLocators(p_oBo.allLocators());
return m_oSnapH.addDTO(oDto);
- } //__________________________________
+ }
+
public BaseBusinessObject getObject (Class p_oCls, long p_lUid) throws Exception
{
BobjStdDTO oDto = m_oSnapH.getDTO(p_oCls.getName(), p_lUid);
return (null==oDto)?null:BaseBusinessObject.getFromDTO(oDto);
- } //__________________________________
- public void rmvObject (Class p_oCls, long p_lUid) throws Exception
- { m_oSnapH.rmvObject(p_oCls.getName(), p_lUid);
- } //__________________________________
- public void rplObject (BaseBusinessObject p_oBo) throws Exception
+ }
+
+ public void rmvObject (Class p_oCls, long p_lUid) throws Exception
+ {
+ m_oSnapH.rmvObject(p_oCls.getName(), p_lUid);
+ }
+
+ public void rplObject (BaseBusinessObject p_oBo) throws Exception
{ if (null==p_oBo) return;
p_oBo.setPackage();
BobjStdDTO oDto = p_oBo.toDTO();
oDto.setLocators(p_oBo.allLocators());
m_oSnapH.rplDTO(oDto);
- } //__________________________________
+ }
public ObjLocator[] getLocatorList(Class p_oCls, Properties p_oProp)
{
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerFactory.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerFactory.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -30,9 +30,10 @@
public class PersistHandlerFactory
{
- private static final String [] s_saTypes = {"local","remote"};
+ private static final String [] s_saTypes = {"local","remote","mock"};
private final static int LCL=0;
private final static int REM=1;
+ private final static int MOK=2;
public static IpersistHandler getPersistHandler
(String p_sLocRem, String p_sJndiType, String p_sJndiServer) throws Exception
@@ -41,15 +42,16 @@
if (iIndex < 0) return null;
switch (iIndex)
{
+ case LCL: return new PersistHandlerBsDelegateLocal(new InitialContext());
case REM: return getPersistHandler
(AppServerContext.getServerContext(p_sJndiType,p_sJndiServer));
- case LCL: return new PersistHandlerBsDelegateLocal(new InitialContext());
+ case MOK: return null; //new MockPersistHandler();
}
throw new Exception("Invalid Persist Handler Delegate <" + p_sLocRem + ">");
- } //__________________________________
+ }
public static IpersistHandler getPersistHandler(Context p_oCtx) throws Exception
- { return new PersistHandlerBsDelegateRemote(p_oCtx);
- } //__________________________________
-
-} //____________________________________________________________________________
+ {
+ return new PersistHandlerBsDelegateRemote(p_oCtx);
+ }
+}
Property changes on: labs/jbossesb/trunk/product/core/services/tests
___________________________________________________________________
Name: svn:ignore
+
TESTS-TestSuites.xml
Modified: labs/jbossesb/trunk/product/core/services/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
<project name="build.services.tests" default="org.jboss.esb.services.tests.compile" basedir=".">
+ <property file="../../../deployment.properties"/>
+
<property name="org.jboss.esb.module.src.dir" value="../src"/>
<property name="org.jboss.esb.module.classes.dir" value="${org.jboss.esb.internal.dest}/classes/services"/>
<property name="org.jboss.esb.module.tests.src.dir" value="${basedir}/src"/>
@@ -20,6 +22,7 @@
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
+
</path>
<target name="org.jboss.esb.tests.init">
@@ -103,10 +106,18 @@
<!-- Need the tests src folder because there may be non-compiled test resources -->
<pathelement location="${org.jboss.esb.module.tests.src.dir}"/>
<path refid="org.jboss.esb.tests.base.classpath"/>
+ <pathelement location="${org.jboss.esb.ejb3.lib.dir}"/>
</classpath>
<!-- emma jvm args -->
<jvmarg value="-Demma.coverage.out.file=${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
<jvmarg value="-Demma.coverage.out.merge=true" />
+ <!-- setting system properties -->
+ <sysproperty key="org.jboss.esb.db.driver" value="${org.jboss.esb.db.driver}"/>
+ <sysproperty key="org.jboss.esb.db.url" value="${org.jboss.esb.db.url}"/>
+ <sysproperty key="org.jboss.esb.db.user" value="${org.jboss.esb.db.user}"/>
+ <sysproperty key="org.jboss.esb.db.password" value="${org.jboss.esb.db.password}"/>
+ <sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
+
</junit>
<junitreport>
<fileset dir="${org.jboss.esb.tests.report.dir}">
Copied: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB (from rev 5482, labs/jbossesb/branches/ejb3/product/core/services/tests/src/org/jboss/soa/esb/services/EJB)
Copied: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test (from rev 5482, labs/jbossesb/branches/ejb3/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test)
Deleted: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/NotificationTest.java
===================================================================
--- labs/jbossesb/branches/ejb3/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/NotificationTest.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/NotificationTest.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,231 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-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;
-import org.jboss.soa.esb.common.tests.EJBContainerSetup;
-import org.jboss.soa.esb.helpers.DomElement;
-import org.jboss.soa.esb.helpers.KeyValuePair;
-import org.jboss.soa.esb.helpers.persist.SimpleDataSource;
-import org.jboss.soa.esb.notification.NotificationList;
-import org.jboss.soa.esb.notification.NotificationTarget;
-import org.jboss.soa.esb.notification.NotifySqlTable;
-import org.jboss.soa.esb.services.EJB.NotificationHandler;
-
-
-public class NotificationTest extends BaseTest
-{
- private Logger logger = Logger.getLogger(NotificationTest.class);
-
- public void testNotification() {
- try {
- logger.log(Priority.INFO, "Notification Test");
- InitialContext ctx = getInitialContext();
- NotificationHandler local = (NotificationHandler ) ctx.lookup("NotificationHandlerBean/local");
- DomElement oEl = new DomElement("MyFileList");
- oEl.setAttr(NotificationList.TYPE,"OK");
-
- // oEl.addElemChild(fileListTarget());
- // oEl.addElemChild(emailTarget());
- // oEl.addElemChild(jmsQueueTarget());
- // oEl.addElemChild(jmsTopicTarget());
- oEl.addElemChild(sqlTableTarget());
-
- NotificationList oNL = new NotificationList(oEl);
-
- // to see how the XML looks like
- // this is just a unit test class
- // Typically the XML is used in a parameter object (DomElement.fromXml())
- System.out.println(oNL.toString());
-
- // a simple timestamped message
- Date oNow = new Date(System.currentTimeMillis());
- SimpleDateFormat oStamp = new SimpleDateFormat("dd/MMM/yyyy HH:mm:ss.SSS");
- StringBuilder sb = new StringBuilder(oStamp.format(oNow))
- .append(" This message from Notification test");
-
- //KS local.sendNotifications(oNL.toString(),sb.toString());
-
- } catch (Exception e) {
- logger.log(Priority.ERROR, e.getMessage(), e);
- }
- }
-
- public void testKurt() {
- logger.log(Priority.INFO, "Test Kurt");
-
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite(NotificationTest.class);
- return new EJBContainerSetup(suite);
- }
-
- public static InitialContext getInitialContext() throws Exception
- {
- Hashtable props = getInitialContextProperties();
- return new InitialContext(props);
- }
-
- private static Hashtable getInitialContextProperties()
- {
- Hashtable props = new Hashtable();
- props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
- props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- return props;
- }
-
-// static DomElement emailTarget() throws Exception
-// {
-// DomElement oTgt = new DomElement(NotificationList.CHILD_TGT);
-// oTgt.setAttr(NotificationTarget.PRM_NOTIF_CLASS,"NotifyEmail");
-// oTgt.setAttr(EsbEmail.FROM,"sender at jboss.com");
-// oTgt.setAttr(EsbEmail.SENDTO,"receiver1 at hotmail.com,receiver2 at jboss.com");;
-// oTgt.setAttr(EsbEmail.SUBJECT,"TEST from Rosetta");
-// oTgt.setAttr(EsbEmail.MESSAGE,"This is the text of your message");
-//
-// // This class does NOT send the e-mails, the app server does
-// // consequently these paths would have to be accessible in the
-// // application server (filesystem / mounts)
-// String[] sa = {"/tmp/tomcat.sh","/tmp/program.js"};
-// for (String sCurr : sa)
-// oTgt.addTextChild(EsbEmail.ATTACH,sCurr);
-//
-// return oTgt;
-// } //________________________________
-//
-// static DomElement fileListTarget() throws Exception
-// {
-// DomElement oTgt = new DomElement(NotificationList.CHILD_TGT);
-// oTgt.setAttr(NotificationTarget.PRM_NOTIF_CLASS,"NotifyFiles");
-//
-// // This class does NOT write the files, the app server does
-// // consequently these paths would have to be accessible in the
-// // application server (filesystem / mounts)
-// String[] sa = {"file:///tmp/file1.notif","file:///tmp/file2.notif"};
-// for (String sCurr : sa)
-// { DomElement oFile = new DomElement(NotifyFiles.CHILD_FILE);
-// oFile.setAttr(NotifyFiles.ATT_URI,sCurr);
-// oFile.setAttr(NotifyFiles.ATT_APPEND,Boolean.toString(true));
-// oTgt.addElemChild(oFile);
-// }
-// return oTgt;
-// } //________________________________
-//
-// static DomElement jmsQueueTarget() throws Exception
-// {
-// DomElement oTgt = new DomElement(NotificationList.CHILD_TGT);
-// oTgt.setAttr(NotificationTarget.PRM_NOTIF_CLASS,"NotifyQueues");
-//
-// String[] sa = {"queue/A","queue/B"};
-// for (String sCurr : sa)
-// { DomElement oQ = new DomElement(NotifyQueues.CHILD_QUEUE);
-// oQ.setAttr(NotifyJMS.ATT_DEST_NAME,sCurr);
-// for (DomElement oProp : getMessageProperties())
-// oQ.addElemChild(oProp);
-// oTgt.addElemChild(oQ);
-// }
-// return oTgt;
-// } //________________________________
-//
-// static DomElement jmsTopicTarget() throws Exception
-// {
-// DomElement oTgt = new DomElement(NotificationList.CHILD_TGT);
-// oTgt.setAttr(NotificationTarget.PRM_NOTIF_CLASS,"NotifyTopics");
-//
-// String[] sa = {"topic/testTopic"};
-// for (String sCurr : sa)
-// { DomElement oQ = new DomElement(NotifyTopics.CHILD_TOPIC);
-// oQ.setAttr(NotifyJMS.ATT_DEST_NAME,sCurr);
-// for (DomElement oProp : getMessageProperties())
-// oQ.addElemChild(oProp);
-// oTgt.addElemChild(oQ);
-// }
-// return oTgt;
-// } //________________________________
-//
-// static DomElement[] getMessageProperties() throws Exception
-// {
-// KeyValuePair[] oaProps = new KeyValuePair[]
-// {new KeyValuePair("prop1","111")
-// ,new KeyValuePair("prop2","bbb")
-// ,new KeyValuePair("prop3","abc123")
-// };
-// DomElement[] oaRet = new DomElement[oaProps.length];
-// int iCurr = 0;
-// for (KeyValuePair oCurr : oaProps)
-// { DomElement oElem = new DomElement(NotifyJMS.CHILD_MSG_PROP);
-// oElem.setAttr(NotifyJMS.ATT_PROP_NAME,oCurr.getKey());
-// oElem.setAttr(NotifyJMS.ATT_PROP_VALUE,oCurr.getValue());
-// oaRet[iCurr++] = oElem;
-// }
-// return oaRet;
-// } //________________________________
-
- static DomElement sqlTableTarget() throws Exception
- {
- DomElement oTgt = new DomElement(NotificationList.CHILD_TGT);
- oTgt.setAttr(NotificationTarget.PRM_NOTIF_CLASS,"NotifySqlTable");
-
- oTgt.setAttr(SimpleDataSource.DRIVER,"org.postgresql.Driver");
- oTgt.setAttr(SimpleDataSource.URL,"jdbc:postgresql://localhost:5432/jbossesb");
- oTgt.setAttr(SimpleDataSource.USER,"postgres");
- oTgt.setAttr(SimpleDataSource.PASSWORD,"postgres");
-
- // Table name for insert - must exist in database (URL)
- oTgt.setAttr(NotifySqlTable.ATT_TABLE,"test_notif_table");
- // Column that will contain the dynamic data generated by the ActionClass
- // must exist in table (ATT_TABLE above)
- oTgt.setAttr(NotifySqlTable.ATT_DATA,"msg");
-
- // constant data that can be also added in the insert
- // (perhaps needed for queries)
- // Key = column name (it must exist in the table, same as ATT_DATA column)
- KeyValuePair[] oaCols = new KeyValuePair[]
- {new KeyValuePair("src","TestNotification")
- ,new KeyValuePair("ref","any Ref")
- ,new KeyValuePair("val1","VVVV 11111")
- };
- for (KeyValuePair oCurr : oaCols)
- { DomElement oElem = new DomElement(NotifySqlTable.CHILD_COLUMN);
- oElem.setAttr(NotifySqlTable.ATT_NAME,oCurr.getKey());
- oElem.setAttr(NotifySqlTable.ATT_VALUE,oCurr.getValue());
- oTgt.addElemChild(oElem);
- }
-
- return oTgt;
- }
-
-}
-
-
Copied: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/NotificationTest.java (from rev 5482, labs/jbossesb/branches/ejb3/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/NotificationTest.java)
Deleted: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java
===================================================================
--- labs/jbossesb/branches/ejb3/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java 2006-08-04 22:04:05 UTC (rev 5482)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java 2006-08-04 23:04:01 UTC (rev 5483)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb.services.EJB.test;
-
-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;
-import org.jboss.soa.esb.common.tests.EJBContainerSetup;
-import org.jboss.soa.esb.services.EJB.PersistHandler;
-
-
-public class PersistHandlerTest extends BaseTest
-{
- private Logger logger = Logger.getLogger(PersistHandlerTest.class);
-
- public void testConnectivityToPersistHandler() {
- try {
- logger.log(Priority.INFO, "PersistHandler Test");
- PersistHandler persistHandlerLocal = (PersistHandler ) EJBContainerSetup.lookup("PersistHandlerBean/remote");
- logger.log(Priority.INFO, "persistHandlerLocal=" + persistHandlerLocal);
- } catch (Exception e) {
- logger.log(Priority.ERROR, e.getMessage(), e);
- }
- }
-
- public void testKurt() {
- logger.log(Priority.INFO, "Test Kurt");
-
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite(PersistHandlerTest.class);
- return new EJBContainerSetup(suite);
- }
-
-
-
-}
-
-
Copied: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java (from rev 5482, labs/jbossesb/branches/ejb3/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerTest.java)
Copied: labs/jbossesb/trunk/product/deployment.properties-example (from rev 5482, labs/jbossesb/branches/ejb3/product/deployment.properties-example)
Copied: labs/jbossesb/trunk/product/lib/deploy (from rev 5482, labs/jbossesb/branches/ejb3/product/lib/deploy)
Deleted: labs/jbossesb/trunk/product/lib/deploy/postgresql-8.1-407.jdbc3.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/trunk/product/lib/deploy/postgresql-8.1-407.jdbc3.jar (from rev 5482, labs/jbossesb/branches/ejb3/product/lib/deploy/postgresql-8.1-407.jdbc3.jar)
Copied: labs/jbossesb/trunk/product/lib/ejb3 (from rev 5482, labs/jbossesb/branches/ejb3/product/lib/ejb3)
Deleted: labs/jbossesb/trunk/product/lib/ejb3/jboss-annotations-ejb3.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/trunk/product/lib/ejb3/jboss-annotations-ejb3.jar (from rev 5482, labs/jbossesb/branches/ejb3/product/lib/ejb3/jboss-annotations-ejb3.jar)
Deleted: labs/jbossesb/trunk/product/lib/ejb3/jboss-ejb3x.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/trunk/product/lib/ejb3/jboss-ejb3x.jar (from rev 5482, labs/jbossesb/branches/ejb3/product/lib/ejb3/jboss-ejb3x.jar)
Copied: labs/jbossesb/trunk/product/lib/ejb3_embedded (from rev 5482, labs/jbossesb/branches/ejb3/product/lib/ejb3_embedded)
Deleted: labs/jbossesb/trunk/product/lib/ejb3_embedded/hibernate-all.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/trunk/product/lib/ejb3_embedded/hibernate-all.jar (from rev 5482, labs/jbossesb/branches/ejb3/product/lib/ejb3_embedded/hibernate-all.jar)
Deleted: labs/jbossesb/trunk/product/lib/ejb3_embedded/jboss-ejb3-all.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/trunk/product/lib/ejb3_embedded/jboss-ejb3-all.jar (from rev 5482, labs/jbossesb/branches/ejb3/product/lib/ejb3_embedded/jboss-ejb3-all.jar)
Deleted: labs/jbossesb/trunk/product/lib/ejb3_embedded/thirdparty-all.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/trunk/product/lib/ejb3_embedded/thirdparty-all.jar (from rev 5482, labs/jbossesb/branches/ejb3/product/lib/ejb3_embedded/thirdparty-all.jar)
Modified: labs/jbossesb/trunk/product/lib/ext/jbossall-client.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list