[jboss-svn-commits] JBL Code SVN: r5228 - in labs/jbossesb/branches/refactor: . ESBCore ESBCore/Tests ESBCore/Tests/src ESBCore/Tests/src/org ESBCore/Tests/src/org/jboss ESBCore/Tests/src/org/jboss/soa ESBCore/Tests/src/org/jboss/soa/esb ESBCore/Tests/src/org/jboss/soa/esb/tests ESBCore/common ESBCore/common/tests ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses ESBCore/listeners ESBCore/listeners/src/org/jboss/soa/esb/listeners ESBCore/processors ESBCore/services ESBCore/services/src/META-INF ESBCore/services/tests
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 21 17:45:40 EDT 2006
Author: arvinder
Date: 2006-07-21 17:45:15 -0400 (Fri, 21 Jul 2006)
New Revision: 5228
Added:
labs/jbossesb/branches/refactor/ESBCore/Tests/
labs/jbossesb/branches/refactor/ESBCore/Tests/build.xml
labs/jbossesb/branches/refactor/ESBCore/Tests/src/
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/Controller.java
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestNotification.java
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestObjStore.java
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java
Removed:
labs/jbossesb/branches/refactor/ESBCore/Tests/build.xml
labs/jbossesb/branches/refactor/ESBCore/Tests/src/
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/Controller.java
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestNotification.java
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestObjStore.java
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java
labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java
Modified:
labs/jbossesb/branches/refactor/ESBCore/build.xml
labs/jbossesb/branches/refactor/ESBCore/common/build.xml
labs/jbossesb/branches/refactor/ESBCore/common/tests/build.xml
labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java
labs/jbossesb/branches/refactor/ESBCore/listeners/build.xml
labs/jbossesb/branches/refactor/ESBCore/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java
labs/jbossesb/branches/refactor/ESBCore/processors/build.xml
labs/jbossesb/branches/refactor/ESBCore/services/build.xml
labs/jbossesb/branches/refactor/ESBCore/services/src/META-INF/ejb-jar.xml
labs/jbossesb/branches/refactor/ESBCore/services/tests/build.xml
labs/jbossesb/branches/refactor/build.xml
Log:
Sync/Merge with trunk
Copied: labs/jbossesb/branches/refactor/ESBCore/Tests (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests)
Deleted: labs/jbossesb/branches/refactor/ESBCore/Tests/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/Tests/build.xml 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/Tests/build.xml 2006-07-21 21:45:15 UTC (rev 5228)
@@ -1,50 +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.core.classes.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"/>
- <pathelement location="${org.jboss.esb.core.classes.dir}/common"/>
- <pathelement location="${org.jboss.esb.core.classes.dir}/listeners"/>
- <pathelement location="${org.jboss.esb.core.classes.dir}/services"/>
- <pathelement location="${org.jboss.esb.core.classes.dir}/processors"/>
- </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}"/>
- </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>
-
-</project>
Copied: labs/jbossesb/branches/refactor/ESBCore/Tests/build.xml (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/build.xml)
Copied: labs/jbossesb/branches/refactor/ESBCore/Tests/src (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/src)
Copied: labs/jbossesb/branches/refactor/ESBCore/Tests/src/org (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/src/org)
Copied: labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss)
Copied: labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa)
Copied: labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb)
Copied: labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests)
Deleted: labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/Controller.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/Controller.java 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/Controller.java 2006-07-21 21:45:15 UTC (rev 5228)
@@ -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/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/Controller.java (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/Controller.java)
Deleted: labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java 2006-07-21 21:45:15 UTC (rev 5228)
@@ -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/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/DrainQueuesAndTopics.java)
Deleted: labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestNotification.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestNotification.java 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestNotification.java 2006-07-21 21:45:15 UTC (rev 5228)
@@ -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/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestNotification.java (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestNotification.java)
Deleted: labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestObjStore.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestObjStore.java 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestObjStore.java 2006-07-21 21:45:15 UTC (rev 5228)
@@ -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/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestObjStore.java (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestObjStore.java)
Deleted: labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java 2006-07-21 21:45:15 UTC (rev 5228)
@@ -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 = m_oRepos.nameFromString(sDir)
- .add("FileMoverConfigExample.xml");
-
- DomElement oElem = m_oRepos.getElement(oInpName);
-
- Name oOutName = m_oRepos.nameFromString(sDir)
- .add("outputTest.xml");
- m_oRepos.storeElement(oOutName,oElem);
-
- oElem = m_oRepos.getElement(oOutName);
- System.out.println(oElem.toString());
- } //________________________________
-
-} //____________________________________________________________________________
Copied: labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java)
Deleted: labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java 2006-07-21 21:45:15 UTC (rev 5228)
@@ -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 "+o.getClass().getSimpleName());
-
- } //________________________________
-
- 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/branches/refactor/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java (from rev 5227, labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestPersonAddrPhone.java)
Modified: labs/jbossesb/branches/refactor/ESBCore/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/build.xml 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/build.xml 2006-07-21 21:45:15 UTC (rev 5228)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- =================================================================== -->
- <!-- build.xml - Builds all subprojects in child directories -->
+ <!-- build.xml - Builds all subprojects in child directories -->
<!-- =================================================================== -->
<project name="JbossEsb" default="org.jboss.esb.core.compile" basedir=".">
@@ -23,7 +23,7 @@
<!-- =================================================================== -->
<target name="org.jboss.esb.core.prepare" depends="org.jboss.esb.core.init">
<mkdir dir="${org.jboss.esb.internal.dest}/dist"/>
- <mkdir dir="${org.jboss.esb.internal.dest}/lib"/>
+ <mkdir dir="${org.jboss.esb.internal.dest}/dist/lib"/>
</target>
<!-- =================================================================== -->
@@ -55,7 +55,7 @@
<!-- =================================================================== -->
<!-- Assemble jars -->
<!-- =================================================================== -->
- <target name="jar" depends="org.jboss.esb.core.compile" description="arma los jars">
+ <target name="jar" depends="org.jboss.esb.core.compile" description="Build jar files">
<echo message="Building jar"/>
<ant dir="common" target="jar"/>
<ant dir="listeners" target="jar"/>
@@ -65,10 +65,10 @@
</target>
<target name="-ear">
- <ear destfile="${org.jboss.esb.internal.dest}/dist/jbossesb-appl.ear"
+ <ear destfile="${org.jboss.esb.internal.dest}/dist/lib/jbossesb-appl.ear"
appxml="services/src/META-INF/application.xml"
>
- <fileset dir="${org.jboss.esb.internal.dest}/dist"
+ <fileset dir="${org.jboss.esb.internal.dest}/dist/lib"
includes="*.jar"
/>
</ear>
Modified: labs/jbossesb/branches/refactor/ESBCore/common/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/common/build.xml 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/common/build.xml 2006-07-21 21:45:15 UTC (rev 5228)
@@ -3,7 +3,7 @@
<property name="org.jboss.esb.common.jar.name" value="jbossesb-common"/>
<property name="org.jboss.esb.common.distrib.dir" value="${org.jboss.esb.internal.dest}/dist"/>
- <property name="org.jboss.esb.common.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+ <property name="org.jboss.esb.common.classes.dir" value="${org.jboss.esb.internal.dest}/classes/common"/>
<property name="org.jboss.esb.common.src.dir" value="${basedir}/src"/>
<property name="org.jboss.esb.root.dir" value="../.."/>
<property environment="env"/>
@@ -19,20 +19,21 @@
<target name="org.jboss.esb.common.init">
<tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
+ <format property="TODAY" pattern="dd-MM-yy"/>
</tstamp>
</target>
<target name="org.jboss.esb.common.prepare" depends="org.jboss.esb.common.init">
- <mkdir dir="${org.jboss.esb.common.bin.dir}"/>
+ <mkdir dir="${org.jboss.esb.common.classes.dir}"/>
<mkdir dir="${org.jboss.esb.common.distrib.dir}"/>
+ <mkdir dir="${org.jboss.esb.common.distrib.dir}/lib"/>
</target>
- <target name="clean" description="Remove bin directory">
+ <target name="clean" description="Remove classes directory">
+ <delete dir="${org.jboss.esb.common.classes.dir}"/>
</target>
<target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.common.bin.dir}"/>
</target>
@@ -48,7 +49,7 @@
description="Compile all classes">
<javac
- destdir="${org.jboss.esb.common.bin.dir}"
+ destdir="${org.jboss.esb.common.classes.dir}"
classpathref="org.jboss.esb.common.base.classpath"
debug="${org.jboss.esb.debug}"
optimize="${org.jboss.esb.optimize}"
@@ -62,9 +63,9 @@
description="Clean and compile"/>
<target name="jar" depends="org.jboss.esb.common.compile" description="Assemble jar files">
- <delete file="${org.jboss.esb.common.distrib.dir}/${org.jboss.esb.common.jar.name}.jar" />
- <jar destfile="${org.jboss.esb.common.distrib.dir}/${org.jboss.esb.common.jar.name}.jar"
- basedir="${org.jboss.esb.common.bin.dir}"
+ <delete file="${org.jboss.esb.common.distrib.dir}/lib/${org.jboss.esb.common.jar.name}.jar" />
+ <jar destfile="${org.jboss.esb.common.distrib.dir}/lib/${org.jboss.esb.common.jar.name}.jar"
+ basedir="${org.jboss.esb.common.classes.dir}"
includes="**/*.class"
excludes="test/**"
/>
Modified: labs/jbossesb/branches/refactor/ESBCore/common/tests/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/common/tests/build.xml 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/common/tests/build.xml 2006-07-21 21:45:15 UTC (rev 5228)
@@ -1,9 +1,9 @@
<?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.classes.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.core.classes.dir" value="${org.jboss.esb.internal.dest}/classes/common"/>
<property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
<property name="org.jboss.esb.root.dir" value="../.."/>
<property environment="env"/>
@@ -16,28 +16,28 @@
<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}"/>
+ <pathelement location="${org.jboss.esb.core.classes.dir}"/>
</path>
<target name="org.jboss.esb.tests.init">
<tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
+ <format property="TODAY" pattern="dd-MM-yy"/>
</tstamp>
- <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
+ <mkdir dir="${org.jboss.esb.tests.classes.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}"/>
+ <delete dir="${org.jboss.esb.tests.classes.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}"
+ destdir="${org.jboss.esb.tests.classes.dir}"
classpathref="org.jboss.esb.tests.base.classpath"
debug="${org.jboss.esb.debug}"
optimize="${org.jboss.esb.optimize}"
@@ -66,14 +66,14 @@
<formatter type="plain" usefile="false"/>
<formatter type="xml"/>
<batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
+ <fileset dir="${org.jboss.esb.tests.classes.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}"/>
+ <pathelement location="${org.jboss.esb.core.classes.dir}"/>
+ <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
</classpath>
</junit>
<junitreport>
@@ -95,14 +95,14 @@
<formatter type="plain" usefile="false"/>
<formatter type="xml"/>
<batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
+ <fileset dir="${org.jboss.esb.tests.classes.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}"/>
+ <pathelement location="${org.jboss.esb.core.classes.dir}"/>
+ <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
</classpath>
</junit>
<junitreport>
Modified: labs/jbossesb/branches/refactor/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-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java 2006-07-21 21:45:15 UTC (rev 5228)
@@ -156,7 +156,7 @@
}
- public static Person getPerson() throws Exception {
+ static Person getPerson() throws Exception {
Person oP = new Person((String) null);
oP.setField(Person.ATTRIB.pfx, "Mr.");
oP.setField(Person.ATTRIB.fmlyN, "Brum");
@@ -174,7 +174,7 @@
return oP;
}
- public static Address getAddress() throws Exception {
+ static Address getAddress() throws Exception {
Address oP = new Address((String) null);
oP.setField(Address.ATTRIB.strNum, "50");
oP.setField(Address.ATTRIB.strLine1, "Balcarce");
Modified: labs/jbossesb/branches/refactor/ESBCore/listeners/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/listeners/build.xml 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/listeners/build.xml 2006-07-21 21:45:15 UTC (rev 5228)
@@ -3,7 +3,7 @@
<property name="org.jboss.esb.listeners.jar.name" value="jbossesb-listeners"/>
<property name="org.jboss.esb.listeners.distrib.dir" value="${org.jboss.esb.internal.dest}/dist"/>
- <property name="org.jboss.esb.listeners.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+ <property name="org.jboss.esb.listeners.classes.dir" value="${org.jboss.esb.internal.dest}/classes/listeners"/>
<property name="org.jboss.esb.listeners.src.dir" value="${basedir}/src"/>
<property name="org.jboss.esb.root.dir" value="../.."/>
<property environment="env"/>
@@ -19,7 +19,10 @@
<path id="org.jboss.esb.listeners.default.classpath">
<path refid="org.jboss.esb.listeners.base.classpath"/>
- <pathelement location="${org.jboss.esb.internal.dest}/classes"/>
+ <pathelement location="${org.jboss.esb.classes.dir}"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes/processors"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes/services"/>
</path>
<target name="org.jboss.esb.listeners.init">
@@ -29,15 +32,16 @@
</target>
<target name="org.jboss.esb.listeners.prepare" depends="org.jboss.esb.listeners.init">
- <mkdir dir="${org.jboss.esb.listeners.bin.dir}"/>
+ <mkdir dir="${org.jboss.esb.listeners.classes.dir}"/>
<mkdir dir="${org.jboss.esb.listeners.distrib.dir}"/>
+ <mkdir dir="${org.jboss.esb.listeners.distrib.dir}/lib"/>
</target>
- <target name="clean" description="Remove bin directory">
+ <target name="clean" description="Remove classes directory">
+ <delete dir="${org.jboss.esb.listeners.classes.dir}"/>
</target>
<target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.listeners.bin.dir}"/>
</target>
@@ -55,7 +59,7 @@
description="Compile all classes">
<javac
- destdir="${org.jboss.esb.listeners.bin.dir}"
+ destdir="${org.jboss.esb.listeners.classes.dir}"
classpathref="org.jboss.esb.listeners.default.classpath"
debug="${org.jboss.esb.debug}"
optimize="${org.jboss.esb.optimize}"
@@ -69,9 +73,9 @@
description="Clean and compile"/>
<target name="jar" depends="org.jboss.esb.listeners.compile" description="Assemble jar files">
- <delete file="${org.jboss.esb.listeners.distrib.dir}/${org.jboss.esb.listeners.jar.name}.jar" />
- <jar destfile="${org.jboss.esb.listeners.distrib.dir}/${org.jboss.esb.listeners.jar.name}.jar"
- basedir="${org.jboss.esb.listeners.bin.dir}"
+ <delete file="${org.jboss.esb.listeners.distrib.dir}/lib/${org.jboss.esb.listeners.jar.name}.jar" />
+ <jar destfile="${org.jboss.esb.listeners.distrib.dir}/lib/${org.jboss.esb.listeners.jar.name}.jar"
+ basedir="${org.jboss.esb.listeners.classes.dir}"
includes="**/*.class"
excludes="test/**"
/>
Modified: labs/jbossesb/branches/refactor/ESBCore/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java 2006-07-21 21:45:15 UTC (rev 5228)
@@ -67,6 +67,7 @@
String sFactoryClass = EsbSysProps.getParamsReposFactoryClass();
m_oParmRepos = ParamsReposUtil.reposFromFactory(sFactoryClass,null);
m_oParmsName = m_oParmRepos.nameFromString(p_sParamsUid);
+ runUntilEndRequested();
} //__________________________________
protected void runUntilEndRequested() throws Exception
@@ -338,7 +339,7 @@
obtainAtt(p_oP,LISTEN_QUEUE,null);
} //________________________________
- protected final void obtainQueue() throws JMSException, NamingException
+ protected final void obtainQueue(DomElement p_oP) throws JMSException, NamingException
{
try
{
@@ -346,8 +347,8 @@
m_oQsess = null;
m_oQueue = null;
- String sQueue = m_oParms.getAttr(LISTEN_QUEUE);
- String sFactClass = m_oParms.getAttr(LISTEN_QUEUE_CONN_FACT);
+ String sQueue = p_oP.getAttr(LISTEN_QUEUE);
+ String sFactClass = p_oP.getAttr(LISTEN_QUEUE_CONN_FACT);
if (EsbUtil.isNullString(sFactClass))
sFactClass = "ConnectionFactory";
@@ -379,6 +380,7 @@
Thread.sleep(5000);
continue;
}
+ obtainQueue(p_oP);
String sSelector = m_oParms.getAttr(LISTEN_MSG_SELECTOR);
MessageConsumer oReader = m_oQsess.createReceiver(m_oQueue, sSelector);
Message oMsg = (null==oReader) ? null
@@ -502,5 +504,10 @@
}
} //______________________________________________________
+
+ public static void main(String[] args) throws Exception
+ {
+ new JmsQueueListener(args[0]);
+ }
} //____________________________________________________________________________
Modified: labs/jbossesb/branches/refactor/ESBCore/processors/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/processors/build.xml 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/processors/build.xml 2006-07-21 21:45:15 UTC (rev 5228)
@@ -3,7 +3,7 @@
<property name="org.jboss.esb.processors.jar.name" value="jbossesb-processors"/>
<property name="org.jboss.esb.processors.distrib.dir" value="${org.jboss.esb.internal.dest}/dist"/>
- <property name="org.jboss.esb.processors.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+ <property name="org.jboss.esb.processors.classes.dir" value="${org.jboss.esb.internal.dest}/classes/processors"/>
<property name="org.jboss.esb.processors.src.dir" value="${basedir}/src"/>
<property name="org.jboss.esb.root.dir" value="../.."/>
<property environment="env"/>
@@ -19,7 +19,9 @@
<path id="org.jboss.esb.processors.default.classpath">
<path refid="org.jboss.esb.processors.base.classpath"/>
- <pathelement location="${org.jboss.esb.internal.dest}/classes"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes/listeners"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes/services"/>
</path>
<target name="org.jboss.esb.processors.init">
@@ -29,15 +31,16 @@
</target>
<target name="org.jboss.esb.processors.prepare" depends="org.jboss.esb.processors.init">
- <mkdir dir="${org.jboss.esb.processors.bin.dir}"/>
+ <mkdir dir="${org.jboss.esb.processors.classes.dir}"/>
<mkdir dir="${org.jboss.esb.processors.distrib.dir}"/>
+ <mkdir dir="${org.jboss.esb.processors.distrib.dir}/lib"/>
</target>
- <target name="clean" description="Remove bin directory">
+ <target name="clean" description="Remove classes directory">
+ <delete dir="${org.jboss.esb.processors.classes.dir}"/>
</target>
<target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.processors.bin.dir}"/>
</target>
@@ -53,7 +56,7 @@
description="Compile all classes">
<javac
- destdir="${org.jboss.esb.processors.bin.dir}"
+ destdir="${org.jboss.esb.processors.classes.dir}"
classpathref="org.jboss.esb.processors.default.classpath"
debug="${org.jboss.esb.debug}"
optimize="${org.jboss.esb.optimize}"
@@ -67,9 +70,9 @@
description="Clean and compile"/>
<target name="jar" depends="org.jboss.esb.processors.compile" description="Assemble jar files">
- <delete file="${org.jboss.esb.processors.distrib.dir}/${org.jboss.esb.processors.jar.name}.jar" />
- <jar destfile="${org.jboss.esb.processors.distrib.dir}/${org.jboss.esb.processors.jar.name}.jar"
- basedir="${org.jboss.esb.processors.bin.dir}"
+ <delete file="${org.jboss.esb.processors.distrib.dir}/lib/${org.jboss.esb.processors.jar.name}.jar" />
+ <jar destfile="${org.jboss.esb.processors.distrib.dir}/lib/${org.jboss.esb.processors.jar.name}.jar"
+ basedir="${org.jboss.esb.processors.classes.dir}"
includes="**/*.class"
excludes="test/**"
/>
Modified: labs/jbossesb/branches/refactor/ESBCore/services/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/build.xml 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/services/build.xml 2006-07-21 21:45:15 UTC (rev 5228)
@@ -3,10 +3,11 @@
<project name="JbossEsbServices" default="org.jboss.esb.services.compile" basedir=".">
<property name="org.jboss.esb.services.name.jar" value="${ant.project.name}.jar"/>
+ <property name="org.jboss.esb.services.dist.dir" value="${org.jboss.esb.internal.dest}/dist"/>
<property name="org.jboss.esb.services.appl.dir" value="../.."/>
<property name="org.jboss.esb.services.metainf.dir" value="src/META-INF"/>
- <property name="org.jboss.esb.services.classes.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+ <property name="org.jboss.esb.services.classes.dir" value="${org.jboss.esb.internal.dest}/classes/services"/>
<property name="org.jboss.esb.services.src.dir" value="${basedir}/src"/>
<property name="org.jboss.esb.root.dir" value="../.."/>
<property environment="env"/>
@@ -92,11 +93,11 @@
<!-- =================================================================== -->
<!-- Clean -->
<!-- =================================================================== -->
- <target name="clean" description="Remove clases directory">
+ <target name="clean" description="Remove classes directory">
+ <delete dir="${org.jboss.esb.services.classes.dir}"/>
</target>
<target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.services.classes.dir}"/>
</target>
<!-- =================================================================== -->
@@ -106,7 +107,9 @@
<path id="org.jboss.esb.services.default.classpath">
<path refid="org.jboss.esb.services.base.classpath"/>
- <pathelement location="${org.jboss.esb.internal.dest}/classes"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes/processors"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes/listeners"/>
</path>
<path id="xdoclet.class.path">
@@ -182,13 +185,13 @@
<target name="jar" description="Assemble jar files"
depends="org.jboss.esb.services.compile,ejbdoclet"
>
- <jar destfile="${org.jboss.esb.internal.dest}/dist/jbossesb-services-client.jar"
- basedir="${org.jboss.esb.internal.dest}/classes"
+ <jar destfile="${org.jboss.esb.services.dist.dir}/lib/jbossesb-services-client.jar"
+ basedir="${org.jboss.esb.services.classes.dir}"
includes="**/*.class"
excludes="**/EJBs/*Bean*"
/>
- <jar destfile="${org.jboss.esb.internal.dest}/dist/jbossesb-services.jar"
- basedir="${org.jboss.esb.internal.dest}/classes"
+ <jar destfile="${org.jboss.esb.services.dist.dir}/lib/jbossesb-services.jar"
+ basedir="${org.jboss.esb.services.classes.dir}"
includes="**/EJBs/*.class"
manifest="${org.jboss.esb.services.metainf.dir}/manifest.server"
>
@@ -201,9 +204,9 @@
</target>
<target name="-ear">
- <ear destfile="${org.jboss.esb.internal.dest}/dist/jbossesb-appl.ear"
+ <ear destfile="${org.jboss.esb.services.dist.dir}/lib/jbossesb-appl.ear"
appxml="${org.jboss.esb.services.metainf.dir}/application.xml">
- <fileset dir="${org.jboss.esb.internal.dest}/dist"
+ <fileset dir="${org.jboss.esb.services.dist.dir}"
includes="jbossesb-common.jar
,CQ3ServicesClient.jar
,CQ3Services.jar
Modified: labs/jbossesb/branches/refactor/ESBCore/services/src/META-INF/ejb-jar.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/src/META-INF/ejb-jar.xml 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/services/src/META-INF/ejb-jar.xml 2006-07-21 21:45:15 UTC (rev 5228)
@@ -40,12 +40,6 @@
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
- <env-entry>
- <env-entry-name>datasource</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value><![CDATA[java:RosettaDS]]></env-entry-value>
- </env-entry>
-
</session>
<session >
Modified: labs/jbossesb/branches/refactor/ESBCore/services/tests/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/tests/build.xml 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/ESBCore/services/tests/build.xml 2006-07-21 21:45:15 UTC (rev 5228)
@@ -53,9 +53,7 @@
<!-- ====================================================================== -->
<target name="org.jboss.esb.services.internal.test">
<antcall target="org.jboss.esb.services.internal.test.unit"/>
- <!-- Lets get unit tests done first, the add functional tests
<antcall target="org.jboss.esb.services.internal.test.functional"/>
- -->
</target>
Modified: labs/jbossesb/branches/refactor/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/build.xml 2006-07-21 21:30:07 UTC (rev 5227)
+++ labs/jbossesb/branches/refactor/build.xml 2006-07-21 21:45:15 UTC (rev 5228)
@@ -12,13 +12,17 @@
<!-- 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}/build/dist/lib"/>
+
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.properties}"/>
<!-- Set internal property defaults -->
- <property name="org.jboss.esb.installationdirectory" value="${basedir}/build/install"/>
+ <property name="org.jboss.esb.installationdirectory" value="${basedir}/build/dist"/>
<!-- Compile with debugging? -->
<property name="org.jboss.esb.debug" value="yes"/>
@@ -98,8 +102,9 @@
<target name="org.jboss.esb.core.jar" depends="org.jboss.esb.compile">
<echo message="Building jar file"/>
<ant dir="ESBCore" target="jar"/>
- <mkdir dir="${org.jboss.esb.internal.jar.dest}"/>
</target>
+
+ <!-- add ear file rule -->
<target name="org.jboss.esb.javadocs"
depends="org.jboss.esb.internal.init">
@@ -142,6 +147,7 @@
<fileset dir="xml"/>
</copy>
+ <!--
<echo message="Installing javadocs"/>
<mkdir dir="${org.jboss.esb.installationdirectory}/javadocs"/>
<copy
@@ -149,6 +155,7 @@
>
<fileset dir="javadocs"/>
</copy>
+ -->
</target>
More information about the jboss-svn-commits
mailing list