[jboss-svn-commits] JBL Code SVN: r5104 - in labs/jbossesb/trunk: . ESBCore ESBCore/common ESBCore/common/src/org/jboss/soa/esb/common ESBCore/common/src/org/jboss/soa/esb/common/bizclasses ESBCore/common/src/org/jboss/soa/esb/helpers ESBCore/common/src/org/jboss/soa/esb/helpers/persist ESBCore/common/src/org/jboss/soa/esb/parameters ESBCore/common/src/org/jboss/soa/esb/services ESBCore/common/src/org/jboss/soa/esb/util ESBCore/common/tests ESBCore/common/tests/src ESBCore/common/tests/src/org ESBCore/common/tests/src/org/jboss ESBCore/common/tests/src/org/jboss/soa ESBCore/common/tests/src/org/jboss/soa/esb ESBCore/common/tests/src/org/jboss/soa/esb/common ESBCore/common/tests/src/org/jboss/soa/esb/common/tests ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses ESBCore/listeners ESBCore/listeners/src/org/jboss/soa/esb/listeners ESBCore/listeners/tests ESBCore/listeners/tests/src ESBCore/listeners/tests/src/org ESBCore/listeners/tests/src/org/jboss ESBCore/listeners/te! sts/src/org/jboss/soa ESBCore/listeners/tests/src/org/jboss/soa/esb ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests ESBCore/processors ESBCore/processors/tests ESBCore/processors/tests/src ESBCore/processors/tests/src/org ESBCore/processors/tests/src/org/jboss ESBCore/processors/tests/src/org/jboss/soa ESBCore/processors/tests/src/org/jboss/soa/esb ESBCore/processors/tests/src/org/jboss/soa/esb/processors ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests ESBCore/services ESBCore/services/src/org/jboss/soa/esb ESBCore/services/src/org/jboss/soa/esb/services ESBCore/services/src/org/jboss/soa/esb/services/EJB ESBCore/services/src/org/jboss/soa/esb/services/crypto ESBCore/services/src/org/jboss/soa/esb/services/dbtables ESBCore/services/src/org/jboss/soa/esb/services/msglistener ESBCore/services/tests ESBCore/services/tests/src ESBCore/services/tests/src/org ESBCore/services/tests/src/org/jboss! ESBCore/services/tests/src/org/jboss/soa ESBCore/services/tests/src/org/jboss/soa/esb ESBCore/services/tests/src/org/jboss/soa/esb/services ESBCore/services/tests/src/org/jboss/soa/esb/services/tests ESBCore/tests ESBCore/tests/src ESBCore/tests/src/org ESBCore/tests/src/org/jboss ESBCore/tests/src/org/jboss/soa ESBCore/tes
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 14 17:06:51 EDT 2006
Author: arvinder
Date: 2006-07-14 17:04:47 -0400 (Fri, 14 Jul 2006)
New Revision: 5104
Added:
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/persist/AbstractBobjStore.java
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/persist/ItfStorable.java
labs/jbossesb/trunk/ESBCore/common/tests/
labs/jbossesb/trunk/ESBCore/common/tests/build.xml
labs/jbossesb/trunk/ESBCore/common/tests/src/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java
labs/jbossesb/trunk/ESBCore/listeners/tests/
labs/jbossesb/trunk/ESBCore/listeners/tests/build.xml
labs/jbossesb/trunk/ESBCore/listeners/tests/src/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java
labs/jbossesb/trunk/ESBCore/processors/tests/
labs/jbossesb/trunk/ESBCore/processors/tests/build.xml
labs/jbossesb/trunk/ESBCore/processors/tests/src/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/crypto/
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/crypto/Mangler.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/BobjStore.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoBatchTable.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoIndexTable.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoSnapTable.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/RowBatch.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlDbTable.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlField.java
labs/jbossesb/trunk/ESBCore/services/tests/
labs/jbossesb/trunk/ESBCore/services/tests/build.xml
labs/jbossesb/trunk/ESBCore/services/tests/src/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java
labs/jbossesb/trunk/ESBCore/tests/
labs/jbossesb/trunk/ESBCore/tests/build.xml
labs/jbossesb/trunk/ESBCore/tests/src/
labs/jbossesb/trunk/ESBCore/tests/src/org/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/BaseTest.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/Controller.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestNotification.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestObjStore.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/AddressUnitTest.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/PersonUnitTest.java
labs/jbossesb/trunk/docs/JBossESB Getting Started Guide.doc
labs/jbossesb/trunk/lib/ext/junit.jar
Removed:
labs/jbossesb/trunk/ESBCore/Tests/
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/services/DefaultEncryptionFactory.java
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/services/Iencryption.java
labs/jbossesb/trunk/ESBCore/common/tests/build.xml
labs/jbossesb/trunk/ESBCore/common/tests/src/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java
labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/ZZderivedSqlTablePoller.java
labs/jbossesb/trunk/ESBCore/listeners/tests/build.xml
labs/jbossesb/trunk/ESBCore/listeners/tests/src/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java
labs/jbossesb/trunk/ESBCore/processors/tests/build.xml
labs/jbossesb/trunk/ESBCore/processors/tests/src/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/crypto/Mangler.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/BobjStore.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoBatchTable.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoIndexTable.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoSnapTable.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/RowBatch.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlDbTable.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlField.java
labs/jbossesb/trunk/ESBCore/services/tests/build.xml
labs/jbossesb/trunk/ESBCore/services/tests/src/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java
labs/jbossesb/trunk/ESBCore/tests/build.xml
labs/jbossesb/trunk/ESBCore/tests/src/
labs/jbossesb/trunk/ESBCore/tests/src/org/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/BaseTest.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/Controller.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestNotification.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestObjStore.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/AddressUnitTest.java
labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/PersonUnitTest.java
labs/jbossesb/trunk/docs/JBossESB Getting Started Guide.rtf
Modified:
labs/jbossesb/trunk/ESBCore/build.xml
labs/jbossesb/trunk/ESBCore/common/build.xml
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/common/EsbSysProps.java
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/common/bizclasses/Address.java
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/common/bizclasses/Person.java
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/KeyValuePair.java
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/DefaultReposFactory.java
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsReposUtil.java
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsRepository.java
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/util/BaseBusinessObject.java
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/util/BobjStdDTO.java
labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/util/EsbUtil.java
labs/jbossesb/trunk/ESBCore/listeners/build.xml
labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java
labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java
labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java
labs/jbossesb/trunk/ESBCore/processors/build.xml
labs/jbossesb/trunk/ESBCore/services/build.xml
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
labs/jbossesb/trunk/build.xml
labs/jbossesb/trunk/docs/Install/conf/jbossEsb.properties
labs/jbossesb/trunk/docs/samples/TestJBossESB/conf/ObjStoreExample.xml
Log:
Initial refactor branch merge
Modified: labs/jbossesb/trunk/ESBCore/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/build.xml 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/build.xml 2006-07-14 21:04:47 UTC (rev 5104)
@@ -18,12 +18,6 @@
</tstamp>
</target>
- <!--
- <condition property="org.jboss.esb.internal.dest" value="..">
- <equals arg1="$org.jboss.esb.internal.dest}" arg2=""/>
- </condition>
- -->
-
<!-- =================================================================== -->
<!-- Prepares the directory structure -->
<!-- =================================================================== -->
@@ -35,15 +29,28 @@
<!-- =================================================================== -->
<!-- Compiles all the classes -->
<!-- =================================================================== -->
-
<target name="org.jboss.esb.core.compile" depends="org.jboss.esb.core.prepare" description="Compile subprojects">
<echo message="Compiling submodules"/>
<ant dir="common"/>
<ant dir="services"/>
<ant dir="processors"/>
<ant dir="listeners"/>
- <ant dir="tests"/>
+ <!--
+ <ant dir="tests"/>
+ -->
</target>
+
+ <!-- =================================================================== -->
+ <!-- Test all the classes -->
+ <!-- =================================================================== -->
+ <target name="org.jboss.esb.core.test" depends="org.jboss.esb.core.compile" description="Test subprojects">
+ <echo message="Testing submodules"/>
+ <ant dir="common" target="org.jboss.esb.common.test"/>
+ <ant dir="listeners" target="org.jboss.esb.listeners.test"/>
+ <ant dir="processors" target="org.jboss.esb.processors.test"/>
+ <ant dir="services" target="org.jboss.esb.services.test"/>
+ </target>
+
<!-- =================================================================== -->
<!-- Assemble jars -->
@@ -72,21 +79,38 @@
<!-- Clean all -->
<!-- =================================================================== -->
<target name="clean" description="Clean dist directory and cleans subprojects">
- <ant dir="common" target="clean"/>
- <ant dir="listeners" target="clean"/>
- <ant dir="processors" target="clean"/>
- <ant dir="services" target="clean"/>
- <ant dir="tests" target="clean"/>
+ <delete dir="${org.jboss.esb.internal.dest}"/>
+ <!--
+ for now I am going to delete the build directory as each module builds
+ to a common place, so calling clean on each module does not make sense,
+ that is unless we later configure the clean task to delete <module>
+ specific classes
+ -->
+ <!--
+ <ant dir="common" target="clean"/>
+ <ant dir="listeners" target="clean"/>
+ <ant dir="processors" target="clean"/>
+ <ant dir="services" target="clean"/>
+ -->
+ <!-- tests are now per module, this will be cleaned up later
+ <ant dir="tests" target="clean"/>
+ -->
</target>
<target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.internal.dest}/dist"/>
-
- <ant dir="common" target="purge"/>
+ <!--
+ <delete dir="${org.jboss.esb.internal.dest}/dist"/>
+ -->
+ <!-- see comment above w.r.t clean and where module are build to -->
+ <!--
+ <ant dir="common" target="purge"/>
<ant dir="listeners" target="purge"/>
<ant dir="processors" target="purge"/>
<ant dir="services" target="purge"/>
- <ant dir="tests" target="purge"/>
+ -->
+ <!-- tests are now per module, this will be cleaned up later
+ <ant dir="tests" target="purge"/>
+ -->
</target>
<!-- =================================================================== -->
Modified: labs/jbossesb/trunk/ESBCore/common/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/build.xml 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/build.xml 2006-07-14 21:04:47 UTC (rev 5104)
@@ -34,8 +34,17 @@
<target name="purge" depends="clean">
<delete dir="${org.jboss.esb.common.bin.dir}"/>
</target>
-
- <target name="org.jboss.esb.common.compile" depends="org.jboss.esb.common.prepare"
+
+
+ <target name="org.jboss.esb.common.compile">
+ <!-- Compile common -->
+ <antcall target="org.jboss.esb.common.internal.compile"/>
+ <!-- Compile common tests -->
+ <ant inheritAll="true" dir="tests" target="org.jboss.esb.common.tests.compile"/>
+ </target>
+
+
+ <target name="org.jboss.esb.common.internal.compile" depends="org.jboss.esb.common.prepare"
description="Compile all classes">
<javac
@@ -61,6 +70,16 @@
/>
</target>
- <target name="all" depends="recompile,jar" />
+
+ <target name="org.jboss.esb.common.test" description="Run tests for this module">
+ <!-- Compile common tests -->
+ <ant dir="tests" target="org.jboss.esb.common.internal.test"/>
+ </target>
+
+
+
+
+ <target name="all" depends="recompile,jar" />
+
</project>
Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/common/EsbSysProps.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/common/EsbSysProps.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/common/EsbSysProps.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -22,8 +22,6 @@
package org.jboss.soa.esb.common;
-import org.jboss.soa.esb.helpers.KeyValuePair;
-
public class EsbSysProps
{
public static final String SMTP_HOST = "jbossEsb.mail.smtp.host";
@@ -35,32 +33,10 @@
public static final String JNDI_SERVER_URL = "jbossEsb.jndi.server.url";
public static final String PARAMS_REPOS_FACTORY_CLASS
- = "jbossEsb.paramsRepository.factory.class";
+ = "jbossEsb.paramsRepository.factoryClass";
public static final String OBJECT_STORE_CONFIG_FILE
- = "jbossEsb.objStore.configfile";
- public static final String ENCRYPT_FACTORY_CLASS
- = "jbossEsb.encryption.factory.class";
+ = "jbossEsb.objStore.configfile";
- private static KeyValuePair[] s_oaKV = new KeyValuePair[]
- {new KeyValuePair(SMTP_HOST ,getSmtpHost())
- ,new KeyValuePair(SMTP_USERNAME ,getSmtpUsername())
- ,new KeyValuePair(SMTP_PASSWORD ,getSmtpPassword())
- ,new KeyValuePair(SMTP_PORT ,getSmtpPort())
- ,new KeyValuePair(JNDI_SERVER_TYPE, getJndiServerType())
- ,new KeyValuePair(JNDI_SERVER_URL,getJndiServerURL())
- ,new KeyValuePair(PARAMS_REPOS_FACTORY_CLASS, getParamsReposFactoryClass())
- ,new KeyValuePair(OBJECT_STORE_CONFIG_FILE, getObjStoreConfigFile())
- ,new KeyValuePair(ENCRYPT_FACTORY_CLASS, getEncryptionFactoryClass())
-
- };
-
- public static String dump()
- { StringBuilder sb = new StringBuilder("Dump of EsbSysProps:\n");
- for (KeyValuePair oCurr : s_oaKV)
- sb.append(oCurr.getKey()).append("=").append(oCurr.getValue()).append("\n")
- ;
- return sb.append("______________________________________").toString();
- } //________________________________
public static String getSmtpHost()
{ return System.getProperty(SMTP_HOST,"localhost");
@@ -94,10 +70,5 @@
{ return System.getProperty(OBJECT_STORE_CONFIG_FILE);
}
- public static String getEncryptionFactoryClass()
- { return System.getProperty(ENCRYPT_FACTORY_CLASS
- ,"org.jboss.soa.esb.services.DefaultEncryptionFactory");
- }
-
} //_____________________________________________________________________
Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/common/bizclasses/Address.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/common/bizclasses/Address.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/common/bizclasses/Address.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -110,10 +110,6 @@
return m_olPhones.remove(p_i);
}//_____________________________________________
- public Telephone getPhoneRole(String p_sRole)
- { return (Telephone)BaseBusinessObject.getRoleFromList(p_sRole,m_olPhones);
- }//_____________________________________________
-
public String toString()
{ StringBuilder sb = new StringBuilder();
String sCurr = getField(ATTRIB.strNum);
Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/common/bizclasses/Person.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/common/bizclasses/Person.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/common/bizclasses/Person.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -173,10 +173,6 @@
if(p_i < 0 || p_i >=m_olAddr.size()) return null;
return m_olAddr.remove(p_i);
}//_____________________________________________
-
- public Address getAddressRole(String p_sRole)
- { return (Address)BaseBusinessObject.getRoleFromList(p_sRole,m_olAddr);
- }//_____________________________________________
// Telephone List handling
@@ -202,10 +198,6 @@
return m_olPhones.remove(p_i);
}//_____________________________________________
- public Telephone getPhoneRole(String p_sRole)
- { return (Telephone)BaseBusinessObject.getRoleFromList(p_sRole,m_olPhones);
- }//_____________________________________________
-
// e-mail List handling
public int getEmailCount ()
Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/KeyValuePair.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/KeyValuePair.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/KeyValuePair.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -39,7 +39,4 @@
{String sRet = mVal; mVal = arg0.toString(); return sRet; }
public String toString()
{ return mVal; }
- public String dump()
- { return "KVpair["+mKey+"="+mVal+"]"; }
-
} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/persist/AbstractBobjStore.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/src/org/jboss/soa/esb/helpers/persist/AbstractBobjStore.java)
Copied: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/persist/ItfStorable.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/src/org/jboss/soa/esb/helpers/persist/ItfStorable.java)
Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -37,9 +37,7 @@
protected Logger m_oLogger;
public JdbcCleanConn(DataSource p_oDS) throws Exception
- { m_oDS = p_oDS;
- m_oLogger = Logger.getLogger(this.getClass());
- }
+ { m_oDS = p_oDS; }
public void commit () throws Exception { if (null != m_conn)m_conn.commit(); }
public void rollback () throws Exception { if (null != m_conn)m_conn.rollback(); }
Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/DefaultReposFactory.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/DefaultReposFactory.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/DefaultReposFactory.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -22,10 +22,6 @@
package org.jboss.soa.esb.parameters;
import java.io.*;
-import java.util.Properties;
-
-import javax.naming.CompoundName;
-import javax.naming.InvalidNameException;
import javax.naming.Name;
import org.jboss.soa.esb.helpers.DomElement;
@@ -120,15 +116,5 @@
oF.delete();
} //____________________________
- private static final Properties s_oSyntax = new Properties();
- static
- { s_oSyntax.setProperty("jndi.syntax.direction","left_to_right");
- s_oSyntax.setProperty("jndi.syntax.separator","/");
- };
-
- public Name nameFromString(String p_s)
- throws InvalidNameException
- { return new CompoundName(p_s,s_oSyntax);
- } //________________________________
} //____________________________________________________
} //____________________________________________________________________________
Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsReposUtil.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsReposUtil.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsReposUtil.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -24,6 +24,8 @@
package org.jboss.soa.esb.parameters;
import java.lang.reflect.*;
+import java.util.Properties;
+import javax.naming.*;
import org.jboss.soa.esb.common.EsbSysProps;
@@ -52,4 +54,14 @@
return reposFromFactory(sFactClass,p_oFactoryParam);
} //________________________________
+ private static final Properties s_oSyntax = new Properties();
+ static
+ { s_oSyntax.setProperty("jndi.syntax.direction","left_to_right");
+ s_oSyntax.setProperty("jndi.syntax.separator","/");
+ };
+
+ public static Name nameFromString(String p_s)
+ throws InvalidNameException
+ { return new CompoundName(p_s,s_oSyntax);
+ } //________________________________
} //____________________________________________________________________________
Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsRepository.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsRepository.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsRepository.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -28,7 +28,6 @@
public interface ParamsRepository
{
- public Name nameFromString (String p_s) throws Exception;
public DomElement storeElement
(Name pName, DomElement p_oNew) throws Exception;
public DomElement getElement (Name pName) throws Exception;
Deleted: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/services/DefaultEncryptionFactory.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/services/DefaultEncryptionFactory.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/services/DefaultEncryptionFactory.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,42 +0,0 @@
-package org.jboss.soa.esb.services;
-
-public class DefaultEncryptionFactory
-{
- public static Iencryption getEncrypter()
- {
- return new DummyEncrypter();
-
- } //________________________________
-
- public static Iencryption getEncrypter(Object p_o)
- {
- return new DummyEncrypter();
-
- } //________________________________
-
- /**
- * This is a dummy class to provide dummy
- * encrypt/decrypt methods for a byte[]
- *
- */
- private static class DummyEncrypter implements Iencryption
- {
-// private static Cipher s_oCC;
-// static
-// { try { s_oCC = Cipher.getInstance("DES"); }
-// catch (Exception e) { e.printStackTrace(); }
-// }
- public byte [] encrypt (byte [] p_ba, Object p_oParms)
- throws Exception
- {
- return p_ba;
- } //__________________________________
-
- public byte [] decrypt (byte [] p_ba, Object p_oParms)
- throws Exception
- {
- return p_ba;
- } //__________________________________
- } //___________________________________________________
-
-} //____________________________________________________________________________
\ No newline at end of file
Deleted: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/services/Iencryption.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/services/Iencryption.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/services/Iencryption.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,28 +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;
-
-public interface Iencryption
-{
- public byte [] encrypt (byte [] p_ba, Object p_oParms) throws Exception;
- public byte [] decrypt (byte [] p_ba, Object p_oParms) throws Exception;
-}
Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/util/BaseBusinessObject.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/util/BaseBusinessObject.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/util/BaseBusinessObject.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -25,10 +25,12 @@
import java.util.*;
import java.lang.reflect.*;
+import org.jboss.soa.esb.helpers.persist.ItfStorable;
+
public class BaseBusinessObject
{
public BobjStdDTO toDTO() throws Exception { return getBaseDTO(); }
- public String classNm() { return this.getClass().getSimpleName(); }
+ public String classNm() { return EsbUtil.classSuffix(this.getClass()); }
public boolean isNull () { return false; }
public String toString ()
{ try { return this.toDTO().toXml(); }
@@ -39,12 +41,6 @@
public String [] locator(int p_i)
{ return (0==p_i) ? locator() : new String [] {};
}
- /**
- * Get all locators for a given BaseBusinessObject
- * <p /> Override this method in your class if you have more than 1 locator array
- * @return An array of String arrays containing all locators
- */
- public String[][] allLocators() { return new String[][] {locator()}; }
public final ObjLocator getObjLocator() { return getObjLocator(0); }
public final ObjLocator getObjLocator(int p_i)
@@ -54,7 +50,7 @@
{elem
,rol
};
- enum HIDDEN
+ private enum HIDDEN
{uid
,stamp
,type
@@ -113,7 +109,7 @@
{ setField(ATTRIB.elem,p_sElem);
m_lUid = p_lUid;
if (null != getElemNm()) return;
- String sClass = getClass().getSimpleName();
+ String sClass = EsbUtil.classSuffix(getClass());
if (null == p_sElem)
setField(ATTRIB.elem,sClass);
} //________________________________
@@ -155,7 +151,12 @@
throws Exception
{ if (null == p_oDto) return null;
- Class oClass = Class.forName(p_oDto.fullClassName());
+ String sPkg = p_oDto.getAttr(BobjStdDTO.BOBJ_PACKAGE);
+ String sConstrPkg = (null==sPkg)?""
+ : (sPkg.endsWith(".")) ? sPkg
+ : sPkg+".";
+ String sClass = sConstrPkg+p_oDto.classNm();
+ Class oClass = Class.forName(sClass);
Constructor CC=oClass.getConstructor (new Class[]{BobjStdDTO.class});
BaseBusinessObject oRet = (BaseBusinessObject)CC.newInstance(new Object []{p_oDto});
@@ -164,7 +165,7 @@
} //________________________________
protected BobjStdDTO getBaseDTO()
- { String sClass = getClass().getSimpleName();
+ { String sClass = EsbUtil.classSuffix(getClass());
BobjStdDTO oRet = new BobjStdDTO(sClass,getElemNm(),null);
if (hasUid())
try { oRet.addAttr(HIDDEN.uid.toString(),Long.toString(m_lUid)); }
@@ -176,8 +177,8 @@
protected void putStdAtts(BobjStdDTO p_oRet)
{ try
{ p_oRet.addAttr(ATTRIB.rol.toString(),getRole());
-// if (this instanceof XtfStorable)
-// p_oRet.addAttr(HIDDEN.type.toString(),((XtfStorable)this).getSnapType());
+ if (this instanceof ItfStorable)
+ p_oRet.addAttr(HIDDEN.type.toString(),((ItfStorable)this).getSnapType());
if (m_lStamp > 0) p_oRet.addAttr(HIDDEN.stamp.toString()
,Long.toString(m_lStamp));
if (m_lLastSnap > 0) p_oRet.addAttr(HIDDEN.snap.toString()
@@ -199,7 +200,7 @@
List<BobjStdDTO> LL = new ArrayList<BobjStdDTO>();
for (BaseBusinessObject oCurr : p_oList)
LL.add( oCurr.toDTO());
- String sElem = p_Class.getSimpleName();
+ String sElem = EsbUtil.classSuffix(p_Class);
return (LL.size()<1) ? null : new BobjStdDTO(sElem,null,LL);
} //__________________________________
Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/util/BobjStdDTO.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/util/BobjStdDTO.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/util/BobjStdDTO.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -49,9 +49,6 @@
protected String m_sElemNm;
protected Map<String,Object> m_oAtts;
protected List<BobjStdDTO> m_oChild;
- protected String[][] m_saaLocators;
- public void setLocators(String[][] p_saa) { m_saaLocators = p_saa; }
- public String[][] getLocators() { return m_saaLocators; }
//Getters
public String classNm() { return m_sClassNm; }
@@ -129,54 +126,7 @@
,new BobjStdDTO(((Element)oCurr)));
}
} //__________________________________
-
- private void setLongAttr(String p_s,long pL)
- { try { addAttr(p_s,Long.toString(pL)); }
- catch (Exception e) { e.printStackTrace(); }
- } //__________________________________
- private void setStringAttr(String p_s,String pVal)
- { try { addAttr(p_s,pVal); }
- catch (Exception e) { e.printStackTrace(); }
- } //__________________________________
-
- private long attrAsLong(String p_s)
- { try
- { String sVal = getAttr(p_s);
- if (! EsbUtil.isNullString(sVal))
- return Long.parseLong(sVal);
- }
- catch (Exception e) {/* OK just fall through and return default*/ }
- return 0;
- } //__________________________________
- private String attrAsString(String p_s)
- { try { return getAttr(p_s); }
- catch (Exception e) {/* OK just fall through and return default*/ }
- return null;
- } //__________________________________
-
- public long getStamp(){ return attrAsLong(BaseBusinessObject.HIDDEN.stamp.toString()); }
- public long getUid() { return attrAsLong(BaseBusinessObject.HIDDEN.uid.toString()); }
- public long getSnap() { return attrAsLong(BaseBusinessObject.HIDDEN.snap.toString()); }
- public long getBatch(){ return attrAsLong(BaseBusinessObject.HIDDEN.batch.toString()); }
- public String getSnapType(){ return attrAsString(BaseBusinessObject.HIDDEN.type.toString()); }
- public String getSnapDate(){ return attrAsString(BaseBusinessObject.HIDDEN.dtSnap.toString()); }
-
- public void setStamp (long pL) { setLongAttr(BaseBusinessObject.HIDDEN.stamp.toString(),pL); }
- public void setUid (long pL) { setLongAttr(BaseBusinessObject.HIDDEN.uid.toString(),pL); }
- public void setSnap (long pL) { setLongAttr(BaseBusinessObject.HIDDEN.snap.toString(),pL); }
- public void setBatch (long pL) { setLongAttr(BaseBusinessObject.HIDDEN.batch.toString(),pL); }
- public void setSnapType(String pS){ setStringAttr(BaseBusinessObject.HIDDEN.type.toString(),pS); }
- public void setSnapDate(String pS){ setStringAttr(BaseBusinessObject.HIDDEN.dtSnap.toString(),pS); }
-
- public String fullClassName()
- { String sPkg = "";
- try { sPkg = getAttr(BobjStdDTO.BOBJ_PACKAGE); }
- catch (Exception e) {/* just leave it empty */ }
- String sConstrPkg = (sPkg.endsWith(".")) ? sPkg : sPkg+".";
- return sConstrPkg+classNm();
- } //__________________________________
-
public List<? extends BaseBusinessObject> getChildObjList(String p_sElem, Class pCls) throws Exception
{ BobjStdDTO oChDto = this.getDTO(p_sElem);
if (null == oChDto) return null;
@@ -405,5 +355,4 @@
((BobjStdDTO)oCurr.getValue()).Dump(1+p_iLev);
}
} //__________________________________
-
} //____________________________________________________________________________
Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/util/EsbUtil.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/util/EsbUtil.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/util/EsbUtil.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -104,7 +104,8 @@
} //__________________________________
public static String classSuffix(Class pCls)
- { return pCls.getSimpleName();
+ { int iPos = 1+pCls.getPackage().getName().length();
+ return pCls.getName().substring(iPos);
} //__________________________________
public static Logger getDefaultLogger(Class p_oCls)
Copied: labs/jbossesb/trunk/ESBCore/common/tests (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests)
Deleted: labs/jbossesb/trunk/ESBCore/common/tests/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/common/tests/build.xml 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/tests/build.xml 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-<project name="build.common.tests" default="org.jboss.esb.common.tests.compile" basedir=".">
-
- <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
- <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
- <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
- <property environment="env"/>
-
- <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"/>
- </condition>
-
- <path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="../${org.jboss.esb.ext.lib.dir}"
- includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- </path>
-
- <target name="org.jboss.esb.tests.init">
- <tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
- </tstamp>
-
- <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
- <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
- </target>
-
- <target name="clean"/>
-
- <target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.tests.bin.dir}"/>
- </target>
-
- <target name="org.jboss.esb.common.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
-
- <javac
- destdir="${org.jboss.esb.tests.bin.dir}"
- classpathref="org.jboss.esb.tests.base.classpath"
- debug="${org.jboss.esb.debug}"
- optimize="${org.jboss.esb.optimize}"
- >
- <src path="${org.jboss.esb.tests.src.dir}"/>
- </javac>
-
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- T E S T -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.common.internal.test">
- <antcall target="org.jboss.esb.common.internal.test.unit"/>
- <antcall target="org.jboss.esb.common.internal.test.functional"/>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- U N I T T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.common.internal.test.unit">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/common/**/**UnitTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- F U NC T I O N A L T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.common.internal.test.functional">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/common/**/**FuncTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-</project>
Copied: labs/jbossesb/trunk/ESBCore/common/tests/build.xml (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests/build.xml)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests/src)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests)
Deleted: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,55 +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.common.tests;
-
-import junit.framework.TestCase;
-import org.jboss.logging.Logger;
-
-/**
- * Base test class for esb test classes, uses jboss logging.
- *
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision$</tt>
- * $Id$
- */
-public class BaseTest extends TestCase {
-
- /**
- * The Logger.
- */
- protected Logger log = Logger.getLogger(getClass());
-
- /**
- * Default class constructor.
- */
- public BaseTest() {
- }
-
- /**
- * Utility constructor.
- * @param name The test name.
- */
- public BaseTest(String name) {
- super(name);
- }
-
-}
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses)
Deleted: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,124 +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.common.tests.bizclasses;
-
-import org.jboss.soa.esb.common.tests.BaseTest;
-import org.jboss.soa.esb.common.bizclasses.Address;
-import org.jboss.soa.esb.common.bizclasses.Telephone;
-import org.jboss.soa.esb.util.BaseBusinessObject;
-import org.jboss.soa.esb.util.BobjStdDTO;
-
-/**
- * Unit test for the address class.
- *
- * @author <a href="mailto:schifest at gmail.com">Esteban Shifman</a>
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision$</tt>
- * $Id$
- */
-public class AddressUnitTest extends BaseTest {
-
-
- public void testAddress() throws Exception {
- Address address = getAddress();
- assertTrue("Expecting Address.strNum to be 50. Actual was " +
- address.getField(Address.ATTRIB.strNum), address.getField(Address.ATTRIB.strNum).equals("50"));
- assertTrue("Expecting Address.strLine1 to be Balcarce. Actual was " +
- address.getField(Address.ATTRIB.strLine1), address.getField(Address.ATTRIB.strLine1).equals("Balcarce"));
- assertTrue("Expecting Address.twnCty1 to be San Isidro. Actual was " +
- address.getField(Address.ATTRIB.twnCty1), address.getField(Address.ATTRIB.twnCty1).equals("San Isidro"));
- assertTrue("Expecting Address.postalZip to be 1642. Actual was " +
- address.getField(Address.ATTRIB.postalZip), address.getField(Address.ATTRIB.postalZip).equals("1642"));
- assertTrue("Expecting Address.provSt to be Buenos Aires. Actual was " +
- address.getField(Address.ATTRIB.provSt), address.getField(Address.ATTRIB.provSt).equals("Buenos Aires"));
- assertTrue("Expecting Address.cntry to be Argentina. Actual was " +
- address.getField(Address.ATTRIB.cntry), address.getField(Address.ATTRIB.cntry).equals("Argentina"));
-
- // Phone
- assertTrue("Expecting Address.phone[0].role to be torIP. Actual was " +
- address.getPhoneAt(0).getRole(), address.getPhoneAt(0).getRole().equals("torIP"));
- assertTrue("Expecting Address.phone[0].country to be null. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.cntry), address.getPhoneAt(0).getField(Telephone.ATTRIB.cntry) == null);
- assertTrue("Expecting Address.phone[0].city to be 416. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.city), address.getPhoneAt(0).getField(Telephone.ATTRIB.city).equals("416"));
- assertTrue("Expecting Address.phone[0].num to be 555-1212. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.num), address.getPhoneAt(0).getField(Telephone.ATTRIB.num).equals("555-1212"));
- assertTrue("Expecting Address.phone[0].ext to be null. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.ext), address.getPhoneAt(0).getField(Telephone.ATTRIB.ext) == null);
-
- assertTrue("Expecting Address.phone[1].role to be home. Actual was " +
- address.getPhoneAt(1).getRole(), address.getPhoneAt(1).getRole().equals("home"));
- assertTrue("Expecting Address.phone[1].country to be 54. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.cntry), address.getPhoneAt(1).getField(Telephone.ATTRIB.cntry).equals("54"));
- assertTrue("Expecting Address.phone[1].city to be 11. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.city), address.getPhoneAt(1).getField(Telephone.ATTRIB.city).equals("11"));
- assertTrue("Expecting Address.phone[1].num to be 4555-1111. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.num), address.getPhoneAt(1).getField(Telephone.ATTRIB.num).equals("4555-1111"));
- assertTrue("Expecting Address.phone[1].ext to be 7. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.ext), address.getPhoneAt(1).getField(Telephone.ATTRIB.ext).equals("7"));
-
- }
-
-
- public void testToDTO() throws Exception {
- BaseBusinessObject addressA = getAddress();
- addressA.setPackage();
-
- BobjStdDTO oDto = addressA.toDTO();
- System.out.println(oDto.toXml());
-
- Address addressB = (Address) BaseBusinessObject.getFromDTO(oDto);
- System.out.println(addressB.toDTO().toXml());
-
- assertTrue("Expecting AddressA == AddressB", addressA.toDTO().toXml().equals(addressB.toDTO().toXml()));
- }
-
-
- static Address getAddress() throws Exception {
- Address oP = new Address((String) null);
- oP.setField(Address.ATTRIB.strNum, "50");
- oP.setField(Address.ATTRIB.strLine1, "Balcarce");
- oP.setField(Address.ATTRIB.twnCty1, "San Isidro");
- oP.setField(Address.ATTRIB.postalZip, "1642");
- oP.setField(Address.ATTRIB.provSt, "Buenos Aires");
- oP.setField(Address.ATTRIB.cntry, "Argentina");
-
- oP.addPhone(newPhone("torIP", null, "416", "555-1212", null));
- oP.addPhone(newPhone("home", "54", "11", "4555-1111", "7"));
-
- return oP;
- }
-
- public static Telephone newPhone(String p_sRole, String p_sCtry, String p_sCity,
- String p_sNum, String p_sExt) {
- Telephone oP = new Telephone((String) null);
- oP.setRole(p_sRole);
- oP.setField(Telephone.ATTRIB.cntry, p_sCtry);
- oP.setField(Telephone.ATTRIB.city, p_sCity);
- oP.setField(Telephone.ATTRIB.num, p_sNum);
- oP.setField(Telephone.ATTRIB.ext, p_sExt);
-
- return oP;
- }
-
-
-}
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java)
Deleted: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,204 +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.common.tests.bizclasses;
-
-import org.jboss.soa.esb.common.tests.BaseTest;
-import org.jboss.soa.esb.common.bizclasses.Person;
-import org.jboss.soa.esb.common.bizclasses.OneValue;
-import org.jboss.soa.esb.common.bizclasses.Address;
-import org.jboss.soa.esb.common.bizclasses.Telephone;
-import org.jboss.soa.esb.util.BaseBusinessObject;
-import org.jboss.soa.esb.util.BobjStdDTO;
-
-/**
- * Unit test for the person class.
- *
- * @author <a href="mailto:schifest at gmail.com">Esteban Shifman</a>
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision$</tt>
- * $Id:$
- */
-public class PersonUnitTest extends BaseTest {
-
-
- public void testPerson() throws Exception {
-
- Person person = getPerson();
-
- assertTrue("Expecting Person.pfx to be Mr. Actual was " +
- person.getField(Person.ATTRIB.pfx), person.getField(Person.ATTRIB.pfx).equals("Mr."));
- assertTrue("Expecting Person.fmlyN to be Brum. Actual was " +
- person.getField(Person.ATTRIB.fmlyN), person.getField(Person.ATTRIB.fmlyN).equals("Brum"));
- assertTrue("Expecting Person.givN to be Daniel. Actual was " +
- person.getField(Person.ATTRIB.givN), person.getField(Person.ATTRIB.givN).equals("Daniel"));
- assertTrue("Expecting Person.sfx to be the 1st.. Actual was " +
- person.getField(Person.ATTRIB.sfx), person.getField(Person.ATTRIB.sfx).equals("the 1st."));
-
- }
-
- public void testPersonEmail() throws Exception {
-
- Person person = getPerson();
-
- String expectedEmail0 = "<OneValue rol=\"home\" v=\"myaddr at gmail.com\"/>";
- assertTrue("Expecting Person.email[0] to be Actual was " +
- person.getEmailAt(0).toString(), person.getEmailAt(0).toString().equals(expectedEmail0));
-
- String expectedEmail1 = "<OneValue rol=\"work\" v=\"john.smith at jboss.com\"/>";
- assertTrue("Expecting Person.email[0] to be Actual was " +
- person.getEmailAt(1).toString(), person.getEmailAt(1).toString().equals(expectedEmail1));
- }
-
- public void testPersonTelephone() throws Exception {
-
- Person person = getPerson();
-
- assertTrue("Expecting Person.phone[0].role to be basement. Actual was " +
- person.getPhoneAt(0).getRole(), person.getPhoneAt(0).getRole().equals("basement"));
- assertTrue("Expecting Person.phone[0].country to be 1. Actual was " +
- person.getPhoneAt(0).getField(Telephone.ATTRIB.cntry), person.getPhoneAt(0).getField(Telephone.ATTRIB.cntry).equals("1"));
- assertTrue("Expecting Person.phone[0].city to be 416. Actual was " +
- person.getPhoneAt(0).getField(Telephone.ATTRIB.city), person.getPhoneAt(0).getField(Telephone.ATTRIB.city).equals("416"));
- assertTrue("Expecting Person.phone[0].num to be 555-1212. Actual was " +
- person.getPhoneAt(0).getField(Telephone.ATTRIB.num), person.getPhoneAt(0).getField(Telephone.ATTRIB.num).equals("555-1212"));
- assertTrue("Expecting Person.phone[0].ext to be null. Actual was " +
- person.getPhoneAt(0).getField(Telephone.ATTRIB.ext), person.getPhoneAt(0).getField(Telephone.ATTRIB.ext) == null);
-
- assertTrue("Expecting Person.phone[1].role to be basement. Actual was " +
- person.getPhoneAt(1).getRole(), person.getPhoneAt(1).getRole().equals("cell"));
- assertTrue("Expecting Person.phone[1].country to be null. Actual was " +
- person.getPhoneAt(1).getField(Telephone.ATTRIB.cntry), person.getPhoneAt(1).getField(Telephone.ATTRIB.cntry) == null);
- assertTrue("Expecting Person.phone[1].city to be 416. Actual was " +
- person.getPhoneAt(1).getField(Telephone.ATTRIB.city), person.getPhoneAt(1).getField(Telephone.ATTRIB.city).equals("416"));
- assertTrue("Expecting Person.phone[1].num to be 666-4444. Actual was " +
- person.getPhoneAt(1).getField(Telephone.ATTRIB.num), person.getPhoneAt(1).getField(Telephone.ATTRIB.num).equals("666-4444"));
- assertTrue("Expecting Person.phone[1].ext to be null. Actual was " +
- person.getPhoneAt(1).getField(Telephone.ATTRIB.ext), person.getPhoneAt(1).getField(Telephone.ATTRIB.ext) == null);
-
- }
-
- public void testPersonAddress() throws Exception {
-
- Address address = getPerson().getAddressAt(0);
- assertTrue("Expecting Address.strNum to be 50. Actual was " +
- address.getField(Address.ATTRIB.strNum), address.getField(Address.ATTRIB.strNum).equals("50"));
- assertTrue("Expecting Address.strLine1 to be Balcarce. Actual was " +
- address.getField(Address.ATTRIB.strLine1), address.getField(Address.ATTRIB.strLine1).equals("Balcarce"));
- assertTrue("Expecting Address.twnCty1 to be San Isidro. Actual was " +
- address.getField(Address.ATTRIB.twnCty1), address.getField(Address.ATTRIB.twnCty1).equals("San Isidro"));
- assertTrue("Expecting Address.postalZip to be 1642. Actual was " +
- address.getField(Address.ATTRIB.postalZip), address.getField(Address.ATTRIB.postalZip).equals("1642"));
- assertTrue("Expecting Address.provSt to be Buenos Aires. Actual was " +
- address.getField(Address.ATTRIB.provSt), address.getField(Address.ATTRIB.provSt).equals("Buenos Aires"));
- assertTrue("Expecting Address.cntry to be Argentina. Actual was " +
- address.getField(Address.ATTRIB.cntry), address.getField(Address.ATTRIB.cntry).equals("Argentina"));
-
- // Phone
- assertTrue("Expecting Address.phone[0].role to be torIP. Actual was " +
- address.getPhoneAt(0).getRole(), address.getPhoneAt(0).getRole().equals("torIP"));
- assertTrue("Expecting Address.phone[0].country to be null. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.cntry), address.getPhoneAt(0).getField(Telephone.ATTRIB.cntry) == null);
- assertTrue("Expecting Address.phone[0].city to be 416. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.city), address.getPhoneAt(0).getField(Telephone.ATTRIB.city).equals("416"));
- assertTrue("Expecting Address.phone[0].num to be 555-1212. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.num), address.getPhoneAt(0).getField(Telephone.ATTRIB.num).equals("555-1212"));
- assertTrue("Expecting Address.phone[0].ext to be null. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.ext), address.getPhoneAt(0).getField(Telephone.ATTRIB.ext) == null);
-
- assertTrue("Expecting Address.phone[1].role to be home. Actual was " +
- address.getPhoneAt(1).getRole(), address.getPhoneAt(1).getRole().equals("home"));
- assertTrue("Expecting Address.phone[1].country to be 54. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.cntry), address.getPhoneAt(1).getField(Telephone.ATTRIB.cntry).equals("54"));
- assertTrue("Expecting Address.phone[1].city to be 11. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.city), address.getPhoneAt(1).getField(Telephone.ATTRIB.city).equals("11"));
- assertTrue("Expecting Address.phone[1].num to be 4555-1111. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.num), address.getPhoneAt(1).getField(Telephone.ATTRIB.num).equals("4555-1111"));
- assertTrue("Expecting Address.phone[1].ext to be 7. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.ext), address.getPhoneAt(1).getField(Telephone.ATTRIB.ext).equals("7"));
-
-
- }
-
-
-
-
-
- public void testToDTO() throws Exception {
- BaseBusinessObject personA = getPerson();
- personA.setPackage();
-
- BobjStdDTO oDto = personA.toDTO();
- System.out.println(oDto.toXml());
-
- Person personB = (Person) BaseBusinessObject.getFromDTO(oDto);
- System.out.println(personB.toDTO().toXml());
-
- assertTrue("Expecting PersonA == PersonB", personA.toDTO().toXml().equals(personB.toDTO().toXml()));
- }
-
-
- static Person getPerson() throws Exception {
- Person oP = new Person((String) null);
- oP.setField(Person.ATTRIB.pfx, "Mr.");
- oP.setField(Person.ATTRIB.fmlyN, "Brum");
- oP.setField(Person.ATTRIB.givN, "Daniel");
- oP.setField(Person.ATTRIB.sfx, "the 1st.");
-
- oP.addAddress(getAddress());
-
- oP.addEmail(OneValue.getStringValue("myaddr at gmail.com", "home"));
- oP.addEmail(OneValue.getStringValue("john.smith at jboss.com", "work"));
-
- oP.addPhone(newPhone("basement", "1", "416", "555-1212", null));
- oP.addPhone(newPhone("cell", null, "416", "666-4444", null));
-
- return oP;
- }
-
- static Address getAddress() throws Exception {
- Address oP = new Address((String) null);
- oP.setField(Address.ATTRIB.strNum, "50");
- oP.setField(Address.ATTRIB.strLine1, "Balcarce");
- oP.setField(Address.ATTRIB.twnCty1, "San Isidro");
- oP.setField(Address.ATTRIB.postalZip, "1642");
- oP.setField(Address.ATTRIB.provSt, "Buenos Aires");
- oP.setField(Address.ATTRIB.cntry, "Argentina");
-
- oP.addPhone(newPhone("torIP", null, "416", "555-1212", null));
- oP.addPhone(newPhone("home", "54", "11", "4555-1111", "7"));
-
- return oP;
- }
-
- public static Telephone newPhone(String p_sRole,
- String p_sCtry, String p_sCity, String p_sNum, String p_sExt) {
- Telephone oP = new Telephone((String) null);
- oP.setRole(p_sRole);
- oP.setField(Telephone.ATTRIB.cntry, p_sCtry);
- oP.setField(Telephone.ATTRIB.city, p_sCity);
- oP.setField(Telephone.ATTRIB.num, p_sNum);
- oP.setField(Telephone.ATTRIB.ext, p_sExt);
-
- return oP;
- }
-
-}
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java)
Modified: labs/jbossesb/trunk/ESBCore/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/listeners/build.xml 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/listeners/build.xml 2006-07-14 21:04:47 UTC (rev 5104)
@@ -40,7 +40,18 @@
<delete dir="${org.jboss.esb.listeners.bin.dir}"/>
</target>
- <target name="org.jboss.esb.listeners.compile" depends="org.jboss.esb.listeners.prepare"
+
+
+ <target name="org.jboss.esb.listeners.compile">
+ <!-- Compile listeners -->
+ <antcall target="org.jboss.esb.listeners.internal.compile"/>
+ <!-- Compile listener tests -->
+ <ant inheritAll="true" dir="tests" target="org.jboss.esb.listeners.tests.compile"/>
+ </target>
+
+
+
+ <target name="org.jboss.esb.listeners.internal.compile" depends="org.jboss.esb.listeners.prepare"
description="Compile all classes">
<javac
@@ -66,6 +77,14 @@
/>
</target>
- <target name="all" depends="recompile,jar" />
+
+ <target name="org.jboss.esb.listeners.test" description="Run tests for this module">
+ <!-- Compile listener tests -->
+ <ant dir="tests" target="org.jboss.esb.listeners.internal.test"/>
+ </target>
+
+
+ <target name="all" depends="recompile,jar" />
+
</project>
Modified: labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -51,8 +51,8 @@
public static final String PARM_ACTION_CLASS = "actionClass";
- public static final String PARM_POLL_LTCY = "pollLatencySecs";
- public static final String PARM_RELOAD_LTCY = "parmsReloadSecs";
+ public static final String PARM_POLL_LTCY = "pollLatency";
+ public static final String PARM_RELOAD_LTCY = "reloadLatency";
public static final String PARM_TOPIC_CONN_FACT = "topicConnFactoryClass";
public static final String PARM_QUIESCE_TOPIC = "quiesceTopic";
@@ -82,7 +82,7 @@
String sFactoryClass = EsbSysProps.getParamsReposFactoryClass();
m_oParmRepos = ParamsReposUtil.reposFromFactory(sFactoryClass,null);
- m_oParmsName = m_oParmRepos.nameFromString(p_sParamsUid);
+ m_oParmsName = ParamsReposUtil.nameFromString(p_sParamsUid);
} //__________________________________
protected void runUntilEndRequested() throws Exception
@@ -149,7 +149,7 @@
protected String formatLogMsg(String p_s)
{ return new StringBuilder("Processor '")
- .append(getClass().getSimpleName()).append("' <")
+ .append(EsbUtil.classSuffix(this.getClass())).append("' <")
.append(p_s).append(">")
.toString();
} //__________________________________
@@ -184,7 +184,7 @@
String sSelector = m_oParms.getAttr(PARM_QUIESCE_SELECTOR);
if (EsbUtil.isNullString(sSelector))
- sSelector = "processor='"+getClass().getSimpleName()+"'";
+ sSelector = "processor='"+EsbUtil.classSuffix(this.getClass())+"'";
m_oTopicSubs = m_oSession.createSubscriber(m_oTopic, sSelector,true);
}
catch (Exception e)
@@ -201,7 +201,7 @@
if (null!=oMsg)
{ m_oLogger.info("Starting Quiesce of "
- +getClass().getSimpleName());
+ +EsbUtil.classSuffix(this.getClass()));
return true;
}
if (bSleep)
Modified: labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -99,7 +99,7 @@
String sFactoryClass = EsbSysProps.getParamsReposFactoryClass();
m_oParmRepos = ParamsReposUtil.reposFromFactory(sFactoryClass,null);
- Name oParms = m_oParmRepos.nameFromString(p_sParamsUid);
+ Name oParms = ParamsReposUtil.nameFromString(p_sParamsUid);
while (loadParmsCycle(oParms))
{
}
Modified: labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -24,102 +24,19 @@
package org.jboss.soa.esb.listeners;
import java.util.*;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
import java.lang.reflect.*;
import java.sql.*;
import javax.sql.*;
-import org.jboss.soa.esb.services.InotificationHandler;
-import org.jboss.soa.esb.services.NotificationHandlerFactory;
import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.common.EsbSysProps;
import org.jboss.soa.esb.helpers.*;
import org.jboss.soa.esb.helpers.persist.*;
-import org.jboss.soa.esb.notification.NotificationList;
import org.jboss.soa.esb.processors.*;
-/**
- * SqlTablePoller class
- *
- * the "main(args)" static method of this class will:
- * 1) load the parameters from the Name supplied in args[0] into a DomElement
- * (See org.jboss.soa.esb.parameters package for options on parameter repositories)
- * 2) for each child element (1st level) of the DomElement, it will try to initiate
- * a Thread group that can start a maximum of simultaneous child threads
- * "maxThreads" supplied in parameters - default=1
- * 3) each thread group will poll a SQL table with parameters defined in the corresponding
- * DomElement (example below has only 1 child element, but you can have several)
- * 4) Execution will orderly finish when a message is received in the "quiesceTopic"
- * with an optional "quiesceSelector" (please see AbstractPoller class constants)
- *
- * The SQL table(s) that is (are) polled should have
- * 1) a unique key (see "keyFields" parameter) that will be used to update status
- * 2) a column to indicate the "processing status" of this trigger row (see ROW_STATE enum)
- * this column will be updated by the SqlChildProcess.run() method (see internal
- * protected class SqlChildProcess)
- *
- * Each retrieved row (see OPTIONAL_ATT.whereCondition) should be considered as a trigger
- * that is intended to instantiate an object of "actionClass". The new instance will
- * receive the full DomElement (level 1 for each child group), with an added child
- * DomElement (see EsbAbstractProcessor.PARMS_THIS_INSTANCE) containing attributes
- * corresponding to the values of the "selectFields" columns in the row that triggered
- * the "actionClass"
- *
- * The ZZDummyProcessor (in this package) is a trivial actionClass included with the
- * sole purpose of illustrating what the actionClass will receive, and the entry points
- * where users can insert their logic
- *
- * GOOD LUCK !!
- *
- * @author Esteban Schifman
- */
+
public class SqlTablePoller extends AbstractPoller
{
-/* ___________________ Example XML configuration file for a SqlTablePoller_______________
- *
-<DocumentElementName>
- <ExampleListenChapter
- pollLatencySecs="20"
- parmsReloadSecs="300"
-
- maxThreads="2"
-
- actionClass="org.jboss.soa.esb.listeners.ZZDummyProcessor"
-
- driver-class="org.postgresql.Driver"
- connection-url="jdbc:postgresql://myhost:5432/myDB"
- user-name="postgres"
- password=""
-
- tableName="test_notif_table"
- selectFields="oid,ref,msg"
- keyFields="oid,ref"
- inProcessField="statusCol"
- whereCondition="src='pepe'"
- orderBy="oid desc"
- >
- <NotificationList type="OK">
- <target class="NotifyFiles">
- <file URI="file:///tmp/jbossEsb/notifyDir/ListenOnNotifTable.notifOK"
- append="true"
- />
- </target>
- </NotificationList>
-
- <NotificationList type="err">
- <target class="NotifyFiles">
- <file URI="file:///tmp/jbossEsb/notifyDir/ListenOnNotifTable.notifErr"
- append="true"
- />
- </target>
- </NotificationList>
- </ExampleListenChapter>
-</DocumentElementName>
- *
- */
-
/**
- * Mandatory attributes needed for SqlTablePoller
+ * These are the mandatory attributes needed for any SqlTablePoller
* 1) Table name
* 2) Comma separated list of fields needed in the ResultSet
* 3) Comma separated list of fields that constitute a unique ID of the working row
@@ -195,31 +112,18 @@
runUntilEndRequested();
} //__________________________________
- /**
- * Override this method if you wish to extend the SqlChildProcess class
- * (for example with ad-hoc notifications for OK list or Error list)
- * @param p_oParms = DomElement containing attributes of trigger
- * @return the SqlChildProcess to be started
- * @throws Exception
- */
- protected SqlChildProcess getSqlChildProcess
- (SqlPollerChildGroup pDad, DomElement p_oParms) throws Exception
- {
- return new SqlChildProcess(pDad, p_oParms);
- } //________________________________
-
@Override
protected GroupOfChilds newChildGroup(ThreadGroup pThG) throws Exception
{
return new SqlPollerChildGroup(pThG);
} //__________________________________
- protected class SqlPollerChildGroup extends AbstractPoller.GroupOfChilds
+ private class SqlPollerChildGroup extends AbstractPoller.GroupOfChilds
{
JdbcCleanConn m_oConn;
String[] m_saKeys;
- protected SqlPollerChildGroup(ThreadGroup p_oThrGrp) throws Exception
+ private SqlPollerChildGroup(ThreadGroup p_oThrGrp) throws Exception
{ super(p_oThrGrp);
} //________________________________
@@ -274,7 +178,7 @@
}
} //________________________________
-
+
@Override
protected void doYourJob(DomElement p_oP) throws Exception
{
@@ -287,11 +191,11 @@
break;
}
- SqlChildProcess oNew = getSqlChildProcess(this,oCurr);
- new Thread(m_oThrGrp,oNew).start();
+ new Thread(m_oThrGrp,
+ new SqlChildProcess(this, oCurr)).start();
// Wait a little bit, so thread count will be updated
// at some point in the past, this sleep was indispensable
- // new thread control classes in Java 5 might have solved the problem
+ // new thread control classes in Java 5 should be explored
Thread.sleep(500);
}
@@ -448,7 +352,6 @@
m_oParent = p_oGrp;
this.addObserver(m_oParent);
setChanged();
- // add 1 to child thread count
notifyObservers(new Integer(1));
m_oInstP = p_oP;
@@ -457,8 +360,7 @@
} //__________________________________
public void run()
- {
- Exception oAbend = null;
+ {
try
{ m_PSsel4U = m_oConn.prepareStatement(m_oParent.selectForUpdStatement());
m_PSupd = m_oConn.prepareStatement(m_oParent.updateStatement());
@@ -471,21 +373,14 @@
// autoincrement leaves things ready for next SQL parameter
m_PSupd.setString (++iParm,sVal);
}
- // will only continue if it can change status to "Working"
if (! changeStatus(ROW_STATE.Pending,ROW_STATE.Working))
- oAbend = new Exception("Unable to change status to Working");
+ return;
}
catch (Exception e)
{ m_oLogger.error("Problems with update statements",e);
- if (null!=m_oConn)
- { try { m_oConn.rollback(); }
- catch (Exception eR) { /* OK do nothing */}
- m_oConn.release();
- }
- oAbend = e;
+ return;
}
- if (null==oAbend)
try
{
Constructor oCnst = m_oParent.m_oExecClass
@@ -494,30 +389,17 @@
oParms.addElemChild(m_oInstP);
Object oInst = oCnst.newInstance (new Object[] {oParms});
((EsbAbstractProcessor)oInst).execute();
- changeStatus(ROW_STATE.Working,ROW_STATE.Done);
}
catch (Exception e)
- { m_oLogger.error("run() FAILED",e);
- try
- { m_oConn.rollback();
- changeStatus(null,ROW_STATE.Error);
- }
- catch (Exception CS) { /* What could we do here ? */}
- oAbend = e;
+ { m_oLogger.error("run() FAILED",e);
}
finally
{ if (null!=m_oConn)
m_oConn.release();
}
-
- if (null==oAbend)
- notifyOK();
- else
- notifyError(oAbend);
-
+
setChanged();
- // decrease child thread count in parent group
notifyObservers(new Integer(-1));
} //______________________________
@@ -538,64 +420,7 @@
return true;
} //______________________________
-
- public void notifyOK()
- { try
- {
- String sNotif = getOkNotifContent();
- for (DomElement oCurr : m_oParms.getElementChildren(NotificationList.ELEMENT))
- { NotificationList oNL = new NotificationList(oCurr);
- if (! oNL.isOK()) continue;
- getNotifHandler().sendNotifications(oCurr,sNotif);
- }
- }
- catch (Exception e) {}
- } //__________________________________
-
- public void notifyError(Exception p_e)
- {
- String sNotif = getErrorNotifContent();
- ByteArrayOutputStream oBO = new ByteArrayOutputStream();
- PrintStream oPS = new PrintStream(oBO);
- try
- { oPS.println(sNotif);
- if (null != p_e) p_e.printStackTrace(oPS);
- oPS.close();
-
- String sMsg = oBO.toString();
- for (DomElement oCurr : m_oParms.getElementChildren(NotificationList.ELEMENT))
- { NotificationList oNL = new NotificationList(oCurr);
- if (! oNL.isErr()) continue;
- getNotifHandler().sendNotifications(oNL,sMsg);
- }
- }
- catch (Exception e) { }
- } //__________________________________
-
- protected InotificationHandler getNotifHandler()
- {
- try { return NotificationHandlerFactory.getNotifHandler
- ("remote"
- ,EsbSysProps.getJndiServerType()
- ,EsbSysProps.getJndiServerURL()
- );
- }
- catch (Exception e)
- { m_oLogger.error(formatLogMsg("Notification FAILED"),e);
- return null;
- }
- } //______________________________
-
- // These methods to be overriden by you own derived class
- protected String getOkNotifContent()
- {
- return "Success";
- }
- protected String getErrorNotifContent()
- {
- return "FAILURE";
- }
-
+
} //______________________________________________________
} //____________________________________________________________________________
Deleted: labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/ZZderivedSqlTablePoller.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/ZZderivedSqlTablePoller.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/ZZderivedSqlTablePoller.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,54 +0,0 @@
-package org.jboss.soa.esb.listeners;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.*;
-
-public class ZZderivedSqlTablePoller extends SqlTablePoller
-{
- public static void main(String[] args) throws Exception
- { new ZZderivedSqlTablePoller(args[0]); }
-
- public ZZderivedSqlTablePoller(String pParamsUid) throws Exception
- { super(pParamsUid);
- } //________________________________
-
- protected SqlChildProcess getSqlChildProcess
- (SqlPollerChildGroup pDad, DomElement p_oParms) throws Exception
- {
- return new ZZChildProcess(pDad, p_oParms);
- } //________________________________
-
- private static final SimpleDateFormat s_oFmt
- = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss.mmm");
-
- protected class ZZChildProcess extends SqlChildProcess
- {
- public ZZChildProcess(SqlPollerChildGroup p_oGrp, DomElement p_oP)
- throws Exception
- { super(p_oGrp,p_oP); }
-
- protected String getMsgPfx()
- { return ZZderivedSqlTablePoller.class.getSimpleName()
- +" "+s_oFmt.format(new Date(System.currentTimeMillis()))+" ";
- }
-
- // object m_oInstP contains parameters unique to this instance
- // object m_oParent.m_oChParms contains parameters common to all child threads
- // of the parent child group
- protected String getOkNotifContent()
- {
- return getMsgPfx()+" OK "+m_oInstP.toString();
- }
-
- protected String getErrorNotifContent()
- {
- return getMsgPfx()+" eeeeerrrrrrrrr "+m_oInstP.toString();
- }
-
- } //__________________________________________________
-
-
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/listeners/tests)
Deleted: labs/jbossesb/trunk/ESBCore/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/listeners/tests/build.xml 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/listeners/tests/build.xml 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-<project name="build.listeners.tests" default="org.jboss.esb.listeners.tests.compile" basedir=".">
-
- <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
- <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
- <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
- <property environment="env"/>
-
- <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"/>
- </condition>
-
- <path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="../${org.jboss.esb.ext.lib.dir}"
- includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- </path>
-
- <target name="org.jboss.esb.tests.init">
- <tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
- </tstamp>
-
- <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
- <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
- </target>
-
- <target name="clean"/>
-
- <target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.tests.bin.dir}"/>
- </target>
-
- <target name="org.jboss.esb.listeners.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
-
- <javac
- destdir="${org.jboss.esb.tests.bin.dir}"
- classpathref="org.jboss.esb.tests.base.classpath"
- debug="${org.jboss.esb.debug}"
- optimize="${org.jboss.esb.optimize}"
- >
- <src path="${org.jboss.esb.tests.src.dir}"/>
- </javac>
-
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- T E S T -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.listeners.internal.test">
- <antcall target="org.jboss.esb.listeners.internal.test.unit"/>
- <antcall target="org.jboss.esb.listeners.internal.test.functional"/>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- U N I T T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.listeners.internal.test.unit">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/listeners/**/**UnitTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- F U NC T I O N A L T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.listeners.internal.test.functional">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/listeners/**/**FuncTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-</project>
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/build.xml (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/build.xml)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss/soa)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss/soa/esb)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests)
Deleted: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,45 +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.listeners.tests;
-
-import org.jboss.soa.esb.common.tests.BaseTest;
-
-/**
- * Dummy test file.
- *
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision$</tt>
- * $Id$
- */
-public class DummyUnitTest extends BaseTest {
-
- /**
- * Remove me
- * @throws Exception
- */
- public void testDummyCompileAndInvoke() throws Exception {
- log.info("****************************************************************");
- log.info(" Dummy unit test called. Replace this with module level tests");
- log.info("****************************************************************");
- }
-
-}
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java)
Modified: labs/jbossesb/trunk/ESBCore/processors/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/processors/build.xml 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/processors/build.xml 2006-07-14 21:04:47 UTC (rev 5104)
@@ -40,7 +40,16 @@
<delete dir="${org.jboss.esb.processors.bin.dir}"/>
</target>
- <target name="org.jboss.esb.processors.compile" depends="org.jboss.esb.processors.prepare"
+
+ <target name="org.jboss.esb.processors.compile">
+ <!-- Compile processors -->
+ <antcall target="org.jboss.esb.processors.internal.compile"/>
+ <!-- Compile processors tests -->
+ <ant inheritAll="true" dir="tests" target="org.jboss.esb.processors.tests.compile"/>
+ </target>
+
+
+ <target name="org.jboss.esb.processors.internal.compile" depends="org.jboss.esb.processors.prepare"
description="Compile all classes">
<javac
@@ -66,6 +75,14 @@
/>
</target>
- <target name="all" depends="recompile,jar" />
+ <target name="org.jboss.esb.processors.test" description="Run tests for this module">
+ <!-- Compile processors tests -->
+ <ant dir="tests" target="org.jboss.esb.processors.internal.test"/>
+ </target>
+
+
+
+ <target name="all" depends="recompile,jar" />
+
</project>
Copied: labs/jbossesb/trunk/ESBCore/processors/tests (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/processors/tests)
Deleted: labs/jbossesb/trunk/ESBCore/processors/tests/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/processors/tests/build.xml 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/processors/tests/build.xml 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-<project name="build.processors.tests" default="org.jboss.esb.processors.tests.compile" basedir=".">
-
- <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
- <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
- <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
- <property environment="env"/>
-
- <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"/>
- </condition>
-
- <path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="../${org.jboss.esb.ext.lib.dir}"
- includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- </path>
-
- <target name="org.jboss.esb.tests.init">
- <tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
- </tstamp>
-
- <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
- <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
- </target>
-
- <target name="clean"/>
-
- <target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.tests.bin.dir}"/>
- </target>
-
- <target name="org.jboss.esb.processors.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
-
- <javac
- destdir="${org.jboss.esb.tests.bin.dir}"
- classpathref="org.jboss.esb.tests.base.classpath"
- debug="${org.jboss.esb.debug}"
- optimize="${org.jboss.esb.optimize}"
- >
- <src path="${org.jboss.esb.tests.src.dir}"/>
- </javac>
-
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- T E S T -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.processors.internal.test">
- <antcall target="org.jboss.esb.processors.internal.test.unit"/>
- <antcall target="org.jboss.esb.processors.internal.test.functional"/>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- U N I T T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.processors.internal.test.unit">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/processors/**/**UnitTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- F U NC T I O N A L T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.processors.internal.test.functional">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/processors/**/**FuncTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-</project>
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/build.xml (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/processors/tests/build.xml)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss/soa)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss/soa/esb)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss/soa/esb/processors)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests)
Deleted: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,45 +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.processors.tests;
-
-import org.jboss.soa.esb.common.tests.BaseTest;
-
-/**
- * Dummy test file.
- *
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision$</tt>
- * $Id$
- */
-public class DummyUnitTest extends BaseTest {
-
- /**
- * Remove me
- * @throws Exception
- */
- public void testDummyCompileAndInvoke() throws Exception {
- log.info("****************************************************************");
- log.info(" Dummy unit test called. Replace this with module level tests");
- log.info("****************************************************************");
- }
-
-}
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java)
Modified: labs/jbossesb/trunk/ESBCore/services/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/build.xml 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/build.xml 2006-07-14 21:04:47 UTC (rev 5104)
@@ -59,7 +59,16 @@
<!-- Compiles all the classes -->
<!-- =================================================================== -->
- <target name="org.jboss.esb.services.compile" depends="org.jboss.esb.services.prepare"
+
+ <target name="org.jboss.esb.services.compile">
+ <!-- Compile services -->
+ <antcall target="org.jboss.esb.services.internal.compile"/>
+ <!-- Compile services tests -->
+ <ant inheritAll="true" dir="tests" target="org.jboss.esb.services.tests.compile"/>
+ </target>
+
+
+ <target name="org.jboss.esb.services.internal.compile" depends="org.jboss.esb.services.prepare"
description="Compile all classes">
<javac
@@ -180,7 +189,7 @@
/>
<jar destfile="${org.jboss.esb.internal.dest}/dist/jbossesb-services.jar"
basedir="${org.jboss.esb.internal.dest}/classes"
- includes="**/EJBs/*.class"
+ includes="**/EJBs/*.class,**/dbtables/*.class,**/crypto/*.class"
manifest="${org.jboss.esb.services.metainf.dir}/manifest.server"
>
<metainf dir="${org.jboss.esb.services.metainf.dir}" includes="*.xml"
@@ -203,4 +212,16 @@
</target>
+
+ <!-- =================================================================== -->
+ <!-- Test -->
+ <!-- =================================================================== -->
+ <target name="org.jboss.esb.services.test" description="Run tests for this module">
+ <!-- Compile processors tests -->
+ <ant dir="tests" target="org.jboss.esb.services.internal.test"/>
+ </target>
+
+
+
+
</project>
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -5,7 +5,7 @@
/**
* Remote interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 12 2006
+ * @xdoclet-generated at July 4 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -33,8 +33,8 @@
import org.apache.log4j.*;
import org.jboss.soa.esb.util.*;
import org.jboss.soa.esb.helpers.persist.*;
-import org.jboss.soa.esb.internal.core.objectstore.*;
import org.jboss.soa.esb.common.bizclasses.*;
+import org.jboss.soa.esb.services.dbtables.*;
/**
* @ejb.bean
* name="JbossEsbBatchHandler"
@@ -148,7 +148,7 @@
} //__________________________________
private void doCommitBatch(BatchProcess p_oBP) throws Exception
- { String sPrevClass = null;
+ { Class oPrevClass = null;
BobjStore oStore = null;
PreparedStatement PSbatch = getDaoBatch(BobjStore.getBatchTableName())
@@ -162,35 +162,31 @@
ResultSet RS = m_oDataConn.execQueryWait(PSbatch,10);
while (RS.next())
{ String sXml = RS.getString(1+DaoBatchTable.STR_DATA);
- BobjStdDTO oDto = BobjStdDTO.getFromXml(sXml);
+ BaseBusinessObject oCurr = BaseBusinessObject.getFromDTO(BobjStdDTO.getFromXml(sXml));
// Get proper Dao's for Index and Snap table
- String sNewClass = oDto.fullClassName();
- if (! sNewClass.equals(sPrevClass))
- { oStore = BobjStore.getStore(sNewClass);
- sPrevClass = sNewClass;
+ Class oNewClass = oCurr.getClass();
+ if (! oNewClass.equals(oPrevClass))
+ { oStore = BobjStore.getStore(oNewClass);
+ oPrevClass = oNewClass;
m_oDaoIndex = null;
m_oDaoSnap = null;
}
// Set batch number to current batch
- oDto.setBatch (p_oBP.getBatchNum());
- oDto.setStamp (lNow);
- oDto.setSnapDate(sSnapDt);
+ oCurr.setBatchNum(p_oBP.getBatchNum());
+ oCurr.setStamp (lNow);
+ oCurr.setSnapDate(sSnapDt);
// Insert Snap row
PreparedStatement PSins = getDaoSnap(oStore).getPS(DaoSnapTable.PS_INS_SNAP);
- m_oDaoSnap.setInsValues(PSins,oDto);
+ m_oDaoSnap.setInsValues(PSins,oCurr);
try { m_oDataConn.execUpdWait(PSins,10); }
catch (Exception e) { m_oLogger.error(e.getMessage()); }
- // Insert row in all index tables
- String[][] saa = oDto.getLocators();
- for (int i1=0; i1<saa.length; i1++)
- { m_oDaoIndex = getDaoIndex(oStore.getLocatorTable(i1));
- PSins = m_oDaoIndex.getPS(DaoIndexTable.PS_INS_INDEX);
- m_oDaoIndex.setInsValues(PSins,oDto,i1);
- try { m_oDataConn.execUpdWait(PSins,10); }
- catch (Exception e) { m_oLogger.error(e.getMessage()); }
- }
+ // Insert Index row
+ PSins = getDaoIndex(oStore.getLocatorTable()).getPS(DaoIndexTable.PS_INS_INDEX);
+ m_oDaoIndex.setInsValues(PSins,oCurr);
+ try { m_oDataConn.execUpdWait(PSins,10); }
+ catch (Exception e) { m_oLogger.error(e.getMessage()); }
}
PSbatch.close();
@@ -204,7 +200,7 @@
p_oBP.setStamp (lNow);
p_oBP.setSnapDate(sSnapDt);
- oStore = BobjStore.getStore(BatchProcess.class.getName());
+ oStore = BobjStore.getStore(BatchProcess.class);
// Update snap table with proper timestamp
m_oDaoSnap = null;
@@ -224,7 +220,6 @@
// Public local and remote interface methods
/**
* @ejb.interface-method
- * view-type="both"
*/
public long newBatch() throws Exception
{ if (m_lBatchNum > 0) throw
@@ -242,7 +237,6 @@
/**
* @ejb.interface-method
- * view-type="both"
* @return
*/
public long getBatchNum()
@@ -251,7 +245,6 @@
/**
* @ejb.interface-method
- * view-type="both"
* @param p_s
* @return
* @throws Exception
@@ -279,7 +272,6 @@
} //__________________________________
/**
* @ejb.interface-method
- * view-type="both"
* @throws Exception
*/
public void finish() throws Exception
@@ -309,7 +301,7 @@
// Public remote interface methods
/**
* @ejb.interface-method
- * view-type="both"
+ * view-type="remote"
*/
public void commitBatch(BobjStdDTO p_oDto) throws Exception
{ commitBatch (new BatchProcess(p_oDto));
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -5,7 +5,7 @@
/**
* Home interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 12 2006
+ * @xdoclet-generated at July 4 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -5,7 +5,7 @@
/**
* Local interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 12 2006
+ * @xdoclet-generated at July 4 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
@@ -24,6 +24,4 @@
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;
-
}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -5,7 +5,7 @@
/**
* Local home interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 12 2006
+ * @xdoclet-generated at July 4 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -5,7 +5,7 @@
/**
* Remote interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 5 2006
+ * @xdoclet-generated at July 4 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -5,7 +5,7 @@
/**
* Home interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 5 2006
+ * @xdoclet-generated at July 4 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -5,7 +5,7 @@
/**
* Local interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 5 2006
+ * @xdoclet-generated at July 4 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -5,7 +5,7 @@
/**
* Local home interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 5 2006
+ * @xdoclet-generated at July 4 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -5,7 +5,7 @@
/**
* Remote interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 12 2006
+ * @xdoclet-generated at July 4 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
@@ -17,13 +17,13 @@
public long getUidChunk( int p_iQ )
throws java.lang.Exception, java.rmi.RemoteException;
- public void rmvObject( java.lang.String p_sClassName,long p_lUid )
+ public void rmvObject( java.lang.Class pCls,long p_lUid )
throws java.lang.Exception, java.rmi.RemoteException;
public long addDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
throws java.lang.Exception, java.rmi.RemoteException;
- public org.jboss.soa.esb.util.BobjStdDTO getDTO( java.lang.String p_sClassName,long p_lUid )
+ public org.jboss.soa.esb.util.BobjStdDTO getDTO( java.lang.Class pCls,long p_lUid )
throws java.lang.Exception, java.rmi.RemoteException;
public void rplDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -28,13 +28,12 @@
import javax.naming.*;
import java.sql.*;
import javax.sql.*;
-
import java.text.*;
import java.io.*;
import org.jboss.soa.esb.util.*;
import org.jboss.soa.esb.helpers.persist.*;
-import org.jboss.soa.esb.internal.core.objectstore.*;
+import org.jboss.soa.esb.services.dbtables.*;
import org.apache.log4j.*;
@@ -47,7 +46,11 @@
* jndi-name="JbossEsbPersistHandler"
* local-jndi-name="JbossEsbPersistHandlerLocal"
* transaction-type="Bean"
- * @author Esteban
+ * @ejb.env-entry
+ * name="datasource"
+ * type="java.lang.String"
+ * value="java:RosettaDS"
+ * @author Administrator
*/
public class JbossEsbPersistHandlerBean implements SessionBean
{
@@ -64,7 +67,7 @@
private DaoUidTable m_oDaoUid;
private DaoSnapTable m_oDaoSnap;
- private DaoIndexTable[] m_oaDaoIndex;
+ private DaoIndexTable m_oDaoIndex;
public void ejbActivate() {}
public void ejbPassivate() {}
@@ -78,10 +81,8 @@
{ try
{ m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
Context oCtxInit = new InitialContext();
- String sDSjndiName = BobjStore.getDataSourceJndi();
- DataSource oDS = (DataSource)oCtxInit.lookup(sDSjndiName);
- m_oUidConn = new JdbcCleanConn(oDS);
- m_oDataConn = new JdbcCleanConn(oDS);
+ m_oUidConn = new JdbcCleanConn((DataSource) oCtxInit.lookup("java:RosettaDS"));
+ m_oDataConn = new JdbcCleanConn((DataSource) oCtxInit.lookup("java:RosettaDS"));
Class oCls = Class.forName("org.jboss.soa.esb.util.BobjStdDTO");
ObjectStreamClass XX = ObjectStreamClass.lookup(oCls);
@@ -114,72 +115,58 @@
return m_oDaoSnap;
} //__________________________________
- private DaoIndexTable getDaoIndex(BobjStore p_oSt,int p_i) throws Exception
- { if (null==m_oaDaoIndex)
- m_oaDaoIndex = new DaoIndexTable[p_oSt.allLocatorTables().length];
- if (null==m_oaDaoIndex[p_i])
- m_oaDaoIndex[p_i] = new DaoIndexTable(m_oDataConn,p_oSt.getLocatorTable(p_i));
- return m_oaDaoIndex[p_i];
+ private DaoIndexTable getDaoIndex(BobjStore p_oSt) throws Exception
+ { if (null==m_oDaoIndex)
+ m_oDaoIndex = new DaoIndexTable(m_oDataConn,p_oSt.getLocatorTable());
+ return m_oDaoIndex;
} //__________________________________
- protected ObjLocator[] doAddLocators(BobjStore pStore,BobjStdDTO p_oDto) throws Exception
- { long lUid = p_oDto.getUid();
+ protected ObjLocator doAddLocator(BaseBusinessObject p_oBO) throws Exception
+ { long lUid = p_oBO.getUid();
if (lUid < 1)
{ lUid = doAssignUid();
- p_oDto.setUid(lUid);
- p_oDto.setSnap(lUid);
+ p_oBO.setUid(lUid);
+ p_oBO.setSnap(lUid);
}
- long lStamp = p_oDto.getStamp();
- if (lStamp < 1)
- p_oDto.setStamp(lStamp = System.currentTimeMillis());
-
- String[][] saa = p_oDto.getLocators();
- ObjLocator[]oaRet = new ObjLocator[saa.length];
- int iCurr = 0;
- for (int i1=0; i1<saa.length; i1++)
- { String[] saCurr = saa[i1];
- ObjLocator oLoc = new ObjLocator(lUid,saCurr);
- oaRet[iCurr] = oLoc;
- String sTbl = pStore.getLocatorTable(iCurr++);
- if (null == sTbl)
- continue;
-
- DaoIndexTable oDao = new DaoIndexTable(m_oDataConn,sTbl);
- PreparedStatement PS = oDao.getPS(DaoIndexTable.PS_INS_INDEX);
-
- PS.setLong (DaoIndexTable.OBJECT_UID,lUid);
- PS.setLong (DaoIndexTable.TIMESTAMP,lStamp);
- PS.setLong (DaoIndexTable.UID_SNAP,p_oDto.getSnap());
- PS.setString (DaoIndexTable.SNAP_DATE,s_oY4md.format(new Date(lStamp)));
-
- int iFld = DaoIndexTable.FIRST_FIELD;
- for (int i2=0; i2<saCurr.length; i2++)
- { String sFldVal = saCurr[i2];
- PS.setString(iFld++,(null == sFldVal)?"":sFldVal);
- }
- m_oDataConn.execUpdWait(PS,1);
+ ObjLocator oLoc = p_oBO.getObjLocator();
+
+ BobjStore oSt = BobjStore.getStore(p_oBO);
+ String sTbl = oSt.getLocatorTable();
+ if (null == sTbl) return oLoc;
+
+ DaoIndexTable oDao = new DaoIndexTable(m_oDataConn,sTbl);
+ PreparedStatement PS = oDao.getPS(DaoIndexTable.PS_INS_INDEX);
+
+ PS.setLong (DaoIndexTable.OBJECT_UID,lUid);
+ long lStamp = p_oBO.getStamp();
+ PS.setLong (DaoIndexTable.TIMESTAMP,lStamp);
+ PS.setLong (DaoIndexTable.UID_SNAP,p_oBO.getSnap());
+ PS.setString (DaoIndexTable.SNAP_DATE,s_oY4md.format(new Date(lStamp)));
+
+ String[] sa = oLoc.getStrings();
+ int iFld = DaoIndexTable.FIRST_FIELD;
+ for (int i1=0; i1<sa.length;i1++)
+ { String sCurr = sa[i1];
+ PS.setString(iFld++,(null == sCurr)?"":sCurr);
}
+ m_oDataConn.execUpdWait(PS,1);
- return oaRet;
+ return oLoc;
} //__________________________________
- private void doDelLocators (BobjStore p_oSt, long p_lUid)
- { if (p_lUid < 1) return;
- int iQlocs = p_oSt.allLocatorTables().length;
- for (int i1=0; i1<iQlocs; i1++)
- try
- { PreparedStatement PS = getDaoIndex(p_oSt,i1).getPS(DaoIndexTable.PS_RMV_INDEX);
- PS.setLong(1,p_lUid);
- m_oDataConn.execQueryWait(PS,5);
- }
- catch (Exception e)
- { m_oLogger.warn("doDelLocator() FAILED <"+e.getMessage()+">");
- }
+ private void doDelLocator (BobjStore p_oSt, long p_lUid)
+ { if (p_lUid < 1) return;try
+ { PreparedStatement PS = getDaoIndex(p_oSt).getPS(DaoIndexTable.PS_RMV_INDEX);
+ PS.setLong(1,p_lUid);
+ m_oDataConn.execQueryWait(PS,5);
+ }
+ catch (Exception e)
+ { m_oLogger.warn("doDelLocator() FAILED <"+e.getMessage()+">");
+ }
} //__________________________________
private void doDelOneSnap (BobjStore p_oSt,long p_lUid) throws Exception
- { if (p_lUid < 1) return;
- PreparedStatement PS = getDaoSnap(p_oSt).getPS(DaoSnapTable.PS_RMV_SNAP);
+ { if (p_lUid < 1) return;PreparedStatement PS = getDaoSnap(p_oSt).getPS(DaoSnapTable.PS_RMV_SNAP);
PS.setLong(1,p_lUid);
m_oDataConn.execQueryWait(PS,5);
} //__________________________________
@@ -193,66 +180,60 @@
long lObjUid = rs.getLong(DaoSnapTable.OBJECT_UID);
doDelOneSnap(p_oSt,p_lUid);
- doDelLocators(p_oSt,lObjUid);
+ doDelLocator(p_oSt,lObjUid);
} //__________________________________
- private void doRplSnapshot(BobjStdDTO p_oDto)
+ private void doRplSnapshot(BaseBusinessObject p_oBo)
throws Exception
- { long lSnapUid = p_oDto.getSnap();
- BobjStore oSt = BobjStore.getStore(p_oDto);
+ { long lSnapUid = p_oBo.getSnap();
+ BobjStore oSt = BobjStore.getStore(p_oBo);
doDelOneSnap(oSt,lSnapUid);
- doDelLocators(oSt,p_oDto.getUid());
- doAddSnapshot(p_oDto,false);
+ doDelLocator(oSt,p_oBo.getUid());
+ doAddSnapshot(p_oBo,false);
} //__________________________________
- private long doAddSnapshot(BobjStdDTO p_oDto)
+ private long doAddSnapshot(BaseBusinessObject p_oBo)
throws Exception
- { return doAddSnapshot(p_oDto,true);
+ { return doAddSnapshot(p_oBo,true);
} //__________________________________
SimpleDateFormat s_oY4md = new SimpleDateFormat("yyyyMMdd");
- private long doAddSnapshot(BobjStdDTO p_oDto, boolean p_bNewVrs)
+ private long doAddSnapshot(BaseBusinessObject p_oBo, boolean p_bNewVrs)
throws Exception
- { long lObjUid = p_oDto.getUid();
- if (lObjUid < 1) p_oDto.setUid(lObjUid=doAssignUid());
- p_oDto.setSnap(lObjUid);
+ { long lObjUid = p_oBo.getUid();
+ if (lObjUid < 1) p_oBo.setUid(lObjUid=doAssignUid());
+ p_oBo.setSnap(lObjUid);
// Set Timestamp
long lNow = System.currentTimeMillis();
- p_oDto.setStamp(lNow);
- p_oDto.setSnapDate(s_oY4md.format(new Date(lNow)));
+ p_oBo.setStamp(lNow);
+ p_oBo.setSnapDate(s_oY4md.format(new Date(lNow)));
- BobjStore oSt = BobjStore.getStore(p_oDto);
+ BobjStore oSt = BobjStore.getStore(p_oBo);
PreparedStatement PS = getDaoSnap(oSt).getPS(DaoSnapTable.PS_INS_SNAP);
- getDaoSnap(oSt).setInsValues(PS,p_oDto);
+ getDaoSnap(oSt).setInsValues(PS,p_oBo);
m_oDataConn.execUpdWait(PS,1);
- int iQlocs = oSt.allLocatorTables().length;
- for (int i1=0; i1<iQlocs; i1++)
- { DaoIndexTable oDao = getDaoIndex(oSt,i1);
- PS = oDao.getPS(DaoIndexTable.PS_INS_INDEX);
- oDao.setInsValues(PS,p_oDto);
- try { m_oDataConn.execUpdWait(PS,1); }
- catch (Exception e)
- { PS = oDao.getPS(DaoIndexTable.PS_UPD_INDEX);
- oDao.setUpdValues(PS,p_oDto);
- m_oDataConn.execUpdWait(PS,10);
- }
+ PS = getDaoIndex(oSt).getPS(DaoIndexTable.PS_INS_INDEX);
+ getDaoIndex(oSt).setInsValues(PS,p_oBo);
+ try { m_oDataConn.execUpdWait(PS,1); }
+ catch (Exception e)
+ { PS = getDaoIndex(oSt).getPS(DaoIndexTable.PS_UPD_INDEX);
+ getDaoIndex(oSt).setUpdValues(PS,p_oBo);
+ m_oDataConn.execUpdWait(PS,10);
}
return lObjUid;
} //__________________________________
- protected void updateLocTbl(BobjStdDTO p_oDto, int p_iNum)
+ protected void updateLocTbl(BaseBusinessObject p_oBo)
throws Exception
- { BobjStore oSt = BobjStore.getStore(p_oDto);
- String sTbl = oSt.getLocatorTable(p_iNum);
- if (null==sTbl) return;
- DaoIndexTable oDao = getDaoIndex(oSt,p_iNum);
- PreparedStatement PSupd = oDao.getPS(DaoIndexTable.PS_UPD_INDEX);
- oDao.setUpdValues(PSupd, p_oDto);
+ { BobjStore oSt = BobjStore.getStore(p_oBo);
+ String sTbl = oSt.getLocatorTable();
+ if (null==sTbl) return;PreparedStatement PSupd = getDaoIndex(oSt).getPS(DaoIndexTable.PS_UPD_INDEX);
+ getDaoIndex(oSt).setUpdValues(PSupd, p_oBo);
m_oDataConn.execUpdWait(PSupd,10);
} //__________________________________
@@ -267,10 +248,7 @@
} //__________________________________
private void releaseResources()
- { if (null!=m_oaDaoIndex)
- for (int i1=0; i1<m_oaDaoIndex.length; i1++)
- m_oaDaoIndex[i1] = null;
- m_oaDaoIndex = null;
+ { m_oDaoIndex = null;
m_oDaoSnap = null;
m_oDaoUid = null;
if (null != m_oDataConn) m_oDataConn.release();
@@ -290,7 +268,6 @@
// 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); }
@@ -299,13 +276,12 @@
} //__________________________________
/**
* @ejb.interface-method
- * view-type="both"
- * @param p_sClassName
+ * @param p_iStore
* @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(); }
+ public void rmvObject(Class pCls, long p_lUid) throws Exception
+ { try { doRmvSnapshot(BobjStore.getStore(pCls), p_lUid); m_oDataConn.commit(); }
catch (Exception e)
{ try { if (null != m_oDataConn) m_oDataConn.rollback(); }
catch (Exception eRoll) {}
@@ -314,54 +290,81 @@
finally { releaseResources(); }
} //__________________________________
+// Public local interface
/**
* @ejb.interface-method
- * view-type="both"
+ * view-type = "local"
*/
+ public long addObject (BaseBusinessObject p_oBO) throws Exception
+ { try
+ { long lUid = doAddSnapshot (p_oBO);
+ m_oDataConn.commit();
+ return lUid;
+ }
+ catch (Exception e)
+ { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
+ catch (Exception eRoll) {}
+ throw e;
+ }
+ finally { releaseResources(); }
+ } //__________________________________
+/**
+ * @ejb.interface-method
+ * view-type = "local"
+ * @param p_iStore
+ * @param p_lUid
+ * @return
+ * @throws Exception
+ */
+ public BaseBusinessObject getObject(Class pCls, long p_lUid) throws Exception
+ { return BaseBusinessObject.getFromDTO(getDTO(pCls, p_lUid));
+ } //__________________________________
+/**
+ * @ejb.interface-method
+ * view-type = "local"
+ * @param p_o
+ * @throws Exception
+ */
+ public void rplObject(BaseBusinessObject p_o) throws Exception
+ { try { doRplSnapshot(p_o); m_oDataConn.commit(); }
+ catch (Exception e)
+ { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
+ catch (Exception eRoll) {}
+ throw e;
+ }
+ finally { releaseResources(); }
+ } //__________________________________
+
+// Public remote interface
+/**
+ * @ejb.interface-method
+ * view-type = "remote"
+ */
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(); }
+ { BaseBusinessObject oBO = BaseBusinessObject.getFromDTO(p_oDto);
+ return addObject (oBO);
} //__________________________________
/**
* @ejb.interface-method
- * view-type="both"
- * @param p_sClassName - String Fully qualified name of class to be retrieved
+ * view-type = "remote"
+ * @param p_iStore
* @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);}
+ public BobjStdDTO getDTO (Class pCls, long p_lUid) throws Exception
+ { try { return doGetSnapshot(BobjStore.getStore(pCls), 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
+ * view-type = "remote"
+ * @param p_oDto
* @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(); }
+ { rplObject(BaseBusinessObject.getFromDTO(p_oDto));
} //__________________________________
} //____________________________________________________________________________
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -5,7 +5,7 @@
/**
* Home interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 12 2006
+ * @xdoclet-generated at July 4 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -5,7 +5,7 @@
/**
* Local interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 12 2006
+ * @xdoclet-generated at July 4 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
@@ -16,12 +16,12 @@
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 void rmvObject( java.lang.Class pCls,long p_lUid ) throws java.lang.Exception;
- public long addDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
+ public long addObject( org.jboss.soa.esb.util.BaseBusinessObject p_oBO ) 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 org.jboss.soa.esb.util.BaseBusinessObject getObject( java.lang.Class pCls,long p_lUid ) throws java.lang.Exception;
- public void rplDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
+ public void rplObject( org.jboss.soa.esb.util.BaseBusinessObject p_o ) throws java.lang.Exception;
}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -5,7 +5,7 @@
/**
* Local home interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 12 2006
+ * @xdoclet-generated at July 4 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -47,22 +47,21 @@
{ return m_oSnapH.getUidChunk(p_iQ);
} //__________________________________
public long addObject (BobjStdDTO p_oDto) throws Exception
- { return m_oSnapH.addDTO(p_oDto);
+ { return m_oSnapH.addObject(BaseBusinessObject.getFromDTO(p_oDto));
} //__________________________________
public long addObject (BaseBusinessObject p_oBo) throws Exception
{ p_oBo.setPackage();
- return m_oSnapH.addDTO(p_oBo.toDTO());
+ return m_oSnapH.addObject(p_oBo);
} //__________________________________
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);
+ { return m_oSnapH.getObject(p_oCls,p_lUid);
} //__________________________________
public void rmvObject (Class p_oCls, long p_lUid) throws Exception
- { m_oSnapH.rmvObject(p_oCls.getName(), p_lUid);
+ { m_oSnapH.rmvObject(p_oCls, p_lUid);
} //__________________________________
public void rplObject (BaseBusinessObject p_o) throws Exception
{ p_o.setPackage();
- m_oSnapH.rplDTO(p_o.toDTO());
+ m_oSnapH.rplObject(p_o);
} //__________________________________
public ObjLocator[] getLocatorList(Class p_oCls, Properties p_oProp)
{
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -50,24 +50,20 @@
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);
+ 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);
+ BobjStdDTO oDto = m_oSnapH.getDTO(p_oCls, 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);
+ { m_oSnapH.rmvObject(p_oCls, 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 void rplObject (BaseBusinessObject p_o) throws Exception
+ { if (null==p_o) return;
+ p_o.setPackage();
+ m_oSnapH.rplDTO(p_o.toDTO());
} //__________________________________
public ObjLocator[] getLocatorList(Class p_oCls, Properties p_oProp)
Copied: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/crypto (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/crypto)
Deleted: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/crypto/Mangler.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/crypto/Mangler.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/crypto/Mangler.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,49 +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.crypto;
-
-//import javax.crypto.*;
-//import javax.crypto.spec.*;
-
-public class Mangler
-{
-// private static Cipher s_oCC;
-// static
-// { try { s_oCC = Cipher.getInstance("DES"); }
-// catch (Exception e) { e.printStackTrace(); }
-// }
- public synchronized static byte [] encrypt (byte [] p_ba, long p_lSeed)
- throws Exception
- {
- return p_ba;
- } //__________________________________
-
- public synchronized static byte [] decrypt (byte [] p_ba, long p_lSeed)
- throws Exception
- {
- return p_ba;
- } //__________________________________
-
-} //____________________________________________________________________________
-
Copied: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/crypto/Mangler.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/crypto/Mangler.java)
Copied: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables)
Deleted: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/BobjStore.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/BobjStore.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/BobjStore.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,191 +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.dbtables;
-
-import java.util.*;
-
-import org.jboss.soa.esb.common.*;
-import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.util.*;
-
-public class BobjStore
-{
- private static String TBL_UIDS;
- public static void setUidTableName(String p_s) { TBL_UIDS = p_s; }
- public static String getUidTableName() { return TBL_UIDS; }
-
- private static String TBL_BATCHES;
- public static void setBatchTableName(String p_s) { TBL_BATCHES = p_s; }
- public static String getBatchTableName() { return TBL_BATCHES; }
-
- private static final Map<Class,BobjStore> s_oStoreMap
- = new HashMap<Class,BobjStore>();
-
- static
- { try
- { DomElement oConf = DomElement.fromURL(EsbSysProps.getObjStoreConfigFile());
- if (null!=oConf)
- {
- setUidTableName (oConf.getAttr("uidTable"));
- setBatchTableName (oConf.getAttr("batchTable"));
- for (DomElement oCurr : oConf.getElementChildren("Class"))
- { String sClass = oCurr.getAttr("name");
- boolean bCrypt = "true".equalsIgnoreCase(oCurr.getAttr("encrypt"));
-
- BobjStore oNew = new BobjStore
- (oCurr.getAttr("type")
- ,oCurr.getAttr("table")
- ,null
- ,sClass.substring(1+sClass.lastIndexOf("."))
- ,bCrypt
- );
-
- for (DomElement oIcurr : oCurr.getElementChildren("Index"))
- oNew.addLocatorTable(oIcurr.getAttr("table"));
- s_oStoreMap.put(Class.forName(sClass),oNew);
- }
- }
- }
- catch (Exception e)
- { EsbUtil.getDefaultLogger(BobjStore.class).error("BobjStore configuration FAILED"
- ,e);
- }
-
- };
-
- private String m_sSnapType , m_sSnapTbl , m_sClass;
- private List<String> m_olLocators;
- private boolean m_bEncrypt=false;
-
- /**
- * Snapshot type getter - The value assigned to this attribute will help if
- * standard SQL queries are required to surf the Object Store's snapshot tables
- * @return String - Value of snapshot type
- * @see Istorable#getSnapType()
- */
- public String getSnapType() { return m_sSnapType; }
- /**
- * Snapshot tablename getter - The value assigned to this attribute is the
- * name of the snapshot table for this object
- * @return String - name of SQL table where snapshots of objects will be stored
- * @see Istorable#getSnapTable()
- */
- public String getSnapTable() { return m_sSnapTbl; }
- /**
- * First locator tablename getter - Locator tables are also called index tables.
- * @return String - name of SQL table where locators(0) will be stored
- * @see Istorable#getLocatorTable()
- * @see BusinessObject#getObjLocator()
- */
- public String getLocatorTable() { return getLocatorTable(0); }
- /**
- * Obtain Nth locator table
- * @param p_n - Index for desired locator table
- * @return String - name of Nth SQL table where for objects will be stored
- * @see BaseBusinessObject#locator(p_i)
- */
- public String getLocatorTable(int p_n)
- { return (null==m_olLocators) ? null
- : (m_olLocators.size() <= p_n) ? null
- : m_olLocators.get(p_n);
- }
- /**
- * Class suffix getter - Deprecated - Left here for backwards compatibility
- * @return String - Class suffix
- * @see Istorable#getLocatorTable()
- * @see BusinessObject#getObjLocator()
- */
- public String getClassSuffix() { return m_sClass; }
- /**
- * Encryption requirement getter
- * @return boolean - true if Objects stored using this descriptor have to be
- * encrypted - decrypted at storage/retrieval time
- */
- public boolean isEncrypted() { return m_bEncrypt; }
-
- /**
- * Constructor using all fields required by a BobjStore object
- * @param p_sSnapType String - Snapshot type
- * @param p_sSnapTbl String - Snapshot SQL tablename
- * @param p_sLocTbl String - Locator SQL tablename (may be null - No locator table)
- * @param p_sCls String - Class name excluding package prefix
- * @param p_bCrypt boolean - Does data have to be encrypted in the snap table ?
- * @see Istorable
- * @see BusinessObject#classNm()
- */
- protected BobjStore (String p_sSnapType,String p_sSnapTbl, String p_sLocTbl
- ,String p_sCls, boolean p_bCrypt)
- { m_sSnapType = p_sSnapType;
- m_sSnapTbl = p_sSnapTbl;
- addLocatorTable(p_sLocTbl);
- m_sClass = p_sCls;
- m_bEncrypt = p_bCrypt;
- } //________________________________
-
- private void addLocatorTable(String p_s)
- { if (EsbUtil.isNullString(p_s)) return;
- if (null==m_olLocators)
- m_olLocators = new ArrayList<String>();
- m_olLocators.add(p_s);
- } //________________________________
-
- /**
- * Constructor for non encrypted BobjStore
- * @param p_sSnapType String
- * @param p_sSnapTbl String
- * @param p_sLocTbl String
- * @param p_sCls String
- * @see BobjStore#BobjStore(String,String,String,String,boolean)
- */
- protected BobjStore (String p_sSnapType,String p_sSnapTbl, String p_sLocTbl
- ,String p_sCls)
- { this(p_sSnapType,p_sSnapTbl,p_sLocTbl,p_sCls,false);
- } //________________________________
-
- /**
- * Get a BobjStore object that describes persistence details for objects of
- * class <arg 1>
- * @param p_sClassName Class to search for in descriptor table
- * @return BobjStore - A descriptor that will provide persistence info
- * @see JbossEsbPersistHandler
- * @see BobjStore#getStore(BusinessObject)
- */
- public static BobjStore getStore (Class p_oClass)
- { if (null == p_oClass) return null;
- return s_oStoreMap.get(p_oClass);
- } //__________________________________
-
- /**
- * Get a BobjStore object that describes persistence details for the
- * object specified in arg 1
- * @param p_o BusinessObject The object whose storage descriptor is requested
- * @return BobjStore - A descriptor that will provide persistence info
- * @see JbossEsbPersistHandler
- * @see BobjStore#getStore(String)
- */
- public static BobjStore getStore (BaseBusinessObject p_o)
- { return (null == p_o) ? null : getStore(p_o.getClass());
- } //__________________________________
-
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/BobjStore.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/BobjStore.java)
Deleted: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoBatchTable.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoBatchTable.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoBatchTable.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,219 +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.dbtables;
-
-import java.sql.*;
-import org.apache.log4j.*;
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.persist.*;
-
-/**
- * Data access object for the SQL table where batches are temporarily stored
- * until they are committed
- *
- */
-public class DaoBatchTable extends SqlDbTable
-{
- private Logger m_oLog;
- private JdbcCleanConn m_oConn;
-
- private DaoBatchTable() throws Exception {this(null,null); }
- /**
- * Instantiate a DaoBatchTable object using the javax.sql.DataSource object
- * within <arg 1>, with table name held in <arg 2>
- * @param p_oConn JdbcCleanConn - Connection to use for preparing and executing
- * all SQL statements in this DAO
- * @param p_sTblName String - SQL table name to use in the context of this
- * DaoBatchTable object
- * @throws Exception - pass through from invoked methods - see Exception.getMessage()
- * at runtime for details
- * @see JdbcCleanConn
- */
- public DaoBatchTable(JdbcCleanConn p_oConn,String p_sTblName) throws Exception
- { super(p_oConn,p_sTblName);
- m_oLog = EsbUtil.getDefaultLogger(this.getClass());
- m_oConn = p_oConn;
- m_oaPS = new PreparedStatement[PS_MAX];
- } //________________________________
- /**
- * List of fields for select statement - provided only to avoid time
- * consuming 'select *' statements
- * @return String - a Comma separated list of fields
- */
- protected String getSelectFields()
- { return "batch_num,seq,data";
- } //________________________________
-
- // -------------------------------------------------------------
- // Column constants
- // -------------------------------------------------------------
- private static int s_iFld = 0;
- /**
- * Column index for field representing batch number
- */
- public static final int BATCH_NUM = s_iFld++;
- /**
- * Column index for field representing sequence number within batch number
- */
- public static final int BATCH_SEQ = s_iFld++;
- /**
- * XML string that will be used to instantiate the BusinessObject
- * @see BusinessObject#BusinessObject(BobjStdDTO)
- * @see BobjStdDTO#getFromXml(String)
- */
- public static final int STR_DATA = s_iFld++;
-
- private static final int QFIELDS = s_iFld;
-
- /**
- * Set values for insert statement
- * @param p_PS PreparedStatement - The prepared SQL statement for insert in this
- * table
- * <p>Must be the result of a previous call to this.getPS(PS_INS_BATCHROW)</p>
- * @param p_o Object - Object to get values from
- * <p>arg 2 is Object to comply with SqlDbTable abstract method setInsValues()
- * <li>For this particular class, arg 2 MUST be an instance of RowBatch</li>
- * </p>
- * @throws Exception
- * @return int
- * @see DaoBatchTable#getPS(int)
- * @see RowBatch
- */
- public int setInsValues(PreparedStatement p_PS,Object p_o)
- throws Exception
- { try
- { if (! (p_o instanceof RowBatch)) throw
- new Exception ("Parameter must be RowBatch");
-
- p_PS.clearParameters();
- RowBatch oBR = (RowBatch)p_o;
- setLong (p_PS, BATCH_NUM ,oBR.m_lBatch); // Batch Number
- setInt (p_PS, BATCH_SEQ ,oBR.m_iSeq); // Batch Sequence
- setObject (p_PS ,STR_DATA ,oBR.m_sData); // Batch Data
-
- return QFIELDS;
- }
- catch (Exception e)
- { m_oLog.error("setInsValues() Failed",e);
- throw e;
- }
- } //________________________________
- /**
- * Returns a RowBatch object containing data from the row in the current
- * cursor position of the ResultSet object <arg 1>
- * @param p_oRS ResultSet - The current ResultSet
- * <p>Must be the result of a previous execution of
- * JdbcCleanConn.execQueryWait() method on a 'select' prepared statement for
- * this object</p>
- * @throws Exception
- * @return Object - A RowBatch object
- * @see JdbcCleanConn#execQueryWait(PreparedStatement, int)
- * @see DaoBatchTable#getPS(int)
- * @see DaoBatchTable#PS_GET_BATCH_ROWS
- * @see RowBatch
- */
- public Object getFromRS (ResultSet p_oRS) throws Exception
- { try
- { RowBatch oRet = new RowBatch();
- oRet.m_lBatch = p_oRS.getLong(1+BATCH_NUM);
- oRet.m_iSeq = p_oRS.getInt (1+BATCH_SEQ);
- oRet.m_sData = p_oRS.getString(1+STR_DATA);
- return oRet;
- }
- catch (Exception e)
- { m_oLog.error("getFromRS() Failed",e);
- throw e;
- }
- } //________________________________
- /**
- * Index of the 'insert' statement in the list of PreparedStatement objects
- * for this DAO
- */
- public static final int PS_INS_BATCHROW = 0;
- /**
- * Index of the 'delete' statement in the list of PreparedStatement objects
- * for this DAO
- */
- public static final int PS_DELETE_BATCH = 1;
- /**
- * Index of the 'select' statement in the list of PreparedStatement objects
- * for this DAO (it has a where batch_num = ?)
- */
- public static final int PS_GET_BATCH_ROWS = 2;
-
- private static final int PS_MAX = 10;
-
- /**
- * Obtain a prepared statement for this DAO from the list of available PStmts
- * <p>Uses lazy instantiation of requested objects</p>
- * @param p_i int - Index of PreparedStatement object to obtain
- * @throws Exception - If an invalid index is passed or there are problems
- * during the prepareStatement() invocation
- * @return PreparedStatement
- */
- public PreparedStatement getPS (int p_i) throws Exception
- { try
- { switch (p_i)
- { case PS_INS_BATCHROW: return getInsBatchRow (p_i);
- case PS_DELETE_BATCH: return deleteBatch (p_i);
- case PS_GET_BATCH_ROWS: return getBatchRows (p_i);
- }
- ;
- throw new Exception("Invalid Index "+p_i);
- }
- catch (Exception e)
- { m_oLog.error("Request for Prepared Statement Failed",e);
- throw e;
- }
- } //__________________________________
-
- private PreparedStatement getInsBatchRow(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- m_oaPS[p_i] = m_oConn.prepareStatement(getInsertStatement());
- return m_oaPS[p_i];
- } //__________________________________
-
- private PreparedStatement deleteBatch(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- { StringBuffer sb = new StringBuffer("delete from ").append(m_sTableName)
- .append(" where ")
- .append(m_oaFields[BATCH_NUM].getFieldName()).append(" = ?")
- ;
- m_oaPS[p_i] = m_oConn.prepareStatement(sb.toString());
- }
- return m_oaPS[p_i];
- } //__________________________________
-
- private PreparedStatement getBatchRows(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- { StringBuffer sb = new StringBuffer(getSelectStatement())
- .append(" where ")
- .append(m_oaFields[BATCH_NUM].getFieldName()).append(" = ?")
- .append(" order by 1,2")
- ;
- m_oaPS[p_i] = m_oConn.prepareStatement(sb.toString());
- }
- return m_oaPS[p_i];
- } //__________________________________
-
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoBatchTable.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoBatchTable.java)
Deleted: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoIndexTable.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoIndexTable.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoIndexTable.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,303 +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.dbtables;
-
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.persist.*;
-import java.sql.*;
-import org.apache.log4j.*;
-
-/**
- * Data access object for all SQL tables that the ROS (Rosetta Object Store)
- * uses as locator tables
- * <p>Number of actual columns in all of these tables equals 4 + the
- * length of the String[] returned by the BusinessObject locator() method</p>
- * <p>It is responsibility of rosetta core developers to ensure
- * synchronization between these two, as well as to add a corresponding
- * entry in the BobjStore static descriptor table</p>
- *
- * @see BobjStore
- * @see BusinessObject#locator()
- */
-public class DaoIndexTable extends SqlDbTable
-{
-
- public static final String LOCATOR_TABLE_INDEX = "__whichLocator";
-
- private Logger m_oLog;
- private JdbcCleanConn m_oConn;
-
- private DaoIndexTable() throws Exception {this(null,null); }
- /**
- * Instantiate a DaoIndexTable object using the javax.sql.DataSource object
- * within <arg 1>, with table name held in <arg 2>
- * @param p_oConn JdbcCleanConn - Connection to use for preparing and executing
- * all SQL statements in this DAO
- * @param p_sTblName String - SQL table name to use in the context of this
- * DaoIndexTable object
- * @throws Exception - pass through from invoked methods - see Exception.getMessage()
- * at runtime for details
- * @see JdbcCleanConn
- */
- public DaoIndexTable(JdbcCleanConn p_oConn,String p_sTbl) throws Exception
- { super(p_oConn,p_sTbl);
- m_oLog = EsbUtil.getDefaultLogger(this.getClass());
- m_oConn = p_oConn;
- if (null != m_oaFields)
- { m_oaFields[OBJECT_UID].setPrimaryKey(true);
- m_sSelectSql = null;
- }
- m_oaPS = new PreparedStatement[PS_MAX];
- } //________________________________
-
- /**
- * List of fields for select statement - provided only to avoid time
- * consuming 'select *' statements
- * @return String - a Comma separated list of fields
- */
- protected String getSelectFields()
- { if (null==m_oaFields) return "*";
- StringBuffer sb = new StringBuffer(256);
- for (int i1=0; i1<m_oaFields.length;i1++)
- ((i1 < 1)?sb:sb.append(","))
- .append(m_oaFields[i1].getFieldName());
- return sb.toString();
- } //________________________________
-
- // -------------------------------------------------------------
- // Column constants
- // -------------------------------------------------------------
- private static int s_iFld = 0;
- /**
- * Column index for the BusinessObject UID represented in the corresponding
- * SQL table row
- */
- public static final int OBJECT_UID = s_iFld++;
- /**
- * Column index for the latest Object snapshot taken for the BusinessObject
- */
- public static final int TIMESTAMP = s_iFld++;
- /**
- * Column index for the latest snapshot's UID for the BusinessObject the row
- * represents
- */
- public static final int UID_SNAP = s_iFld++;
- /**
- * Column index for the latest Object snapshot's date (yyyymmdd)
- */
- public static final int SNAP_DATE = s_iFld++;
- /**
- * Column index for the first field in the String array returned by the
- * BusinessObject's locator() method - Subsequent fields in the array will
- * have consecutive sequential indices
- * @see BusinessObject#locator()
- */
- public static final int FIRST_FIELD = s_iFld++;
-
- /**
- * Set values for insert statement
- * @param p_PS PreparedStatement - The prepared SQL statement for insert in this
- * table
- * <p>Must be the result of a previous call to this.getPS(PS_INS_INDEX)</p>
- * @param p_o Object - Object to get values from
- * <p>arg 2 is Object to comply with SqlDbTable abstract method setInsValues()
- * <li>For this particular class, arg 2 MUST be an instance of BusinessObject</li>
- * </p>
- * @throws Exception
- * @return int
- * @see DaoIndexTable#getPS(int)
- * @see DaoIndexTable#PS_INS_INDEX
- */
- public int setInsValues(PreparedStatement p_PS,Object p_o)
- throws Exception
- { try
- { if (! (p_o instanceof BaseBusinessObject)) throw
- new Exception ("Parameter must be BusinessObject");
-
- BaseBusinessObject oBO = (BaseBusinessObject)p_o;
-
- p_PS.clearParameters();
- setLong (p_PS, OBJECT_UID ,oBO.getUid()); // Object's UID
- long lStamp = oBO.getStamp();
- setLong (p_PS, TIMESTAMP ,lStamp); // Timestamp
- setLong (p_PS, UID_SNAP ,oBO.getSnap()); // Snap UID
- setObject(p_PS, SNAP_DATE ,oBO.getSnapDate()); // Snap Date
-
- int iFld = FIRST_FIELD;
- String[] sa = oBO.locator();
- for (int i1=0; i1<sa.length;i1++)
- if (iFld < m_oaFields.length) setObject(p_PS,iFld++,sa[i1]);
-
- return iFld;
- }
- catch (Exception e)
- { m_oLog.error("setInsValues() Failed",e);
- throw e;
- }
- } //________________________________
-
- /**
- * Set values for update statement
- * @param p_PS PreparedStatement - The prepared SQL statement for update in this
- * table
- * <p>Must be the result of a previous call to this.getPS(PS_UPD_INDEX)</p>
- * @param p_o Object - Object to get values from
- * <li>For this particular class, arg 2 MUST be an instance of BaseBusinessObject</li>
- * </p>
- * @throws Exception
- * @see DaoIndexTable#getPS(int)
- * @see DaoIndexTable#PS_UPD_INDEX
- */
- public void setUpdValues(PreparedStatement p_PS,Object p_o)
- throws Exception
- { try
- { if (! (p_o instanceof BaseBusinessObject)) throw
- new Exception ("Parameter must be BaseBusinessObject");
-
- BaseBusinessObject oBO = (BaseBusinessObject)p_o;
-
- int iFld = 0;
- p_PS.clearParameters();
- setLong (p_PS, iFld++ ,oBO.getStamp()); // Timestamp
- setLong (p_PS, iFld++ ,oBO.getSnap()); // Snap UID
- setObject(p_PS, iFld++ ,oBO.getSnapDate());
-
- String[] sa = oBO.locator();
- for (int i1=0; i1<sa.length;i1++)
- if (iFld < m_oaFields.length) setObject(p_PS,iFld++,sa[i1]);
-
- setLong(p_PS, iFld++, oBO.getUid());
- }
- catch (Exception e)
- { m_oLog.error("setUpdValues() Failed",e);
- throw e;
- }
- } //________________________________
-
- /**
- * Returns an ObjLocator object containing data from the row in the current
- * cursor position of the ResultSet object <arg 1>
- * @param p_oRS ResultSet - The current ResultSet
- * <p>Must be the result of a previous execution of
- * JdbcCleanConn.execQueryWait() method on a 'select' prepared statement for
- * this object</p>
- * @throws Exception
- * @return Object - An ObjLocator object
- * @see JdbcCleanConn#execQueryWait(PreparedStatement, int)
- * @see DaoIndexTable#getPS(int)
- * @see DaoIndexTable#PS_SEL_INDEX
- * @see ObjLocator
- */
- public Object getFromRS (ResultSet p_oRS) throws Exception
- { try
- {
- long lUid = p_oRS.getLong(1+OBJECT_UID);
- String[] sa = new String[m_oaFields.length-FIRST_FIELD];
- int iFld = FIRST_FIELD;
- for (int i1=0; i1<sa.length;i1++) sa[i1] = p_oRS.getString(++iFld);
-
- return new ObjLocator(lUid,sa);
- }
- catch (Exception e)
- { m_oLog.error("getFromRS() Failed",e);
- throw e;
- }
- } //________________________________
-
-
- /**
- * Index of the 'insert' statement in the list of PreparedStatement objects
- * for this DAO
- */
- public static final int PS_INS_INDEX = 0;
- /**
- * Index of the 'select' statement in the list of PreparedStatement objects
- * for this DAO
- */
- public static final int PS_SEL_INDEX = 1;
- /**
- * Index of the 'delete' statement in the list of PreparedStatement objects
- * for this DAO
- */
- public static final int PS_RMV_INDEX = 2;
- /**
- * Index of the 'update' statement in the list of PreparedStatement objects
- * for this DAO
- */
- public static final int PS_UPD_INDEX = 3;
-
- private static final int PS_MAX = 10;
-
- /**
- * Obtain a prepared statement for this DAO from the list of available PStmts
- * <p>Uses lazy instantiation of requested objects</p>
- * @param p_i int - Index of PreparedStatement object to obtain
- * @throws Exception - If an invalid index is passed or there are problems
- * during the prepareStatement() invocation
- * @return PreparedStatement
- */
- public PreparedStatement getPS (int p_i) throws Exception
- { try
- { switch (p_i)
- { case PS_INS_INDEX: return getInsIndex(p_i);
- case PS_SEL_INDEX: return getSelIndex(p_i);
- case PS_RMV_INDEX: return getRmvIndex(p_i);
- case PS_UPD_INDEX: return getUpdIndex(p_i);
- }
- ;
- throw new Exception("Invalid Index "+p_i);
- }
- catch (Exception e)
- { m_oLog.error("Request for Prepared Statement Failed",e);
- throw e;
- }
- } //__________________________________
-
- private PreparedStatement getInsIndex(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- m_oaPS[p_i] = m_oConn.prepareStatement(getInsertStatement());
- return m_oaPS[p_i];
- } //__________________________________
-
- private PreparedStatement getSelIndex(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- { StringBuffer sb = new StringBuffer(getSelectStatement())
- .append(" where ").append(getFldName(OBJECT_UID)).append(" = ? ");
- m_oaPS[p_i] = m_oConn.prepareStatement(sb.toString());
- }
- return m_oaPS[p_i];
- } //__________________________________
-
- private PreparedStatement getRmvIndex(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- m_oaPS[p_i] = m_oConn.prepareStatement(getDeleteStatement());
- return m_oaPS[p_i];
- } //__________________________________
-
- private PreparedStatement getUpdIndex(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- m_oaPS[p_i] = m_oConn.prepareStatement(getUpdateStatement());
- return m_oaPS[p_i];
- } //__________________________________
-
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoIndexTable.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoIndexTable.java)
Deleted: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoSnapTable.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoSnapTable.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoSnapTable.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,352 +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.dbtables;
-
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.persist.*;
-import org.jboss.soa.esb.services.crypto.*;
-import java.sql.*;
-import org.apache.log4j.*;
-
-
-/**
- * Data access object for all SQL tables that the ROS (Rosetta Object Store)
- * uses as snapshot tables
- *
- * @see BobjStore
- */
-public class DaoSnapTable extends SqlDbTable
-{
- private Logger m_oLogger;
- private JdbcCleanConn m_oConn;
- private BobjStore m_oST;
-
- private DaoSnapTable() throws Exception {this(null,null); }
- /**
- * Instantiate a DaoSnapTable object using the javax.sql.DataSource object
- * within <arg 1>, with table name held in <arg 2>
- * @param p_oConn JdbcCleanConn - Connection to use for preparing and executing
- * all SQL statements in this DAO
- * @param p_oST BobjStore - Descriptor that holds information of what physical
- * SQL tables to use both for the snapshot and the locator tables for
- * BusinessObjects sent to this DAO
- * @throws Exception - pass through from invoked methods - see Exception.getMessage()
- * at runtime for details
- * @see JdbcCleanConn
- * @see BobjStore
- * @see Istorable
- */
- public DaoSnapTable(JdbcCleanConn p_oConn,BobjStore p_oST) throws Exception
- { super(p_oConn,p_oST.getSnapTable());
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
- m_oConn = p_oConn;
- m_oST = p_oST;
- if (null != m_oaFields)m_oaFields[UID_SNAP].setPrimaryKey(true);
- m_oaPS = new PreparedStatement[PS_MAX];
- } //________________________________
-
- /**
- * List of fields for select statement - provided only to avoid time
- * consuming 'select *' statements
- * @return String - a Comma separated list of fields
- */
- protected String getSelectFields()
- { return "uid,stamp,snap_type,object_uid,batch_num,xml_data";
- } //________________________________
-
- // -------------------------------------------------------------
- // Column constants
- // -------------------------------------------------------------
- private static int s_iFld = 0;
- /**
- * Column index for the SQL table field representing snapshot's unique identifier
- * <p>This would be the 'natural' primary key for all snapshot tables, and the
- * number should only be assigned by the JbossEsbPersistHandler EJB at insert time</p>
- * <p>There could potentially be several snapshots for the same
- * BusinessObject - In that case, there would be several rows in the
- * snapshot table with the same OBJECT_UID value and different UID_SNAP
- * values
- * </p>
- * @see DaoSnapTable#OBJECT_UID
- */
- public static final int UID_SNAP = s_iFld++;
- /**
- * Column index for the SQL table field representing this snapshot's timestamp, expressed
- * in milliseconds since the start of the 'epoch'
- * @see java.util.Date
- */
- public static final int TIMESTAMP = s_iFld++;
- /**
- * Column index for the SQL table field representing this snapshot's
- * underlying BusinessObject type - This is a Rosetta Core design level decision
- * <p>Having this field as an SQL column will enable SQL 'visibility' and thus
- * can be used in the 'where' clause of any SQL statement</p>
- * <p>An example of when this field could potentially be used is if a
- * decision is made by Rosetta Administrators to move all objects of a specific
- * type to a different SQL snapshot table</p>
- */
- public static final int SNAP_TYPE = s_iFld++;
- /**
- * Column index for the SQL table field representing BusinessObject unique identifier
- * <p>There could potentially be several snapshots for the same
- * BusinessObject - In that case, there would be several rows in the
- * snapshot table with the same OBJECT_UID value and different UID_SNAP
- * values
- * </p>
- * @see DaoSnapTable#OBJECT_UID
- */
- public static final int OBJECT_UID = s_iFld++;
- /**
- * Column index for the SQL table field representing the batch number
- * as a result of which this snapshot was added to the store
- * <p>If this snapshot was not added as part of a batch process (meaning a
- * group of BusinessObjects added using the JbossEsbBatchHandler EJB), then it
- * will hold a null value</p>
- */
- public static final int BATCH_NUM = s_iFld++;
- /**
- * Column index for the SQL table field representing the XML representation
- * of the BusinessObject stored in this SQL table
- * <p>The contents of this field are going to be the result of invoking
- * the BusinessObject.toDTO().toXml() method</p>
- * @see BusinessObject#toDTO()
- * @see BobjStdDTO#toXml()
- * @see DaoSnapTable#setInsValues(PreparedStatement,Object)
- */
- public static final int XML_OBJECT = s_iFld++;
-
- private static final int QFIELDS = s_iFld++;
-
- /**
- * Set values for insert statement
- * @param p_PS PreparedStatement - The prepared SQL statement for insert in this
- * table
- * <p>Must be the result of a previous call to this.getPS(PS_INS_SNAP)</p>
- * @param p_o Object - Object to get values from
- * <p>arg 2 is Object to comply with SqlDbTable abstract method setInsValues()
- * <li>For this particular class, arg 2 MUST be an instance of BusinessObject</li>
- * </p>
- * @throws Exception
- * @return int
- * @see DaoSnapTable#getPS(int)
- * @see DaoSnapTable#PS_INS_SNAP
- * @see BusinessObject
- */
- public int setInsValues(PreparedStatement p_PS,Object p_o)
- throws Exception
- { try
- { if (! (p_o instanceof BaseBusinessObject)) throw
- new Exception ("Parameter must be BaseBusinessObject");
-
- BaseBusinessObject oBO = (BaseBusinessObject)p_o;
- long lSnapUid = oBO.getSnap();
-
- p_PS.clearParameters();
- setLong (p_PS, UID_SNAP ,lSnapUid);
- setLong (p_PS, TIMESTAMP ,oBO.getStamp()); // Timestamp
- setObject(p_PS, SNAP_TYPE ,m_oST.getSnapType()); // Snap Type
- setLong (p_PS, OBJECT_UID ,oBO.getUid()); // Object's UID
- setLong (p_PS, BATCH_NUM ,oBO.getBatchNum()); // Batch Number
- byte[] baXml = oBO.toDTO().toXml().getBytes();
- p_PS.setBytes(1+XML_OBJECT,seeCrypt(baXml,lSnapUid));
-
- return QFIELDS;
- }
- catch (Exception e)
- { m_oLogger.error("setInsValues() Failed",e);
- throw e;
- }
- } //________________________________
-
- /**
- * Set values for update statement
- * @param p_PS PreparedStatement - The prepared SQL statement for updates in this
- * table
- * <p>Must be the result of a previous call to this.getPS(PS_UPD_SNAP)</p>
- * @param p_o Object - Object to get values from
- * <li>For this particular class, arg 2 MUST be an instance of BaseBusinessObject</li>
- * </p>
- * @throws Exception
- * @see DaoSnapTable#getPS(int)
- * @see DaoSnapTable#PS_UPD_SNAP
- * @see BaseBusinessObject
- */
- public void setUpdValues(PreparedStatement p_PS,Object p_o)
- throws Exception
- { try
- { if (! (p_o instanceof BaseBusinessObject)) throw
- new Exception ("Parameter must be BaseBusinessObject");
-
- BaseBusinessObject oBO = (BaseBusinessObject)p_o;
- long lSnapUid = oBO.getSnap();
-
- p_PS.clearParameters();
-
- int iFld = 0;
- setLong (p_PS, iFld++ ,oBO.getStamp()); // Timestamp
- setObject(p_PS, iFld++ ,m_oST.getSnapType()); // Snap Type
- setLong (p_PS, iFld++ ,oBO.getUid()); // Object's UID
- setLong (p_PS, iFld++ ,oBO.getBatchNum()); // Batch Number
- byte[] baXml = oBO.toDTO().toXml().getBytes();
- p_PS.setBytes(1+iFld++ ,seeCrypt(baXml,lSnapUid));
- setLong (p_PS, iFld++ ,lSnapUid);
- }
- catch (Exception e)
- { m_oLogger.error("setInsValues() Failed",e);
- throw e;
- }
- } //________________________________
-
- private byte[] seeCrypt(byte[] p_ba,long p_l) throws Exception
- { if (! m_oST.isEncrypted()) return p_ba;
- return Mangler.encrypt(p_ba,p_l);
- } //________________________________
-
- private byte[] seeDecrypt(byte[] p_ba,long p_l) throws Exception
- { if (! m_oST.isEncrypted()) return p_ba;
- return Mangler.decrypt(p_ba,p_l);
- } //________________________________
-
- /**
- * Returns a BaseBusinessObject containing data from the row in the current
- * cursor position of the ResultSet object <arg 1>
- * @param p_oRS ResultSet - The current ResultSet
- * <p>Must be the result of a previous execution of
- * JdbcCleanConn.execQueryWait() method on a 'select' prepared statement for
- * this object</p>
- * @throws Exception
- * @return Object - A BaseBusinessObject
- * @see JdbcCleanConn#execQueryWait(PreparedStatement, int)
- * @see DaoSnapTable#getPS(int)
- * @see DaoSnapTable#PS_SEL_SNAP
- * @see DaoSnapTable#PS_SEL_4UPD
- * @see BaseBusinessObject
- */
- public Object getFromRS (ResultSet p_oRS) throws Exception
- { try
- { long lUid = p_oRS.getLong(1+UID_SNAP);
- String sXml = (m_oST.isEncrypted())
- ? new String(seeDecrypt(p_oRS.getBytes(1+XML_OBJECT),lUid),"ISO-8859-1")
- : p_oRS.getString(1+XML_OBJECT);
- Object oRet = BobjStdDTO.getFromXml(sXml);
- return oRet;
- }
- catch (Exception e)
- { m_oLogger.error("getFromRS() Failed",e);
- throw e;
- }
- } //________________________________
-
-
- /**
- * Index of the 'insert' statement in the list of PreparedStatement objects
- * for this DAO
- */
- public static final int PS_INS_SNAP = 0;
- /**
- * Index of the 'select' statement in the list of PreparedStatement objects
- * for this DAO
- */
- public static final int PS_SEL_SNAP = 1;
- /**
- * Index of the 'delete' statement in the list of PreparedStatement objects
- * for this DAO
- */
- public static final int PS_RMV_SNAP = 2;
- /**
- * Index of the 'update' statement in the list of PreparedStatement objects
- * for this DAO
- */
- public static final int PS_UPD_SNAP = 3;
- /**
- * Index of the 'select for update' statement in the list of PreparedStatement
- * objects for this DAO
- */
- public static final int PS_SEL_4UPD = 4;
-
- private static final int PS_MAX = 10;
-
- /**
- * Obtain a prepared statement for this DAO from the list of available PStmts
- * <p>Uses lazy instantiation of requested objects</p>
- * @param p_i int - Index of PreparedStatement object to obtain
- * @throws Exception - If an invalid index is passed or there are problems
- * during the prepareStatement() invocation
- * @return PreparedStatement
- */
- public PreparedStatement getPS (int p_i) throws Exception
- { try
- { switch (p_i)
- { case PS_INS_SNAP: return getInsSnap(p_i);
- case PS_SEL_SNAP: return getSelSnap(p_i);
- case PS_RMV_SNAP: return getRmvSnap(p_i);
- case PS_UPD_SNAP: return getUpdSnap(p_i);
- case PS_SEL_4UPD: return getSel4UpdSnap(p_i);
- }
- ;
- throw new Exception("Invalid Index "+p_i);
- }
- catch (Exception e)
- { m_oLogger.error("Request for Prepared Statement Failed",e);
- throw e;
- }
- } //__________________________________
-
- private PreparedStatement getInsSnap(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- m_oaPS[p_i] = m_oConn.prepareStatement(getInsertStatement());
- return m_oaPS[p_i];
- } //__________________________________
-
- private PreparedStatement getSelSnap(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- { StringBuffer sb = new StringBuffer(getSelectStatement())
- .append(" where ").append(getFldName(UID_SNAP)).append(" = ? ");
- m_oaPS[p_i] = m_oConn.prepareStatement(sb.toString());
- }
- return m_oaPS[p_i];
- } //__________________________________
-
- private PreparedStatement getRmvSnap(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- m_oaPS[p_i] = m_oConn.prepareStatement(getDeleteStatement());
- return m_oaPS[p_i];
- } //__________________________________
-
- private PreparedStatement getUpdSnap(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- m_oaPS[p_i] = m_oConn.prepareStatement(getUpdateStatement());
- return m_oaPS[p_i];
- } //__________________________________
-
- private PreparedStatement getSel4UpdSnap(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- { StringBuffer sb = new StringBuffer(getSelectStatement())
- .append(" where ").append(getFldName(UID_SNAP)).append(" = ? ")
- .append(" for update");
- m_oaPS[p_i] = m_oConn.prepareStatement(sb.toString());
- }
- return m_oaPS[p_i];
- } //__________________________________
-
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoSnapTable.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoSnapTable.java)
Deleted: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,233 +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.dbtables;
-
-import org.jboss.soa.esb.helpers.persist.*;
-import org.jboss.soa.esb.util.*;
-import java.sql.*;
-import org.apache.log4j.*;
-
-/**
- * Data access object for the SQL table that the Object Store
- * uses to assign Unique Identifiers (UID) to any object in the framework
- * @see IpersistHandler#getUidChunk(int)
- */
-public class DaoUidTable extends SqlDbTable
-{
- /**
- * Key value for the row in the UID table that holds UIDs for BusinessObjects
- * "jbossEsb_objuid"
- */
- public static final String SEQUENCE_OBJ = "jbossEsb_objuid";
- /**
- * Key value for the row in the UID table that holds UIDs for BatchProcess
- * "jbossEsb_batchuid"
- */
- public static final String SEQUENCE_BATCH = "jbossEsb_batchuid";
-
- private Logger m_oLogger;
-
- private DaoUidTable() throws Exception {this(null,null); }
- /**
- * Instantiate a DaoUidTable object using the javax.sql.DataSource object
- * within <arg 1>, with table name held in <arg 2>
- * @param p_oConn JdbcCleanConn - Connection to use for preparing and executing
- * all SQL statements in this DAO
- * @param p_sTblName String - SQL table name to use in the context of this
- * DaoUidTable object
- * @throws Exception - pass through from invoked methods - see Exception.getMessage()
- * at runtime for details
- * @see JdbcCleanConn
- */
- public DaoUidTable(JdbcCleanConn p_oConn,String p_sTblName) throws Exception
- { super(p_oConn,p_sTblName);
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
- if (null != m_oaFields)
- { m_oaFields[UID].setPrimaryKey(true);
- }
- m_oaPS = new PreparedStatement[PS_MAX];
- } //________________________________
- /**
- * List of fields for select statement - provided only to avoid time
- * consuming 'select *' statements
- * @return String - a Comma separated list of fields
- */
- protected String getSelectFields()
- { return "uid,sequence_name,last_used_uid";
- } //________________________________
-
- // -------------------------------------------------------------
- // Column constants
- // -------------------------------------------------------------
- private static int s_iFld = 0;
- /**
- * Column index for field representing the UID of this table row
- */
- public static final int UID = s_iFld++;
- /**
- * Column index for field representing the sequence name of this row
- * @see DoiUidTable#SEQUENCE_OBJ
- * @see DoiUidTable#SEQUENCE_BATCH
- */
- public static final int SEQ_NAME = s_iFld++;
- /**
- * Column index for field representing the last used UID number for this
- * particular sequence name
- */
- public static final int LAST_USED_UID = s_iFld++;
-
-
- /**
- * This method is supplied to comply with the parent class but it should
- * NEVER be used
- * @param p_PS PreparedStatement
- * @param p_o Object
- * @throws Exception - This will ALWAYS throw an Exception - Inserts to
- * this table class should be handled ONLY by the Rosetta Administrator
- * @return int - It will never return a value
- */
- public int setInsValues(PreparedStatement p_PS,Object p_o)
- throws Exception
- { String sErr = "No Inserts to UID table";
- m_oLogger.error(sErr);
- throw new Exception (sErr);
- } //________________________________
- /**
- * Provided for compatibility - Never used - Will always return null
- * @param p_oRS ResultSet
- * @throws Exception
- * @return Object
- */
- public Object getFromRS(ResultSet p_oRS) throws Exception
- { return null;
- } //________________________________
-
- /**
- * Index of the 'select for update' statement in the list of PreparedStatement
- * objects for this DAO
- */
- public static final int PS_GET_SEQ_4_UPD = 0;
- /**
- * Index of the 'update' statement in the list of PreparedStatement
- * objects for this DAO
- */
- public static final int PS_UPDATE_LAST_USED = 1;
-
- private static final int PS_MAX = 10;
-
- /**
- * Obtain a prepared statement for this DAO from the list of available PStmts
- * <p>Uses lazy instantiation of requested objects</p>
- * @param p_i int - Index of PreparedStatement object to obtain
- * @throws Exception - If an invalid index is passed or there are problems
- * during the prepareStatement() invocation
- * @return PreparedStatement
- */
- public PreparedStatement getPS (int p_i) throws Exception
- { try
- { switch (p_i)
- { case PS_GET_SEQ_4_UPD: return getSeq4Upd(p_i);
- case PS_UPDATE_LAST_USED: return updateLastUsed(p_i);
- }
- ;
- throw new Exception("Invalid Index "+p_i);
- }
- catch (Exception e)
- { m_oLogger.error("Request for Prepared Statement Failed",e);
- throw e;
- }
- } //__________________________________
-
- private PreparedStatement getSeq4Upd(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- { StringBuffer sb = new StringBuffer(getSelectStatement())
- .append(" where ").append(getFldName(SEQ_NAME))
- .append(" = ? for update");
- m_oaPS[p_i] = getConn().prepareStatement(sb.toString());
- }
- return m_oaPS[p_i];
- } //__________________________________
-
- private PreparedStatement updateLastUsed(int p_i) throws Exception
- { if (null == m_oaPS[p_i])
- { StringBuffer sb = new StringBuffer("update ").append(m_sTableName)
- .append(" set ").append(getFldName(LAST_USED_UID)).append(" = ?")
- .append(" where ").append(getFldName(SEQ_NAME)).append(" = ?")
- ;
- m_oaPS[p_i] = getConn().prepareStatement(sb.toString());
- }
- return m_oaPS[p_i];
- } //__________________________________
-
- /**
- * This is an exception to the standard behaviour of derived classes that
- * extend the SqlDbTable abstract class
- * <p>This method is called by the JbossEsbPersistHandler and JbossEsbBatchHandler EJBs
- * and makes their life easier when they need to obtain UID chunks</p>
- * <p>These EJBs rely on this table to ensure no duplicate UIDs across all of
- * Rosetta</p>
- * <p>It could also be invoked from a different context, provided that the
- * Rosetta Administrators have added a row with a unique sequence name to
- * the underlying SQL table that holds the last used UIDs for all numbering
- * sequences</p>
- * @param p_sSeqName String - Key to the sequence name to get the chunk from
- * @param p_iQuids int - Number of UIDs to return
- * @throws Exception
- * @return long - First UID in the chunk assigned by this method
- */
- public long getUidChunk(String p_sSeqName, int p_iQuids) throws Exception
- {
- try
- { PreparedStatement PS = getPS(DaoUidTable.PS_GET_SEQ_4_UPD);
- PS.setString(1,p_sSeqName);
- ResultSet rs = getConn().execQueryWait(PS,30);
-
- boolean bOK=false;
- try
- { if (rs.next())
- bOK = true;
- }
- catch (Exception e1) { getConn().rollback(); }
- if (! bOK) throw new Exception("Select FAILED jbossEsb.getChunk()");
-
- int iSqlFld = 1+DaoUidTable.LAST_USED_UID;
- long lUid = rs.getLong(iSqlFld);
- if (lUid < 1) lUid = 1;
- long lNewLast = lUid + p_iQuids;
-
- PS = getPS(DaoUidTable.PS_UPDATE_LAST_USED);
- PS.setLong (1,lNewLast);
- PS.setString(2,p_sSeqName);
- getConn().execUpdWait(PS,10);
-
- getConn().commit();
-
- return lUid;
- }
- catch (Exception e)
- { m_oLogger.error(e.getMessage());
- throw e;
- }
- } //__________________________________
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java)
Deleted: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/RowBatch.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/RowBatch.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/RowBatch.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,42 +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.dbtables;
-
-public class RowBatch
-{
- public long m_lBatch;
- public int m_iSeq;
- public long m_lCommitTS;
- public String m_sData;
-
- public RowBatch()
- { this(0,0,0,null);
- } //__________________________________
-
- public RowBatch (long p_lBatch, int p_iSeq, long p_lTS, String p_sData)
- { m_lBatch = p_lBatch;
- m_iSeq = p_iSeq;
- m_lCommitTS = p_lTS;
- m_sData = p_sData;
- } //__________________________________
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/RowBatch.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/RowBatch.java)
Deleted: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlDbTable.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlDbTable.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlDbTable.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,178 +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.dbtables;
-
-import org.jboss.soa.esb.helpers.persist.*;
-
-import java.sql.*;
-
-public abstract class SqlDbTable
-{
- protected String m_sTableName;
- protected SqlField [] m_oaFields;
-
- protected PreparedStatement[] m_oaPS;
- private JdbcCleanConn m_oConn;
- public JdbcCleanConn getConn() { return m_oConn; }
-
-
- public final String getTableName() { return m_sTableName; }
- public final SqlField[] getAllFields() { return m_oaFields; }
-
- private String m_sInsertSql, m_sUpdateSql, m_sDeleteSql;
- protected String m_sSelectSql;
-
- public SqlDbTable(JdbcCleanConn p_oC, String p_sTblNm) throws Exception
- { m_oConn = p_oC;
- m_sTableName = p_sTblNm;
- initFields();
- } //________________________________
-
- /**
- * Sets values of all columns in underlying table
- *
- * <p>Developers should use this class's setObject or setLong methods
- * @param p_PS PreparedStatement
- * @param bobj BusinessObject
- * @return the number of fields that were set
- * @throws Exception
- */
- public abstract int setInsValues(PreparedStatement p_PS,Object bobj)
- throws Exception;
- public abstract Object getFromRS(ResultSet p_oRS)
- throws Exception;
-
- protected abstract String getSelectFields();
-
- public String getFldName(int p_i)
- { return (null ==m_oaFields) ? null
- : (p_i < 0) ? null
- : (p_i >= m_oaFields.length) ? null
- : m_oaFields[p_i].getFieldName();
- } //________________________________
-
- public String getSelectStatement()
- { if ( m_sSelectSql != null ) return m_sSelectSql;
- StringBuffer sb=new StringBuffer("select ").append(getSelectFields());
- m_sSelectSql = sb.append(" from ").append(getTableName()).toString();
- return m_sSelectSql;
- } //________________________________
-
- public String getInsertStatement()
- {
- if ( m_sInsertSql != null ) return m_sInsertSql;
-
- StringBuffer sb=new StringBuffer(256);
- sb.append("insert into ").append(getTableName());
-
- sb.append(" values (");
- for (int i = 0; i <m_oaFields.length; i++) ((i<1)?sb:sb.append(",")).append('?');
- sb.append(')');
-
- return (m_sInsertSql = sb.toString());
- } //________________________________
-
- public String getUpdateStatement()
- {
- if ( m_sUpdateSql != null ) return m_sUpdateSql;
-
- StringBuffer sb=new StringBuffer(256);
- sb.append("update ").append(getTableName()).append(" set ");
-
- StringBuffer sbWhere = new StringBuffer(" where ");
-
- int iVal = 0;
- int iWh = 0;
- for (int i = 0; i <m_oaFields.length; i++)
- { SqlField oCurr = m_oaFields[i];
- if (oCurr.isPrimaryKey())
- ((iWh++<1)?sbWhere:sbWhere.append(" and "))
- .append(oCurr.getFieldName()).append(" = ?");
- else
- ((iVal++<1)?sb:sb.append(","))
- .append(oCurr.getFieldName()).append(" = ?");
- }
- sb.append(sbWhere);
-
- return (m_sUpdateSql = sb.toString());
- } //________________________________
-
- public String getDeleteStatement()
- {
- if ( m_sDeleteSql != null ) return m_sDeleteSql;
-
- StringBuffer sb=new StringBuffer(256);
- sb.append("delete from ").append(getTableName())
- .append(" where ");
-
- int iWh = 0;
- for (int i = 0; i <m_oaFields.length; i++)
- { SqlField oCurr = m_oaFields[i];
- if (! oCurr.isPrimaryKey()) continue;
- ((iWh++<1)?sb:sb.append(" and "))
- .append(oCurr.getFieldName()).append(" = ?");
- }
-
- return (m_sDeleteSql = sb.toString());
- } //________________________________
-
- public void setObject(PreparedStatement p_PS, int p_iFld, Object p_sFldVal)
- throws SQLException
- { if (null!=p_sFldVal)
- if (p_sFldVal instanceof String)
- { String sTr = ((String)p_sFldVal).trim();
- p_sFldVal = (sTr.length()>0) ? sTr : null;
- }
- ;
- int iSqlIdx = 1 + p_iFld;
- if (null==p_sFldVal)p_PS.setNull (iSqlIdx, m_oaFields[p_iFld].getSqlType());
- else p_PS.setObject (iSqlIdx, p_sFldVal);
- } //________________________________
-
- public void setLong(PreparedStatement p_PS, int p_iFld, long p_lVal)
- throws SQLException
- { p_PS.setLong(1+p_iFld,p_lVal);
- } //________________________________
-
- public void setInt(PreparedStatement p_PS, int p_iFld, int p_iVal)
- throws SQLException
- { p_PS.setInt(1+p_iFld,p_iVal);
- } //________________________________
-
- private void initFields() throws Exception
- { PreparedStatement PS = m_oConn.prepareStatement(getSelectStatement());
-
- ResultSetMetaData MD = m_oConn.execQueryWait(PS,3).getMetaData();
- m_oaFields = new SqlField[MD.getColumnCount()];
- for (int i1=0; i1<m_oaFields.length;i1++)
- { int iCol = 1+i1;
- String sFN = MD.getColumnName(iCol);
- Class oCL = Class.forName(MD.getColumnClassName(iCol));
- int iTP = MD.getColumnType(iCol);
- int iSZ = MD.getColumnDisplaySize(iCol);
- m_oaFields[i1] = new SqlField(sFN,oCL,iTP,iSZ,false);
- }
- PS.close();
- } //________________________________
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlDbTable.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlDbTable.java)
Deleted: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlField.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlField.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlField.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,64 +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.dbtables;
-
-public class SqlField
-{
- private int m_sqlType;
- private Class m_javaType;
- private int m_sqlLength;
- private String m_fieldName;
- private boolean m_primaryKey;
-
- /**
- * SqlField
- *
- * @param pFldName String
- * @param pJavaType Class
- * @param pSqlType int
- * @param pFieldLength int
- * @param pk boolean Is primary key ?
- */
- public SqlField(String pFldName,Class pJavaType,int pSqlType
- ,int pFieldLength, boolean pk)
- {
- m_fieldName = pFldName;
- m_javaType = pJavaType;
- m_sqlType = pSqlType;
- m_sqlLength = pFieldLength;
- m_primaryKey = pk;
- }
-
- public int getSqlType() { return m_sqlType; }
- public Class getJavaType() { return m_javaType; }
- public int getSqlLength() { return this.m_sqlLength; }
- public String getFieldName() { return this.m_fieldName; }
- public boolean isPrimaryKey() { return this.m_primaryKey; }
-
- public void setSqlType(int pSqlType) { m_sqlType = pSqlType; }
- public void setJavaType(Class pJavaType) { m_javaType = pJavaType; }
- public void setSqlLength(int pSqlLength) { m_sqlLength = pSqlLength; }
- public void setFieldName(String pFieldName) { m_fieldName = pFieldName; }
- public void setPrimaryKey(boolean pPrimaryKey) { m_primaryKey = pPrimaryKey; }
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlField.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/src/org/jboss/soa/esb/services/dbtables/SqlField.java)
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -244,7 +244,7 @@
= EsbSysProps.getParamsReposFactoryClass();
ParamsRepository oRep
= ParamsReposUtil.reposFromFactory(sFactoryClass,null);
- return oRep.getElement(oRep.nameFromString(p_sKey));
+ return oRep.getElement(ParamsReposUtil.nameFromString(p_sKey));
} //__________________________________
Copied: labs/jbossesb/trunk/ESBCore/services/tests (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/tests)
Deleted: labs/jbossesb/trunk/ESBCore/services/tests/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/tests/build.xml 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/tests/build.xml 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-<project name="build.services.tests" default="org.jboss.esb.services.tests.compile" basedir=".">
-
- <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
- <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
- <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
- <property environment="env"/>
-
- <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"/>
- </condition>
-
- <path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="../${org.jboss.esb.ext.lib.dir}"
- includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- </path>
-
- <target name="org.jboss.esb.tests.init">
- <tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
- </tstamp>
-
- <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
- <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
- </target>
-
- <target name="clean"/>
-
- <target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.tests.bin.dir}"/>
- </target>
-
- <target name="org.jboss.esb.services.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
-
- <javac
- destdir="${org.jboss.esb.tests.bin.dir}"
- classpathref="org.jboss.esb.tests.base.classpath"
- debug="${org.jboss.esb.debug}"
- optimize="${org.jboss.esb.optimize}"
- >
- <src path="${org.jboss.esb.tests.src.dir}"/>
- </javac>
-
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- T E S T -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.services.internal.test">
- <antcall target="org.jboss.esb.services.internal.test.unit"/>
- <antcall target="org.jboss.esb.services.internal.test.functional"/>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- U N I T T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.services.internal.test.unit">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/services/**/**UnitTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- F U NC T I O N A L T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.services.internal.test.functional">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/services/**/**FuncTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-</project>
Copied: labs/jbossesb/trunk/ESBCore/services/tests/build.xml (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/tests/build.xml)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/tests/src)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss/soa)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss/soa/esb)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss/soa/esb/services)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests)
Deleted: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,45 +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.tests;
-
-import org.jboss.soa.esb.common.tests.BaseTest;
-
-/**
- * Dummy test file.
- *
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision$</tt>
- * $Id$
- */
-public class DummyUnitTest extends BaseTest {
-
- /**
- * Remove me
- * @throws Exception
- */
- public void testDummyCompileAndInvoke() throws Exception {
- log.info("****************************************************************");
- log.info(" Dummy unit test called. Replace this with module level tests");
- log.info("****************************************************************");
- }
-
-}
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java)
Copied: labs/jbossesb/trunk/ESBCore/tests (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests)
Deleted: labs/jbossesb/trunk/ESBCore/tests/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/tests/build.xml 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/tests/build.xml 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-<project name="BuildEsbTests" default="org.jboss.esb.tests.compile" basedir=".">
-
- <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
- <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
- <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
- <property environment="env"/>
-
- <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"/>
- </condition>
-
- <path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="${org.jboss.esb.ext.lib.dir}"
- includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- </path>
-
- <target name="org.jboss.esb.tests.init">
- <tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
- </tstamp>
-
- <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
- <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
- </target>
-
- <target name="clean"/>
-
- <target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.tests.bin.dir}"/>
- </target>
-
- <target name="org.jboss.esb.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
-
- <javac
- destdir="${org.jboss.esb.tests.bin.dir}"
- classpathref="org.jboss.esb.tests.base.classpath"
- debug="${org.jboss.esb.debug}"
- optimize="${org.jboss.esb.optimize}"
- >
- <src path="${org.jboss.esb.tests.src.dir}"/>
- </javac>
-
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- T E S T -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.internal.test">
- <antcall target="org.jboss.esb.internal.test.unit"/>
- <antcall target="org.jboss.esb.internal.test.functional"/>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- U N I T T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.internal.test.unit">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/**/**/**UnitTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- F U NC T I O N A L T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.internal.test.functional">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/**FunctionalTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-</project>
Copied: labs/jbossesb/trunk/ESBCore/tests/build.xml (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/build.xml)
Copied: labs/jbossesb/trunk/ESBCore/tests/src (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src)
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org)
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss)
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa)
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb)
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests)
Deleted: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/BaseTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/BaseTest.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/BaseTest.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,55 +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.tests;
-
-import junit.framework.TestCase;
-import org.jboss.logging.Logger;
-
-/**
- * Base test class for esb test classes, uses jboss logging.
- *
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision$</tt>
- * $Id$
- */
-public class BaseTest extends TestCase {
-
- /**
- * The Logger.
- */
- protected Logger log = Logger.getLogger(getClass());
-
- /**
- * Default class constructor.
- */
- public BaseTest() {
- }
-
- /**
- * Utility constructor.
- * @param name The test name.
- */
- public BaseTest(String name) {
- super(name);
- }
-
-}
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/BaseTest.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/BaseTest.java)
Deleted: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/Controller.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/Controller.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/Controller.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,56 +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.tests;
-
-import java.lang.reflect.*;
-
-public class Controller
-{
- private static String[] s_saArgs;
- static String[] getArgs() { return s_saArgs; }
- public static void main(String[] args) throws Exception
- { s_saArgs = args; new Controller(); }
-
- private Controller() throws Exception
- {
- // build this Class[] with the list of classes you wish to test
- // Tested classes should have a public constructor with no arguments
-
- Class[] oaTest =
- {
-// TestParamsRepository.class
-// ,TestPersonAddrPhone.class
-// ,TestObjStore.class
-// ,TestNotification.class
- DrainQueuesAndTopics.class
- };
-
- for (Class oCls : oaTest)
- {
- Constructor oConst = oCls.getConstructor(new Class[] {});
- oConst.newInstance(new Object[] {});
- }
-
- Thread.sleep(500);
- } //________________________________
-
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/Controller.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/Controller.java)
Deleted: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,92 +0,0 @@
-package org.jboss.soa.esb.tests;
-
-import javax.jms.*;
-import javax.naming.*;
-
-import org.jboss.soa.esb.helpers.*;
-
-public class DrainQueuesAndTopics
-{
- private static final int MAX_TIMES_NOMSG = 10;
- private static final String JNDI_URL = "localhost";
- private static final String JNDI_TYPE
- = AppServerContext.SERVER_TYPE.jboss.toString();
-
- private Context m_oCtx;
-
- public DrainQueuesAndTopics() throws Exception
- {
- purgeQueueTopic("queue/A");
- purgeQueueTopic("queue/B");
- purgeQueueTopic("topic/testTopic");
- } //__________________________________
-
- public int purgeQueueTopic(String p_sName) throws Exception
- {
- int iRet = 0;
- m_oCtx = AppServerContext.getServerContext(JNDI_TYPE,JNDI_URL);
-
- System.out.println(p_sName);
- MessageConsumer oCns = null;
- switch(p_sName.toLowerCase().charAt(0))
- { case 't' : oCns = getTopic(p_sName); break;
- case 'q' : oCns = getQueue(p_sName); break;
- }
- if (null==oCns)
- return 0;
-
- for (int iNoRcv=0; iNoRcv < MAX_TIMES_NOMSG; )
- { Message oMsg = oCns.receive(200);
- if (null==oMsg)
- { iNoRcv++;
- System.out.print(".");
- continue;
- }
- iRet++;
- dumpMessage(oMsg);
- iNoRcv = 0;
- }
- System.out.println();
- return iRet;
- } //__________________________________
-
- void dumpMessage(Message pM)
- {
- System.out.println(pM);
- } //__________________________________
-
- QueueReceiver getQueue(String p_sJndi) throws Exception
- {
- QueueConnection oQconn = null;
- QueueSession oQsess = null;
- QueueConnectionFactory qcf = (QueueConnectionFactory) m_oCtx
- .lookup("ConnectionFactory");
-
- oQconn = qcf.createQueueConnection();
- oQsess = oQconn.createQueueSession(false
- ,QueueSession.AUTO_ACKNOWLEDGE);
- javax.jms.Queue oQueue
- = (javax.jms.Queue) m_oCtx.lookup(p_sJndi);
-
- QueueReceiver oRcv = oQsess.createReceiver(oQueue);
- oQconn.start();
- return oRcv;
- } //__________________________________
-
- TopicSubscriber getTopic(String p_sJndi) throws Exception
- {
- TopicConnection oTconn = null;
- TopicSession oTsess = null;
- TopicConnectionFactory qcf = (TopicConnectionFactory) m_oCtx
- .lookup("ConnectionFactory");
-
- oTconn = qcf.createTopicConnection();
- oTsess = oTconn.createTopicSession(false
- ,QueueSession.AUTO_ACKNOWLEDGE);
- Topic oT = (Topic) m_oCtx.lookup(p_sJndi);
-
- TopicSubscriber oRcv = oTsess.createSubscriber(oT);
- oTconn.start();
- return oRcv;
- } //__________________________________
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java)
Deleted: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestNotification.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/TestNotification.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestNotification.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,201 +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.tests;
-
-import java.util.*;
-import java.text.SimpleDateFormat;
-
-import org.jboss.soa.esb.common.EsbSysProps;
-import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.helpers.persist.SimpleDataSource;
-import org.jboss.soa.esb.notification.*;
-import org.jboss.soa.esb.services.*;
-
-// DON'T FORGET !!
-// The Rosetta Application server has to be up and running
-// (set JNDI_SERVER appropriately)
-// For e-mail notification: System properties for smtp
-// (server, user, password, port) must be set up in app server
-
-public class TestNotification
-{
- private static InotificationHandler m_oH;
-
- public TestNotification () throws Exception
- { performTest(); }
-
- static void performTest() throws Exception
- {
- // get a handle to your business delegate
- m_oH = NotificationHandlerFactory.getNotifHandler
- ("remote"
- ,EsbSysProps.getJndiServerType()
- ,EsbSysProps.getJndiServerURL()
- );
-
- 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");
-
- m_oH.sendNotifications(oNL,sb.toString());
- } //________________________________
-
- 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://lavasca:5432/rosetta");
- oTgt.setAttr(SimpleDataSource.USER,"postgres");
- oTgt.setAttr(SimpleDataSource.PASSWORD,"");
-
- // 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/ESBCore/tests/src/org/jboss/soa/esb/tests/TestNotification.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/TestNotification.java)
Deleted: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestObjStore.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/TestObjStore.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestObjStore.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,84 +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.tests;
-
-import org.jboss.soa.esb.common.EsbSysProps;
-import org.jboss.soa.esb.common.bizclasses.*;
-import org.jboss.soa.esb.services.*;
-
-// DON'T FORGET !!
-// The Rosetta Application server has to be up and running
-// (set JNDI_SERVER appropriately)
-
-public class TestObjStore
-{
- private static IpersistHandler m_oH;
-
- public TestObjStore () throws Exception
- { performTest(); }
-
- static void performTest() throws Exception
- {
- // get a handle to your business delegate
- m_oH = PersistHandlerFactory.getPersistHandler
- ("remote"
- ,EsbSysProps.getJndiServerType()
- ,EsbSysProps.getJndiServerURL()
- );
-
- // request UID chunks for your own use
- int[] ia = {10,20,30};
- for (int iCurr : ia)
- System.out.println
- ("Requesting "+iCurr+" uids "
- +" - First UID returned = " +m_oH.getUidChunk(iCurr)
- );
-
- storeAndRetrievePerson();
- } //________________________________
-
- static void storeAndRetrievePerson() throws Exception
- {
- // set up a Person (see TestPersonAddrPhone.class)
- Person oPrs = TestPersonAddrPhone.getPerson();
- // timestamp, uid and snap Uid are added just to make it easier
- // to compare output text
- oPrs.setStamp(System.currentTimeMillis());
- long lUid = m_oH.addObject(oPrs);
- oPrs.setUid(lUid);
- oPrs.setSnap(lUid);
-
- // retrieve it from the Object Store
- Person oP2 = (Person)m_oH.getObject(Person.class,lUid);
-
- // output in XML format both objects, and compare
- // timestamps will differ slightly because first object
- // has a dummy timestamp (just before "store" request)
- System.out.println(oPrs.toDTO().toXml());
- System.out.println(oP2.toDTO().toXml());
-
- // if you used the "ObjStoreExample.xml" that comes with the
- // standard example, you'll be able to see your objects
- // in the "object_snap" and "people_index" tables
-
- } //________________________________
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestObjStore.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/TestObjStore.java)
Deleted: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,55 +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.tests;
-
-import javax.naming.*;
-
-import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.parameters.*;
-
-public class TestParamsRepository
-{
- ParamsRepository m_oRepos;
- public TestParamsRepository() throws Exception
- {
- m_oRepos = ParamsReposUtil.reposFromFactory(null,null);
- performTest();
- } //________________________________
-
- @SuppressWarnings("unused")
- private void performTest() throws Exception
- {
- String sDir = "/tmp/jbossEsb/paramsDir";
- Name oInpName = ParamsReposUtil.nameFromString(sDir)
- .add("FileMoverConfigExample.xml");
-
- DomElement oElem = m_oRepos.getElement(oInpName);
-
- Name oOutName = ParamsReposUtil.nameFromString(sDir)
- .add("outputTest.xml");
- m_oRepos.storeElement(oOutName,oElem);
-
- oElem = m_oRepos.getElement(oOutName);
- System.out.println(oElem.toString());
- } //________________________________
-
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java)
Deleted: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,96 +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.tests;
-
-
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.common.bizclasses.*;
-
-public class TestPersonAddrPhone
-{
- public TestPersonAddrPhone() throws Exception
- { performTest(); }
-
- static void performTest() throws Exception
- {
- BaseBusinessObject o = getPerson();
- o.setPackage();
-
- BobjStdDTO oDto = o.toDTO();
- System.out.println(oDto.toXml());
-
- o = BaseBusinessObject.getFromDTO(oDto);
- System.out.println(o.toDTO().toXml());
- Thread.sleep(500);
-
- o.toDTO().Dump("Example dump of "+EsbUtil.classSuffix(o.getClass()));
-
- } //________________________________
-
- static Person getPerson() throws Exception
- { Person oP = new Person((String)null);
- oP.setField(Person.ATTRIB.pfx,"Mr.");
- oP.setField(Person.ATTRIB.fmlyN,"Brum");
- oP.setField(Person.ATTRIB.givN,"Daniel");
- oP.setField(Person.ATTRIB.sfx,"the 1st.");
-
- oP.addAddress(getAddress());
-
- oP.addEmail(OneValue.getStringValue("myaddr at gmail.com","home"));
- oP.addEmail(OneValue.getStringValue("john.smith at jboss.com","work"));
-
- oP.addPhone(newPhone("basement","1","416","555-1212",null));
- oP.addPhone(newPhone("cell",null,"416","666-4444",null));
-
- return oP;
- } //________________________________
-
- static Address getAddress() throws Exception
- {
- Address oP = new Address((String)null);
- oP.setField(Address.ATTRIB.strNum,"50");
- oP.setField(Address.ATTRIB.strLine1,"Balcarce");
- oP.setField(Address.ATTRIB.twnCty1,"San Isidro");
- oP.setField(Address.ATTRIB.postalZip,"1642");
- oP.setField(Address.ATTRIB.provSt,"Buenos Aires");
- oP.setField(Address.ATTRIB.cntry,"Argentina");
-
- oP.addPhone(newPhone("torIP",null,"416","555-1212",null));
- oP.addPhone(newPhone("home","54","11","4555-1111","7"));
-
- return oP;
- } //________________________________
-
- public static Telephone newPhone(String p_sRole,
- String p_sCtry, String p_sCity, String p_sNum, String p_sExt)
- {
- Telephone oP = new Telephone((String)null);
- oP.setRole(p_sRole);
- oP.setField(Telephone.ATTRIB.cntry,p_sCtry);
- oP.setField(Telephone.ATTRIB.city,p_sCity);
- oP.setField(Telephone.ATTRIB.num,p_sNum);
- oP.setField(Telephone.ATTRIB.ext,p_sExt);
-
- return oP;
- }
-
-} //____________________________________________________________________________
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java)
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/common)
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses)
Deleted: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/AddressUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/AddressUnitTest.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/AddressUnitTest.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,124 +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.tests.common.bizclasses;
-
-import org.jboss.soa.esb.tests.BaseTest;
-import org.jboss.soa.esb.common.bizclasses.Address;
-import org.jboss.soa.esb.common.bizclasses.Telephone;
-import org.jboss.soa.esb.util.BaseBusinessObject;
-import org.jboss.soa.esb.util.BobjStdDTO;
-
-/**
- * Unit test for the address class.
- *
- * @author <a href="mailto:schifest at gmail.com">Esteban Shifman</a>
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision:$</tt>
- * $Id:$
- */
-public class AddressUnitTest extends BaseTest {
-
-
- public void testAddress() throws Exception {
- Address address = getAddress();
- assertTrue("Expecting Address.strNum to be 50. Actual was " +
- address.getField(Address.ATTRIB.strNum), address.getField(Address.ATTRIB.strNum).equals("50"));
- assertTrue("Expecting Address.strLine1 to be Balcarce. Actual was " +
- address.getField(Address.ATTRIB.strLine1), address.getField(Address.ATTRIB.strLine1).equals("Balcarce"));
- assertTrue("Expecting Address.twnCty1 to be San Isidro. Actual was " +
- address.getField(Address.ATTRIB.twnCty1), address.getField(Address.ATTRIB.twnCty1).equals("San Isidro"));
- assertTrue("Expecting Address.postalZip to be 1642. Actual was " +
- address.getField(Address.ATTRIB.postalZip), address.getField(Address.ATTRIB.postalZip).equals("1642"));
- assertTrue("Expecting Address.provSt to be Buenos Aires. Actual was " +
- address.getField(Address.ATTRIB.provSt), address.getField(Address.ATTRIB.provSt).equals("Buenos Aires"));
- assertTrue("Expecting Address.cntry to be Argentina. Actual was " +
- address.getField(Address.ATTRIB.cntry), address.getField(Address.ATTRIB.cntry).equals("Argentina"));
-
- // Phone
- assertTrue("Expecting Address.phone[0].role to be torIP. Actual was " +
- address.getPhoneAt(0).getRole(), address.getPhoneAt(0).getRole().equals("torIP"));
- assertTrue("Expecting Address.phone[0].country to be null. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.cntry), address.getPhoneAt(0).getField(Telephone.ATTRIB.cntry) == null);
- assertTrue("Expecting Address.phone[0].city to be 416. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.city), address.getPhoneAt(0).getField(Telephone.ATTRIB.city).equals("416"));
- assertTrue("Expecting Address.phone[0].num to be 555-1212. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.num), address.getPhoneAt(0).getField(Telephone.ATTRIB.num).equals("555-1212"));
- assertTrue("Expecting Address.phone[0].ext to be null. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.ext), address.getPhoneAt(0).getField(Telephone.ATTRIB.ext) == null);
-
- assertTrue("Expecting Address.phone[1].role to be home. Actual was " +
- address.getPhoneAt(1).getRole(), address.getPhoneAt(1).getRole().equals("home"));
- assertTrue("Expecting Address.phone[1].country to be 54. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.cntry), address.getPhoneAt(1).getField(Telephone.ATTRIB.cntry).equals("54"));
- assertTrue("Expecting Address.phone[1].city to be 11. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.city), address.getPhoneAt(1).getField(Telephone.ATTRIB.city).equals("11"));
- assertTrue("Expecting Address.phone[1].num to be 4555-1111. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.num), address.getPhoneAt(1).getField(Telephone.ATTRIB.num).equals("4555-1111"));
- assertTrue("Expecting Address.phone[1].ext to be 7. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.ext), address.getPhoneAt(1).getField(Telephone.ATTRIB.ext).equals("7"));
-
- }
-
-
- public void testToDTO() throws Exception {
- BaseBusinessObject addressA = getAddress();
- addressA.setPackage();
-
- BobjStdDTO oDto = addressA.toDTO();
- System.out.println(oDto.toXml());
-
- Address addressB = (Address) BaseBusinessObject.getFromDTO(oDto);
- System.out.println(addressB.toDTO().toXml());
-
- assertTrue("Expecting AddressA == AddressB", addressA.toDTO().toXml().equals(addressB.toDTO().toXml()));
- }
-
-
- static Address getAddress() throws Exception {
- Address oP = new Address((String) null);
- oP.setField(Address.ATTRIB.strNum, "50");
- oP.setField(Address.ATTRIB.strLine1, "Balcarce");
- oP.setField(Address.ATTRIB.twnCty1, "San Isidro");
- oP.setField(Address.ATTRIB.postalZip, "1642");
- oP.setField(Address.ATTRIB.provSt, "Buenos Aires");
- oP.setField(Address.ATTRIB.cntry, "Argentina");
-
- oP.addPhone(newPhone("torIP", null, "416", "555-1212", null));
- oP.addPhone(newPhone("home", "54", "11", "4555-1111", "7"));
-
- return oP;
- }
-
- public static Telephone newPhone(String p_sRole, String p_sCtry, String p_sCity,
- String p_sNum, String p_sExt) {
- Telephone oP = new Telephone((String) null);
- oP.setRole(p_sRole);
- oP.setField(Telephone.ATTRIB.cntry, p_sCtry);
- oP.setField(Telephone.ATTRIB.city, p_sCity);
- oP.setField(Telephone.ATTRIB.num, p_sNum);
- oP.setField(Telephone.ATTRIB.ext, p_sExt);
-
- return oP;
- }
-
-
-}
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/AddressUnitTest.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/AddressUnitTest.java)
Deleted: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/PersonUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/PersonUnitTest.java 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/PersonUnitTest.java 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,204 +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.tests.common.bizclasses;
-
-import org.jboss.soa.esb.tests.BaseTest;
-import org.jboss.soa.esb.common.bizclasses.Person;
-import org.jboss.soa.esb.common.bizclasses.OneValue;
-import org.jboss.soa.esb.common.bizclasses.Address;
-import org.jboss.soa.esb.common.bizclasses.Telephone;
-import org.jboss.soa.esb.util.BaseBusinessObject;
-import org.jboss.soa.esb.util.BobjStdDTO;
-
-/**
- * Unit test for the person class.
- *
- * @author <a href="mailto:schifest at gmail.com">Esteban Shifman</a>
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision:$</tt>
- * $Id:$
- */
-public class PersonUnitTest extends BaseTest {
-
-
- public void testPerson() throws Exception {
-
- Person person = getPerson();
-
- assertTrue("Expecting Person.pfx to be Mr. Actual was " +
- person.getField(Person.ATTRIB.pfx), person.getField(Person.ATTRIB.pfx).equals("Mr."));
- assertTrue("Expecting Person.fmlyN to be Brum. Actual was " +
- person.getField(Person.ATTRIB.fmlyN), person.getField(Person.ATTRIB.fmlyN).equals("Brum"));
- assertTrue("Expecting Person.givN to be Daniel. Actual was " +
- person.getField(Person.ATTRIB.givN), person.getField(Person.ATTRIB.givN).equals("Daniel"));
- assertTrue("Expecting Person.sfx to be the 1st.. Actual was " +
- person.getField(Person.ATTRIB.sfx), person.getField(Person.ATTRIB.sfx).equals("the 1st."));
-
- }
-
- public void testPersonEmail() throws Exception {
-
- Person person = getPerson();
-
- String expectedEmail0 = "<OneValue rol=\"home\" v=\"myaddr at gmail.com\"/>";
- assertTrue("Expecting Person.email[0] to be Actual was " +
- person.getEmailAt(0).toString(), person.getEmailAt(0).toString().equals(expectedEmail0));
-
- String expectedEmail1 = "<OneValue rol=\"work\" v=\"john.smith at jboss.com\"/>";
- assertTrue("Expecting Person.email[0] to be Actual was " +
- person.getEmailAt(1).toString(), person.getEmailAt(1).toString().equals(expectedEmail1));
- }
-
- public void testPersonTelephone() throws Exception {
-
- Person person = getPerson();
-
- assertTrue("Expecting Person.phone[0].role to be basement. Actual was " +
- person.getPhoneAt(0).getRole(), person.getPhoneAt(0).getRole().equals("basement"));
- assertTrue("Expecting Person.phone[0].country to be 1. Actual was " +
- person.getPhoneAt(0).getField(Telephone.ATTRIB.cntry), person.getPhoneAt(0).getField(Telephone.ATTRIB.cntry).equals("1"));
- assertTrue("Expecting Person.phone[0].city to be 416. Actual was " +
- person.getPhoneAt(0).getField(Telephone.ATTRIB.city), person.getPhoneAt(0).getField(Telephone.ATTRIB.city).equals("416"));
- assertTrue("Expecting Person.phone[0].num to be 555-1212. Actual was " +
- person.getPhoneAt(0).getField(Telephone.ATTRIB.num), person.getPhoneAt(0).getField(Telephone.ATTRIB.num).equals("555-1212"));
- assertTrue("Expecting Person.phone[0].ext to be null. Actual was " +
- person.getPhoneAt(0).getField(Telephone.ATTRIB.ext), person.getPhoneAt(0).getField(Telephone.ATTRIB.ext) == null);
-
- assertTrue("Expecting Person.phone[1].role to be basement. Actual was " +
- person.getPhoneAt(1).getRole(), person.getPhoneAt(1).getRole().equals("cell"));
- assertTrue("Expecting Person.phone[1].country to be null. Actual was " +
- person.getPhoneAt(1).getField(Telephone.ATTRIB.cntry), person.getPhoneAt(1).getField(Telephone.ATTRIB.cntry) == null);
- assertTrue("Expecting Person.phone[1].city to be 416. Actual was " +
- person.getPhoneAt(1).getField(Telephone.ATTRIB.city), person.getPhoneAt(1).getField(Telephone.ATTRIB.city).equals("416"));
- assertTrue("Expecting Person.phone[1].num to be 666-4444. Actual was " +
- person.getPhoneAt(1).getField(Telephone.ATTRIB.num), person.getPhoneAt(1).getField(Telephone.ATTRIB.num).equals("666-4444"));
- assertTrue("Expecting Person.phone[1].ext to be null. Actual was " +
- person.getPhoneAt(1).getField(Telephone.ATTRIB.ext), person.getPhoneAt(1).getField(Telephone.ATTRIB.ext) == null);
-
- }
-
- public void testPersonAddress() throws Exception {
-
- Address address = getPerson().getAddressAt(0);
- assertTrue("Expecting Address.strNum to be 50. Actual was " +
- address.getField(Address.ATTRIB.strNum), address.getField(Address.ATTRIB.strNum).equals("50"));
- assertTrue("Expecting Address.strLine1 to be Balcarce. Actual was " +
- address.getField(Address.ATTRIB.strLine1), address.getField(Address.ATTRIB.strLine1).equals("Balcarce"));
- assertTrue("Expecting Address.twnCty1 to be San Isidro. Actual was " +
- address.getField(Address.ATTRIB.twnCty1), address.getField(Address.ATTRIB.twnCty1).equals("San Isidro"));
- assertTrue("Expecting Address.postalZip to be 1642. Actual was " +
- address.getField(Address.ATTRIB.postalZip), address.getField(Address.ATTRIB.postalZip).equals("1642"));
- assertTrue("Expecting Address.provSt to be Buenos Aires. Actual was " +
- address.getField(Address.ATTRIB.provSt), address.getField(Address.ATTRIB.provSt).equals("Buenos Aires"));
- assertTrue("Expecting Address.cntry to be Argentina. Actual was " +
- address.getField(Address.ATTRIB.cntry), address.getField(Address.ATTRIB.cntry).equals("Argentina"));
-
- // Phone
- assertTrue("Expecting Address.phone[0].role to be torIP. Actual was " +
- address.getPhoneAt(0).getRole(), address.getPhoneAt(0).getRole().equals("torIP"));
- assertTrue("Expecting Address.phone[0].country to be null. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.cntry), address.getPhoneAt(0).getField(Telephone.ATTRIB.cntry) == null);
- assertTrue("Expecting Address.phone[0].city to be 416. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.city), address.getPhoneAt(0).getField(Telephone.ATTRIB.city).equals("416"));
- assertTrue("Expecting Address.phone[0].num to be 555-1212. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.num), address.getPhoneAt(0).getField(Telephone.ATTRIB.num).equals("555-1212"));
- assertTrue("Expecting Address.phone[0].ext to be null. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.ext), address.getPhoneAt(0).getField(Telephone.ATTRIB.ext) == null);
-
- assertTrue("Expecting Address.phone[1].role to be home. Actual was " +
- address.getPhoneAt(1).getRole(), address.getPhoneAt(1).getRole().equals("home"));
- assertTrue("Expecting Address.phone[1].country to be 54. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.cntry), address.getPhoneAt(1).getField(Telephone.ATTRIB.cntry).equals("54"));
- assertTrue("Expecting Address.phone[1].city to be 11. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.city), address.getPhoneAt(1).getField(Telephone.ATTRIB.city).equals("11"));
- assertTrue("Expecting Address.phone[1].num to be 4555-1111. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.num), address.getPhoneAt(1).getField(Telephone.ATTRIB.num).equals("4555-1111"));
- assertTrue("Expecting Address.phone[1].ext to be 7. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.ext), address.getPhoneAt(1).getField(Telephone.ATTRIB.ext).equals("7"));
-
-
- }
-
-
-
-
-
- public void testToDTO() throws Exception {
- BaseBusinessObject personA = getPerson();
- personA.setPackage();
-
- BobjStdDTO oDto = personA.toDTO();
- System.out.println(oDto.toXml());
-
- Person personB = (Person) BaseBusinessObject.getFromDTO(oDto);
- System.out.println(personB.toDTO().toXml());
-
- assertTrue("Expecting PersonA == PersonB", personA.toDTO().toXml().equals(personB.toDTO().toXml()));
- }
-
-
- static Person getPerson() throws Exception {
- Person oP = new Person((String) null);
- oP.setField(Person.ATTRIB.pfx, "Mr.");
- oP.setField(Person.ATTRIB.fmlyN, "Brum");
- oP.setField(Person.ATTRIB.givN, "Daniel");
- oP.setField(Person.ATTRIB.sfx, "the 1st.");
-
- oP.addAddress(getAddress());
-
- oP.addEmail(OneValue.getStringValue("myaddr at gmail.com", "home"));
- oP.addEmail(OneValue.getStringValue("john.smith at jboss.com", "work"));
-
- oP.addPhone(newPhone("basement", "1", "416", "555-1212", null));
- oP.addPhone(newPhone("cell", null, "416", "666-4444", null));
-
- return oP;
- }
-
- static Address getAddress() throws Exception {
- Address oP = new Address((String) null);
- oP.setField(Address.ATTRIB.strNum, "50");
- oP.setField(Address.ATTRIB.strLine1, "Balcarce");
- oP.setField(Address.ATTRIB.twnCty1, "San Isidro");
- oP.setField(Address.ATTRIB.postalZip, "1642");
- oP.setField(Address.ATTRIB.provSt, "Buenos Aires");
- oP.setField(Address.ATTRIB.cntry, "Argentina");
-
- oP.addPhone(newPhone("torIP", null, "416", "555-1212", null));
- oP.addPhone(newPhone("home", "54", "11", "4555-1111", "7"));
-
- return oP;
- }
-
- public static Telephone newPhone(String p_sRole,
- String p_sCtry, String p_sCity, String p_sNum, String p_sExt) {
- Telephone oP = new Telephone((String) null);
- oP.setRole(p_sRole);
- oP.setField(Telephone.ATTRIB.cntry, p_sCtry);
- oP.setField(Telephone.ATTRIB.city, p_sCity);
- oP.setField(Telephone.ATTRIB.num, p_sNum);
- oP.setField(Telephone.ATTRIB.ext, p_sExt);
-
- return oP;
- }
-
-}
Copied: labs/jbossesb/trunk/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/PersonUnitTest.java (from rev 5103, labs/jbossesb/branches/refactor/ESBCore/tests/src/org/jboss/soa/esb/tests/common/bizclasses/PersonUnitTest.java)
Modified: labs/jbossesb/trunk/build.xml
===================================================================
--- labs/jbossesb/trunk/build.xml 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/build.xml 2006-07-14 21:04:47 UTC (rev 5104)
@@ -13,10 +13,6 @@
<!-- Set default properties filename -->
<property name="org.jboss.esb.properties" value="product.properties"/>
- <!-- Some default build locations -->
- <property name="org.jboss.esb.internal.dest" value="${basedir}/build"/>
- <property name="org.jboss.esb.internal.jar.dest" value="${basedir}/lib"/>
-
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.properties}"/>
@@ -56,6 +52,8 @@
<!-- Path names -->
<property name="org.jboss.esb.internal.core" value="ESBCore"/>
+ <property name="org.jboss.esb.internal.dest" value="${basedir}/build"/>
+ <property name="org.jboss.esb.internal.jar.dest" value="${basedir}/lib"/>
<property name="org.jboss.esb.internal.javadocs.dest" value="javadocs"/>
<!-- Initialisation -->
@@ -80,7 +78,15 @@
<ant dir="ESBCore"/>
</target>
- <!-- javadocs paths -->
+ <!-- Test targets -->
+ <target name="org.jboss.esb.test" depends="org.jboss.esb.compile">
+ <echo message="Testing modules"/>
+ <ant dir="ESBCore" target="org.jboss.esb.core.test"/>
+ </target>
+
+
+
+ <!-- javadocs paths -->
<path id="org.jboss.esb.javadocs.path">
<pathelement path="ESBCore/classes"/>
</path>
@@ -150,7 +156,7 @@
<target name="org.jboss.esb.clean">
<echo message="Cleaning modules"/>
- <echo message="Compiling modules"/>
+ <echo message="Cleaning ESBCore"/>
<ant dir="ESBCore" target="clean"/>
</target>
@@ -166,7 +172,8 @@
<!-- Short target names -->
<target name="compile" depends="org.jboss.esb.compile"/>
- <target name="jar" depends="org.jboss.esb.jar"/>
+ <target name="test" depends="org.jboss.esb.test"/>
+ <target name="jar" depends="org.jboss.esb.jar"/>
<target name="clean" depends="org.jboss.esb.clean"/>
<target name="purge" depends="org.jboss.esb.purge"/>
</project>
Modified: labs/jbossesb/trunk/docs/Install/conf/jbossEsb.properties
===================================================================
--- labs/jbossesb/trunk/docs/Install/conf/jbossEsb.properties 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/docs/Install/conf/jbossEsb.properties 2006-07-14 21:04:47 UTC (rev 5104)
@@ -36,4 +36,4 @@
#
# Object Store Settings
#
-jbossEsb.objStore.configfile=/mypath/.../ObjStoreExample.xml
\ No newline at end of file
+jbossEsb.objStore.configfile=E:/Projects/JBoss/ESB/EsbServices/src/org/jboss/soa/esb/services/dbtables/ObjStoreExample.xml
\ No newline at end of file
Copied: labs/jbossesb/trunk/docs/JBossESB Getting Started Guide.doc (from rev 5103, labs/jbossesb/branches/refactor/docs/JBossESB Getting Started Guide.doc)
Deleted: labs/jbossesb/trunk/docs/JBossESB Getting Started Guide.rtf
===================================================================
--- labs/jbossesb/trunk/docs/JBossESB Getting Started Guide.rtf 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/docs/JBossESB Getting Started Guide.rtf 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1 +0,0 @@
-{\rtf1\mac\ansicpg10000\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\upr{\fonttbl{\f0\fnil\fcharset256\fprq2{\*\panose 00020206030504050203}Times New Roman;}
{\f1\fnil\fcharset256\fprq2{\*\panose 00020b06040202020202}Arial;}{\f2\fnil\fcharset256\fprq2{\*\panose 00020703090202050204}Courier New;}{\f3\fnil\fcharset2\fprq2{\*\panose 00020005000000000000}Symbol;}
{\f14\fnil\fcharset2\fprq2{\*\panose 00050201020108040807}Wingdings;}}{\*\ud{\fonttbl{\f0\fnil\fcharset256\fprq2{\*\panose 00020206030504050203}Times New Roman;}{\f1\fnil\fcharset256\fprq2{\*\panose 00020b06040202020202}Arial;}
{\f2\fnil\fcharset256\fprq2{\*\panose 00020703090202050204}Courier New;}{\f3\fnil\fcharset2\fprq2{\*\panose 00020005000000000000}Symbol;}{\f14\fnil\fcharset2\fprq2{\*\panose 00050201020108040807}Wingdings;}}}}{\colortbl;\red0\green0\blue0;
\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;
\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{
\s1\ql \li0\ri0\sb240\sa60\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0 \b\f1\fs32\lang1033\langfe1033\kerning32\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 1;}{
\s2\ql \li0\ri0\sb240\sa60\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0 \b\i\f1\fs28\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 2;}{
\s3\ql \li0\ri0\sb240\sa60\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel2\adjustright\rin0\lin0\itap0 \b\f1\fs26\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 3;}{\*\cs10 \additive Default Paragraph Font;}{\*
\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 Normal Table;}{\s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
\f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext15 Body Text;}{\*\cs16 \additive \ul\cf2 \sbasedon10 Hyperlink;}}{\*\listtable{\list\listtemplateid-433178152\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
\levelfollow0\levelstartat0\levelspace720\levelindent0{\leveltext\leveltemplateid-1717533548\'01-;}{\levelnumbers;}\loch\af1\hich\af1\dbch\f0\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li1080\jclisttab\tx1080\lin1080 }{\listlevel
\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li1800\jclisttab\tx1800\lin1800 }
{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li2520
\jclisttab\tx2520\lin2520 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1
\chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li3240\jclisttab\tx3240\lin3240 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr
\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li3960\jclisttab\tx3960\lin3960 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid328713
\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li4680\jclisttab\tx4680\lin4680 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li5400\jclisttab\tx5400\lin5400 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li6120\jclisttab\tx6120\lin6120 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li6840\jclisttab\tx6840\lin6840 }{\listname ;}\listid88232598}
{\list\listtemplateid-870289146\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr
\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li1080\jclisttab\tx1080\lin1080 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers
;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li1800\jclisttab\tx1800\lin1800 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713
\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li2520\jclisttab\tx2520\lin2520 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li3240\jclisttab\tx3240\lin3240 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li3960\jclisttab\tx3960\lin3960 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li4680\jclisttab\tx4680\lin4680 }{\listlevel\levelnfc23
\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li5400
\jclisttab\tx5400\lin5400 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0
\fi-360\li6120\jclisttab\tx6120\lin6120 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1
\chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li6840\jclisttab\tx6840\lin6840 }{\listname ;}\listid138814588}{\list\listtemplateid1846689302\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0
{\leveltext\leveltemplateid984073\'02\'00.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li360\jclisttab\tx360\lin360 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levellegal
\levelspace0\levelindent0{\leveltext\leveltemplateid1639433\'03\'00.\'01;}{\levelnumbers\'01\'03;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-720\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0
\levelfollow0\levelstartat1\levellegal\levelspace0\levelindent0{\leveltext\leveltemplateid1770505\'05\'00.\'01.\'02;}{\levelnumbers\'01\'03\'05;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-720\li720\jclisttab\tx720\lin720 }{\listlevel
\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levellegal\levelspace0\levelindent0{\leveltext\leveltemplateid984073\'07\'00.\'01.\'02.\'03;}{\levelnumbers\'01\'03\'05\'07;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0
\fi-720\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levellegal\levelspace0\levelindent0{\leveltext\leveltemplateid1639433\'09\'00.\'01.\'02.\'03.\'04;}{\levelnumbers\'01\'03\'05\'07\'09;}
\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-1080\li1080\jclisttab\tx1080\lin1080 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levellegal\levelspace0\levelindent0{\leveltext\leveltemplateid1770505
\'0b\'00.\'01.\'02.\'03.\'04.\'05;}{\levelnumbers\'01\'03\'05\'07\'09\'0b;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-1080\li1080\jclisttab\tx1080\lin1080 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1
\levellegal\levelspace0\levelindent0{\leveltext\leveltemplateid984073\'0d\'00.\'01.\'02.\'03.\'04.\'05.\'06;}{\levelnumbers\'01\'03\'05\'07\'09\'0b\'0d;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-1440\li1440\jclisttab\tx1440\lin1440 }
{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levellegal\levelspace0\levelindent0{\leveltext\leveltemplateid1639433\'0f\'00.\'01.\'02.\'03.\'04.\'05.\'06.\'07;}{\levelnumbers\'01\'03\'05\'07\'09\'0b\'0d\'0f;}\chbrdr
\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-1440\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levellegal\levelspace0\levelindent0{\leveltext\leveltemplateid1770505
\'11\'00.\'01.\'02.\'03.\'04.\'05.\'06.\'07.\'08;}{\levelnumbers\'01\'03\'05\'07\'09\'0b\'0d\'0f\'11;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-1800\li1800\jclisttab\tx1800\lin1800 }{\listname ;}\listid168302149}
{\list\listtemplateid1502011006\listhybrid{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid1639433\'02\'00.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1
\chshdng0\chcfpat1\chcbpat1 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid1639433\'02\'01.;}{\levelnumbers\'01;}\chbrdr
\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid1770505\'02\'02.;}{\levelnumbers
\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-180\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid984073
\'02\'03.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
\leveltemplateid1639433\'02\'04.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0
{\leveltext\leveltemplateid1770505\'02\'05.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-180\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
\levelindent0{\leveltext\leveltemplateid984073\'02\'06.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
\levelspace360\levelindent0{\leveltext\leveltemplateid1639433\'02\'07.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0
\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid1770505\'02\'08.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-180\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid529537610}
{\list\listtemplateid-1041347676\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr
\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2
\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid328713
\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23
\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li5040
\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0
\fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1
\chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid718937965}{\list\listtemplateid-1467567266\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
\levelindent0{\leveltext\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0
\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23
\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }
{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1
\chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr
\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713
\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid838035434}
{\list\listtemplateid1734899192\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid984073\'02\'00.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1
\chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid195572928\'01\u-3913 _;}{\levelnumbers;}
\loch\af3\dbch\af0\hich\f3 \loch\af3\hich\af3\dbch\f0\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0
\levelindent0{\leveltext\leveltemplateid1770505\'02\'02.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-180\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1
\levelspace0\levelindent0{\leveltext\leveltemplateid984073\'02\'03.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid1639433\'02\'04.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2
\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid1770505\'02\'05.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-180\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0
\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid984073\'02\'06.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4
\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid1639433\'02\'07.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc2
\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid1770505\'02\'08.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-180\li6480\jclisttab\tx6480\lin6480 }{\listname
;}\listid955793474}{\list\listtemplateid248405116\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid984073\'02\'00.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1
\chshdng0\chcfpat1\chcbpat1 \fi-360\li360\jclisttab\tx360\lin360 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr
\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713
\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23
\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li5040
\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0
\fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1
\chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1302230321}{\list\listtemplateid248405116\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0
{\leveltext\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li360\jclisttab\tx360\lin360 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li1080\jclisttab\tx1080\lin1080 }{\listlevel\levelnfc23\levelnfcn23
\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li1800\jclisttab\tx1800\lin1800 }{\listlevel
\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0
\fi-360\li2520\jclisttab\tx2520\lin2520 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1
\chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li3240\jclisttab\tx3240\lin3240 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14
\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li3960\jclisttab\tx3960\lin3960 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid66569
\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li4680\jclisttab\tx4680\lin4680 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li5400\jclisttab\tx5400\lin5400 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li6120\jclisttab\tx6120\lin6120 }{\listname ;}\listid1362244777}
{\list\listtemplateid1464628240\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid984073\'02\'00.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1
\chshdng0\chcfpat1\chcbpat1 \fi-360\li360\jclisttab\tx360\lin360 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid1639433\'02\'01.;}{\levelnumbers\'01;}\chbrdr
\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li1080\jclisttab\tx1080\lin1080 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid1770505\'02\'02.;}{\levelnumbers
\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-180\li1800\jclisttab\tx1800\lin1800 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid984073
\'02\'03.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li2520\jclisttab\tx2520\lin2520 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
\leveltemplateid1639433\'02\'04.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li3240\jclisttab\tx3240\lin3240 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0
{\leveltext\leveltemplateid1770505\'02\'05.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-180\li3960\jclisttab\tx3960\lin3960 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
\levelindent0{\leveltext\leveltemplateid984073\'02\'06.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li4680\jclisttab\tx4680\lin4680 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
\levelspace360\levelindent0{\leveltext\leveltemplateid1639433\'02\'07.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li5400\jclisttab\tx5400\lin5400 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0
\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid1770505\'02\'08.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-180\li6120\jclisttab\tx6120\lin6120 }{\listname ;}\listid1388650458}
{\list\listtemplateid-1467567266\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid984073\'02\'00.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1
\chshdng0\chcfpat1\chcbpat1 \fi-360\li360\jclisttab\tx360\lin360 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr
\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713
\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23
\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid66569\'01\u-3913 _;}{\levelnumbers;}\loch\af3\dbch\af0\hich\f3 \f3\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li5040
\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid197641\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0
\fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid328713\'01\u-3929 _;}{\levelnumbers;}\f14\chbrdr\brdrnone\brdrcf1
\chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1612400476}{\list\listtemplateid2057746814\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0
{\leveltext\leveltemplateid984073\'02\'00.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li360\jclisttab\tx360\lin360 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
\levelindent0{\leveltext\leveltemplateid1639433\'02\'01.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li1080\jclisttab\tx1080\lin1080 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1
\levelspace360\levelindent0{\leveltext\leveltemplateid1770505\'02\'02.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-180\li1800\jclisttab\tx1800\lin1800 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0
\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid984073\'02\'03.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li2520\jclisttab\tx2520\lin2520 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0
\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid1639433\'02\'04.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li3240\jclisttab\tx3240\lin3240 }{\listlevel\levelnfc2\levelnfcn2\leveljc2
\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid1770505\'02\'05.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-180\li3960\jclisttab\tx3960\lin3960 }{\listlevel\levelnfc0\levelnfcn0
\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid984073\'02\'06.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li4680\jclisttab\tx4680\lin4680 }{\listlevel\levelnfc4
\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid1639433\'02\'07.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-360\li5400\jclisttab\tx5400\lin5400 }{\listlevel
\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid1770505\'02\'08.;}{\levelnumbers\'01;}\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1 \fi-180\li6120\jclisttab\tx6120\lin6120 }
{\listname ;}\listid1621766678}}{\*\listoverridetable{\listoverride\listid1621766678\listoverridecount0\ls1}{\listoverride\listid1388650458\listoverridecount0\ls2}{\listoverride\listid168302149\listoverridecount0\ls3}{\listoverride\listid838035434
\listoverridecount0\ls4}{\listoverride\listid1612400476\listoverridecount0\ls5}{\listoverride\listid1362244777\listoverridecount0\ls6}{\listoverride\listid1302230321\listoverridecount0\ls7}{\listoverride\listid718937965\listoverridecount0\ls8}
{\listoverride\listid529537610\listoverridecount0\ls9}{\listoverride\listid138814588\listoverridecount0\ls10}{\listoverride\listid88232598\listoverridecount0\ls11}{\listoverride\listid955793474\listoverridecount0\ls12}}{\info
{\title High level description of Rosetta}{\author Esteban}{\operator Mark Little}{\creatim\yr2006\mo7\dy13\hr11\min23}{\revtim\yr2006\mo7\dy13\hr11\min23}{\printim\yr2006\mo6\dy19\hr9\min3}{\version2}{\edmins0}{\nofpages8}{\nofwords1820}{\nofchars10376}
{\*\company CGU Group Canada Ltd.}{\nofcharsws12742}{\vern24839}}\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1800\dgvorigin1440\dghshow1\dgvshow1
\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\rsidroot13457462 \fet0\sectd \linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1
\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5
\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang
{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain \s2\ql \li0\ri0\sb240\sa60\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0
\b\i\f1\fs28\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid13457462 JBoss ESB Getting Started Guide and Programmers Guide}{\insrsid6031830
\par }\pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid15608600 \lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid15608600
\par By: Daniel Brum (}{\field{\*\fldinst {\insrsid10236317 HYPERLINK "mailto:}{\insrsid10236317\charrsid10236317 daniel.brum at Jboss.com}{\insrsid10236317 " }{\insrsid10236317 {\*\datafield
00d0c9ea79f9bace118c8200aa004ba90b020000001700000016000000640061006e00690065006c002e006200720075006d0040004a0062006f00730073002e0063006f006d000000e0c9ea79f9bace118c8200aa004ba90b3a0000006d00610069006c0074006f003a00640061006e00690065006c002e00620072007500
6d0040004a0062006f00730073002e0063006f006d000000}}}{\fldrslt {\cs16\ul\cf2\insrsid10236317\charrsid1074628 daniel.brum at Jboss.com}}}{\insrsid15608600 )
\par
\par JBoss ESB JBoss Labs Home Page: }{\field{\*\fldinst {\insrsid15608600 HYPERLINK "}{\insrsid15608600\charrsid15608600 http://labs.jboss.com/portal/jbossesb}{\insrsid15608600 " }{\insrsid15608600 {\*\datafield
00d0c9ea79f9bace118c8200aa004ba90b02000000170000002600000068007400740070003a002f002f006c006100620073002e006a0062006f00730073002e0063006f006d002f0070006f007200740061006c002f006a0062006f00730073006500730062000000e0c9ea79f9bace118c8200aa004ba90b4c0000006800
7400740070003a002f002f006c006100620073002e006a0062006f00730073002e0063006f006d002f0070006f007200740061006c002f006a0062006f00730073006500730062000000}}}{\fldrslt {\cs16\ul\cf2\insrsid15608600\charrsid8929992 http://labs.jboss.com/portal/jbossesb}}}{
\insrsid15608600
\par
\par JBoss ESB Developer Community Forums: }{\field{\*\fldinst {\insrsid15608600 HYPERLINK "}{\insrsid15608600\charrsid15608600 http://www.jboss.com/index.html?module=bb&op=viewforum&f=220}{\insrsid15608600 " }{\insrsid15608600 {\*\datafield
00d0c9ea79f9bace118c8200aa004ba90b02000000170000003d00000068007400740070003a002f002f007700770077002e006a0062006f00730073002e0063006f006d002f0069006e006400650078002e00680074006d006c003f006d006f00640075006c0065003d006200620026006f0070003d007600690065007700
66006f00720075006d00260066003d003200320030000000e0c9ea79f9bace118c8200aa004ba90b7a00000068007400740070003a002f002f007700770077002e006a0062006f00730073002e0063006f006d002f0069006e006400650078002e00680074006d006c003f006d006f00640075006c0065003d006200620026
006f0070003d00760069006500770066006f00720075006d00260066003d003200320030000000}}}{\fldrslt {\cs16\ul\cf2\insrsid15608600\charrsid8929992 http://www.jboss.com/index.html?module=bb&op=viewforum&f=220}}}{\insrsid15608600
\par }{\insrsid10236317
\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10236317 {\insrsid10236317 ########################################################################
\par # JBoss, Home of Professional Open Source
\par # Copyright 2006, JBoss Inc., and individual contributors as indicated
\par # by the @authors tag. See the copyright.txt in the distribution for a
\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10236317 {\insrsid10236317 # full listing of individual contributors.
\par #
\par # This is free software; you can redistribute it and/or modify it
\par # under the terms of the GNU Lesser General Public License as
\par # published by the Free Software Foundation; either version 2.1 of
\par # the License, or (at your option) any later version.
\par #
\par # This software is distributed in the hope that it will be useful,
\par # but WITHOUT ANY WARRANTY; without even the implied warranty of
\par # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
\par # Lesser General Public License for more details.
\par #
\par # You should have received a copy of the GNU Lesser General Public
\par # License along with this software; if not, write to the Free
\par # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
\par # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10236317 {\insrsid10236317 ########################################################################\page
\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid15608600 {\insrsid15608600
\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\f1\fs22\insrsid6031830
\par {\listtext\pard\plain\s3 \b\f1\fs26\insrsid6031830 \hich\af1\dbch\af0\loch\f1 1.\tab}}\pard\plain \s3\ql \fi-360\li360\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx360\aspalpha\aspnum\faauto\ls3\outlinelevel2\adjustright\rin0\lin360\itap0
\b\f1\fs26\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830 Background
\par }\pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\f1\fs22\insrsid6031830
\par }\pard\plain \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830 The purpose of this document is to introduce the main ideas behind the Rosetta}{
\insrsid13457462 ESB}{\insrsid6031830 , what it is, how it was used in it\rquote s first real world scenario}{\insrsid13457462 at a large insurance and financial services company.}{\insrsid6031830
\par }\pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\f1\fs22\insrsid6031830
\par }\pard\plain \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid13457462
The introduction of an Oracle Financials implementation into the I.T projects menu of projects to handle and plan for, clearly identified the need for a common solution to the problem of integrating several dozen interfaces from the mainframe and newer
portal applications to and from the Oracle Financials deployment. It was not feasible to continue with the creation and maintenance of point-to-point and \ldblquote swivel chair\rdblquote
integration as was the common practice inside of the I.T data center. The answer was to create a \ldblquote bus\rdblquote
that would consume data from systems (producers) and then to provide the data to recipient systems in whatever format and input method required (consumers) without any side ever knowing anything about the what/when/where/how with any other system.}{
\insrsid6031830
\par
\par Rosetta borrowed it\rquote s name from the stone found in 1799 by French soldiers in the Nile delta\rquote s town of Rosetta (french for Rashid) that was instrumental in Jean-Fran\u231\'8dois Champollion deciphering of hieroglyphs.
\par
\par {\listtext\pard\plain\s3 \b\f1\fs26\insrsid6031830 \hich\af1\dbch\af0\loch\f1 2.\tab}}\pard\plain \s3\ql \fi-360\li360\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx360\aspalpha\aspnum\faauto\ls3\outlinelevel2\adjustright\rin0\lin360\itap0
\b\f1\fs26\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830 Design highlights
\par }\pard\plain \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830
\par The code}{\insrsid14708790 base}{\insrsid6031830 as it stands at present, is compliant with all the guidelines and concepts that follow.
\par
\par {\listtext\pard\plain\s3 \b\f1\fs26\insrsid6031830 \hich\af1\dbch\af0\loch\f1 2.1\tab}}\pard\plain \s3\ql \fi-720\li720\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls3\ilvl1\outlinelevel2\adjustright\rin0\lin720\itap0
\b\f1\fs26\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830 XML serialization
\par }\pard\plain \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 \f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830
\par Business objects would be represented in Java classes. There would be a \ldblquote standard\rdblquote serialization of all of these classes into }{\i\insrsid6031830 visible}{\insrsid6031830 format(s). We chose not to override the:
\par }\pard \s15\ql \li1440\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1440\itap0 {\i\insrsid6031830 writeObject(ObjectOutputStream) }{\insrsid6031830 and }{\i\insrsid6031830 readObject(ObjectInputStream)}{\insrsid6031830 of the }{
\i\insrsid6031830 Serializable }{\insrsid6031830 interface
\par }\pard \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 {\insrsid6031830 but to provide a pair of extra methods:
\par }\pard \s15\ql \fi720\li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 {\insrsid6031830 String toXml() and it\rquote s inverse
\par static <T> fromXml(String sXml)
\par so that X.equals(<T>.fromXml(X.toXml())
\par }\pard \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 {\insrsid6031830
\par Every class is thus responsible of knowing it\rquote s }{\i\insrsid6031830 standard}{\insrsid6031830 XML representation (in fact }{\b\insrsid6031830 only }{\insrsid6031830 this serialized form), and of instantiating objects from this XML representation
\par
\par All }{\insrsid10236317 of JBoss ESB\rquote s}{\insrsid6031830 }{\i\insrsid6031830 BusinessObject}{\insrsid6031830 derived classes must provide a:
\par }\pard \s15\ql \li1440\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1440\itap0 {\insrsid6031830 public String[] getLocator() method
\par }\pard \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 {\insrsid6031830 and can choose to provide a
\par \tab public String[] getLocator(int iLocIndex)
\par (in which case getLocator() will translate to getLocator(0); )
\par
\par that will provide }{\i\insrsid6031830 visible}{\insrsid6031830 RDBMS indexing information for possible searches using standard SQL queries
\par }\pard \s15\ql \li360\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0 {\insrsid6031830
\par {\listtext\pard\plain\s3 \b\f1\fs26\insrsid6031830 \hich\af1\dbch\af0\loch\f1 2.2\tab}}\pard\plain \s3\ql \fi-720\li720\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls3\ilvl1\outlinelevel2\adjustright\rin0\lin720\itap0
\b\f1\fs26\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830 Encapsulate data transformation/formatting in \ldblquote Format adapters\rdblquote
\par }\pard\plain \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 \f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830
\par Format adapters were implemented as classes with only static methods, whose sole responsibility is data transformation. In order to minimize coupling it is essential that the business class itself is unaware of any format other than it\rquote
s standard XML.
\par
\par Format adapters should be the }{\b\insrsid6031830 only}{\insrsid6031830 place that needs to be aware of coupling between different applications\rquote representation of the same business object
\par }\pard \s15\ql \li360\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0 {\insrsid6031830
\par {\listtext\pard\plain\s3 \b\f1\fs26\insrsid6031830 \hich\af1\dbch\af0\loch\f1 2.3\tab}}\pard\plain \s3\ql \fi-720\li720\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls3\ilvl1\outlinelevel2\adjustright\rin0\lin720\itap0
\b\f1\fs26\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830 Encapsulate communication mechanisms and protocols in \ldblquote Transport adapters\rdblquote
\par }\pard\plain \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 \f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830
\par Only }{\i\insrsid6031830 Listeners}{\insrsid6031830 and }{\i\insrsid6031830 Processors}{\insrsid6031830 should be concerned about transport.
\par
\par {\listtext\pard\plain\s3 \b\f1\fs26\insrsid6031830 \hich\af1\dbch\af0\loch\f1 2.4\tab}}\pard\plain \s3\ql \fi-720\li720\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls3\ilvl1\outlinelevel2\adjustright\rin0\lin720\itap0
\b\f1\fs26\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830 Encapsulate triggering of processes into }{\i\insrsid6031830 Listener}{\insrsid6031830 classes
\par }\pard\plain \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830
\par }\pard \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 {\insrsid6031830 There are many ways of triggering processes (in our case integration processes):
\par }\pard \s15\ql \li1440\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1440\itap0 {\insrsid6031830
Queue/Topic listeners (in independent processes and/or as MDBs within a J2EE container), raw or protocol specific socket listeners, directory pollers with FilenameFilters (in independent processes and/or as MBeans), RDBMS triggers and/or table
listeners, email listeners, }{\insrsid2580469 S/FTP, }{\insrsid6031830 etc. The list goes on and on
\par }\pard \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 {\insrsid6031830
\par The main responsibility of a }{\i\insrsid6031830 Listener}{\insrsid6031830 is to trigger }{\i\insrsid6031830 Processors}{\insrsid6031830 and }{\i\insrsid6031830 notify}{\insrsid6031830 other }{\i\insrsid6031830 Listeners}{\insrsid6031830
about the outcome of the processes, by calling the Processors\rquote notify methods
\par {\listtext\pard\plain\s3 \b\f1\fs26\insrsid6031830 \hich\af1\dbch\af0\loch\f1 2.5\tab}}\pard\plain \s3\ql \fi-720\li720\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls3\ilvl1\outlinelevel2\adjustright\rin0\lin720\itap0
\b\f1\fs26\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830 Provide base abstract }{\i\insrsid6031830 Processor}{\insrsid6031830 classes
\par }\pard\plain \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 \f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830
\par These hold protected common methods for it\rquote s children, and demand these to implement the abstract methods that will be later invoked at runtime using reflection
\par
\par A }{\i\insrsid6031830 Processor}{\insrsid6031830 that uses }{\i\insrsid6031830 BusinessObjects}{\insrsid6031830 performs (but is not limited to) data transformation using }{\i\insrsid6031830 FormatAdapters}{\insrsid6031830 , is triggered by a }{
\i\insrsid6031830 Listener}{\insrsid6031830 , and provides methods (and/or throws Exceptions) to learn about it\rquote s outcome
\par }{\i\insrsid6031830
\par Outcome notification}{\insrsid6031830 only differs from (and in fact is configured as) any other }{\i\insrsid6031830 Processor}{\insrsid6031830 , except for the fact
that you very often wish to notify the outcome of a normal process, and seldom wish to notify the outcome of a simple notification
\par
\par Two dummy overrideable methods are provided in the Processor base class and automatically called at the end of the Processor\rquote s lifecycle
\par
\par }\pard \s15\ql \li1440\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1440\itap0 {\insrsid6031830 notifyOkListeners(List<NotificationListener> oList)
\par notifyErrListeners(List<NotificationListener> oList)
\par }\pard \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 {\insrsid6031830
\par }\pard \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2580469 {\insrsid6031830 A few real (non abstract) Processor classes can be reused to tailor the most frequent type of processors:
\par }\pard \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 {\insrsid6031830
\par }\pard \s15\ql \li1440\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1440\itap0 {\insrsid6031830 FileProcessor (Object oConfig, File oF)
\par FileCopier }{\b\insrsid6031830 extends}{\insrsid6031830 FileProcessor
\par MessageProcessor(Object oConfig, javax.jms.Message oM)
\par
\par }\pard \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 {\insrsid6031830
The configuration tree of these derived classes, has the same configuration subtree as the parent class, and typically a specific subtree whose root is a node of the parent class\rquote configuration tree.
\par
\par {\listtext\pard\plain\s3 \b\f1\fs26\insrsid6031830 \hich\af1\dbch\af0\loch\f1 2.6\tab}}\pard\plain \s3\ql \fi-720\li720\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls3\ilvl1\outlinelevel2\adjustright\rin0\lin720\itap0
\b\f1\fs26\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830 Centralized configuration
\par }\pard\plain \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 \f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830
\par All Processors receive their configuration parameters as an XML tree, known both to they themselves, and to whoever is responsible for their configuration.
\par
\par }{\insrsid10236317 JBoss ESB}{\insrsid6031830 chose to store configuration information for all of it\rquote s components (Listeners, Processors, Notifiers, Factories, etc), in an LDAP repository.
\par
\par Access to this repository is encapsulated in a }{\i\insrsid6031830 Configurator}{\insrsid6031830 class. An immediate consequence of this encapsulation is that by changing the implementation of the Configurator class (but not it\rquote
s signatures), configuration information can be stored anywhere (as long as it\rquote s known by the }{\i\insrsid6031830 Configurator}{\insrsid6031830 class) The idea is to use a ConfiguratorFactory instead of instantiating a }{\i\insrsid6031830 new
LdapConfigurator()}{\insrsid6031830
\par }\pard \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\insrsid6031830
\par {\listtext\pard\plain\s3 \b\f1\fs26\insrsid6031830 \hich\af1\dbch\af0\loch\f1 2.7\tab}}\pard\plain \s3\ql \fi-720\li720\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls3\ilvl1\outlinelevel2\adjustright\rin0\lin720\itap0
\b\f1\fs26\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830 General purpose Object Repository
\par }\pard\plain \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 \f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid6031830
\par The ability to store }{\i\insrsid6031830 BusinessObjects}{\insrsid6031830 and }{\i\insrsid6031830 ProcessingBatches}{\insrsid6031830 in persistent media, provides a simple mechanism for }{\b\insrsid6031830 decoupling successive steps}{\insrsid6031830
in a chain of individual asynchronous }{\i\insrsid6031830 Processor}{\insrsid6031830 steps.
\par
\par It is a simple (albeit effective) scheme that allows for storage of the serialized object itself (in the standard XML format), plus index information (Object\rquote
s UID, batch UID, timestamp, etc.) in a single SQL table (and as many SQL index tables as configured in the }{\i\insrsid6031830 ObjectStore}{\insrsid6031830 configuration class.
\par
\par The purpose of this repository is }{\b\insrsid6031830 NOT}{\insrsid6031830 to act as a high performance general purpose database. It is used to store }{\i\insrsid6031830 Batches}{\insrsid6031830 until the batch is commited/rolled back, and/or to store
}{\i\insrsid6031830 BusinessObjects}{\insrsid6031830 for future retrieval, together with the RDBMS index tables according to the }{\i\insrsid6031830 BusinessObject}{\insrsid6031830 \rquote s getLocator(int) methods
\par
\par The object storage and retrieval functionality is usable only through the business delegate of the actual implementation (in the current versions of Rosetta, a J2EE stateless session bean) that can be obtained by the }{\i\insrsid6031830 Processor}{
\insrsid6031830 classes using the }{\i\insrsid6031830 PersistHandlerFactory}{\insrsid6031830 class:
\par }\pard \s15\ql \li1440\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1440\itap0 {\insrsid6031830 \page
\par Interface }{\i\insrsid6031830 PersistHandler \{\u8230\'c9\}
\par }\pard \s15\ql \li2160\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin2160\itap0 {\insrsid6031830 The contract of the }{\i\insrsid6031830 ObjectRepository}{\insrsid6031830 service is published in this interface
\par }\pard \s15\ql \li1440\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1440\itap0 {\insrsid6031830
\par }{\i\insrsid6031830 PersistHandler }{\insrsid6031830 handler}{\i\insrsid6031830 = PersistHandlerFactory}{\insrsid6031830 .getHandler();
\par }\pard \s15\ql \li2160\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin2160\itap0 {\insrsid6031830 Nobody but this factory needs to know that the services are provided by an EJB (or any other implementation mechanism, should that be the case)
\par }{\insrsid14708790
\par }\pard\plain \s2\ql \li0\ri0\sb240\sa60\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0\pararsid14179073 \b\i\f1\fs28\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid14179073 Building and deploying JBoss ESB}{
\insrsid14708790
\par }\pard\plain \s15\ql \li2160\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin2160\itap0 \f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid14179073
\par }\pard \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0\pararsid14179073 {\insrsid5332965 Building and deploying the JBoss ESB is prett
y straight-forward. It is a J2EE/Java application, and as such uses all the customary ways in which you should all be used to doing this. You will need to define the following environment variables:}{\insrsid14179073
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid5332965 \hich\af1\dbch\af0\loch\f1 -\tab}}\pard \s15\ql \fi-360\li1080\ri0\widctlpar\jclisttab\tx1080\aspalpha\aspnum\faauto\ls11\adjustright\rin0\lin1080\itap0\pararsid5332965 {\insrsid5332965 JAVA_HOME
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid5332965 \hich\af1\dbch\af0\loch\f1 -\tab}XDOCLET_HOME
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid5332965 \hich\af1\dbch\af0\loch\f1 -\tab}ANT_HOME
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid5332965 \hich\af1\dbch\af0\loch\f1 -\tab}JBOSS_HOME
\par }\pard \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid15608600 {\insrsid15608600
\par }\pard \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0\pararsid15608600 {\i\insrsid15608600\charrsid15608600 What\rquote s required to run JBoss ESB:}{\i\insrsid15608600
\par {\listtext\pard\plain\s15 \f2\fs22\insrsid15608600 \hich\af2\dbch\af0\loch\f2 o\tab}}\pard \s15\ql \fi-360\li1800\ri0\widctlpar\jclisttab\tx1800\aspalpha\aspnum\faauto\ls11\ilvl1\adjustright\rin0\lin1800\itap0\pararsid15608600 {\i\insrsid15608600
JBoss Application Server 4.0.x \endash You could deploy this to another app. Server if you migrate the deployment files.
\par {\listtext\pard\plain\s15 \f2\fs22\insrsid15608600 \hich\af2\dbch\af0\loch\f2 o\tab}PostGreSQL \endash if you want to use something like MySQL you will need to migrate the DB schema provided for your database. Please send us your migrated schema\rquote
s so we can add them to the distribution.}{\i\insrsid15608600\charrsid15608600
\par }\pard \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid15608600 {\insrsid15608600
\par }\pard \s15\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0\pararsid15608600 {\i\insrsid15608600 Environment Settings Required to Build JBoss ESB:}{\i\insrsid5332965
\par }{\i\insrsid15608600\charrsid15608600
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid5332965 \hich\af1\dbch\af0\loch\f1 -\tab}}\pard \s15\ql \fi-360\li1080\ri0\widctlpar\jclisttab\tx1080\aspalpha\aspnum\faauto\ls11\adjustright\rin0\lin1080\itap0\pararsid5332965 {\insrsid5332965
JAVA_HOME should point to your JDK 1.5.x root directory. This is required to build any of the code.
\par }\pard \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5332965 {\insrsid5332965
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid5332965 \hich\af1\dbch\af0\loch\f1 -\tab}}\pard \s15\ql \fi-360\li1080\ri0\widctlpar\jclisttab\tx1080\aspalpha\aspnum\faauto\ls11\adjustright\rin0\lin1080\itap0\pararsid5332965 {\insrsid5332965
XDOCLET_HOME should point to the root directory of your XDoclet 1.2.x distribution. XDoclet is used to generate the EJB2.1 artifacts. Most of this will be replaced by the migration to EJB3 in the near future and we will no longer require XDoclet.
\par }\pard \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5332965 {\insrsid5332965
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid5332965 \hich\af1\dbch\af0\loch\f1 -\tab}}\pard \s15\ql \fi-360\li1080\ri0\widctlpar\jclisttab\tx1080\aspalpha\aspnum\faauto\ls11\adjustright\rin0\lin1080\itap0\pararsid5332965 {\insrsid5332965
ANT_HOME required to build the project and all the associated artifacts
\par }\pard \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5332965 {\insrsid5332965
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid5332965 \hich\af1\dbch\af0\loch\f1 -\tab}}\pard \s15\ql \fi-360\li1080\ri0\widctlpar\jclisttab\tx1080\aspalpha\aspnum\faauto\ls11\adjustright\rin0\lin1080\itap0\pararsid5332965 {\insrsid5332965
JBOSS_HOME used to identify where the required client-side libraries are for building JBoss ESB. It could also easily be used to add a new ANT task to actually deploy the artifacts right into your JBoss server instance.
\par }\pard \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5332965 {\insrsid5332965
\par
\par To build the artifacts, at t}{\insrsid16068642 he JBoss ESB Home directory (i.e}{\insrsid5332965 : c:\\JbossESB) }{\insrsid2580469 run the}{\insrsid5332965 ANT all}{\insrsid2580469 task.}{\insrsid5332965
\par The \ldblquote all\rdblquote ant task will clean up, compile, and package up the source code and create an EAR file which you can deploy into your JBoss server.
\par }{\insrsid16068642
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid16068642 \hich\af1\dbch\af0\loch\f1 1.\tab}}\pard \s15\ql \fi-360\li720\ri0\sl360\slmult1\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls12\adjustright\rin0\lin720\itap0\pararsid212399 {\insrsid16068642 Copy
the }{\i\insrsid14051247 <JBoss ESB Home>/dist/}{\i\insrsid16068642\charrsid212399 JbossEsbAppl.ear}{\insrsid16068642 to your }{\i\insrsid14051247 <JBOSS_HOME>/server/all/}{\i\insrsid16068642\charrsid212399 deploy}{\insrsid16068642 directory
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid16068642 \hich\af1\dbch\af0\loch\f1 2.\tab}Edit the properties-servic}{\insrsid14051247 e.xml in your <JBOSS_HOME>/server/all/d}{\insrsid16068642 eploy directory and add the following attribute entry:
\par }\pard \s15\ql \fi360\li720\ri0\sl360\slmult1\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0\pararsid212399 {\i\insrsid16068642\charrsid212399 <attribute name="URLList">\line \~\~\~\~\~ \tab ./conf/jbossEsb.properties\line \~\~\~
</attribute>
\par {\listtext\pard\plain\s15 \f3\fs22\insrsid16068642 \loch\af3\dbch\af0\hich\f3 \u-3913\'b7\tab}}\pard \s15\ql \fi-360\li1440\ri0\sl360\slmult1\widctlpar\jclisttab\tx1440\aspalpha\aspnum\faauto\ls12\ilvl1\adjustright\rin0\lin1440\itap0\pararsid212399 {
\insrsid16068642 This let\rquote s the JBoss ESB }{\insrsid14051247 application }{\insrsid16068642 know where to find it\rquote s config file
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid16068642 \hich\af1\dbch\af0\loch\f1 3.\tab}}\pard \s15\ql \fi-360\li720\ri0\sl360\slmult1\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls12\adjustright\rin0\lin720\itap0\pararsid212399 {\insrsid16068642
Copy the }{\i\insrsid16068642\charrsid212399 <JBoss ESB HOM}{\i\insrsid14051247 E>/docs/install/conf/}{\i\insrsid16068642\charrsid212399 jbossEsb.properties}{\insrsid16068642 to your }{\insrsid16068642\charrsid212399 <JBOSS_HOME>\\server\\all\\conf}{
\insrsid14051247 director}{\insrsid16068642
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid7021789 \hich\af1\dbch\af0\loch\f1 4.\tab}}{\insrsid7021789 Load the database schema located in }{\i\insrsid14051247 <J}{\i\insrsid6620530 Boss ESB HOME>/docs/install/}{\i\insrsid14051247 database/}{
\i\insrsid7021789\charrsid212399 JBossESB-DB.sql}{\insrsid7021789 into your PostGreSQL database \endash create a new database of your choice.}{\insrsid16068642
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid7021789 \hich\af1\dbch\af0\loch\f1 5.\tab}}{\insrsid7021789 Copy the }{\i\insrsid7021789\charrsid212399 <JBoss ESB HOM}{\i\insrsid6620530 E>/doc/install/}{\i\insrsid14051247 deploy/}{
\i\insrsid7021789\charrsid212399 JBossESB-DS.xml}{\insrsid7021789 to your }{\i\insrsid14051247 <JBOSS_HOME>/server/all/}{\i\insrsid7021789\charrsid212399 deploy}{\insrsid7021789 directory.
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid7021789 \hich\af1\dbch\af0\loch\f1 6.\tab}Edit the }{\i\insrsid7021789\charrsid212399 JBossESB-DS.xml}{\insrsid7021789 and change as required for your database settings
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid7021789 \hich\af1\dbch\af0\loch\f1 7.\tab}Copy the PostGreSQL JDBC driver into your }{\i\insrsid14051247 <JBOSS_HOME>/server/all/}{\i\insrsid7021789\charrsid212399 lib}{\insrsid7021789 directory
\par {\listtext\pard\plain\s15 \f1\fs22\insrsid5915745 \hich\af1\dbch\af0\loch\f1 8.\tab}}\pard \s15\ql \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls12\adjustright\rin0\lin720\itap0\pararsid16068642 {\insrsid5915745
Launch JBoss Application Server}{\insrsid7021789
\par }\pard \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5332965 {\insrsid16068642\charrsid16068642
\par }{\insrsid2580469
\par
\par }{\insrsid8270832
\par }\pard\plain \s2\ql \li0\ri0\sb240\sa60\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0\pararsid6258257 \b\i\f1\fs28\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid8270832 \page DEPLOYING A }{\insrsid15740327
TEST}{\insrsid8270832 EXAMPLE
\par }\pard\plain \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5332965 \f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid8270832
\par }{\insrsid15740327\charrsid15740327 This very }{\insrsid15740327 simple example will allow }{\insrsid10236317 you to \ldblquote test\rdblquote JBossESB and verif}{\insrsid15740327
y that it is running as a deployed application inside of JBoss app. server.}{\insrsid8270832
\par }{\insrsid15740327
\par }{\insrsid15740327\charrsid15740327
\par }{\insrsid10236317 Once JBoss ESB is running inside of your JBoss App. Server, you can find a sample File Copier test case in the <JBoss ESB HOME>/docs/samples directory.}{\insrsid8270832
\par }{\insrsid10236317
\par Launch the TestJBossESB.bat. This will launch a DirListener process which will scan for files with a .INP suffix. All configuration settings and directory structures can be seen and modified in the JBoss ESB HOME>}{\insrsid10236317\charrsid10236317 }{
\insrsid10236317 /docs/samples/TestJBossESB/}{\insrsid10236317\charrsid10236317 paramsDir}{\insrsid10236317 /}{\insrsid10236317\charrsid10236317 FileMoverConfigExample.xml}{\insrsid10236317
. More documentation on the contents and available options on this file are in progress. For now, it should be pretty evident by just looking at the contents to see what this param file does. A DirListener process with 1 thread (maxThreads) polls
the InputDirURI for files with the \ldblquote .inp\rdblquote
(InputSuffix). Once a file is found, it will invoke the FileCopier actionClass among other things. The NotificationList specifies this example to notify by way of the NotifyFiles and NotifyEmail classes if \ldblquote OK\rdblquote ,
and just to a file if \ldblquote err\rdblquote .
\par
\par }\pard \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5332965 {\insrsid10236317
Drop a file, or a set of files in the InputDirURI with the .INP suffix and the Listener will move those, notifying on each one of those found. This is a very basic e}{\insrsid13772669 xample, with no transformation, no routing, etc. More exam
ples will come with future releases.}{\insrsid10236317
\par
\par }\pard \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5332965 {\insrsid10236317
\par }{\insrsid10236317\charrsid10236317
\par }}
\ No newline at end of file
Modified: labs/jbossesb/trunk/docs/samples/TestJBossESB/conf/ObjStoreExample.xml
===================================================================
--- labs/jbossesb/trunk/docs/samples/TestJBossESB/conf/ObjStoreExample.xml 2006-07-14 20:57:19 UTC (rev 5103)
+++ labs/jbossesb/trunk/docs/samples/TestJBossESB/conf/ObjStoreExample.xml 2006-07-14 21:04:47 UTC (rev 5104)
@@ -1,19 +1,12 @@
-<ObjectStore
- dataSourceJndiName="java:JbossEsbDS"
+<ObjectStore
uidTable="uid_table"
- batchTable="batches" >
-
+ batchTable="batches"
+>
<Class name="org.jboss.soa.esb.common.bizclasses.Person"
table="object_snap"
type="Person"
- encrypt="false" >
+ encrypt="false"
+ >
<Index table="people_index" />
</Class>
-
- <Class name="org.jboss.soa.esb.samples.Customer"
- table="object_snap"
- type="Customer"
- encrypt="false" >
- <Index table="customer_index" />
- </Class>
</ObjectStore>
Copied: labs/jbossesb/trunk/lib/ext/junit.jar (from rev 5103, labs/jbossesb/branches/refactor/lib/ext/junit.jar)
More information about the jboss-svn-commits
mailing list