Author: indika
Date: Sun Nov 16 01:08:08 2008
New Revision: 24000
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=24000
Log:
move dscode into synape utils
Added:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRegistrar.java
- copied, changed from r23999,
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MBeanRegistrar.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRepository.java
- copied, changed from r23999,
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MBeanRepository.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java
- copied, changed from r23999,
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MiscellaneousUtil.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java
- copied, changed from r23999,
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/
- copied from r23999,
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/
Removed:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MBeanRegistrar.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MBeanRepository.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MiscellaneousUtil.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
branches/synapse/1.2.wso2v1/modules/transports/pom.xml
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolView.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolViewMBean.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceFinder.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryListener.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceManager.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepository.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
Sun Nov 16 01:08:08 2008
@@ -25,6 +25,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.*;
+import org.apache.synapse.commons.util.RMIRegistryController;
+import org.apache.synapse.commons.util.datasource.InMemoryDataSourceRepository;
+import
org.apache.synapse.commons.util.datasource.JNDIBasedDataSourceRepository;
import org.apache.synapse.config.xml.MediatorFactoryFinder;
import org.apache.synapse.config.xml.endpoints.XMLToEndpointMapper;
import org.apache.synapse.core.SynapseEnvironment;
@@ -37,9 +40,6 @@
import org.apache.synapse.registry.Registry;
import org.apache.synapse.task.TaskDescriptionRepository;
import org.apache.synapse.task.TaskDescriptionRepositoryFactory;
-import org.apache.synapse.util.RMIRegistryController;
-import org.apache.synapse.util.datasource.InMemoryDataSourceRepository;
-import org.apache.synapse.util.datasource.JNDIBasedDataSourceRepository;
import javax.xml.namespace.QName;
import java.io.IOException;
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java
Sun Nov 16 01:08:08 2008
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.util.MiscellaneousUtil;
+import org.apache.synapse.commons.util.MiscellaneousUtil;
import java.util.Properties;
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java
Sun Nov 16 01:08:08 2008
@@ -22,12 +22,12 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.synapse.commons.util.MBeanRepository;
+import org.apache.synapse.commons.util.datasource.DBPoolView;
+import org.apache.synapse.commons.util.datasource.DataSourceManager;
+import org.apache.synapse.commons.util.datasource.DatasourceMBeanRepository;
import org.apache.synapse.mediators.db.AbstractDBMediator;
import org.apache.synapse.mediators.db.Statement;
-import org.apache.synapse.util.MBeanRepository;
-import org.apache.synapse.util.datasource.DBPoolView;
-import org.apache.synapse.util.datasource.DataSourceManager;
-import org.apache.synapse.util.datasource.DatasourceMBeanRepository;
import org.apache.synapse.util.xpath.SynapseXPath;
import org.jaxen.JaxenException;
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java
Sun Nov 16 01:08:08 2008
@@ -33,12 +33,12 @@
import org.apache.synapse.ServerManager;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
+import
org.apache.synapse.commons.util.datasource.DataSourceInformationRepositoryHelper;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.config.SynapseConfigurationBuilder;
import org.apache.synapse.config.SynapsePropertiesLoader;
import org.apache.synapse.format.BinaryBuilder;
import org.apache.synapse.format.PlainTextBuilder;
-import
org.apache.synapse.util.datasource.DataSourceInformationRepositoryHelper;
import java.net.InetAddress;
import java.net.UnknownHostException;
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
Sun Nov 16 01:08:08 2008
@@ -25,7 +25,7 @@
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.util.datasource.DBPoolView;
+import org.apache.synapse.commons.util.datasource.DBPoolView;
import org.apache.synapse.config.xml.AbstractDBMediatorFactory;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.AbstractMediator;
Deleted:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MBeanRegistrar.java
URL: http://wso2.org/svn/browse/wso2/None?pathrev=23999
Deleted:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MBeanRepository.java
URL: http://wso2.org/svn/browse/wso2/None?pathrev=23999
Deleted:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MiscellaneousUtil.java
URL: http://wso2.org/svn/browse/wso2/None?pathrev=23999
Deleted:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java
URL: http://wso2.org/svn/browse/wso2/None?pathrev=23999
Modified: branches/synapse/1.2.wso2v1/modules/transports/pom.xml
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/transports/pom.xml?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
--- branches/synapse/1.2.wso2v1/modules/transports/pom.xml (original)
+++ branches/synapse/1.2.wso2v1/modules/transports/pom.xml Sun Nov 16
01:08:08 2008
@@ -128,6 +128,12 @@
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-utils</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Copied:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRegistrar.java
(from r23999,
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MBeanRegistrar.java)
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRegistrar.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MBeanRegistrar.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRegistrar.java
Sun Nov 16 01:08:08 2008
@@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util;
+package org.apache.synapse.commons.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -30,7 +29,7 @@
public class MBeanRegistrar {
private static final MBeanRegistrar ourInstance = new MBeanRegistrar();
- private static final Log log = LogFactory.getLog(MessageHelper.class);
+ private static final Log log = LogFactory.getLog(MBeanRegistrar.class);
public static MBeanRegistrar getInstance() {
return ourInstance;
@@ -95,7 +94,7 @@
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
}
Copied:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRepository.java
(from r23999,
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MBeanRepository.java)
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRepository.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MBeanRepository.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRepository.java
Sun Nov 16 01:08:08 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util;
+package org.apache.synapse.commons.util;
/**
*/
Copied:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java
(from r23999,
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MiscellaneousUtil.java)
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/MiscellaneousUtil.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java
Sun Nov 16 01:08:08 2008
@@ -16,15 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util;
+package org.apache.synapse.commons.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.SynapseException;
-import java.util.Properties;
import java.io.*;
+import java.util.Properties;
/**
* Miscellaneous Utility methods
@@ -39,7 +37,7 @@
/**
* Helper method to get the value of the property from a given property bag
*
- * @param properties The property collection
+ * @param properties The property collection
* @param name The name of the property
* @param defaultValue The default value for the property
* @return The value of the property if it is found , otherwise , default
value
@@ -148,7 +146,7 @@
log.debug("Unable to load file ' " + filePath + " '");
}
- filePath = SynapseConstants.CONF_DIRECTORY +
+ filePath = "conf" +
File.separatorChar + filePath;
if (log.isDebugEnabled()) {
log.debug("Loading a file ' " + filePath + " ' from
classpath");
@@ -167,7 +165,7 @@
} catch (IOException e) {
String msg = "Error loading properties from a file at :" +
filePath;
log.error(msg, e);
- throw new SynapseException(msg, e);
+ throw new SynapseUtilException(msg, e);
}
}
return properties;
@@ -216,6 +214,6 @@
*/
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
}
Copied:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java
(from r23999,
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java)
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java
Sun Nov 16 01:08:08 2008
@@ -1,16 +1,15 @@
/**
*
*/
-package org.apache.synapse.util;
+package org.apache.synapse.commons.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
-import java.rmi.registry.Registry;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.RemoteException;
import java.rmi.NoSuchObjectException;
+import java.rmi.RemoteException;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
import java.rmi.server.UnicastRemoteObject;
public class RMIRegistryController {
@@ -66,7 +65,7 @@
*/
private static void handleException(String msg, Exception e) {
log.error(msg, e);
- throw new SynapseException(msg, e);
+ throw new SynapseUtilException(msg, e);
}
}
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolView.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolView.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/DBPoolView.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolView.java
Sun Nov 16 01:08:08 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
import java.util.HashMap;
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolViewMBean.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolViewMBean.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/DBPoolViewMBean.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolViewMBean.java
Sun Nov 16 01:08:08 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
import java.util.Map;
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/DataSourceConfigurationConstants.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java
Sun Nov 16 01:08:08 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
/**
* To change this template use File | Settings | File Templates.
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceFinder.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceFinder.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/DataSourceFinder.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceFinder.java
Sun Nov 16 01:08:08 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
import javax.naming.Context;
import javax.sql.DataSource;
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/DataSourceInformation.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java
Sun Nov 16 01:08:08 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
import org.apache.commons.pool.impl.GenericObjectPool;
@@ -39,7 +39,7 @@
private long maxWait = GenericObjectPool.DEFAULT_MAX_WAIT;
private String driver;
private String url;
- private String type;
+ private String type = BASIC_DATA_SOURCE;
private boolean defaultAutoCommit = true;
private boolean defaultReadOnly = false;
private boolean testOnBorrow = true;
@@ -55,7 +55,7 @@
private boolean poolPreparedStatements;
private int maxOpenPreparedStatements;
private final Properties properties = new Properties();
- private String repositoryType;
+ private String repositoryType =
DataSourceConfigurationConstants.PROP_REGISTRY_MEMORY;
private String alias;
private long timeBetweenEvictionRunsMillis =
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/DataSourceInformationRepository.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java
Sun Nov 16 01:08:08 2008
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
+import org.apache.synapse.commons.util.SynapseUtilException;
import java.util.*;
@@ -89,7 +89,7 @@
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
private void assertNull(String name, String msg) {
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/DataSourceInformationRepositoryHelper.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
Sun Nov 16 01:08:08 2008
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
-import
org.apache.synapse.util.datasource.factory.DataSourceInformationRepositoryFactory;
+import org.apache.synapse.commons.util.SynapseUtilException;
+import
org.apache.synapse.commons.util.datasource.factory.DataSourceInformationRepositoryFactory;
import java.util.Properties;
@@ -71,11 +71,11 @@
private static void handleException(String msg, Throwable error) {
log.error(msg, error);
- throw new SynapseException(msg, error);
+ throw new SynapseUtilException(msg, error);
}
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
}
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryListener.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryListener.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/DataSourceInformationRepositoryListener.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryListener.java
Sun Nov 16 01:08:08 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
import java.util.Properties;
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceManager.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceManager.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/DataSourceManager.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceManager.java
Sun Nov 16 01:08:08 2008
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
+import org.apache.synapse.commons.util.SynapseUtilException;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -154,7 +154,7 @@
*/
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
/**
@@ -165,7 +165,7 @@
*/
private static void handleException(String msg, Exception e) {
log.error(msg, e);
- throw new SynapseException(msg, e);
+ throw new SynapseUtilException(msg, e);
}
}
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepository.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepository.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/DataSourceRepository.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepository.java
Sun Nov 16 01:08:08 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
import javax.sql.DataSource;
import java.util.Properties;
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/DatasourceMBeanRepository.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java
Sun Nov 16 01:08:08 2008
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.util.MBeanRegistrar;
-import org.apache.synapse.util.MBeanRepository;
+import org.apache.synapse.commons.util.MBeanRegistrar;
+import org.apache.synapse.commons.util.MBeanRepository;
+import org.apache.synapse.commons.util.SynapseUtilException;
import java.util.HashMap;
import java.util.Map;
@@ -106,7 +106,7 @@
*/
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/InMemoryDataSourceRepository.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java
Sun Nov 16 01:08:08 2008
@@ -19,13 +19,13 @@
/**
* To change this template use File | Settings | File Templates.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.util.MBeanRepository;
-import org.apache.synapse.util.datasource.factory.DataSourceFactory;
+import org.apache.synapse.commons.util.MBeanRepository;
+import org.apache.synapse.commons.util.SynapseUtilException;
+import org.apache.synapse.commons.util.datasource.factory.DataSourceFactory;
import javax.sql.DataSource;
import java.util.HashMap;
@@ -119,7 +119,7 @@
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/JNDIBasedDataSourceRepository.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
Sun Nov 16 01:08:08 2008
@@ -19,13 +19,13 @@
/**
* To change this template use File | Settings | File Templates.
*/
-package org.apache.synapse.util.datasource;
+package org.apache.synapse.commons.util.datasource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.util.MiscellaneousUtil;
-import org.apache.synapse.util.RMIRegistryController;
+import org.apache.synapse.commons.util.MiscellaneousUtil;
+import org.apache.synapse.commons.util.RMIRegistryController;
+import org.apache.synapse.commons.util.SynapseUtilException;
import javax.naming.*;
import javax.sql.DataSource;
@@ -447,7 +447,7 @@
*/
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
/**
@@ -458,7 +458,7 @@
*/
private static void handleException(String msg, Exception e) {
log.error(msg, e);
- throw new SynapseException(msg, e);
+ throw new SynapseUtilException(msg, e);
}
private void validateInitialized() {
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/factory/DataSourceFactory.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java
Sun Nov 16 01:08:08 2008
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource.factory;
+package org.apache.synapse.commons.util.datasource.factory;
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS;
import org.apache.commons.dbcp.datasources.PerUserPoolDataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.util.datasource.DataSourceInformation;
+import org.apache.synapse.commons.util.SynapseUtilException;
+import org.apache.synapse.commons.util.datasource.DataSourceInformation;
import javax.sql.DataSource;
@@ -184,6 +184,6 @@
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
}
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/factory/DataSourceInformationFactory.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java
Sun Nov 16 01:08:08 2008
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource.factory;
+package org.apache.synapse.commons.util.datasource.factory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.pool.impl.GenericKeyedObjectPool;
import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.util.MiscellaneousUtil;
-import org.apache.synapse.util.datasource.DataSourceConfigurationConstants;
-import org.apache.synapse.util.datasource.DataSourceInformation;
+import org.apache.synapse.commons.util.MiscellaneousUtil;
+import org.apache.synapse.commons.util.SynapseUtilException;
+import
org.apache.synapse.commons.util.datasource.DataSourceConfigurationConstants;
+import org.apache.synapse.commons.util.datasource.DataSourceInformation;
import java.util.Properties;
@@ -236,6 +236,6 @@
*/
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
}
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/factory/DataSourceInformationListFactory.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java
Sun Nov 16 01:08:08 2008
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource.factory;
+package org.apache.synapse.commons.util.datasource.factory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.util.MiscellaneousUtil;
-import org.apache.synapse.util.datasource.DataSourceConfigurationConstants;
-import org.apache.synapse.util.datasource.DataSourceInformation;
+import org.apache.synapse.commons.util.MiscellaneousUtil;
+import
org.apache.synapse.commons.util.datasource.DataSourceConfigurationConstants;
+import org.apache.synapse.commons.util.datasource.DataSourceInformation;
import java.util.ArrayList;
import java.util.List;
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/factory/DataSourceInformationRepositoryFactory.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java
Sun Nov 16 01:08:08 2008
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource.factory;
+package org.apache.synapse.commons.util.datasource.factory;
-import org.apache.synapse.util.datasource.DataSourceInformation;
-import org.apache.synapse.util.datasource.DataSourceInformationRepository;
-import
org.apache.synapse.util.datasource.DataSourceInformationRepositoryListener;
-import org.apache.synapse.util.datasource.DataSourceManager;
+import org.apache.synapse.commons.util.datasource.DataSourceInformation;
+import
org.apache.synapse.commons.util.datasource.DataSourceInformationRepository;
+import
org.apache.synapse.commons.util.datasource.DataSourceInformationRepositoryListener;
+import org.apache.synapse.commons.util.datasource.DataSourceManager;
import java.util.List;
import java.util.Properties;
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/serializer/DataSourceInformationListSerializer.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java
Sun Nov 16 01:08:08 2008
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource.serializer;
+package org.apache.synapse.commons.util.datasource.serializer;
-import org.apache.synapse.util.datasource.DataSourceConfigurationConstants;
-import org.apache.synapse.util.datasource.DataSourceInformation;
+import
org.apache.synapse.commons.util.datasource.DataSourceConfigurationConstants;
+import org.apache.synapse.commons.util.datasource.DataSourceInformation;
import java.util.List;
import java.util.Properties;
Modified:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java?rev=24000&r1=23999&r2=24000&view=diff
==============================================================================
---
/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/datasource/serializer/DataSourceInformationSerializer.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java
Sun Nov 16 01:08:08 2008
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.util.datasource.serializer;
+package org.apache.synapse.commons.util.datasource.serializer;
-import org.apache.synapse.util.datasource.DataSourceConfigurationConstants;
-import org.apache.synapse.util.datasource.DataSourceInformation;
+import
org.apache.synapse.commons.util.datasource.DataSourceConfigurationConstants;
+import org.apache.synapse.commons.util.datasource.DataSourceInformation;
import java.util.Properties;
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://mailman.wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
