[jboss-svn-commits] JBL Code SVN: r5393 - in labs/jbossesb/trunk/product/core: common/src/org/jboss/soa/esb common/src/org/jboss/soa/esb/common common/src/org/jboss/soa/esb/connection common/src/org/jboss/soa/esb/connection/exception common/src/org/jboss/soa/esb/helpers common/src/org/jboss/soa/esb/notification common/src/org/jboss/soa/esb/parameters common/tests/src/org/jboss/soa/esb common/tests/src/org/jboss/soa/esb/connection listeners/src/org/jboss/soa/esb/listeners processors/src/org/jboss/soa/esb/processors services/src/META-INF services/src/org/jboss/soa/esb/internal/core/objectstore services/src/org/jboss/soa/esb/services services/src/org/jboss/soa/esb/services/EJB services/src/org/jboss/soa/esb/services/msglistener services/tests/src/org/jboss/soa/esb/services/tests/notification services/tests/src/org/jboss/soa/esb/services/tests/objectstore
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 1 18:45:03 EDT 2006
Author: arvinder
Date: 2006-08-01 18:43:44 -0400 (Tue, 01 Aug 2006)
New Revision: 5393
Added:
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/SystemProperties.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/AbandonedConnectionTimerTask.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionFactory.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPool.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPoolFactory.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionProperties.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionWrapper.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DefaultConnectionPoolImpl.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DriverConnectionFactory.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/FreeConnectionPoolResources.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PasswordDecoder.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PoolDataSource.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/ESBConnectionException.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestConnectionPool.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestPasswordDecoder.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractAggregator.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSaxProcessor.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlPassthrough.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlProcessor.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/FileProcessor.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/MsgProcessor.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocalHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocalHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocalHome.java
Removed:
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/AbandonedConnectionTimerTask.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionFactory.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPool.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPoolFactory.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionProperties.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionWrapper.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DefaultConnectionPoolImpl.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DriverConnectionFactory.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/FreeConnectionPoolResources.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PasswordDecoder.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PoolDataSource.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/ESBConnectionException.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestConnectionPool.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestPasswordDecoder.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractAggregator.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractProcessor.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractSaxProcessor.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractSqlPassthrough.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractSqlProcessor.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbFileProcessor.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbMsgProcessor.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java
Modified:
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/EsbEmail.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/notification/NotificationList.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/parameters/ParamsReposUtil.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/BetterDirListener.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ZZDummyProcessor.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/FileCopier.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/ParamsFileProcessor.java
labs/jbossesb/trunk/product/core/services/src/META-INF/ejb-jar.xml
labs/jbossesb/trunk/product/core/services/src/META-INF/jboss.xml
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/tests/notification/NotificationFuncTest.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/tests/objectstore/ObjectStoreFuncTest.java
Log:
Remove JbossEsb & Esb prefix
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/EsbSysProps.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,119 +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;
-
-import org.jboss.soa.esb.helpers.KeyValuePair;
-
-public class EsbSysProps {
- public static final String SMTP_HOST = "org.jboss.soa.esb.mail.smtp.host";
-
- public static final String SMTP_USERNAME = "org.jboss.soa.esb.mail.smtp.user";
-
- public static final String SMTP_PASSWORD = "org.jboss.soa.esb.mail.smtp.password";
-
- public static final String SMTP_PORT = "org.jboss.soa.esb.mail.smtp.port";
-
- public static final String JNDI_SERVER_TYPE = "org.jboss.soa.esb.jndi.server.type";
-
- public static final String JNDI_SERVER_URL = "org.jboss.soa.esb.jndi.server.url";
-
- public static final String PARAMS_REPOS_FACTORY_CLASS = "org.jboss.soa.esb.paramsRepository.factory.class";
-
- public static final String OBJECT_STORE_CONFIG_FILE = "org.jboss.soa.esb.objStore.configfile";
-
- public static final String ENCRYPT_FACTORY_CLASS = "jorg.jboss.soa.esb.encryption.factory.class";
-
- public static final String DEFAULT_HOST = "localhost";
-
- public static final String DEFAULT_USERNAME = "";
-
- public static final String DEFAULT_PASSWORD = "";
-
- public static final String DEFAULT_PORT = "25";
-
- public static final String DEFAULT_SERVER_TYPE = "jboss";
-
- 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, EsbSysProps.DEFAULT_HOST);
- }
-
- public static String getSmtpUsername() {
- return System.getProperty(SMTP_USERNAME, EsbSysProps.DEFAULT_USERNAME);
- }
-
- public static String getSmtpPassword() {
- return System.getProperty(SMTP_PASSWORD, EsbSysProps.DEFAULT_PASSWORD);
- }
-
- public static String getSmtpPort() {
- return System.getProperty(SMTP_PORT, EsbSysProps.DEFAULT_PORT);
- }
-
- public static String getJndiServerType() {
- return System.getProperty(JNDI_SERVER_TYPE,
- EsbSysProps.DEFAULT_SERVER_TYPE);
- }
-
- public static String getJndiServerURL() {
- return System.getProperty(JNDI_SERVER_URL, EsbSysProps.DEFAULT_HOST);
- }
-
- public static String getParamsReposFactoryClass() {
- return System.getProperty(PARAMS_REPOS_FACTORY_CLASS,
- org.jboss.soa.esb.parameters.DefaultReposFactory.class
- .getName());
- }
-
- public static String getObjStoreConfigFile() {
- return System.getProperty(OBJECT_STORE_CONFIG_FILE);
- }
-
- public static String getEncryptionFactoryClass() {
- return System.getProperty(ENCRYPT_FACTORY_CLASS,
- org.jboss.soa.esb.services.DefaultEncryptionFactory.class
- .getName());
- }
-
-}
\ No newline at end of file
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/SystemProperties.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/SystemProperties.java)
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/AbandonedConnectionTimerTask.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/AbandonedConnectionTimerTask.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/AbandonedConnectionTimerTask.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,50 +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.connection;
-
-import java.util.TimerTask;
-
-/**
- * Timer task which will run at scheduled times based on the property set by the user.
- * This task will remove all unused connections which have elapsed a certain period of time
- * User: MohitK
- * Date: Jul 26, 2006
- */
-public class AbandonedConnectionTimerTask extends TimerTask {
-
- private DefaultConnectionPoolImpl m_oPool;
-
- /**
- * Constructor which takes the pool implementation
- * @param pool
- */
- public AbandonedConnectionTimerTask(DefaultConnectionPoolImpl pool){
- this.m_oPool = pool;
- }
-
- public void run() {
- synchronized(m_oPool){
- m_oPool.releaseAbandonedConnections();
- }
- }
-
-}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/AbandonedConnectionTimerTask.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/AbandonedConnectionTimerTask.java)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionFactory.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/ConnectionFactory.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionFactory.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,39 +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.connection;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * Factory interface for creating connections based on different sources such as DataSource, DriverConnection
- * User: MohitK
- * Date: Jul 18, 2006
- */
-public interface ConnectionFactory {
- /**
- * Creates a new JDBC Connection. The implementation is left to the classes.
- * @return Connection
- * @throws SQLException
- */
- public Connection createConnection() throws SQLException;
-}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionFactory.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/ConnectionFactory.java)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPool.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPool.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPool.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb.connection;
-
-import org.jboss.soa.esb.connection.exception.ESBConnectionException;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * TODO
- * User: MohitK
- * Date: Jul 18, 2006
- */
-public interface ConnectionPool {
- /**
- * This method is used to create the connection pool and keep it ready
- * @param prop Properties for the connection pool including connection properties
- * @throws ESBConnectionException
- */
- public void createPool(ConnectionProperties prop) throws ESBConnectionException;
-
- /**
- * This method is called whenever a connection is needed from the pool.
- * @return Connection to be used
- * @throws SQLException
- */
- public Connection getConnection() throws SQLException;
-
- /**
- * This method closes an open connection and returns the connection to the pool.
- * @param connectionToClose The connection to be returned to the pool.
- * @throws SQLException
- */
- public void closeConnection(Connection connectionToClose) throws SQLException;
-
- /**
- * This method is called when the pool needs to be destroyed effectively closing all open connections
- * @throws SQLException
- */
- public void releasePool() throws SQLException;
-
-}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPool.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPool.java)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPoolFactory.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPoolFactory.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPoolFactory.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -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.connection;
-
-import org.jboss.soa.esb.connection.exception.ESBConnectionException;
-
-/**
- * Factory class to create the connection pool.
- * User: MohitK
- * Date: Jul 19, 2006
- */
-public class ConnectionPoolFactory {
-
- /**
- * Factory method to create and return a connection pool based on the property set for the connection pool
- * implementation. The factory also registers a shut down hook with the JVM so that the connections in the pool
- * are closed and released with causing connections leaks.
- * @param connProperties Properties for the connection pool
- * @return Connection Pool
- * @throws ESBConnectionException
- */
- public static ConnectionPool createPool(ConnectionProperties connProperties) throws ESBConnectionException {
- String connectionPoolClassName = connProperties.getConnectionPoolClass();
- try {
- ConnectionPool pool = (ConnectionPool)Class.forName(connectionPoolClassName).newInstance();
- pool.createPool(connProperties);
- FreeConnectionPoolResources freeResourcesThread = new FreeConnectionPoolResources(pool);
- Runtime.getRuntime().addShutdownHook(freeResourcesThread);
- return pool;
- } catch (Throwable t) {
- System.err.println("ConnectionPoolFactory: Error in Connection Pool");
- System.err.println(t);
- throw new ESBConnectionException(t);
- }
- }
-}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPoolFactory.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPoolFactory.java)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionProperties.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/ConnectionProperties.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionProperties.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,248 +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.connection;
-
-import java.util.Properties;
-
-/**
- * Connection Property class which stores all connection and connection pool properties. It keeps the peroperties ready
- * so that is can be used by the pool and connection factory
- * User: MohitK
- * Date: Jul 18, 2006
- */
-public class ConnectionProperties {
-
- private Properties _connectionProperties;
-
- public static final String DRIVER_CLASSNAME = "driver-class";
- public static final String CONNECTION_URL = "connection-url";
- public static final String USERNAME = "user-name";
- public static final String PASSWORD = "password";
- public static final String AUTO_COMMIT = "auto-commit";
- public static final String ISOLATION_LEVEL = "isolation";
- public static final String MIN_POOL_SIZE = "min-pool-size";
- public static final String MAX_POOL_SIZE = "max-pool-size";
- public static final String BLOCKING_CONNECTION_TIME = "blocking-timeout-millis";
- public static final String CONNECTION_POOL_CLASS = "connection-pool-class";
- public static final String PASSWORD_DECODER = "password-decrypter";
- public static final String ABANDONED_CONNECTION_TIMEOUT = "abandoned-connection-timeout";
- public static final String ABANDONED_CONNECTION_CHECK_INTERVAL = "abandoned-connection-time-interval";
-
- private boolean _autoCommit;
- private Integer _isolationLvl;
- private int _minPoolSize;
- private int _maxPoolSize;
- private long _connBlockTime;
- private String _connectionPoolClass;
- private String _user;
- private String _password;
- private String _connectionUrl;
- private long _abandonedConnectionTimeout;
- private long _abandonedConnectionCheckInterval;
- private String _driverClassName;
-
-
- public static final String DEFAULT_MIN_POOL_SIZE = "5";
- public static final String DEFAULT_MAX_POOL_SIZE = "10";
- public static final String DEFAULT_CONN_BLOCK_TIME_MILLIS = "5000";
- public static final String DEFAULT_CONNECTION_POOL_CLASS = DefaultConnectionPoolImpl.class.getName();
- public static final String DEFAULT_ABANDONED_CONNECTION_TIMEOUT = "10000";
- public static final String DEFAULT_ABANDONED_CONNECTION_CHECK_INTERVAL = "30000";
-
- public ConnectionProperties(Properties connectionProperties) {
- this._connectionProperties = connectionProperties;
- setDriverClassName();
- setConnectionUrl();
- setUser();
- setPassword();
- setConnectionPoolClass();
- setAutoCommit();
- setIsolationLevel();
- setMinPoolSize();
- setMaxPoolSize();
- setBlockingConnectionTime();
- setAbandonedConnectionTimeOut();
- setAbandonedConnectionCheckInterval();
- }
-
- private void setDriverClassName() {
- _driverClassName = _connectionProperties.getProperty(DRIVER_CLASSNAME);
- if (_driverClassName == null) {
- _driverClassName = System.getProperty(DRIVER_CLASSNAME);
- }
- }
-
- protected String getDriverClassName() {
- return _driverClassName;
- }
-
- protected String getConnectionUrl() {
- return _connectionUrl;
- }
-
- private void setConnectionUrl() {
- _connectionUrl = _connectionProperties.getProperty(CONNECTION_URL);
- if (_connectionUrl == null) {
- _connectionUrl = System.getProperty(CONNECTION_URL);
- }
- }
-
- protected boolean getAutoCommit() {
- return _autoCommit;
- }
-
- protected Integer getIsolationLevel() {
- return _isolationLvl;
- }
-
- private void setIsolationLevel() {
- String isolation = (String) _connectionProperties.get(ISOLATION_LEVEL);
- if (isolation == null) {
- isolation = System.getProperty(ISOLATION_LEVEL);
- }
- this._isolationLvl = (isolation != null) ? new Integer(isolation) : null;
- }
-
- protected int getMinPoolSize() {
- return _minPoolSize;
- }
-
- protected int getMaxPoolSize() {
- return _maxPoolSize;
- }
-
- private void setMinPoolSize() {
- String strPoolSize = _connectionProperties.getProperty(MIN_POOL_SIZE);
- if (strPoolSize == null) {
- strPoolSize = System.getProperty(MIN_POOL_SIZE, DEFAULT_MIN_POOL_SIZE);
- this._minPoolSize = Integer.parseInt(strPoolSize);
- }
- }
-
- private void setMaxPoolSize() {
- String strPoolSize = (String) _connectionProperties.get(MAX_POOL_SIZE);
- if (strPoolSize == null) {
- strPoolSize = System.getProperty(MAX_POOL_SIZE, DEFAULT_MAX_POOL_SIZE);
- this._maxPoolSize = Integer.parseInt(strPoolSize);
- }
- }
-
- private void setBlockingConnectionTime() {
- String strBlockTimeMillis = (String) _connectionProperties.get(BLOCKING_CONNECTION_TIME);
- if (strBlockTimeMillis == null) {
- strBlockTimeMillis = System.getProperty(BLOCKING_CONNECTION_TIME, DEFAULT_CONN_BLOCK_TIME_MILLIS);
- this._connBlockTime = Integer.parseInt(strBlockTimeMillis);
- }
- }
-
- protected long getConnectionBlockTimeInMillis() {
- return _connBlockTime;
- }
-
- private void setAutoCommit() {
- String autoCommit = (String) _connectionProperties.get(AUTO_COMMIT);
- if (autoCommit == null || autoCommit.equals("false")) {
- _autoCommit = Boolean.FALSE;
- } else {
- _autoCommit = Boolean.TRUE;
- }
- }
-
- private void setConnectionPoolClass() {
- _connectionPoolClass = _connectionProperties.getProperty(CONNECTION_POOL_CLASS);
- if (_connectionPoolClass == null) {
- _connectionPoolClass = System.getProperty(CONNECTION_POOL_CLASS, DEFAULT_CONNECTION_POOL_CLASS);
- }
- }
-
-
- protected String getUser() {
- return _user;
- }
-
- public void setUser() {
- this._user = _connectionProperties.getProperty(USERNAME);
- if (_user == null) {
- _user = System.getProperty(USERNAME);
- }
- }
-
- protected String getPassword() {
- return _password;
- }
-
- protected void setPassword() {
- this._password = _connectionProperties.getProperty(PASSWORD);
- if (_password == null) {
- _password = System.getProperty(PASSWORD);
- }
- String strPasswordDecoder = _connectionProperties.getProperty(PASSWORD_DECODER);
- if (strPasswordDecoder == null) {
- strPasswordDecoder = System.getProperty(PASSWORD_DECODER);
- }
- if (strPasswordDecoder != null) {
- try {
- PasswordDecoder decoder = (PasswordDecoder) Class.forName(strPasswordDecoder).newInstance();
- this._password = decoder.decode(_password);
- } catch (InstantiationException e) {
- System.err.println("Error in creating instance of Password Decoder Class:-" + strPasswordDecoder);
- System.err.println(e);
- } catch (IllegalAccessException e) {
- System.err.println("Error in creating instance of Password Decoder Class:-" + strPasswordDecoder);
- System.err.println(e);
- } catch (ClassNotFoundException e) {
- System.err.println("Password Decoder Class:-" + strPasswordDecoder + " not found in Classpath");
- System.err.println("Please check the property:-" + PASSWORD_DECODER);
- System.err.println(e);
- }
- }
- }
-
- protected String getConnectionPoolClass() {
- return _connectionPoolClass;
- }
-
- private void setAbandonedConnectionTimeOut() {
- String strAbandonedConnectionTimeout = _connectionProperties.getProperty(ABANDONED_CONNECTION_TIMEOUT);
- if (strAbandonedConnectionTimeout == null) {
- strAbandonedConnectionTimeout = System.getProperty(ABANDONED_CONNECTION_TIMEOUT, DEFAULT_ABANDONED_CONNECTION_TIMEOUT);
- }
- this._abandonedConnectionTimeout = Long.parseLong(strAbandonedConnectionTimeout);
- }
-
- private void setAbandonedConnectionCheckInterval() {
- String strAbandonedConnectionCheckInterval = _connectionProperties.getProperty(ABANDONED_CONNECTION_CHECK_INTERVAL);
- if (strAbandonedConnectionCheckInterval == null || strAbandonedConnectionCheckInterval.trim().length() == 0) {
- strAbandonedConnectionCheckInterval = System.getProperty(ABANDONED_CONNECTION_CHECK_INTERVAL, DEFAULT_ABANDONED_CONNECTION_CHECK_INTERVAL);
- }
- this._abandonedConnectionCheckInterval = Long.parseLong(strAbandonedConnectionCheckInterval);
- }
-
- protected long getAbandonedConnectionTimeOut(){
- return this._abandonedConnectionTimeout;
- }
-
- protected long getAbandonedConnectionCheckInterval(){
- return this._abandonedConnectionCheckInterval;
- }
-
-}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionProperties.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/ConnectionProperties.java)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionWrapper.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/ConnectionWrapper.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionWrapper.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,319 +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.connection;
-
-import java.sql.*;
-import java.util.Map;
-
-/**
- * Wrapper class which encapsulates @link Connection
- * User: MohitK
- * Date: Jul 18, 2006
- */
-public class ConnectionWrapper implements Connection {
-
- private Connection _originalHeavyConnection;
- private ConnectionPool _connectionPool;
- private boolean _isClosed = false;
- private long _activatedTime;
-
- public ConnectionWrapper(Connection originalHeavyConnection, ConnectionPool pool) throws SQLException {
- if (originalHeavyConnection == null) {
- throw new SQLException("Original Connection is Null");
- }
- this._originalHeavyConnection = originalHeavyConnection;
- if (pool == null) {
- throw new SQLException("Connection Pool is null");
- }
- this._connectionPool = pool;
- }
-
- public Statement createStatement() throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.createStatement();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public PreparedStatement prepareStatement(String sql) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.prepareStatement(sql);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public CallableStatement prepareCall(String sql) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.prepareCall(sql);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public String nativeSQL(String sql) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.nativeSQL(sql);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public void setAutoCommit(boolean autoCommit) throws SQLException {
- if (_originalHeavyConnection != null) {
- _originalHeavyConnection.setAutoCommit(autoCommit);
- } else
- throw new SQLException("Connection closed due to inactivity");
-
- }
-
- public boolean getAutoCommit() throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.getAutoCommit();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public void commit() throws SQLException {
- if (_originalHeavyConnection != null) {
- _originalHeavyConnection.commit();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public void rollback() throws SQLException {
- if (_originalHeavyConnection != null) {
- _originalHeavyConnection.rollback();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public synchronized void close() throws SQLException {
- if (_originalHeavyConnection != null) {
- _connectionPool.closeConnection(this);
- }
- this._isClosed = true;
- }
-
- public boolean isClosed() throws SQLException {
- return _isClosed;
- }
-
- public DatabaseMetaData getMetaData() throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.getMetaData();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public void setReadOnly(boolean readOnly) throws SQLException {
- if (_originalHeavyConnection != null) {
- _originalHeavyConnection.setReadOnly(readOnly);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public boolean isReadOnly() throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.isReadOnly();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public void setCatalog(String catalog) throws SQLException {
- if (_originalHeavyConnection != null) {
- _originalHeavyConnection.setCatalog(catalog);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public String getCatalog() throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.getCatalog();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public void setTransactionIsolation(int level) throws SQLException {
- if (_originalHeavyConnection != null) {
- _originalHeavyConnection.setTransactionIsolation(level);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public int getTransactionIsolation() throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.getTransactionIsolation();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public SQLWarning getWarnings() throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.getWarnings();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public void clearWarnings() throws SQLException {
- if (_originalHeavyConnection != null) {
- _originalHeavyConnection.clearWarnings();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.createStatement(resultSetType, resultSetConcurrency);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.prepareStatement(sql, resultSetType, resultSetConcurrency);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.prepareCall(sql, resultSetType, resultSetConcurrency);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public Map<String, Class<?>> getTypeMap() throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.getTypeMap();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
- if (_originalHeavyConnection != null) {
- _originalHeavyConnection.setTypeMap(map);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public void setHoldability(int holdability) throws SQLException {
- if (_originalHeavyConnection != null) {
- _originalHeavyConnection.setHoldability(holdability);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public int getHoldability() throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.getHoldability();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public Savepoint setSavepoint() throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.setSavepoint();
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public Savepoint setSavepoint(String name) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.setSavepoint(name);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public void rollback(Savepoint savepoint) throws SQLException {
- if (_originalHeavyConnection != null) {
- _originalHeavyConnection.rollback(savepoint);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- if (_originalHeavyConnection != null) {
- _originalHeavyConnection.releaseSavepoint(savepoint);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.prepareStatement(sql, autoGeneratedKeys);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public PreparedStatement prepareStatement(String sql, int columnIndexes[]) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.prepareStatement(sql, columnIndexes);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- public PreparedStatement prepareStatement(String sql, String columnNames[]) throws SQLException {
- if (_originalHeavyConnection != null) {
- return _originalHeavyConnection.prepareStatement(sql, columnNames);
- } else
- throw new SQLException("Connection closed due to inactivity");
- }
-
- protected synchronized Connection getActualConnection() {
- return _originalHeavyConnection;
- }
-
- protected long getActivatedTime() {
- return _activatedTime;
- }
-
- protected void setActivatedTime(long activedTime) {
- this._activatedTime = activedTime;
- }
-
- protected String getName() {
- return _originalHeavyConnection.toString();
- }
-
- protected void setOriginalConnection(Connection conn) {
- this._originalHeavyConnection = conn;
- }
-}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionWrapper.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/ConnectionWrapper.java)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DefaultConnectionPoolImpl.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/DefaultConnectionPoolImpl.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DefaultConnectionPoolImpl.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,202 +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.connection;
-
-import org.jboss.soa.esb.connection.exception.ESBConnectionException;
-
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.Stack;
-import java.util.Timer;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Default connection pool implementation class when there is none specified by the user in @link ConnectionProperties
- * User: MohitK
- * Date: Jul 18, 2006
- */
-public class DefaultConnectionPoolImpl implements ConnectionPool {
-
- private final Stack<ConnectionWrapper> m_oConnectionStack = new Stack<ConnectionWrapper>();
- private final ConcurrentHashMap<String, ConnectionWrapper> m_oUsedConnectionMap = new ConcurrentHashMap<String, ConnectionWrapper>();
- private int m_iConnCountInPool;
- private ConnectionProperties m_oConnProperties;
- private ConnectionFactory _connectionFactory;
-
- /**
- * @see org.jboss.soa.esb.connection.ConnectionPool#createPool(ConnectionProperties)
- *
- */
- public void createPool(ConnectionProperties prop) throws ESBConnectionException {
- this.m_oConnProperties = prop;
- try {
- initPool();
- AbandonedConnectionTimerTask abandonedConnTask = new AbandonedConnectionTimerTask(this);
- Timer abandonedTimer = new Timer(":AbandonedConnectionPoolScheduler:@" + this.toString(), true);
- abandonedTimer.schedule(abandonedConnTask, prop.getAbandonedConnectionCheckInterval(), prop.getAbandonedConnectionCheckInterval());
- } catch (SQLException e) {
- throw new ESBConnectionException("DefaultConnectionPoolImpl: Error in creating Connection Pool", e);
- }
- }
-
- private void initPool() throws SQLException {
-
- if (_connectionFactory == null) {
- Properties properties = new Properties();
- properties.put("user", m_oConnProperties.getUser());
- properties.put("password", m_oConnProperties.getPassword());
- _connectionFactory = new DriverConnectionFactory(getDriver(m_oConnProperties.getDriverClassName()), m_oConnProperties.getConnectionUrl(), properties);
- }
- while (m_iConnCountInPool < m_oConnProperties.getMinPoolSize()) {
- synchronized (m_oConnectionStack) {
- m_oConnectionStack.add(new ConnectionWrapper(_connectionFactory.createConnection(), this));
- m_iConnCountInPool++;
- }
- }
- }
-
- private Driver getDriver(String driverClassName) throws SQLException {
- if (driverClassName != null) {
- try {
- Class.forName(driverClassName);
- } catch (Throwable e) {
- System.err.println("DefaultConnectionPoolImpl: Error in loading class " + driverClassName + " to create connection pool");
- System.err.println(e);
- throw new SQLException("DefaultConnectionPoolImpl: Error in loading class " + driverClassName + " to create connection pool");
- }
- return DriverManager.getDriver(m_oConnProperties.getConnectionUrl());
- }
- throw new SQLException("DefaultConnectionPoolImpl: Driver Class could not be loaded");
- }
-
- /**
- * @see org.jboss.soa.esb.connection.ConnectionPool#getConnection()
- *
- */
- public synchronized Connection getConnection() throws SQLException {
- ConnectionWrapper newPoolConnection;
- if (!m_oConnectionStack.isEmpty()) {
- newPoolConnection = m_oConnectionStack.pop();
- m_oUsedConnectionMap.put(newPoolConnection.getName(), newPoolConnection);
- } else if (m_iConnCountInPool < m_oConnProperties.getMaxPoolSize()) {
- newPoolConnection = new ConnectionWrapper(_connectionFactory.createConnection(), this);
- m_oUsedConnectionMap.put(newPoolConnection.getName(), newPoolConnection);
- m_iConnCountInPool++;
- } else {
- try {
- Thread.sleep(m_oConnProperties.getConnectionBlockTimeInMillis());
- } catch (InterruptedException e) {
- //Do Nothing
- }
- if (!m_oConnectionStack.empty()) {
- newPoolConnection = m_oConnectionStack.pop();
- m_oUsedConnectionMap.put(newPoolConnection.getName(), newPoolConnection);
- } else {
- throw new SQLException("Connection Pool exhausted. Please increase number of connections");
- }
-
- }
- Integer isolation = m_oConnProperties.getIsolationLevel();
- if (isolation != null) newPoolConnection.setTransactionIsolation(isolation);
- newPoolConnection.setAutoCommit(m_oConnProperties.getAutoCommit());
- newPoolConnection.setActivatedTime(System.currentTimeMillis());
- return newPoolConnection;
- }
-
- /**
- * @see ConnectionPool;
- */
- public void closeConnection(Connection connectionToClose) {
- synchronized (m_oConnectionStack) {
- m_oConnectionStack.push((ConnectionWrapper) connectionToClose);
- }
- m_oUsedConnectionMap.remove(connectionToClose);
- }
-
- /**
- * @see ConnectionPool#releasePool()
- */
- public void releasePool() {
- try {
- synchronized (m_oConnectionStack) {
- for (ConnectionWrapper connection : m_oConnectionStack) {
- Connection origConn = connection.getActualConnection();
- origConn.close();
- m_iConnCountInPool--;
- }
- }
- Enumeration<ConnectionWrapper> connectionWrapperEnum = m_oUsedConnectionMap.elements();
- while (connectionWrapperEnum.hasMoreElements()) {
- ConnectionWrapper connectionWrapper = connectionWrapperEnum.nextElement();
- Connection con = connectionWrapper.getActualConnection();
- String name = connectionWrapper.getName();
- if (con != null && !con.isClosed()) {
- con.close();
- }
- m_iConnCountInPool--;
- m_oUsedConnectionMap.remove(name);
- }
- } catch (SQLException e) {
- System.err.println("DefaultConnectionPoolImpl: Error in closing physical Connection");
- System.err.println(e);
- }
- }
-
- protected void finalize() throws Throwable {
- super.finalize();
- releasePool();
- }
-
- /**
- * This method will release all abandoned connections from the pool.
- *
- */
- protected synchronized void releaseAbandonedConnections() {
-
- Enumeration<ConnectionWrapper> connectionWrapperEnum = m_oUsedConnectionMap.elements();
- while (connectionWrapperEnum.hasMoreElements()) {
- ConnectionWrapper connectionWrapper = connectionWrapperEnum.nextElement();
- long activedTime = connectionWrapper.getActivatedTime();
- long currentTime = System.currentTimeMillis();
- if ((currentTime - activedTime) > m_oConnProperties.getAbandonedConnectionTimeOut()) {
- try {
- System.out.println("Removing abandoned Connection:-" + connectionWrapper);
- Connection actualConnection = connectionWrapper.getActualConnection();
- m_oUsedConnectionMap.remove(connectionWrapper.getName());
- connectionWrapper.setOriginalConnection(null);
- connectionWrapper = null;
- connectionWrapper = new ConnectionWrapper(actualConnection, this);
- synchronized (m_oConnectionStack) {
- m_oConnectionStack.push(connectionWrapper);
- }
- } catch (SQLException e) {
- System.err.println("Error in releasing abandoned connection from Pool");
- e.printStackTrace(System.err);
- }
- }
- }
- }
-}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DefaultConnectionPoolImpl.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/DefaultConnectionPoolImpl.java)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DriverConnectionFactory.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/DriverConnectionFactory.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DriverConnectionFactory.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -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.connection;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Driver;
-import java.util.Properties;
-
-/**
- * Driver implementation of Connection Factory
- * User: MohitK
- * Date: Jul 18, 2006
- */
-public class DriverConnectionFactory implements ConnectionFactory{
-
- private Driver _driver;
- private String _driverUrl;
- private Properties _properties;
-
- public DriverConnectionFactory(Driver driver,String driverUrl,Properties connectionProps){
- this._driver=driver;
- this._driverUrl=driverUrl;
- this._properties=connectionProps;
-
- }
-
- /**
- *
- * @see org.jboss.soa.esb.connection.ConnectionFactory#createConnection()
- */
- public Connection createConnection() throws SQLException {
- return _driver.connect(_driverUrl,_properties);
- }
-
-}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DriverConnectionFactory.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/DriverConnectionFactory.java)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/FreeConnectionPoolResources.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/FreeConnectionPoolResources.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/FreeConnectionPoolResources.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,46 +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.connection;
-
-/**
- * Shutdown Hook into the JVM. The class will be invoked by the JVM when the JVM is shutting down.
- * Used to free connection resources and destroy the connection pool.
- * User: MohitK
- * Date: Jul 22, 2006
- */
-public class FreeConnectionPoolResources extends Thread {
-
- ConnectionPool pool;
-
- public FreeConnectionPoolResources(ConnectionPool pool) {
- this.pool = pool;
- }
-
- public void run() {
- try {
- pool.releasePool();
- } catch (Exception e) {
- System.err.println("Error in freeing resources");
- }
- }
-
-}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/FreeConnectionPoolResources.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/FreeConnectionPoolResources.java)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PasswordDecoder.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/PasswordDecoder.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PasswordDecoder.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,39 +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.connection;
-
-/**
- * Interface to be implemented by classes when they need to return the DB password for the connection by using their own
- * algorithm. Called by the connection pool
- * User: MohitK
- * Date: Jul 21, 2006
- */
-public interface PasswordDecoder {
- /**
- * This method decodes the password for JDBC Connection, it will be called when setting JDBC connection properties.
- * Users who need to decode the password need to implement this interface and write their own
- * decoding logic to send the actual DB password. If this method returns null
- * @param encodedPassword The encoded password sent by JDBC framework
- * @return Decoded password.
- */
- public String decode(String encodedPassword);
-}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PasswordDecoder.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/PasswordDecoder.java)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PoolDataSource.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/PoolDataSource.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PoolDataSource.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,113 +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.connection;
-
-import org.jboss.soa.esb.connection.exception.ESBConnectionException;
-
-import javax.sql.DataSource;
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Properties;
-
-/**
- * Implementation if Datasource for getting connections from pool.
- * User: MohitK
- * Date: Jul 19, 2006
- */
-public class PoolDataSource implements DataSource {
-
- private ConnectionPool _pool;
- private PrintWriter _logWriter = new PrintWriter(System.out);
- private int _loginTimeOut;
- private final Properties _connProps = new Properties();
- ConnectionProperties _connectionProperties;
-
- private synchronized ConnectionPool createConnectionPool() throws SQLException {
- if (_pool == null) {
- try {
- if (_connProps != null) {
- _connectionProperties = new ConnectionProperties(_connProps);
- _pool = ConnectionPoolFactory.createPool(_connectionProperties);
- }
- } catch (ESBConnectionException e) {
- _logWriter.println("PoolDataSource: Error in creating Connection Pool");
- throw new SQLException("Error in Connection Pool Creation");
- }
- }
- return _pool;
- }
-
-
- public Properties getConnectionProperties() {
- return _connProps;
- }
-
- public void setConnectionProperties(Properties _connProperties) {
- _connProps.putAll(_connProperties);
- }
-
- /**
- * @see javax.sql.DataSource#getConnection()
- */
- public Connection getConnection() throws SQLException {
- return createConnectionPool().getConnection();
- }
-
- /**
- * @see javax.sql.DataSource#getConnection(String, String)
- */
- public Connection getConnection(String username, String password) throws SQLException {
- synchronized(_connProps){
- _connProps.setProperty(ConnectionProperties.USERNAME, username);
- _connProps.setProperty(ConnectionProperties.PASSWORD, password);
- }
- return createConnectionPool().getConnection();
- }
-
- /**
- * @see javax.sql.DataSource#getLogWriter()
- */
- public PrintWriter getLogWriter() throws SQLException {
- return null;
- }
- /**
- * @see javax.sql.DataSource#setLogWriter(java.io.PrintWriter)
- */
- public void setLogWriter(PrintWriter out) throws SQLException {
- this._logWriter = out;
- }
- /**
- * @see javax.sql.DataSource#setLoginTimeout(int)
- */
- public void setLoginTimeout(int seconds) throws SQLException {
- this._loginTimeOut = seconds;
- }
-
- /**
- * @see javax.sql.DataSource#getLoginTimeout()
- */
- public int getLoginTimeout() throws SQLException {
- return _loginTimeOut;
- }
-
-}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PoolDataSource.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/PoolDataSource.java)
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/exception)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/ESBConnectionException.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/exception/ESBConnectionException.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/ESBConnectionException.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -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.connection.exception;
-
-/**
- * This exception is thrown when Connection Pool fails to initialize
- * User: MohitK
- * Date: Jul 21, 2006
- */
-public class ESBConnectionException extends Exception{
- public ESBConnectionException() {
- super();
- }
-
- public ESBConnectionException(String message) {
- super(message);
- }
-
- public ESBConnectionException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public ESBConnectionException(Throwable cause) {
- super(cause);
- }
-}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/ESBConnectionException.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/exception/ESBConnectionException.java)
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/EsbEmail.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/EsbEmail.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/EsbEmail.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -40,7 +40,7 @@
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
-import org.jboss.soa.esb.common.EsbSysProps;
+import org.jboss.soa.esb.common.SystemProperties;
/**
* Simplifies sending of e-mails with attachments from java.
@@ -247,16 +247,16 @@
*/
private Session initMailServerSession() {
Authenticator oAuth = null;
- String sSmtpUser = EsbSysProps.getSmtpUsername();
+ String sSmtpUser = SystemProperties.getSmtpUsername();
if (null != sSmtpUser) {
- oAuth = new MyAuth(sSmtpUser, EsbSysProps.getSmtpPassword());
+ oAuth = new MyAuth(sSmtpUser, SystemProperties.getSmtpPassword());
}
Properties oMailP = new Properties();
- oMailP.setProperty("mail.smtp.host", EsbSysProps.getSmtpHost());
+ oMailP.setProperty("mail.smtp.host", SystemProperties.getSmtpHost());
try {
- String sPort = EsbSysProps.getSmtpPort();
+ String sPort = SystemProperties.getSmtpPort();
Integer.parseInt(sPort);
oMailP.setProperty("mail.smtp.port", sPort);
} catch (Exception e) { /* OK just leave standard port */
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/notification/NotificationList.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/notification/NotificationList.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/notification/NotificationList.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -27,13 +27,13 @@
/**
* Holds lists of NotificationTarget objects so that the
- * JbossEsbNotificationHandler EJB behaviour can be controlled at runtime by
+ * NotificationHandler EJB behaviour can be controlled at runtime by
* client applications
* <p>
* Description: Objects of this class will hold a list of objects that extend
* the NotificationTarget base class. It's main purpose is to allow Rosetta
* users to configure lists of recipients of specific events, and request the
- * JbossEsbNotificationHandler EJB to take care of triggering the events to each
+ * NotificationHandler EJB to take care of triggering the events to each
* object specified as a child "target" element
* </p>
* <p>
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/parameters/ParamsReposUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/parameters/ParamsReposUtil.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/parameters/ParamsReposUtil.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -25,7 +25,7 @@
import java.lang.reflect.*;
-import org.jboss.soa.esb.common.EsbSysProps;
+import org.jboss.soa.esb.common.SystemProperties;
public class ParamsReposUtil
{
@@ -48,7 +48,7 @@
throws Exception
{
String sFactClass
- = System.getProperty(EsbSysProps.PARAMS_REPOS_FACTORY_CLASS);
+ = System.getProperty(SystemProperties.PARAMS_REPOS_FACTORY_CLASS);
return reposFromFactory(sFactClass,p_oFactoryParam);
} //________________________________
Copied: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/connection)
Deleted: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestConnectionPool.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/connection/TestConnectionPool.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestConnectionPool.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,104 +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.connection;
-
-import junit.framework.TestCase;
-import org.jboss.soa.esb.connection.ConnectionProperties;
-import org.jboss.soa.esb.connection.PoolDataSource;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Properties;
-
-/**
- * TODO
- * User: MohitK
- * Date: Jul 22, 2006
- */
-public class TestConnectionPool extends TestCase {
-
- Properties properties = new Properties();
-
- protected void setUp() throws Exception {
- properties.put(ConnectionProperties.DRIVER_CLASSNAME, "oracle.jdbc.driver.OracleDriver");
- properties.put(ConnectionProperties.CONNECTION_URL, "jdbc:oracle:thin:@localhost:1521:EMS");
- properties.put(ConnectionProperties.USERNAME, "CLEARSTORY");
- properties.put(ConnectionProperties.PASSWORD, "password");
- properties.put(ConnectionProperties.ABANDONED_CONNECTION_CHECK_INTERVAL, "30000");
- }
-
-
- public void testConnectionPool() {
- PoolDataSource ds = new PoolDataSource();
- ds.setConnectionProperties(properties);
- Connection con1 = null;
- Connection con2 = null;
- Connection con3 = null;
- Connection con4 = null;
- Connection con5 = null;
- Connection con6 = null;
- Connection con7 = null;
- Connection con8 = null;
- Connection con9 = null;
- Connection con10 = null;
- Statement stat = null;
- try {
- con1 = ds.getConnection();
- con2 = ds.getConnection();
- stat = con1.createStatement();
- ResultSet rs = stat.executeQuery("select count(*) from WM_SERVER");
- while (rs.next()) {
- int count = rs.getInt(1);
- System.out.println("count = " + count);
- }
- try {
- if (stat != null) {
- stat.close();
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }
- con3 = ds.getConnection();
- con4 = ds.getConnection();
- con5 = ds.getConnection();
- con6 = ds.getConnection();
- con7 = ds.getConnection();
- con8 = ds.getConnection();
- con9 = ds.getConnection();
- try {
- Thread.sleep(35000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- stat = con3.createStatement();
- stat.executeQuery("select count(*) from WM_SERVER");
- } catch (SQLException e) {
- e.printStackTrace();
- fail();
- }
- }
-
-
-
-}
Copied: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestConnectionPool.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/connection/TestConnectionPool.java)
Deleted: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestPasswordDecoder.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/connection/TestPasswordDecoder.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestPasswordDecoder.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,90 +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.connection;
-
-import junit.framework.TestCase;
-import org.jboss.soa.esb.connection.ConnectionProperties;
-import org.jboss.soa.esb.connection.PoolDataSource;
-import org.jboss.soa.esb.connection.HashPasswordDecoder;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Properties;
-
-/**
- * TODO
- * User: MohitK
- * Date: Aug 1, 2006
- */
-public class TestPasswordDecoder extends TestCase {
-
- Properties properties = new Properties();
-
- protected void setUp() throws Exception {
- properties.put(ConnectionProperties.DRIVER_CLASSNAME, "oracle.jdbc.driver.OracleDriver");
- properties.put(ConnectionProperties.CONNECTION_URL, "jdbc:oracle:thin:@localhost:1521:EMS");
- properties.put(ConnectionProperties.USERNAME, "CLEARSTORY");
- properties.put(ConnectionProperties.PASSWORD, "password");
- properties.setProperty(ConnectionProperties.PASSWORD_DECODER, HashPasswordDecoder.class.getName());
- }
-
- public void testPasswordDecoder() {
-
- PoolDataSource ds = new PoolDataSource();
- ds.setConnectionProperties(properties);
- Connection con1 = null;
- Statement stat = null;
- try {
- con1 = ds.getConnection();
- stat = con1.createStatement();
- ResultSet rs = stat.executeQuery("select count(*) from WM_SERVER");
- while (rs.next()) {
- int count = rs.getInt(1);
- System.out.println("count = " + count);
- }
-
-
- } catch (SQLException e) {
- e.printStackTrace();
- fail();
- } finally {
- if (stat != null) {
- try {
- stat.close();
- } catch (SQLException e) {
- e.printStackTrace();
- fail();
- }
- }
- if (con1 != null) {
- try {
- con1.close();
- } catch (SQLException e) {
- e.printStackTrace();
- fail();
- }
- }
- }
- }
-}
Copied: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestPasswordDecoder.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/connection/TestPasswordDecoder.java)
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -34,7 +34,7 @@
import org.jboss.soa.esb.common.*;
import org.jboss.soa.esb.helpers.*;
import org.jboss.soa.esb.parameters.*;
-import org.jboss.soa.esb.processors.EsbAbstractProcessor;
+import org.jboss.soa.esb.processors.AbstractProcessor;
public abstract class AbstractPoller
{
@@ -80,7 +80,7 @@
{
m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
- String sFactoryClass = EsbSysProps.getParamsReposFactoryClass();
+ String sFactoryClass = SystemProperties.getParamsReposFactoryClass();
m_oParmRepos = ParamsReposUtil.reposFromFactory(sFactoryClass,null);
m_oParmsName = m_oParmRepos.nameFromString(p_sParamsUid);
} //__________________________________
@@ -170,8 +170,8 @@
if (EsbUtil.isNullString(sFactClass))
sFactClass = "ConnectionFactory";
- String sJndiType = EsbSysProps.getJndiServerType();
- String sJndiURL = EsbSysProps.getJndiServerURL();
+ String sJndiType = SystemProperties.getJndiServerType();
+ String sJndiURL = SystemProperties.getJndiServerURL();
Context oJndiCtx = AppServerContext.getServerContext(sJndiType,sJndiURL);
Object tmp = oJndiCtx.lookup(sFactClass);
TopicConnectionFactory tcf = (TopicConnectionFactory) tmp;
@@ -360,7 +360,7 @@
{
m_sb.setLength(m_iSbIni);
m_oChParms = p_oP.cloneObj();
- m_oChParms.rmvChildsByName(EsbAbstractProcessor.PARMS_THIS_INSTANCE);
+ m_oChParms.rmvChildsByName(AbstractProcessor.PARMS_THIS_INSTANCE);
setMaxThreads(p_oP,10);
} //________________________________
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/BetterDirListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/BetterDirListener.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/BetterDirListener.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -82,8 +82,8 @@
Thread.sleep(5000);
break;
}
- m_oChParms.rmvChildsByName(EsbAbstractProcessor.PARMS_THIS_INSTANCE);
- DomElement oThisProc = new DomElement(EsbAbstractProcessor.PARMS_THIS_INSTANCE);
+ m_oChParms.rmvChildsByName(AbstractProcessor.PARMS_THIS_INSTANCE);
+ DomElement oThisProc = new DomElement(AbstractProcessor.PARMS_THIS_INSTANCE);
oThisProc.setAttr(ParamsFileProcessor.FPRC_FILENAME, oFcurr.getName());
m_oChParms.addElemChild(oThisProc);
@@ -172,7 +172,7 @@
{ try
{ Constructor oCnst = m_oExecClass.getConstructor(new Class[] {DomElement.class});
Object oProc = oCnst.newInstance(new Object[] {m_oParms});
- ((EsbFileProcessor)oProc).execute();
+ ((FileProcessor)oProc).execute();
}
catch (Exception e) { m_oLogger.error("run() FAILED",e); }
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -65,7 +65,7 @@
{
m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
- String sFactoryClass = EsbSysProps.getParamsReposFactoryClass();
+ String sFactoryClass = SystemProperties.getParamsReposFactoryClass();
m_oParmRepos = ParamsReposUtil.reposFromFactory(sFactoryClass,null);
m_oParmsName = m_oParmRepos.nameFromString(p_sParamsUid);
runUntilEndRequested();
@@ -143,8 +143,8 @@
if (EsbUtil.isNullString(sFactClass))
sFactClass = "ConnectionFactory";
- String sJndiType = EsbSysProps.getJndiServerType();
- String sJndiURL = EsbSysProps.getJndiServerURL();
+ String sJndiType = SystemProperties.getJndiServerType();
+ String sJndiURL = SystemProperties.getJndiServerURL();
Context oJndiCtx = AppServerContext.getServerContext(sJndiType,sJndiURL);
Object tmp = oJndiCtx.lookup(sFactClass);
TopicConnectionFactory tcf = (TopicConnectionFactory) tmp;
@@ -331,7 +331,7 @@
{
m_sb.setLength(m_iSbIni);
m_oChParms = p_oP.cloneObj();
- m_oChParms.rmvChildsByName(EsbAbstractProcessor.PARMS_THIS_INSTANCE);
+ m_oChParms.rmvChildsByName(AbstractProcessor.PARMS_THIS_INSTANCE);
setMaxThreads(p_oP,10);
obtainAtt(p_oP,LISTEN_QUEUE,null);
@@ -361,8 +361,8 @@
if (EsbUtil.isNullString(sFactClass))
sFactClass = "ConnectionFactory";
- String sJndiType = EsbSysProps.getJndiServerType();
- String sJndiURL = EsbSysProps.getJndiServerURL();
+ String sJndiType = SystemProperties.getJndiServerType();
+ String sJndiURL = SystemProperties.getJndiServerURL();
Context oJndiCtx = AppServerContext.getServerContext(sJndiType,sJndiURL);
Object tmp = oJndiCtx.lookup(sFactClass);
QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
@@ -414,7 +414,7 @@
{
protected GroupOfChilds m_oParent; // you can always go there for common stuff
protected DomElement m_oParms;
- protected EsbMsgProcessor m_oExec;
+ protected MsgProcessor m_oExec;
public MsgChildProcess(GroupOfChilds p_oGrp, DomElement p_oParms)
throws Exception
@@ -450,7 +450,7 @@
DomElement oParms = m_oParms.cloneObj();
Constructor oCns = m_oParent.m_oExecClass.getConstructor(oaArgs);
Object oInst = oCns.newInstance (new Object[] {oParms});
- m_oExec = (EsbMsgProcessor)oInst;
+ m_oExec = (MsgProcessor)oInst;
m_oExec.processMessage(oMsg);
notifyOK();
}
@@ -509,8 +509,8 @@
{
try { return NotificationHandlerFactory.getNotifHandler
("remote"
- ,EsbSysProps.getJndiServerType()
- ,EsbSysProps.getJndiServerURL()
+ ,SystemProperties.getJndiServerType()
+ ,SystemProperties.getJndiServerURL()
);
}
catch (Exception e)
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -96,7 +96,7 @@
}
*/
- String sFactoryClass = EsbSysProps.getParamsReposFactoryClass();
+ String sFactoryClass = SystemProperties.getParamsReposFactoryClass();
m_oParmRepos = ParamsReposUtil.reposFromFactory(sFactoryClass,null);
Name oParms = m_oParmRepos.nameFromString(p_sParamsUid);
@@ -164,8 +164,8 @@
String sStopTopic = "topic/quiesce";
StringBuilder sb = new StringBuilder("processor='OldDirListener'");
- String sJndiType = EsbSysProps.getJndiServerType();
- String sJndiServer = EsbSysProps.getJndiServerURL();
+ String sJndiType = SystemProperties.getJndiServerType();
+ String sJndiServer = SystemProperties.getJndiServerURL();
Context oJndiCtx = AppServerContext.getServerContext(sJndiType,sJndiServer);
Object tmp = oJndiCtx.lookup("UIL2ConnectionFactory");
@@ -308,8 +308,8 @@
Thread.sleep(5000);
break;
}
- m_oChParms.rmvChildsByName(EsbAbstractProcessor.PARMS_THIS_INSTANCE);
- DomElement oThisProc = new DomElement(EsbAbstractProcessor.PARMS_THIS_INSTANCE);
+ m_oChParms.rmvChildsByName(AbstractProcessor.PARMS_THIS_INSTANCE);
+ DomElement oThisProc = new DomElement(AbstractProcessor.PARMS_THIS_INSTANCE);
oThisProc.setAttr(ParamsFileProcessor.FPRC_FILENAME, oFcurr.getName());
m_oChParms.addElemChild(oThisProc);
@@ -429,7 +429,7 @@
{ try
{ Constructor oCnst = m_oExecClass.getConstructor(new Class[] {DomElement.class});
Object oProc = oCnst.newInstance(new Object[] {m_oParms});
- ((EsbFileProcessor)oProc).execute();
+ ((FileProcessor)oProc).execute();
}
catch (Exception e) { m_oLogger.error("run() FAILED",e); }
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -34,7 +34,7 @@
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.common.SystemProperties;
import org.jboss.soa.esb.helpers.*;
import org.jboss.soa.esb.helpers.persist.*;
import org.jboss.soa.esb.notification.NotificationList;
@@ -313,7 +313,7 @@
List<DomElement> oResults = new ArrayList<DomElement>();
while (RS.next())
- { DomElement oNew = new DomElement(EsbAbstractProcessor.PARMS_THIS_INSTANCE);
+ { DomElement oNew = new DomElement(AbstractProcessor.PARMS_THIS_INSTANCE);
for (String sCurrCol : saColName)
oNew.setAttr(sCurrCol,RS.getString(sCurrCol));
oResults.add(oNew);
@@ -494,7 +494,7 @@
DomElement oParms = m_oParent.m_oChParms.cloneObj();
oParms.addElemChild(m_oInstP);
Object oInst = oCnst.newInstance (new Object[] {oParms});
- ((EsbAbstractProcessor)oInst).execute();
+ ((AbstractProcessor)oInst).execute();
changeStatus(ROW_STATE.Working,ROW_STATE.Done);
}
catch (Exception e)
@@ -577,8 +577,8 @@
{
try { return NotificationHandlerFactory.getNotifHandler
("remote"
- ,EsbSysProps.getJndiServerType()
- ,EsbSysProps.getJndiServerURL()
+ ,SystemProperties.getJndiServerType()
+ ,SystemProperties.getJndiServerURL()
);
}
catch (Exception e)
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ZZDummyProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ZZDummyProcessor.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ZZDummyProcessor.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -3,7 +3,7 @@
import org.jboss.soa.esb.helpers.*;
import org.jboss.soa.esb.processors.*;
-public class ZZDummyProcessor extends EsbAbstractProcessor
+public class ZZDummyProcessor extends AbstractProcessor
{
public ZZDummyProcessor(DomElement p_oParms) throws Exception
{ super(p_oParms);
Copied: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractAggregator.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractAggregator.java)
Copied: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java)
Copied: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSaxProcessor.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSaxProcessor.java)
Copied: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlPassthrough.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlPassthrough.java)
Copied: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlProcessor.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlProcessor.java)
Deleted: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractAggregator.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractAggregator.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractAggregator.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,82 +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;
-
-import java.io.EOFException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.soa.esb.helpers.*;
-
-public abstract class EsbAbstractAggregator extends EsbFileProcessor
-{
- public abstract Object nextInputLine () throws Exception;
- public abstract Object getGroupKey (Object p_oInp) throws Exception;
- protected abstract Object composeObj (List p_oLout) throws Exception;
-
- private Object m_oGroupKey = null;
- protected List<Object> m_olGroup = new ArrayList<Object>();
- ParamsFileProcessor m_oFPparm;
-
- protected EsbAbstractAggregator(DomElement p_oP) throws Exception
- { super(p_oP);
- } //__________________________________
-
- private boolean isSameGroup(Object p_o)
- { return (null == m_oGroupKey) ? false
- :(null == p_o) ? false
- : p_o.equals(m_oGroupKey)
- ;
- } //__________________________________
-
- private long sendComposedObj() throws Exception
- { if (null == m_oGroupKey) return -1;
- return super.sendObject(composeObj(m_olGroup));
- } //__________________________________
-
- public void execute() throws Exception
- { m_oFPparm.checkFile();
- renameToWrk();
- while (true)
- try
- { Object oInp = nextInputLine();
- Object oGrpK = getGroupKey(oInp);
- if (! isSameGroup(oGrpK))
- { sendComposedObj();
- m_olGroup.clear();
- m_oGroupKey = getGroupKey(oInp);
- }
- m_olGroup.add(oInp);
- }
- catch (EOFException eEOF)
- { sendComposedObj();
- break;
- }
- catch (Exception e)
- { m_oLogger.fatal("Exception in EsbFileProcessor",e);
- renameToErr();
- throw e;
- }
- renameToOK();
- } //__________________________________
-
-} //____________________________________________________________________________
Deleted: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractProcessor.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractProcessor.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,377 +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;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import javax.sql.*;
-
-import org.apache.log4j.*;
-
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.common.*;
-import org.jboss.soa.esb.common.bizclasses.*;
-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.*;
-
-public abstract class EsbAbstractProcessor
-{
- public abstract void execute() throws Exception;
- protected abstract void checkParms() throws Exception;
-
- public static final String PARMS_THIS_INSTANCE = "__thisInstance";
-
- private static final String POSTPRC_ELEMENT= "postProcess";
- private static final String POSTPRC_CLASS = "actionClass";
-
- public static final String CTX_PREFIX = "@@ctx@@";
- public static final String CTX_BATCH_UID = CTX_PREFIX+"batchUid";
- public static final String CTX_BATCH_NUM = CTX_PREFIX+"batchNum";
- public static final String CTX_INPUT_FILE = CTX_PREFIX+"inputFile";
- public static final String CTX_POST_FILE = CTX_PREFIX+"postFile";
-
- private static final String[] s_saMacros =
- {CTX_BATCH_UID, CTX_BATCH_NUM ,CTX_INPUT_FILE, CTX_POST_FILE };
-
- protected Map <String,Object> m_oContext = new HashMap<String,Object>();
- public void clearContext () { m_oContext.clear(); }
- public Object rmvContextObj (String p_sKey) { return m_oContext.remove(p_sKey); }
- public Object getContextObj (String p_sKey) { return m_oContext.get(p_sKey); }
- public Object setContextObj (String p_sKey, Object p_oVal)
- { return m_oContext.put(p_sKey,p_oVal); }
-
- protected DomElement m_oParms ,m_oInstP;
- protected Logger m_oLogger;
-
- private InotificationHandler m_oNotifH;
- protected InotificationHandler getNotifHandler() throws Exception
- { if (null == m_oNotifH)
- {
- String sJndiType= EsbSysProps.getJndiServerType();
- String sJndiURL = EsbSysProps.getJndiServerURL();
- m_oNotifH = NotificationHandlerFactory.getNotifHandler
- ("remote",sJndiType,sJndiURL);
- }
- return m_oNotifH;
- } //________________________________
-
-
- private EsbAbstractProcessor() {}
-
- protected EsbAbstractProcessor(DomElement p_oParms) throws Exception
- { this(p_oParms,true);
- } //__________________________________
-
- protected EsbAbstractProcessor(DomElement p_oParms, boolean p_bLogInit) throws Exception
- {
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
- m_oParms = p_oParms;
-
- try { m_oInstP = m_oParms.getFirstElementChild(PARMS_THIS_INSTANCE); }
- catch (Exception eNo) {}
- if (null==m_oInstP)
- { m_oInstP = new DomElement(PARMS_THIS_INSTANCE);
- m_oParms.addElemChild(m_oInstP);
- }
-
- checkParms();
- } //__________________________________
-
-
- public DomElement cloneParams() throws Exception {return m_oParms.cloneObj();}
-
- private Integer m_oiType;
-
- protected static final int TYP_UNKNOWN = -1;
- protected static final int TYP_BATCHER = 0;
- protected static final int TYP_FEEDER = 1;
- protected static final int TYP_COPIER = 2;
-
- protected boolean isBatcher() { return TYP_BATCHER == getOutputType(); }
- protected boolean isFeeder () { return TYP_FEEDER == getOutputType(); }
- protected boolean isCopier () { return TYP_COPIER == getOutputType(); }
-
- protected void setOutputType(int p_i)
- { if (null != m_oiType)
- m_oLogger.info("Redefining Processor Type from "+m_oiType.toString()
- +" to "+p_i);
- m_oiType = new Integer(p_i);
- } //__________________________________
-
- protected int getOutputType()
- { if (null == m_oiType)
- { // m_oLogger.info("Requesting unknown processor type (forgot to set it ?)");
- return TYP_UNKNOWN;
- }
- return m_oiType.intValue();
- } //__________________________________
-
- protected long getBatchNumber() throws Exception
- { if (! isBatcher()) throw new Exception ("'this' is not a Batcher");
- return getBatcher().getBatchNumber();
- } //__________________________________
-
- private static final Class[] s_oaPostCnst = new Class[] {DomElement.class};
- protected void postProcess() throws Exception
- { InotificationHandler oNH =
- NotificationHandlerFactory.getNotifHandler
- ("remote"
- ,EsbSysProps.getJndiServerType()
- ,EsbSysProps.getJndiServerURL()
- );
- DomElement[] oaPost = m_oParms.getElementChildren(POSTPRC_ELEMENT);
- for (int i1=0; i1<oaPost.length;i1++)
- { DomElement oCpy = oaPost[i1].cloneObj();
- replaceMacros(oCpy);
- try
- { Class oCls = Class.forName(oCpy.getAttr(POSTPRC_CLASS));
- Constructor oConst = oCls.getConstructor(s_oaPostCnst);
- oConst.newInstance(new Object[] {oCpy});
- NotifyUtil.notifyOK(oNH,oaPost[i1].getDad(),("postProcess() <"+i1+"> Succeeded")
- ,null);
-
- }
- catch (Exception e)
- { m_oLogger.error("postProcess() <"+i1+"> FAILED :"+e.getMessage());
- NotifyUtil.notifyError(oNH,oaPost[i1].getDad(),("postProcess() <"+i1+"> Failed")
- ,null,e);
- }
- }
- }//_________________________
-
- void replaceMacros(DomElement p_oParm)
- { String[] saAtt = p_oParm.getAttrKeys();
- for (int i1=0; i1<saAtt.length;i1++)
- { String sKey = saAtt[i1];
- String sVal = p_oParm.getAttr(sKey);
-
- boolean bSubst = false;
- int iWh = 0;
- int iPos = 0;
- while (0 <= (iPos=sVal.indexOf(CTX_PREFIX,iWh)))
- { String sRest = sVal.substring(iPos);
- for (int i2=0; i2<s_saMacros.length; i2++)
- { String sMac = s_saMacros[i2];
- if (! sRest.startsWith(sMac)) continue;
- Object oRpl = getContextObj(sMac);
- if (null == oRpl) continue;
- bSubst = true;
- sVal = sVal.substring(0,iPos)
- +oRpl.toString()+sVal.substring(iPos+sMac.length());
- }
- }
- if (bSubst) p_oParm.setAttr(sKey,sVal);
- }
- DomElement[] oaChilds = p_oParm.getAllElemChildren();
- for (int i1=0; i1<oaChilds.length;i1++)
- replaceMacros(oaChilds[i1]);
- }//_________________________
-
- protected void release()
- { switch (getOutputType())
- { case TYP_BATCHER: getBatcher().release(); break;
- }
- } //__________________________________
-
- protected void finish(BatchProcess p_oBP) throws Exception
- {
- switch (getOutputType())
- { case TYP_BATCHER:
- if (p_oBP.getUid() <1) p_oBP.setUid(assignUid());
- if (p_oBP.getSnap()<1) p_oBP.setSnap(p_oBP.getUid());
- p_oBP.setField(BatchProcess.ATTRIB.createStamp
- ,Long.toString(System.currentTimeMillis()));
- getPersistHandler().addObject(p_oBP);
- getBatcher().finish();
- setContextObj(CTX_BATCH_UID,new Long(p_oBP.getUid()));
- setContextObj(CTX_BATCH_NUM,new Long(p_oBP.getBatchNum()));
- break;
- }
- } //__________________________________
-
- protected void commitBatch(BatchProcess p_oBP) throws Exception
- { switch (getOutputType())
- { case TYP_BATCHER: getBatcher().commitBatch(p_oBP); break;
- }
- } //________________________________
-
- protected BatchProcess getBatchObj()
- { return (this.isBatcher()) ? getBatcher().m_oBP : null;
- } //________________________________
-
- protected long sendObject(Object p_o) throws Exception
- { BaseBusinessObject BO = null;
- if (p_o instanceof BaseBusinessObject)
- { BO = (BaseBusinessObject) p_o;
- if (BO.getUid() <1) BO.setUid(assignUid());
- if (BO.getSnap()<1) BO.setSnap(BO.getUid());
- }
-
- switch (getOutputType())
- { case TYP_BATCHER: getBatcher().addRow(p_o); break;
- case TYP_FEEDER: getFeeder ().addRow(p_o); break;
- }
- return (null==BO) ? -1 : BO.getUid();
- } //________________________________
-
- public void notifyOK(Serializable p_o)
- { try
- {
- DomElement[] oaP = m_oParms.getElementChildren(NotificationList.ELEMENT);
- for (int i1=0; i1<oaP.length;i1++)
- { NotificationList oCurr = new NotificationList(oaP[i1]);
- if (! oCurr.isOK()) continue;
- DomElement oCpy = oaP[i1].cloneObj();
- m_oLogger.info("BEFORE EXPAND <"+m_oContext.get(CTX_BATCH_UID)+">");
- replaceMacros(oCpy);
- m_oLogger.info("AFTER EXPAND \n"+oCpy.toString()+"\n");
- getNotifHandler().sendNotifications(oCpy,p_o);
- }
- }
- catch (Exception e) {}
- } //__________________________________
-
- public void notifyError(Exception p_e, Serializable p_o)
- {
- try
- {
- DomElement[] oaP = m_oParms.getElementChildren(NotificationList.ELEMENT);
- if (oaP.length<1) // Uncomment this line to send only to the list
- getNotifHandler().sendNotifications(p_o);
- for (int i1=0; i1<oaP.length;i1++)
- { NotificationList oCurr = new NotificationList(oaP[i1]);
- if (! oCurr.isErr()) continue;
- getNotifHandler().sendNotifications(oaP[i1],p_o);
- }
- }
- catch (Exception e) {
- e.printStackTrace(System.out);
- }
- } //__________________________________
-
- private int m_iChunkLeft = 0;
- private long m_lNewUid = -1;
-
- public long assignUid() throws Exception
- { if (m_iChunkLeft < 1)
- { int iChunk = 100;
- m_lNewUid = getPersistHandler().getUidChunk(iChunk);
- m_iChunkLeft = iChunk;
- }
- m_iChunkLeft--;
- return ++m_lNewUid;
- } //__________________________________
-
- private IpersistHandler m_oPHandler;
- private IpersistHandler getPersistHandler() throws Exception
- { if (null == m_oPHandler)
- m_oPHandler = PersistHandlerFactory
- .getPersistHandler
- ("remote"
- ,EsbSysProps.getJndiServerType()
- ,EsbSysProps.getJndiServerURL()
- );
- return m_oPHandler;
- } //________________________________
-
- public static DataSource getDataSource(String p_sDriver, String p_sConnURL
- ,String p_sUser, String p_sPassowrd) throws Exception
- { return new SimpleDataSource(p_sDriver, p_sConnURL, p_sUser, p_sPassowrd);
- } //__________________________________
-
- protected Feeder m_oFeeder;
- protected Feeder getFeeder()
- { if (! this.isFeeder()) return null;
- if (null==m_oFeeder) m_oFeeder = new Feeder();
- return m_oFeeder;
- } //__________________________________
-
- class Feeder
- {
- private Long m_olNum;
- public long getBatchNumber() { return m_olNum.longValue(); }
-
- private long addRow(Object p_o) throws Exception
- { return getPersistHandler().addObject((BaseBusinessObject)p_o);
- } //________________________________
- } //______________________________________________________
-
- protected Batcher m_oBatcher;
- protected Batcher getBatcher()
- { if (! this.isBatcher()) return null;
- if (null==m_oBatcher) m_oBatcher = new Batcher();
- return m_oBatcher;
- } //__________________________________
-
- class Batcher
- {
- private IbatchHandler m_oBHandler;
- private BatchProcess m_oBP;
-
- private IbatchHandler getBatchHandler() throws Exception
- { if (null == m_oBHandler)
- m_oBHandler = BatchHandlerFactory
- .getBatchHandler
- ("remote"
- ,EsbSysProps.getJndiServerType()
- ,EsbSysProps.getJndiServerURL()
- );
- return m_oBHandler;
- } //________________________________
-
- private Long m_olNum = null;
- private long getBatchNumber() throws Exception
- { if (null==m_olNum) m_olNum = new Long(getBatchHandler().newBatch());
- return m_olNum.longValue();
- }
-
- private int addRow(Object p_o) throws Exception
- { if (null==m_olNum)
- { Exception oEx = new Exception("No batch number was requested");
- m_oLogger.error("Batcher.addRow() - "+oEx.getMessage());
- throw oEx;
- }
- return getBatchHandler().addToBatch(p_o.toString());
- } //________________________________
-
- private void release()
- { try {m_oBHandler.releaseHandler(); }
- catch (Exception e) {}
- } //________________________________
-
- private void finish() throws Exception
- { m_olNum = null;
- m_oBHandler.finish();
- } //________________________________
-
- private void commitBatch(BatchProcess p_oBP) throws Exception
- { m_oBP = p_oBP;
- getBatchHandler().commitBatch(p_oBP);
- } //________________________________
- } //______________________________________________________
-} //____________________________________________________________________________
Deleted: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractSaxProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractSaxProcessor.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractSaxProcessor.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,137 +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;
-
-import java.io.*;
-import java.util.*;
-
-import javax.xml.parsers.*;
-
-import org.apache.log4j.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.common.bizclasses.*;
-
-public abstract class EsbAbstractSaxProcessor extends DefaultHandler
-{
- protected abstract String getDocElemName();
- protected abstract boolean handleElement(Element p_oElem) throws Exception;
- protected abstract void wrapUp(EsbAbstractProcessor p_oProc) throws Exception;
-
- protected EsbAbstractProcessor m_oProcessor;
- protected Logger m_oLogger;
- protected BatchProcess m_oBatchP;
-
- private DocumentBuilder m_oDB;
- private SAXParser m_oSaxPrs;
-
- static
- { try
- { System.setProperty("javax.xml.parsers.SAXParserFactory",
- "org.apache.xerces.jaxp.SAXParserFactoryImpl");
- }
- catch (Exception eX) { eX.printStackTrace(System.err); }
- }
- private Stack <Element> m_oElemStk;
-
- protected EsbAbstractSaxProcessor(File p_oF, EsbAbstractProcessor p_oProc, int p_iOutType)
- throws Exception
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
- m_oProcessor = p_oProc;
- m_oProcessor.setOutputType(p_iOutType);
-
- m_oDB =DocumentBuilderFactory.newInstance().newDocumentBuilder();
- m_oSaxPrs = SAXParserFactory.newInstance().newSAXParser();
- XMLReader oXmlRd = null;
- oXmlRd = m_oSaxPrs.getXMLReader();
- oXmlRd.setContentHandler(this);
-
- InputStream oIstr = new FileInputStream(p_oF);
- InputSource oIsrc = new InputSource(oIstr);
- m_oElemStk = new Stack<Element>();
-
- try
- { if (m_oProcessor.isBatcher())
- { m_oBatchP = new BatchProcess(null,m_oProcessor.assignUid());
- m_oBatchP.setBatchNum(m_oProcessor.getBatchNumber());
- }
-
- oXmlRd.parse(oIsrc);
-
- wrapUp(m_oProcessor);
- }
- catch (Exception e)
- { m_oLogger.fatal(this.getClass().getName()+" FAILED",e);
- throw e;
- }
- finally
- { if (null != oIstr) try { oIstr.close(); } catch (Exception e) {}
- }
- } //__________________________________
-
- public void characters(char [] p_ca, int p_iSt, int p_iLn)
- throws SAXException
- { Element nTop = (Element)m_oElemStk.peek();
- String sTxt = new String(p_ca,p_iSt,p_iLn);
- nTop.appendChild(nTop.getOwnerDocument().createTextNode(sTxt));
- } //_________________________________
-
- public void startElement (String namespaceURI, String localName,
- String qName ,Attributes attr ) throws SAXException
- { Element onDad = (m_oElemStk.isEmpty())
- ? null : m_oElemStk.peek();
- if (null == onDad)
- { if (! (getDocElemName().equals(qName)))
- { m_oLogger.error("Invalid Document Element <" + qName + ">");
- throw new SAXException(getClass().getName()+"Invalid Document Element <" + qName + ">");
- }
- Document oDoc = m_oDB.newDocument();
- oDoc.appendChild(onDad=oDoc.createElement("root"));
- }
-
- Element eNew = onDad.getOwnerDocument().createElement(qName);
- onDad.appendChild(eNew);
-
- int iQ = attr.getLength();
- for (int i1=0; i1<iQ; i1++)
- eNew.setAttribute(attr.getQName(i1),attr.getValue(i1));
- m_oElemStk.push(eNew);
- } //_________________________________
-
- public void endElement( String namespaceURI,
- String localName, String qName ) throws SAXException
- {
- Element nCurr = m_oElemStk.pop();
- if (m_oElemStk.isEmpty()) return;
-
- try
- { if (handleElement(nCurr))
- nCurr.getParentNode().removeChild(nCurr);
- }
- catch (Exception e) { throw new SAXException(e); }
- } //_________________________________
-
-} //____________________________________________________________________________
Deleted: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractSqlPassthrough.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractSqlPassthrough.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractSqlPassthrough.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,93 +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;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.net.URI;
-import java.sql.PreparedStatement;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
-import javax.sql.DataSource;
-
-import org.jboss.soa.esb.helpers.persist.*;
-import org.jboss.soa.esb.helpers.*;
-
-
-public abstract class EsbAbstractSqlPassthrough extends EsbAbstractSqlProcessor
-{
- public JdbcCleanConn m_oConn;
- public String[] m_saColNames;
- public PreparedStatement m_oPSinsert;
- public File m_oOutTrigger;
- public long m_lGroupUid;
-
- public EsbAbstractSqlPassthrough(File p_oF, EsbAbstractProcessor p_oProc) throws Exception
- { super(p_oF, p_oProc,EsbAbstractProcessor.TYP_COPIER);
- } //__________________________________
-
- public void wrapUp (EsbAbstractProcessor p_oProc) throws Exception
- {
- if (null != m_oConn) {
- m_oConn.commit();
- m_oConn.release();
- }
- if (null!=m_oOutTrigger)
- try
- { FileOutputStream oF = new FileOutputStream(m_oOutTrigger);
- oF.close();
- }
- catch (Exception e) {}
- } //__________________________________
-
- public void checkParms() throws Exception
- {
-
- DomElement oCh = m_oParms.getFirstElementChild("output");
- DataSource oDS = EsbAbstractProcessor.getDataSource
- (oCh.getAttr("driver-class") ,oCh.getAttr("connection-url")
- ,oCh.getAttr("user-name") ,oCh.getAttr("password") );
- m_oConn = new JdbcCleanConn(oDS);
-
- String sTrigger = oCh.getAttr("outputTriggerURI");
- if (null!= sTrigger)
- m_oOutTrigger = new File(new URI(sTrigger));
-
- String sTable = oCh.getAttr("table");
- StringTokenizer ST = new StringTokenizer(oCh.getAttr("columns"),",");
-
- m_saColNames = new String[ST.countTokens()];
- for (int i1=0;i1<m_saColNames.length;i1++) m_saColNames[i1]=ST.nextToken();
-
-
- String sIns = EsbAbstractSqlProcessor.getInsertStmt(sTable,m_saColNames);
- m_oPSinsert = m_oConn.prepareStatement(sIns);
-
- m_lGroupUid = m_oProcessor.assignUid();
-
- } //_________________________________
-
- public abstract boolean handleTblRow(Properties p_oProw) throws Exception;
-
-
-} //____________________________________________________________________________
Deleted: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractSqlProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractSqlProcessor.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbAbstractSqlProcessor.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,137 +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;
-
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-
-import javax.sql.DataSource;
-
-import org.apache.log4j.Logger;
-
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.common.bizclasses.*;
-import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.helpers.persist.*;
-
-public abstract class EsbAbstractSqlProcessor
-{
- protected abstract boolean handleTblRow (Properties p_opRow) throws Exception;
- protected abstract void wrapUp (EsbAbstractProcessor p_oProc) throws Exception;
-
- public static final String QPARM_TABLE = "table";
- public static final String QPARM_CONDITION = "condition";
- public static final String QPARM_ORDER_BY = "orderBy";
-
- protected DomElement m_oParms;
- protected EsbAbstractProcessor m_oProcessor;
- protected Logger m_oLogger;
- protected BatchProcess m_oBatchP;
- public JdbcCleanConn m_oConn;
-
- private String[] m_saColNames;
- protected String[] getColNames() { return m_saColNames; }
-
- protected EsbAbstractSqlProcessor(File p_oF, EsbAbstractProcessor p_oProc, int p_iOutType)
- throws Exception
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
- m_oProcessor= p_oProc;
- m_oProcessor.setOutputType(p_iOutType);
- m_oParms = m_oProcessor.cloneParams();
-
- InputStream oIstr = null;
- try
- { connectToDB();
- oIstr = new FileInputStream(p_oF);
-
- if (m_oProcessor.isBatcher())
- { m_oBatchP = new BatchProcess(null,m_oProcessor.assignUid());
- m_oBatchP.setBatchNum(m_oProcessor.getBatchNumber());
- }
-
- processRows(oIstr);
-
- wrapUp(m_oProcessor);
- }
- catch (Exception e)
- { m_oLogger.fatal(this.getClass().getName()+" FAILED",e);
- throw e;
- }
- finally
- { if (null != oIstr) try { oIstr.close(); } catch (Exception e) {}
- if (null != m_oConn) m_oConn.release();
- }
- } //__________________________________
-
- protected void connectToDB() throws Exception
- {
- DataSource oDS = EsbAbstractProcessor.getDataSource
- (m_oParms.getAttr(SimpleDataSource.DRIVER)
- ,m_oParms.getAttr(SimpleDataSource.URL)
- ,m_oParms.getAttr(SimpleDataSource.USER)
- ,m_oParms.getAttr(SimpleDataSource.PASSWORD)
- );
- m_oConn = new JdbcCleanConn(oDS);
- } //__________________________________
-
- private void processRows(InputStream p_oIS) throws Exception
- { StringBuilder sb = new StringBuilder("select * from ")
- .append(m_oParms.getAttr(QPARM_TABLE));
-
- String sCond = m_oParms.getAttr(QPARM_CONDITION);
- if (null != sCond) sb.append(" ").append(sCond);
-
- String sOrder = m_oParms.getAttr(QPARM_ORDER_BY);
- if (null != sOrder) sb.append(" order by ").append(sOrder);
-
- PreparedStatement PS = m_oConn.prepareStatement(sb.toString());
- ResultSet RS = m_oConn.execQueryWait(PS,10);
- ResultSetMetaData MD = RS.getMetaData();
- m_saColNames = new String[MD.getColumnCount()];
- for (int i1=0; i1<m_saColNames.length; i1++)
- m_saColNames[i1] = MD.getColumnName(1+i1);
-
- Properties oP = new Properties();
- while (RS.next())
- { oP.clear();
- for (int i1=0; i1<m_saColNames.length; i1++)
- { String sVal = RS.getString(1 + i1);
- if (null != sVal) oP.setProperty(m_saColNames[i1], sVal);
- }
- handleTblRow(oP);
- }
- } //__________________________________
-
- public static final String getInsertStmt(String p_sTbl, String[] p_saCols)
- { StringBuilder sbCol = new StringBuilder("insert into ").append(p_sTbl).append(" ");
- StringBuilder sbPrm = new StringBuilder(" values ");
- for (int i1=0; i1<p_saCols.length; i1++)
- { String sIn = (i1==0) ? "(" : ",";
- sbCol.append(sIn).append("\"").append(p_saCols[i1]).append("\"");
- sbPrm.append(sIn).append("?");
- }
- return sbCol.append(")").append(sbPrm).append(")").toString();
- } //__________________________________
-
-} //____________________________________________________________________________
Deleted: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbFileProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbFileProcessor.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbFileProcessor.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,110 +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;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-
-import org.jboss.soa.esb.helpers.*;
-
-public class EsbFileProcessor extends EsbAbstractProcessor
-{
- ParamsFileProcessor m_oFPparm;
-
- public EsbFileProcessor(DomElement p_oP) throws Exception
- { super(p_oP);
- } //______________________comment____________
-
- protected File renameToWrk() throws Exception
- { File oWrk = File.createTempFile
- (m_oFPparm.m_sInpFile,"",m_oFPparm.m_oInpDir);
- oWrk.delete();
- m_oFPparm.m_oWorkF = oWrk;
- if (m_oFPparm.m_oIF.renameTo(oWrk)) return oWrk;
- throw new Exception ("Cannot rename "+m_oFPparm.m_oIF.toString()+" to "+oWrk.toString());
- } //__________________________________
-
- protected File renameToOK() throws Exception
- { File oOK = File.createTempFile
- (m_oFPparm.m_sInpFile,m_oFPparm.m_sPostSfx,m_oFPparm.m_oPostDir);
- oOK.delete();
- if (m_oFPparm.m_oWorkF.renameTo(oOK)) return oOK;
- throw new Exception ("Cannot rename "+m_oFPparm.m_oWorkF.toString()+" to "+oOK.toString());
- } //__________________________________
-
- protected File renameToErr() throws Exception
- { File oErr = File.createTempFile
- (m_oFPparm.m_sInpFile,m_oFPparm.m_sErrorSfx,m_oFPparm.m_oErrorDir);
- oErr.delete();
- if (m_oFPparm.m_oWorkF.renameTo(oErr)) return oErr;
- throw new Exception ("Cannot rename "+m_oFPparm.m_oWorkF.toString()+" to "+oErr.toString());
- } //__________________________________
-
- protected void checkParms() throws Exception
- { try { m_oFPparm = new ParamsFileProcessor(super.m_oParms); }
- catch (Exception e)
- { m_oLogger.fatal("checkParms() FAILED",e);
- throw e;
- }
- } //__________________________________
-
- public void execute() throws Exception
- { try
- {
- m_oFPparm.checkFile();
- super.setContextObj(CTX_INPUT_FILE,m_oFPparm.m_oIF.getName());
- try { renameToWrk(); }
- catch (Exception eRn)
- {
- m_oLogger.info("Skipping rename to wrk "+m_oFPparm.m_oIF.getName(),eRn);
- return;
- }
-
- try
- { Class oCls = Class.forName(m_oParms.getAttr(ParamsFileProcessor.FPRC_ACTION));
- Constructor oCns = oCls.getConstructor(new Class[] {File.class,EsbAbstractProcessor.class});
- oCns.newInstance(new Object[] {m_oFPparm.m_oWorkF,this});
-
- File oFok = renameToOK();
-
- super.setContextObj(EsbAbstractProcessor.CTX_POST_FILE,oFok.getName());
- super.postProcess();
- super.notifyOK("File "+m_oFPparm.m_sInpFile+" processed successfully");
- }
- catch (Exception e)
- { renameToErr();
- m_oLogger.fatal("Input File processor FAILED",e);
- throw e;
- }
- finally
- { super.release();
- }
- }
- catch (Exception eGen)
- {
-// super.notifyError(eGen,"PROBLEMS processing File "+m_oFPparm.m_sInpFile);
- eGen.printStackTrace();
- }
- }//_________________________
-
-} //____________________________________________________________________________
Deleted: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbMsgProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbMsgProcessor.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/EsbMsgProcessor.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,90 +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;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.io.Serializable;
-
-import javax.jms.Message;
-import javax.jms.TextMessage;
-
-import org.jboss.soa.esb.helpers.*;
-
-public class EsbMsgProcessor extends EsbAbstractProcessor
-{
- public EsbMsgProcessor(DomElement p_oP) throws Exception
- { super(p_oP,false);
- } //__________________________________
-
- protected void checkParms() throws Exception {}
- public void execute() throws Exception {}
-
- public void processMessage(Message p_oMsg) throws Exception
- {
- StringBuilder sb = new StringBuilder();
- if (p_oMsg instanceof TextMessage)
- sb.append("TextMessage<")
- .append(((TextMessage)p_oMsg).getText())
- .append("> ");
- else
- sb.append(p_oMsg.toString());
- System.out.println(sb.toString());
- }//_________________________
-
- private static final SimpleDateFormat s_oDF
- = new SimpleDateFormat("MMMM dd, yyyy ");
-
- protected String messagePfx()
- {
- return
- s_oDF.format(new Date(System.currentTimeMillis()))
- +" " +this.getClass().getSimpleName()
- + " : ";
- }//_________________________
-
- /**
- * Override this method in your derived class
- * <p />Listeners will call this method to request
- * the object that has to be sent to the 'ok'
- * notification list
- * @return Object - The Rosetta notification framework
- * will use the toString() method of the returned Object
- */
- public Serializable getOkNotification()
- {
- return messagePfx()+" Normal completion";
- }
- /**
- * Override this method in your derived class
- * <p />Listeners will call this method to request
- * the object that has to be sent to the 'error'
- * notification list
- * @return Object - The Rosetta notification framework
- * will use the toString() method of the returned Object
- */
- public Serializable getErrorNotification()
- {
- return messagePfx()+" Abnormal end";
- }
-
-} //____________________________________________________________________________
Modified: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/FileCopier.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/FileCopier.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/FileCopier.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -36,12 +36,12 @@
private static final String PARMS_OUTDIR = "copyToDirURI";
private static final String PARMS_OUTSFX = "copyToSuffix";
- EsbFileProcessor m_oProc;
+ FileProcessor m_oProc;
private File [] m_oaTmpFile;
private File [] m_oaOutFile;
- public FileCopier(File p_oF, EsbAbstractProcessor p_oProc) throws Exception
- { m_oProc = (EsbFileProcessor)p_oProc;
+ public FileCopier(File p_oF, AbstractProcessor p_oProc) throws Exception
+ { m_oProc = (FileProcessor)p_oProc;
checkParms();
if (m_oaTmpFile.length> 0) execute();
} //__________________________________
Copied: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/FileProcessor.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/FileProcessor.java)
Copied: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/MsgProcessor.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/MsgProcessor.java)
Modified: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/ParamsFileProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/ParamsFileProcessor.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/ParamsFileProcessor.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -133,7 +133,7 @@
} //__________________________________
public void checkFile() throws Exception
- { DomElement oPthis = m_oParms.getFirstElementChild(EsbAbstractProcessor.PARMS_THIS_INSTANCE);
+ { DomElement oPthis = m_oParms.getFirstElementChild(AbstractProcessor.PARMS_THIS_INSTANCE);
m_sInpFile = oPthis.getAttr(FPRC_FILENAME);
m_oIF = new File((new File(m_oInpDir,m_sInpFile)).getAbsolutePath());
if (! m_oIF.exists()) throw new Exception ("File "+m_oIF.toString()+" not found");
Modified: labs/jbossesb/trunk/product/core/services/src/META-INF/ejb-jar.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/META-INF/ejb-jar.xml 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/META-INF/ejb-jar.xml 2006-08-01 22:43:44 UTC (rev 5393)
@@ -11,16 +11,16 @@
<!-- Session Beans -->
<session >
- <description><![CDATA[JbossEsbNotificationHandler]]></description>
+ <description><![CDATA[NotificationHandler]]></description>
<display-name>Jboss_Esb_Notification_Handler</display-name>
- <ejb-name>JbossEsbNotificationHandler</ejb-name>
+ <ejb-name>NotificationHandler</ejb-name>
- <home>org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandlerHome</home>
- <remote>org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandler</remote>
- <local-home>org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandlerLocalHome</local-home>
- <local>org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandlerLocal</local>
- <ejb-class>org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandlerBean</ejb-class>
+ <home>org.jboss.soa.esb.services.EJB.NotificationHandlerHome</home>
+ <remote>org.jboss.soa.esb.services.EJB.NotificationHandler</remote>
+ <local-home>org.jboss.soa.esb.services.EJB.NotificationHandlerLocalHome</local-home>
+ <local>org.jboss.soa.esb.services.EJB.NotificationHandlerLocal</local>
+ <ejb-class>org.jboss.soa.esb.services.EJB.NotificationHandlerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
@@ -30,13 +30,13 @@
<description><![CDATA[]]></description>
<display-name>Jboss_ESB_PERSIST_HANDLER</display-name>
- <ejb-name>JbossEsbPersistHandler</ejb-name>
+ <ejb-name>PersistHandler</ejb-name>
- <home>org.jboss.soa.esb.services.EJB.JbossEsbPersistHandlerHome</home>
- <remote>org.jboss.soa.esb.services.EJB.JbossEsbPersistHandler</remote>
- <local-home>org.jboss.soa.esb.services.EJB.JbossEsbPersistHandlerLocalHome</local-home>
- <local>org.jboss.soa.esb.services.EJB.JbossEsbPersistHandlerLocal</local>
- <ejb-class>org.jboss.soa.esb.services.EJB.JbossEsbPersistHandlerBean</ejb-class>
+ <home>org.jboss.soa.esb.services.EJB.PersistHandlerHome</home>
+ <remote>org.jboss.soa.esb.services.EJB.PersistHandler</remote>
+ <local-home>org.jboss.soa.esb.services.EJB.PersistHandlerLocalHome</local-home>
+ <local>org.jboss.soa.esb.services.EJB.PersistHandlerLocal</local>
+ <ejb-class>org.jboss.soa.esb.services.EJB.PersistHandlerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
@@ -46,13 +46,13 @@
<description><![CDATA[]]></description>
<display-name>Jboss_Esb_Batch_Handler</display-name>
- <ejb-name>JbossEsbBatchHandler</ejb-name>
+ <ejb-name>BatchHandler</ejb-name>
- <home>org.jboss.soa.esb.services.EJB.JbossEsbBatchHandlerHome</home>
- <remote>org.jboss.soa.esb.services.EJB.JbossEsbBatchHandler</remote>
- <local-home>org.jboss.soa.esb.services.EJB.JbossEsbBatchHandlerLocalHome</local-home>
- <local>org.jboss.soa.esb.services.EJB.JbossEsbBatchHandlerLocal</local>
- <ejb-class>org.jboss.soa.esb.services.EJB.JbossEsbBatchHandlerBean</ejb-class>
+ <home>org.jboss.soa.esb.services.EJB.BatchHandlerHome</home>
+ <remote>org.jboss.soa.esb.services.EJB.BatchHandler</remote>
+ <local-home>org.jboss.soa.esb.services.EJB.BatchHandlerLocalHome</local-home>
+ <local>org.jboss.soa.esb.services.EJB.BatchHandlerLocal</local>
+ <ejb-class>org.jboss.soa.esb.services.EJB.BatchHandlerBean</ejb-class>
<session-type>Stateful</session-type>
<transaction-type>Bean</transaction-type>
@@ -108,7 +108,7 @@
-->
<container-transaction >
<method >
- <ejb-name>JbossEsbNotificationHandler</ejb-name>
+ <ejb-name>NotificationHandler</ejb-name>
<method-name>*</method-name>
</method>
<trans-attribute>Required</trans-attribute>
Modified: labs/jbossesb/trunk/product/core/services/src/META-INF/jboss.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/META-INF/jboss.xml 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/META-INF/jboss.xml 2006-08-01 22:43:44 UTC (rev 5393)
@@ -13,25 +13,25 @@
-->
<session>
- <ejb-name>JbossEsbNotificationHandler</ejb-name>
- <jndi-name>JbossEsbNotificationHandler</jndi-name>
- <local-jndi-name>JbossEsbNotificationHandlerLocal</local-jndi-name>
+ <ejb-name>NotificationHandler</ejb-name>
+ <jndi-name>NotificationHandler</jndi-name>
+ <local-jndi-name>NotificationHandlerLocal</local-jndi-name>
<method-attributes>
</method-attributes>
</session>
<session>
- <ejb-name>JbossEsbPersistHandler</ejb-name>
- <jndi-name>JbossEsbPersistHandler</jndi-name>
- <local-jndi-name>JbossEsbPersistHandlerLocal</local-jndi-name>
+ <ejb-name>PersistHandler</ejb-name>
+ <jndi-name>PersistHandler</jndi-name>
+ <local-jndi-name>PersistHandlerLocal</local-jndi-name>
<method-attributes>
</method-attributes>
</session>
<session>
- <ejb-name>JbossEsbBatchHandler</ejb-name>
- <jndi-name>JbossEsbBatchHandler</jndi-name>
- <local-jndi-name>JbossEsbBatchHandlerLocal</local-jndi-name>
+ <ejb-name>BatchHandler</ejb-name>
+ <jndi-name>BatchHandler</jndi-name>
+ <local-jndi-name>BatchHandlerLocal</local-jndi-name>
<method-attributes>
</method-attributes>
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -65,7 +65,7 @@
static {
try {
URI objStoreConfig = URI.create(
- EsbSysProps.getObjStoreConfigFile());
+ SystemProperties.getObjStoreConfigFile());
DomElement oConf = DomElement.fromInputStream(
objStoreConfig.toURL().openStream());
@@ -239,7 +239,7 @@
* @param p_sClassName
* Class to search for in descriptor table
* @return BobjStore - A descriptor that will provide persistence info
- * @see JbossEsbPersistHandler
+ * @see PersistHandler
* @see BobjStore#getStore(BusinessObject)
*/
public static BobjStore getStore(String p_sClassName) {
@@ -255,7 +255,7 @@
* @param p_sClassName
* BobjStdDTO for which we need an object store
* @return BobjStore - A descriptor that will provide persistence info
- * @see JbossEsbPersistHandler
+ * @see PersistHandler
* @see BobjStore#getStore(String)
*/
public static BobjStore getStore(BobjStdDTO p_oDto) {
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -85,7 +85,7 @@
/**
* 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>
+ * number should only be assigned by the PersistHandler 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
@@ -124,7 +124,7 @@
* 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
+ * group of BusinessObjects added using the BatchHandler EJB), then it
* will hold a null value</p>
*/
public static final int BATCH_NUM = s_iFld++;
@@ -232,7 +232,7 @@
{ if (null!=m_oMangler)
return m_oMangler;
- String sFactoryName = EsbSysProps.getEncryptionFactoryClass();
+ String sFactoryName = SystemProperties.getEncryptionFactoryClass();
Class oFactClass = DefaultEncryptionFactory.class;
if (null!=sFactoryName)
oFactClass = Class.forName(sFactoryName);
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -183,7 +183,7 @@
/**
* 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
+ * <p>This method is called by the PersistHandler and BatchHandler 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>
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -30,13 +30,13 @@
public class BatchHandlerBsDelegateLocal implements IbatchHandler
{
- private JbossEsbBatchHandlerLocal m_oBatchH;
+ private BatchHandlerLocal m_oBatchH;
public BatchHandlerBsDelegateLocal(Context p_ctx) throws Exception
{
- Object ref = p_ctx.lookup("JbossEsbBatchHandlerLocal");
+ Object ref = p_ctx.lookup("BatchHandlerLocal");
- JbossEsbBatchHandlerLocalHome oHu = (JbossEsbBatchHandlerLocalHome) ref;
+ BatchHandlerLocalHome oHu = (BatchHandlerLocalHome) ref;
m_oBatchH = oHu.create();
} //__________________________________
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -31,13 +31,13 @@
public class BatchHandlerBsDelegateRemote implements IbatchHandler
{
- private JbossEsbBatchHandler m_oBatchH;
+ private BatchHandler m_oBatchH;
public BatchHandlerBsDelegateRemote(Context p_ctx) throws Exception
{
- Object ref = p_ctx.lookup("JbossEsbBatchHandler");
- Object oNarr = PortableRemoteObject.narrow(ref, JbossEsbBatchHandlerHome.class);
- JbossEsbBatchHandlerHome oHu = (JbossEsbBatchHandlerHome) oNarr;
+ Object ref = p_ctx.lookup("BatchHandler");
+ Object oNarr = PortableRemoteObject.narrow(ref, BatchHandlerHome.class);
+ BatchHandlerHome oHu = (BatchHandlerHome) oNarr;
m_oBatchH = oHu.create();
} //__________________________________
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerHome.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerHome.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocal.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocal.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocalHome.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocalHome.java)
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,32 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Remote interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbBatchHandler
- extends javax.ejb.EJBObject
-{
-
- public long newBatch( )
- throws java.lang.Exception, java.rmi.RemoteException;
-
- public long getBatchNum( )
- throws java.rmi.RemoteException;
-
- public int addToBatch( java.lang.String p_s )
- throws java.lang.Exception, java.rmi.RemoteException;
-
- public void finish( )
- throws java.lang.Exception, java.rmi.RemoteException;
-
- public void commitBatch( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
- throws java.lang.Exception, java.rmi.RemoteException;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,318 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-
-
-package org.jboss.soa.esb.services.EJB;
-
-import java.sql.*;
-import java.text.*;
-import javax.ejb.*;
-import javax.naming.*;
-import javax.sql.*;
-
-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.*;
-/**
- * @ejb.bean
- * name="JbossEsbBatchHandler"
- * display-name="Jboss_Esb_Batch_Handler"
- * type="Stateful"
- * view-type="both"
- * jndi-name="JbossEsbBatchHandler"
- * local-jndi-name="JbossEsbBatchHandlerLocal"
- * transaction-type="Bean"
- * @author
- */
-public class JbossEsbBatchHandlerBean implements SessionBean
-{
- private static final long serialVersionUID = 1L;
- SessionContext m_oSessCtx;
-
- public void setSessionContext(SessionContext p_oSessCtx)
- { this.m_oSessCtx = p_oSessCtx; }
-
- private Logger m_oLogger;
- private JdbcCleanConn m_oUidConn;
- private JdbcCleanConn m_oDataConn;
-
- private DaoUidTable m_oDaoUid;
- private DaoBatchTable m_oDaoBatch;
- private DaoIndexTable m_oDaoIndex;
- private DaoSnapTable m_oDaoSnap;
-
- private long m_lBatchNum = -1;
- private int m_iSeq;
-
-/**
- * @ejb.create-method
- * @throws CreateException
- */
- public void ejbCreate() throws CreateException
- {
- try
- { getResources();
- m_oLogger.info(this.toString()+" Created");
- }
- catch (Exception e)
- { m_oLogger.error("Failed to Create : <"+e.getMessage()+">");
- throw new CreateException(e.getMessage());
- }
- } //__________________________________
-
- public void ejbActivate()
- { try
- { getResources();
- m_oLogger.info("EJB Activated");
- }
- catch (Exception e)
- { m_oLogger.error("Failed to Activate : <"+e.getMessage()+">");
- }
- } //__________________________________
-
- public void ejbPassivate()
- { m_oLogger.info("EJB Passivated");
- releaseResources();
- m_oLogger = null;
- m_oUidConn = null;
- m_oDataConn = null;
- } //__________________________________
-
- public void ejbRemove()
- { releaseResources();
- m_oLogger.info("EJB Removed");
- } //__________________________________
-
- private void getResources() throws Exception
- { Context oCtx = new InitialContext();
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
- m_oUidConn = new JdbcCleanConn ((DataSource)oCtx.lookup("java:JbossEsbDS"));
- m_oDataConn = new JdbcCleanConn ((DataSource)oCtx.lookup("java:JbossEsbDS"));
- } //__________________________________
-
- private void releaseResources()
- { if (null != m_oDataConn) m_oDataConn.release();
- if (null != m_oUidConn) m_oUidConn.release();
- m_oDaoBatch = null;
- m_oDaoUid = null;
- m_oDaoIndex = null;
- m_oDaoSnap = null;
- } //__________________________________
-
-// Utility Methods
-
- private DaoUidTable getDaoUid() throws Exception
- { if (null==m_oDaoUid)
- m_oDaoUid = new DaoUidTable(m_oUidConn,BobjStore.getUidTableName());
- return m_oDaoUid;
- } //__________________________________
-
- private DaoBatchTable getDaoBatch(String p_sTbl) throws Exception
- { if (null==m_oDaoBatch)
- m_oDaoBatch = new DaoBatchTable(m_oDataConn,p_sTbl);
- return m_oDaoBatch;
- } //__________________________________
-
- private DaoIndexTable getDaoIndex(String p_sTbl) throws Exception
- { if (null==m_oDaoIndex)
- m_oDaoIndex = new DaoIndexTable(m_oDataConn,p_sTbl);
- return m_oDaoIndex;
- } //__________________________________
-
- private DaoSnapTable getDaoSnap(BobjStore p_o) throws Exception
- { if (null==m_oDaoSnap)
- m_oDaoSnap = new DaoSnapTable(m_oDataConn,p_o);
- return m_oDaoSnap;
- } //__________________________________
-
- private void doCommitBatch(BatchProcess p_oBP) throws Exception
- { String sPrevClass = null;
- BobjStore oStore = null;
-
- PreparedStatement PSbatch = getDaoBatch(BobjStore.getBatchTableName())
- .getPS(DaoBatchTable.PS_GET_BATCH_ROWS);
- PSbatch.setLong(1,p_oBP.getBatchNum());
-
- long lNow = System.currentTimeMillis();
- String sSnapDt = new SimpleDateFormat("yyyyMMdd").format(new Date(lNow));
-
- // Get all Batch rows
- ResultSet RS = m_oDataConn.execQueryWait(PSbatch,10);
- while (RS.next())
- { String sXml = RS.getString(1+DaoBatchTable.STR_DATA);
- BobjStdDTO oDto = 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;
- m_oDaoIndex = null;
- m_oDaoSnap = null;
- }
- // Set batch number to current batch
- oDto.setBatch (p_oBP.getBatchNum());
- oDto.setStamp (lNow);
- oDto.setSnapDate(sSnapDt);
-
- // Insert Snap row
- PreparedStatement PSins = getDaoSnap(oStore).getPS(DaoSnapTable.PS_INS_SNAP);
- m_oDaoSnap.setInsValues(PSins,oDto);
- 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()); }
- }
- }
- PSbatch.close();
-
- // Delete batch rows we just used
- PreparedStatement PSdel = getDaoBatch(BobjStore.getBatchTableName())
- .getPS(DaoBatchTable.PS_DELETE_BATCH);
- PSdel.setLong(1,p_oBP.getBatchNum());
- m_oDataConn.execUpdWait(PSdel,10);
-
- p_oBP.setField (BatchProcess.ATTRIB.commitStamp,Long.toString(lNow));
- p_oBP.setStamp (lNow);
- p_oBP.setSnapDate(sSnapDt);
-
- oStore = BobjStore.getStore(BatchProcess.class.getName());
-
- // Update snap table with proper timestamp
- m_oDaoSnap = null;
- PreparedStatement PSupd = getDaoSnap(oStore).getPS(DaoSnapTable.PS_UPD_SNAP);
- getDaoSnap(oStore).setUpdValues(PSupd,p_oBP);
- m_oDataConn.execUpdWait(PSupd,10);
-
- // Update index table with proper timestamp
- m_oDaoIndex = null;
- PSupd = getDaoIndex(oStore.getLocatorTable()).getPS(DaoIndexTable.PS_UPD_INDEX);
- getDaoIndex(oStore.getLocatorTable()).setUpdValues(PSupd,p_oBP);
- m_oDataConn.execUpdWait(PSupd,10);
-
- } //__________________________________
-
-//______________________________________________________________________________
-// Public local and remote interface methods
-/**
- * @ejb.interface-method
- * view-type="both"
- */
- public long newBatch() throws Exception
- { if (m_lBatchNum > 0) throw
- new Exception ("Must finish with previous batch before opening new");
- m_iSeq = 0;
- try
- { return m_lBatchNum = getDaoUid().getUidChunk(DaoUidTable.SEQUENCE_BATCH, 1);
- }
- catch (Exception e)
- { m_oLogger.error("BatchHandlerBean.newBatch() FAILED "+ e.getMessage());
- throw e;
- }
- finally { releaseResources(); }
- } //__________________________________
-
-/**
- * @ejb.interface-method
- * view-type="both"
- * @return
- */
- public long getBatchNum()
- { return m_lBatchNum;
- } //__________________________________
-
-/**
- * @ejb.interface-method
- * view-type="both"
- * @param p_s
- * @return
- * @throws Exception
- */
- public int addToBatch(String p_s) throws Exception
- { if (null==p_s) throw
- new Exception ("Tryng to add a null String to a batch");
- if (m_lBatchNum < 1) throw
- new Exception ("Must request batch number before adding objects");
- try
- { RowBatch oRow = new RowBatch(m_lBatchNum,++m_iSeq,0,p_s);
- getDaoBatch(BobjStore.getBatchTableName());
- PreparedStatement PS = m_oDaoBatch.getPS(DaoBatchTable.PS_INS_BATCHROW);
- m_oDaoBatch.setInsValues(PS,oRow);
- m_oDataConn.execUpdWait(PS,1);
- m_oDataConn.commit();
- return m_iSeq;
- }
- catch (Exception e)
- { if (null != m_oDataConn) m_oDataConn.rollback();
- m_oLogger.error("addToBatch() failed",e);
- throw e;
- }
- finally { releaseResources(); }
- } //__________________________________
-/**
- * @ejb.interface-method
- * view-type="both"
- * @throws Exception
- */
- public void finish() throws Exception
- { if (m_lBatchNum < 1) return;
- m_lBatchNum = -1;
- m_iSeq = 0;
- } //__________________________________
-
-//______________________________________________________________________________
-// Public local interface methods
-
-/**
- * @ejb.interface-method
- * view-type="local"
- */
- public void commitBatch(BatchProcess p_oBO) throws Exception
- { try { doCommitBatch(p_oBO); m_oDataConn.commit(); }
- catch (Exception e)
- { if (null != m_oDataConn) m_oDataConn.rollback();
- m_oLogger.error("commitBatch(BatchProcess) FAILED ",e);
- throw e;
- }
- finally { releaseResources(); }
- } //__________________________________
-
-//______________________________________________________________________________
-// Public remote interface methods
-/**
- * @ejb.interface-method
- * view-type="both"
- */
- public void commitBatch(BobjStdDTO p_oDto) throws Exception
- { commitBatch (new BatchProcess(p_oDto));
- } //__________________________________
-
-} //____________________________________________________________________________
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Home interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbBatchHandlerHome
- extends javax.ejb.EJBHome
-{
- public static final String COMP_NAME="java:comp/env/ejb/JbossEsbBatchHandler";
- public static final String JNDI_NAME="JbossEsbBatchHandler";
-
- public org.jboss.soa.esb.services.EJB.JbossEsbBatchHandler create()
- throws javax.ejb.CreateException,java.rmi.RemoteException;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,29 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbBatchHandlerLocal
- extends javax.ejb.EJBLocalObject
-{
-
- public long newBatch( ) throws java.lang.Exception;
-
- public long getBatchNum( ) ;
-
- public int addToBatch( java.lang.String p_s ) throws java.lang.Exception;
-
- public void finish( ) throws java.lang.Exception;
-
- public void commitBatch( org.jboss.soa.esb.common.bizclasses.BatchProcess p_oBO ) throws java.lang.Exception;
-
- public void commitBatch( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local home interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbBatchHandlerLocalHome
- extends javax.ejb.EJBLocalHome
-{
- public static final String COMP_NAME="java:comp/env/ejb/JbossEsbBatchHandlerLocal";
- public static final String JNDI_NAME="JbossEsbBatchHandlerLocal";
-
- public org.jboss.soa.esb.services.EJB.JbossEsbBatchHandlerLocal create()
- throws javax.ejb.CreateException;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-import java.io.Serializable;
-
-/**
- * Remote interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 24 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbNotificationHandler
- extends javax.ejb.EJBObject
-{
-
- public void sendNotifications( java.lang.String p_sParams,Serializable p_sMsg )
- throws java.lang.Exception, java.rmi.RemoteException;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,119 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-
-
-package org.jboss.soa.esb.services.EJB;
-
-import java.io.Serializable;
-import javax.ejb.*;
-import javax.naming.*;
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.notification.*;
-
-import org.apache.log4j.*;
-/**
- * @ejb.bean description="JbossEsbNotificationHandler"
- * display-name="Jboss_Esb_Notification_Handler"
- * jndi-name="JbossEsbNotificationHandler"
- * local-jndi-name="JbossEsbNotificationHandlerLocal"
- * name="JbossEsbNotificationHandler"
- * type="Stateless"
- * view-type="both"
- * transaction-type="Container"
- * @ejb.transaction type="Required"
- * @author
- */
-public class JbossEsbNotificationHandlerBean implements SessionBean
-{
- private static final long serialVersionUID = 1L;
- private Logger m_oLogger;
- SessionContext m_ctxSess;
-
- public void ejbActivate() {}
- public void ejbPassivate() {}
- public void setSessionContext(SessionContext sessionContext)
- { m_ctxSess = sessionContext; }
-/**
- * @ejb.create-method
- * @throws CreateException
- */
- public void ejbCreate() throws CreateException
- { try
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
-// Context oCtxInit =
- new InitialContext();
-
- m_oLogger.info(this.toString()+" Created");
- }
- catch (Exception e)
- { m_oLogger.error("EJB Create Failed <"+e.getMessage()+">");
- throw new CreateException(e.getMessage());
- }
- } //__________________________________
-
- public void ejbRemove()
- { m_oLogger.info(this.toString()+" Removed");
- } //__________________________________
-
-// Utility Methods
-
- protected void releaseResources()
- {
- } //__________________________________
-
-//______________________________________________________________________________
-// Public local and remote interface methods
-
- private static final String s_sDfltList =
- "<NotificationList type=\"Error\" >"
- +" <target"
- +" class = \"NotifyEmail\""
- +" from = \"JbossEsbDefault at myOrg.com\""
- +" sendTo = \"\""
- +" subject = \"Default JBoss ESB Notification\""
- +" message = \" Message from JBoss ESB :\""
- +" />"
- +" </NotificationList>"
- ;
- private static NotificationList s_dfltList;
- static
- { try
- { s_dfltList = new NotificationList(DomElement.fromXml(s_sDfltList)); }
- catch (Exception e) { e.printStackTrace(System.out); }
- }
-/**
- * @ejb.interface-method
- * @param p_sParams
- * @param p_sMsg
- * @throws Exception
- */
- public void sendNotifications(String p_sParams, Serializable p_oMsg)
- throws Exception
- {
- DomElement oP = (null==p_sParams)?null:DomElement.fromXml(p_sParams);
- NotificationList m_oL = (null==oP) ? s_dfltList : new NotificationList(oP);
- m_oL.sendNotification(p_oMsg);
- } //__________________________________
-
-} //____________________________________________________________________________
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Home interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 27 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbNotificationHandlerHome
- extends javax.ejb.EJBHome
-{
- public static final String COMP_NAME="java:comp/env/ejb/JbossEsbNotificationHandler";
- public static final String JNDI_NAME="JbossEsbNotificationHandler";
-
- public org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandler create()
- throws javax.ejb.CreateException,java.rmi.RemoteException;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,21 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-import java.io.Serializable;
-
-/**
- * Local interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 5 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbNotificationHandlerLocal
- extends javax.ejb.EJBLocalObject
-{
-
- public void sendNotifications( java.lang.String p_sParams,Serializable p_sMsg ) throws java.lang.Exception;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local home interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 27 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbNotificationHandlerLocalHome
- extends javax.ejb.EJBLocalHome
-{
- public static final String COMP_NAME="java:comp/env/ejb/JbossEsbNotificationHandlerLocal";
- public static final String JNDI_NAME="JbossEsbNotificationHandlerLocal";
-
- public org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandlerLocal create()
- throws javax.ejb.CreateException;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,32 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Remote interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 24 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbPersistHandler
- extends javax.ejb.EJBObject
-{
-
- public long getUidChunk( int p_iQ )
- throws java.lang.Exception, java.rmi.RemoteException;
-
- public void rmvObject( java.lang.String p_sClassName,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 )
- throws java.lang.Exception, java.rmi.RemoteException;
-
- public void rplDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
- throws java.lang.Exception, java.rmi.RemoteException;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,367 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-
-
-package org.jboss.soa.esb.services.EJB;
-
-import javax.ejb.*;
-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.apache.log4j.*;
-
-/**
- * @ejb.bean
- * name="JbossEsbPersistHandler"
- * display-name="Jboss_ESB_PERSIST_HANDLER"
- * type="Stateless"
- * view-type="both"
- * jndi-name="JbossEsbPersistHandler"
- * local-jndi-name="JbossEsbPersistHandlerLocal"
- * transaction-type="Bean"
- * @author Esteban
- */
-public class JbossEsbPersistHandlerBean implements SessionBean
-{
- private static final long serialVersionUID = 1L;
- private Logger m_oLogger;
- SessionContext m_ctxSess;
-
- private JdbcCleanConn m_oUidConn;
- private JdbcCleanConn m_oDataConn;
-
- private static final int s_iChunkSize=100;
- private long m_lUid;
- private int m_iChunkLeft=0;
-
- private DaoUidTable m_oDaoUid;
- private DaoSnapTable m_oDaoSnap;
- private DaoIndexTable[] m_oaDaoIndex;
-
- public void ejbActivate() {}
- public void ejbPassivate() {}
- public void setSessionContext(SessionContext sessionContext)
- { m_ctxSess = sessionContext; }
-/**
- * @ejb.create-method
- * @throws CreateException
- */
- public void ejbCreate() throws CreateException
- { 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);
-
- Class oCls = Class.forName("org.jboss.soa.esb.util.BobjStdDTO");
- ObjectStreamClass XX = ObjectStreamClass.lookup(oCls);
- System.out.println(XX.getSerialVersionUID());
- System.out.println(oCls.getProtectionDomain().getCodeSource().getLocation());
-
- m_oLogger.info(this.toString()+" Created");
- }
- catch (Exception e)
- { m_oLogger.error("EJB Create Failed <"+e.getMessage()+">");
- throw new CreateException(e.getMessage());
- }
- } //__________________________________
-
- public void ejbRemove()
- { m_oLogger.info(this.toString()+" Removed");
- } //__________________________________
-
-// Utility Methods
-
- private DaoUidTable getDaoUid() throws Exception
- { if (null==m_oDaoUid) m_oDaoUid
- = new DaoUidTable(m_oUidConn,BobjStore.getUidTableName());
- return m_oDaoUid;
- } //__________________________________
-
- private DaoSnapTable getDaoSnap(BobjStore p_oSt) throws Exception
- { if (null==m_oDaoSnap)
- m_oDaoSnap = new DaoSnapTable(m_oDataConn,p_oSt);
- 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];
- } //__________________________________
-
- protected ObjLocator[] doAddLocators(BobjStore pStore,BobjStdDTO p_oDto) throws Exception
- { long lUid = p_oDto.getUid();
- if (lUid < 1)
- { lUid = doAssignUid();
- p_oDto.setUid(lUid);
- p_oDto.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);
- }
-
- return oaRet;
- } //__________________________________
-
- 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 doDelOneSnap (BobjStore p_oSt,long p_lUid) throws Exception
- { 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);
- } //__________________________________
-
- private void doRmvSnapshot (BobjStore p_oSt,long p_lUid) throws Exception
- {
- PreparedStatement PS = getDaoSnap(p_oSt).getPS(DaoSnapTable.PS_SEL_4UPD);
- PS.setLong(1,p_lUid);
- ResultSet rs = m_oDataConn.execQueryWait(PS,30);
- if (! rs.next()) throw new Exception("Non existing Snapshot");
- long lObjUid = rs.getLong(DaoSnapTable.OBJECT_UID);
-
- doDelOneSnap(p_oSt,p_lUid);
- doDelLocators(p_oSt,lObjUid);
-
- } //__________________________________
-
- private void doRplSnapshot(BobjStdDTO p_oDto)
- throws Exception
- { long lSnapUid = p_oDto.getSnap();
- BobjStore oSt = BobjStore.getStore(p_oDto);
- doDelOneSnap(oSt,lSnapUid);
- doDelLocators(oSt,p_oDto.getUid());
- doAddSnapshot(p_oDto,false);
- } //__________________________________
-
- private long doAddSnapshot(BobjStdDTO p_oDto)
- throws Exception
- { return doAddSnapshot(p_oDto,true);
- } //__________________________________
-
- SimpleDateFormat s_oY4md = new SimpleDateFormat("yyyyMMdd");
- private long doAddSnapshot(BobjStdDTO p_oDto, boolean p_bNewVrs)
- throws Exception
- { long lObjUid = p_oDto.getUid();
- if (lObjUid < 1) p_oDto.setUid(lObjUid=doAssignUid());
- p_oDto.setSnap(lObjUid);
-
- // Set Timestamp
- long lNow = System.currentTimeMillis();
- p_oDto.setStamp(lNow);
- p_oDto.setSnapDate(s_oY4md.format(new Date(lNow)));
-
- BobjStore oSt = BobjStore.getStore(p_oDto);
- PreparedStatement PS = getDaoSnap(oSt).getPS(DaoSnapTable.PS_INS_SNAP);
- getDaoSnap(oSt).setInsValues(PS,p_oDto);
-
- 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);
- }
- }
-
- return lObjUid;
- } //__________________________________
-
- protected void updateLocTbl(BobjStdDTO p_oDto, int p_iNum)
- 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);
-
- m_oDataConn.execUpdWait(PSupd,10);
- } //__________________________________
-
- private BobjStdDTO doGetSnapshot (BobjStore p_oSt,long p_lUid) throws Exception
- { PreparedStatement PS = getDaoSnap(p_oSt).getPS(DaoSnapTable.PS_SEL_SNAP);
- PS.setLong(1,p_lUid);
- ResultSet rs = m_oDataConn.execQueryWait(PS,30);
- if (! rs.next()) throw new Exception("Non existing Snapshot");
- BobjStdDTO oRet = (BobjStdDTO)getDaoSnap(p_oSt).getFromRS(rs);
- return oRet;
- } //__________________________________
-
- private void releaseResources()
- { if (null!=m_oaDaoIndex)
- for (int i1=0; i1<m_oaDaoIndex.length; i1++)
- m_oaDaoIndex[i1] = null;
- m_oaDaoIndex = null;
- m_oDaoSnap = null;
- m_oDaoUid = null;
- if (null != m_oDataConn) m_oDataConn.release();
- if (null != m_oUidConn) m_oUidConn.release();
- } //__________________________________
-
- public long doAssignUid() throws Exception
- { if (m_iChunkLeft < 1)
- { m_lUid = getDaoUid().getUidChunk(DaoUidTable.SEQUENCE_OBJ, s_iChunkSize);
- m_iChunkLeft = s_iChunkSize;
- }
- m_iChunkLeft--;
- return ++m_lUid;
- } //__________________________________
-
-//______________________________________________________________________________
-// Public local and remote interface methods
- /**
- * @ejb.interface-method
- * view-type="both"
- */
- public long getUidChunk (int p_iQ) throws Exception
- { try { return getDaoUid().getUidChunk(DaoUidTable.SEQUENCE_OBJ,p_iQ); }
- catch (Exception e) { throw e;}
- finally { releaseResources(); }
- } //__________________________________
-/**
- * @ejb.interface-method
- * view-type="both"
- * @param p_sClassName
- * @param p_lUid
- * @throws Exception
- */
- public void rmvObject(String p_sClassName, long p_lUid) throws Exception
- { try { doRmvSnapshot(BobjStore.getStore(p_sClassName), p_lUid); m_oDataConn.commit(); }
- catch (Exception e)
- { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
- catch (Exception eRoll) {}
- throw e;
- }
- finally { releaseResources(); }
- } //__________________________________
-
-/**
- * @ejb.interface-method
- * view-type="both"
- */
- public long addDTO(BobjStdDTO p_oDto) throws Exception
- { try
- { long lRet = doAddSnapshot(p_oDto);
- m_oDataConn.commit();
- return lRet;
- }
- catch (Exception e)
- { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
- catch (Exception eRoll) {}
- throw e;
- }
- finally { releaseResources(); }
- } //__________________________________
-/**
- * @ejb.interface-method
- * view-type="both"
- * @param p_sClassName - String Fully qualified name of class to be retrieved
- * @param p_lUid
- * @return
- * @throws Exception
- */
- public BobjStdDTO getDTO (String p_sClassName, long p_lUid) throws Exception
- { try { return doGetSnapshot(BobjStore.getStore(p_sClassName), p_lUid);}
- catch (Exception e) { throw e; }
- finally { releaseResources(); }
- } //__________________________________
-/**
- * @ejb.interface-method
- * view-type="both"
- *
- * @param p_oDto BobjStdDTO - Serialized BaseBusinessObject that has to be replaced
- * @throws Exception
- */
- public void rplDTO(BobjStdDTO p_oDto) throws Exception
- { try
- { doRplSnapshot(p_oDto);
- m_oDataConn.commit();
- }
- catch (Exception e)
- { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
- catch (Exception eRoll) {}
- throw e;
- }
- finally { releaseResources(); }
- } //__________________________________
-
-} //____________________________________________________________________________
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Home interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbPersistHandlerHome
- extends javax.ejb.EJBHome
-{
- public static final String COMP_NAME="java:comp/env/ejb/JbossEsbPersistHandler";
- public static final String JNDI_NAME="JbossEsbPersistHandler";
-
- public org.jboss.soa.esb.services.EJB.JbossEsbPersistHandler create()
- throws javax.ejb.CreateException,java.rmi.RemoteException;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,27 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbPersistHandlerLocal
- extends javax.ejb.EJBLocalObject
-{
-
- public long getUidChunk( int p_iQ ) throws java.lang.Exception;
-
- public void rmvObject( java.lang.String p_sClassName,long p_lUid ) throws java.lang.Exception;
-
- public long addDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
-
- public org.jboss.soa.esb.util.BobjStdDTO getDTO( java.lang.String p_sClassName,long p_lUid ) throws java.lang.Exception;
-
- public void rplDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
-
-}
Deleted: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local home interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 24 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbPersistHandlerLocalHome
- extends javax.ejb.EJBLocalHome
-{
- public static final String COMP_NAME="java:comp/env/ejb/JbossEsbPersistHandlerLocal";
- public static final String JNDI_NAME="JbossEsbPersistHandlerLocal";
-
- public org.jboss.soa.esb.services.EJB.JbossEsbPersistHandlerLocal create()
- throws javax.ejb.CreateException;
-
-}
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerHome.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerHome.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocal.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocal.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocalHome.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocalHome.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerHome.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerHome.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocal.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocal.java)
Copied: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocalHome.java (from rev 5392, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocalHome.java)
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -30,12 +30,12 @@
public class NotifHandlerBsDelegateLocal implements InotificationHandler
{
- private JbossEsbNotificationHandlerLocal m_oNotifH;
+ private NotificationHandlerLocal m_oNotifH;
public NotifHandlerBsDelegateLocal(Context p_ctx) throws Exception
{
- Object ref = p_ctx.lookup("JbossEsbNotificationHandlerLocal");
+ Object ref = p_ctx.lookup("NotificationHandlerLocal");
- JbossEsbNotificationHandlerLocalHome oHu = (JbossEsbNotificationHandlerLocalHome) ref;
+ NotificationHandlerLocalHome oHu = (NotificationHandlerLocalHome) ref;
m_oNotifH = oHu.create();
} //__________________________________
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -31,13 +31,13 @@
public class NotifHandlerBsDelegateRemote implements InotificationHandler
{
- private JbossEsbNotificationHandler m_oNotifH;
+ private NotificationHandler m_oNotifH;
public NotifHandlerBsDelegateRemote(Context p_ctx) throws Exception
{
- Object ref = p_ctx.lookup("JbossEsbNotificationHandler");
- Object oNarr = PortableRemoteObject.narrow(ref, JbossEsbNotificationHandlerHome.class);
- JbossEsbNotificationHandlerHome oHu = (JbossEsbNotificationHandlerHome) oNarr;
+ Object ref = p_ctx.lookup("NotificationHandler");
+ Object oNarr = PortableRemoteObject.narrow(ref, NotificationHandlerHome.class);
+ NotificationHandlerHome oHu = (NotificationHandlerHome) oNarr;
m_oNotifH = oHu.create();
} //__________________________________
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -32,13 +32,13 @@
public class PersistHandlerBsDelegateLocal implements IpersistHandler
{
- private JbossEsbPersistHandlerLocal m_oSnapH;
+ private PersistHandlerLocal m_oSnapH;
public PersistHandlerBsDelegateLocal(Context p_ctx) throws Exception
{
- Object ref = p_ctx.lookup("JbossEsbPersistHandlerLocal");
+ Object ref = p_ctx.lookup("PersistHandlerLocal");
- JbossEsbPersistHandlerLocalHome oHu = (JbossEsbPersistHandlerLocalHome) ref;
+ PersistHandlerLocalHome oHu = (PersistHandlerLocalHome) ref;
m_oSnapH = oHu.create();
} //__________________________________
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -33,13 +33,13 @@
public class PersistHandlerBsDelegateRemote implements IpersistHandler
{
- private JbossEsbPersistHandler m_oSnapH;
+ private PersistHandler m_oSnapH;
public PersistHandlerBsDelegateRemote(Context p_ctx) throws Exception
{
- Object ref = p_ctx.lookup("JbossEsbPersistHandler");
- Object oNarr = PortableRemoteObject.narrow(ref, JbossEsbPersistHandlerHome.class);
- JbossEsbPersistHandlerHome oHu = (JbossEsbPersistHandlerHome) oNarr;
+ Object ref = p_ctx.lookup("PersistHandler");
+ Object oNarr = PortableRemoteObject.narrow(ref, PersistHandlerHome.class);
+ PersistHandlerHome oHu = (PersistHandlerHome) oNarr;
m_oSnapH = oHu.create();
} //__________________________________
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -50,7 +50,7 @@
* The service identifier will be used as a left_to_right (separator="/")
* Name to search the corresponding configuration in a ParamsRepository object
* provided by the factory class name in the
- * EsbSysProps.PARAMS_REPOS_FACTORY_CLASS system property
+ * SystemProperties.PARAMS_REPOS_FACTORY_CLASS system property
*<p>
* Derived classes are typically empty, and are coded just to tie the
* MDB that extends this class with a specific
@@ -241,7 +241,7 @@
throws Exception
{
String sFactoryClass
- = EsbSysProps.getParamsReposFactoryClass();
+ = SystemProperties.getParamsReposFactoryClass();
ParamsRepository oRep
= ParamsReposUtil.reposFromFactory(sFactoryClass,null);
return oRep.getElement(oRep.nameFromString(p_sKey));
Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/tests/notification/NotificationFuncTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/tests/notification/NotificationFuncTest.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/tests/notification/NotificationFuncTest.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -24,7 +24,7 @@
import java.util.*;
import java.text.SimpleDateFormat;
-import org.jboss.soa.esb.common.EsbSysProps;
+import org.jboss.soa.esb.common.SystemProperties;
import org.jboss.soa.esb.common.tests.BaseTest;
import org.jboss.soa.esb.helpers.*;
import org.jboss.soa.esb.helpers.persist.SimpleDataSource;
@@ -62,8 +62,8 @@
// get a handle to your business delegate
m_oH = NotificationHandlerFactory.getNotifHandler
("remote"
- ,EsbSysProps.getJndiServerType()
- ,EsbSysProps.getJndiServerURL()
+ ,SystemProperties.getJndiServerType()
+ ,SystemProperties.getJndiServerURL()
);
DomElement oEl = new DomElement("MyFileList");
Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/tests/objectstore/ObjectStoreFuncTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/tests/objectstore/ObjectStoreFuncTest.java 2006-08-01 22:32:20 UTC (rev 5392)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/tests/objectstore/ObjectStoreFuncTest.java 2006-08-01 22:43:44 UTC (rev 5393)
@@ -21,7 +21,7 @@
*/
package org.jboss.soa.esb.services.tests.objectstore;
-import org.jboss.soa.esb.common.EsbSysProps;
+import org.jboss.soa.esb.common.SystemProperties;
import org.jboss.soa.esb.common.tests.bizclasses.PersonUnitTest;
import org.jboss.soa.esb.common.tests.BaseTest;
import org.jboss.soa.esb.common.bizclasses.*;
@@ -53,8 +53,8 @@
// get a handle to your business delegate
m_oH = PersistHandlerFactory.getPersistHandler
("remote"
- ,EsbSysProps.getJndiServerType()
- ,EsbSysProps.getJndiServerURL()
+ ,SystemProperties.getJndiServerType()
+ ,SystemProperties.getJndiServerURL()
);
// request UID chunks for your own use
More information about the jboss-svn-commits
mailing list