You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2008/11/16 12:49:07 UTC
svn commit: r718007 - in /synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/config/
core/src/main/java/org/apache/synapse/config/xml/
core/src/main/java/org/apache/synapse/core/axis2/
core/src/main/java/org/apache/synapse/mediators/db/ ...
Author: indika
Date: Sun Nov 16 03:49:06 2008
New Revision: 718007
URL: http://svn.apache.org/viewvc?rev=718007&view=rev
Log:
move datasource code into synapse utils
Added:
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRegistrar.java
- copied, changed from r718005, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MBeanRegistrar.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRepository.java
- copied, changed from r718005, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MBeanRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java
- copied, changed from r718005, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MiscellaneousUtil.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java
- copied, changed from r718005, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/
- copied from r718005, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/datasource/
Removed:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MBeanRegistrar.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MBeanRepository.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MiscellaneousUtil.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/datasource/
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/factory/KeyStoreInformationFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/repository/filebased/FileBaseSecretRepository.java
synapse/trunk/java/modules/transports/pom.xml
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolView.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolViewMBean.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceFinder.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryListener.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceManager.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=718007&r1=718006&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java Sun Nov 16 03:49:06 2008
@@ -25,10 +25,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.*;
-import org.apache.synapse.util.RMIRegistryController;
-import org.apache.synapse.util.datasource.DataSourceInformationRepository;
-import org.apache.synapse.util.datasource.InMemoryDataSourceRepository;
-import org.apache.synapse.util.datasource.JNDIBasedDataSourceRepository;
+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.task.TaskDescriptionRepository;
import org.apache.synapse.task.TaskDescriptionRepositoryFactory;
import org.apache.synapse.config.xml.MediatorFactoryFinder;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java?rev=718007&r1=718006&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java Sun Nov 16 03:49:06 2008
@@ -19,7 +19,7 @@
package org.apache.synapse.config;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.util.MiscellaneousUtil;
+import org.apache.synapse.commons.util.MiscellaneousUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java?rev=718007&r1=718006&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java Sun Nov 16 03:49:06 2008
@@ -24,10 +24,10 @@
import org.apache.commons.dbcp.BasicDataSource;
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.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.util.xpath.SynapseXPath;
import org.apache.synapse.security.secret.SecretManager;
import org.jaxen.JaxenException;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java?rev=718007&r1=718006&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java Sun Nov 16 03:49:06 2008
@@ -35,7 +35,7 @@
import org.apache.synapse.ServerManager;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.util.datasource.DataSourceInformationRepositoryHelper;
+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;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java?rev=718007&r1=718006&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java Sun Nov 16 03:49:06 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;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/factory/KeyStoreInformationFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/factory/KeyStoreInformationFactory.java?rev=718007&r1=718006&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/factory/KeyStoreInformationFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/definition/factory/KeyStoreInformationFactory.java Sun Nov 16 03:49:06 2008
@@ -23,7 +23,7 @@
import org.apache.synapse.security.definition.IdentityKeyStoreInformation;
import org.apache.synapse.security.definition.KeyStoreInformation;
import org.apache.synapse.security.definition.TrustKeyStoreInformation;
-import org.apache.synapse.util.MiscellaneousUtil;
+import org.apache.synapse.commons.util.MiscellaneousUtil;
import java.util.Properties;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java?rev=718007&r1=718006&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java Sun Nov 16 03:49:06 2008
@@ -13,8 +13,8 @@
import org.apache.synapse.security.wrappers.IdentityKeyStoreWrapper;
import org.apache.synapse.security.wrappers.TrustKeyStoreWrapper;
import org.apache.synapse.security.mbean.SecretManagerAdmin;
-import org.apache.synapse.util.MiscellaneousUtil;
-import org.apache.synapse.util.MBeanRegistrar;
+import org.apache.synapse.commons.util.MiscellaneousUtil;
+import org.apache.synapse.commons.util.MBeanRegistrar;
import java.util.Properties;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/repository/filebased/FileBaseSecretRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/repository/filebased/FileBaseSecretRepository.java?rev=718007&r1=718006&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/repository/filebased/FileBaseSecretRepository.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/repository/filebased/FileBaseSecretRepository.java Sun Nov 16 03:49:06 2008
@@ -26,7 +26,7 @@
import org.apache.synapse.security.wrappers.CipherWrapper;
import org.apache.synapse.security.wrappers.IdentityKeyStoreWrapper;
import org.apache.synapse.security.wrappers.TrustKeyStoreWrapper;
-import org.apache.synapse.util.MiscellaneousUtil;
+import org.apache.synapse.commons.util.MiscellaneousUtil;
import java.io.ByteArrayInputStream;
import java.security.PublicKey;
Modified: synapse/trunk/java/modules/transports/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/pom.xml?rev=718007&r1=718006&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/pom.xml (original)
+++ synapse/trunk/java/modules/transports/pom.xml Sun Nov 16 03:49:06 2008
@@ -160,8 +160,14 @@
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-utils</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-testkit</artifactId>
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRegistrar.java (from r718005, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MBeanRegistrar.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRegistrar.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRegistrar.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MBeanRegistrar.java&r1=718005&r2=718007&rev=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MBeanRegistrar.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRegistrar.java Sun Nov 16 03:49:06 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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRepository.java (from r718005, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MBeanRepository.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRepository.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRepository.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MBeanRepository.java&r1=718005&r2=718007&rev=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MBeanRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MBeanRepository.java Sun Nov 16 03:49:06 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;
/**
*/
@@ -25,9 +25,9 @@
public void addMBean(String name, Object MBean);
public Object getMBean(String name);
-
+
public void removeMBean(String name);
-
+
public void clear();
}
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java (from r718005, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MiscellaneousUtil.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MiscellaneousUtil.java&r1=718005&r2=718007&rev=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MiscellaneousUtil.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java Sun Nov 16 03:49:06 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;
/**
*
@@ -147,7 +145,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");
@@ -166,7 +164,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;
@@ -215,6 +213,6 @@
*/
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java?rev=718007&r1=718006&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java Sun Nov 16 03:49:06 2008
@@ -40,9 +40,10 @@
/**
* Find and invoke the setter method with the name of form setXXX passing in the value given
* on the POJO object
+ *
* @param name name of the setter field
- * @param val value to be set
- * @param obj POJO instance
+ * @param val value to be set
+ * @param obj POJO instance
*/
public static void setInstanceProperty(String name, Object val, Object obj) {
@@ -110,9 +111,9 @@
/**
* This method will set the static property discribed in the OMElement to the specified object.
* This Object should have the setter method for the specified property name
- *
+ *
* @param property - OMElement specifying the property to be built in to the object
- * @param o - Object to which the specified property will be set.
+ * @param o - Object to which the specified property will be set.
*/
public static void setStaticProperty(OMElement property, Object o) {
@@ -154,13 +155,13 @@
/**
* This method will check the given OMElement represent either a static property or not
- *
+ *
* @param property - OMElement to be checked for the static property
* @return boolean true if the elemet represents a static property element false otherwise
*/
public static boolean isStaticProperty(OMElement property) {
return "property".equals(property.getLocalName().toLowerCase())
- && (property.getAttributeValue(new QName("expression")) == null);
+ && (property.getAttributeValue(new QName("expression")) == null);
}
private static void handleException(String message, Throwable e) {
@@ -171,5 +172,5 @@
private static void handleException(String message) {
log.error(message);
throw new SynapseUtilException(message);
- }
+ }
}
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java (from r718005, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java&r1=718005&r2=718007&rev=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/RMIRegistryController.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java Sun Nov 16 03:49:06 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 {
@@ -25,7 +24,8 @@
return ourInstance;
}
- private RMIRegistryController() {}
+ private RMIRegistryController() {
+ }
/**
* Creates a RMI local registry with given port
@@ -70,7 +70,7 @@
*/
private static void handleException(String msg, Exception e) {
log.error(msg, e);
- throw new SynapseException(msg, e);
+ throw new SynapseUtilException(msg, e);
}
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolView.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolView.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolView.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolView.java Sun Nov 16 03:49:06 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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolViewMBean.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolViewMBean.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolViewMBean.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DBPoolViewMBean.java Sun Nov 16 03:49:06 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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java Sun Nov 16 03:49:06 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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceFinder.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceFinder.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceFinder.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceFinder.java Sun Nov 16 03:49:06 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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java Sun Nov 16 03:49:06 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;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java Sun Nov 16 03:49:06 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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java Sun Nov 16 03:49:06 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;
@@ -68,11 +68,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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryListener.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryListener.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryListener.java Sun Nov 16 03:49:06 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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceManager.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceManager.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceManager.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceManager.java Sun Nov 16 03:49:06 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;
@@ -121,7 +121,7 @@
if (dataSourceInformation == null) {
return;
}
-
+
String repositoryType = dataSourceInformation.getRepositoryType();
if (DataSourceConfigurationConstants.PROP_REGISTRY_JNDI.equals(repositoryType)) {
JNDI_REPOSITORY.register(dataSourceInformation);
@@ -131,9 +131,9 @@
}
public void removeDataSourceInformation(DataSourceInformation dataSourceInformation) {
-
+
String repositoryType = dataSourceInformation.getRepositoryType();
-
+
if (DataSourceConfigurationConstants.PROP_REGISTRY_JNDI.equals(repositoryType)) {
JNDI_REPOSITORY.unRegister(dataSourceInformation.getDatasourceName());
} else {
@@ -142,7 +142,7 @@
}
public void reConfigure(Properties confProperties) {
-
+
JNDI_REPOSITORY.init(confProperties);
IN_MEMORY_REPOSITORY.init(confProperties);
}
@@ -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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepository.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepository.java Sun Nov 16 03:49:06 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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java Sun Nov 16 03:49:06 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;
@@ -31,7 +31,7 @@
*
*/
public class DatasourceMBeanRepository implements MBeanRepository {
-
+
private final static Log log = LogFactory.getLog(DatasourceMBeanRepository.class);
private final static Map<String, DBPoolView> dataSourcesMBeans = new HashMap<String, DBPoolView>();
@@ -46,7 +46,7 @@
}
public void addMBean(String name, Object mBean) {
-
+
assertNull(name, "DataSorce MBean name cannot be found.");
assertNull(mBean, "DataSorce MBean cannot be found.");
assertFalse(mBean instanceof DBPoolView, "Given MBean instance is not matched " +
@@ -57,19 +57,19 @@
}
public Object getMBean(String name) {
-
+
assertNull(name, "DataSorce MBean name cannot be found.");
return dataSourcesMBeans.get(name);
}
public void removeMBean(String name) {
-
+
dataSourcesMBeans.remove(name);
MBeanRegistrar.getInstance().unRegisterMBean(MBEAN_CATEGORY_DATABASE_CONNECTION_POOL, name);
}
public void clear() {
-
+
if (!dataSourcesMBeans.isEmpty()) {
log.info("UnRegistering DBPool MBeans");
for (DBPoolView dbPoolView : dataSourcesMBeans.values()) {
@@ -106,7 +106,7 @@
*/
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java Sun Nov 16 03:49:06 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;
@@ -83,8 +83,8 @@
}
public void unRegister(String name) {
-
- assertNull(name,"Name of the datasource to be removed is empty or null");
+
+ assertNull(name, "Name of the datasource to be removed is empty or null");
dataSources.remove(name);
REPOSITORY.removeMBean(name);
}
@@ -119,7 +119,7 @@
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java Sun Nov 16 03:49:06 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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java Sun Nov 16 03:49:06 2008
@@ -16,16 +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.security.secret.SecretManager;
-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;
@@ -65,10 +64,11 @@
String user = information.getUser();
String password = information.getPassword();
- SecretManager secretManager = SecretManager.getInstance();
- if (secretManager.isInitialized()) {
- password = secretManager.getSecret(password);
- }
+ //TODO move security code
+// SecretManager secretManager = SecretManager.getInstance();
+// if (secretManager.isInitialized()) {
+// password = secretManager.getSecret(password);
+// }
int defaultTransactionIsolation = information.getDefaultTransactionIsolation();
@@ -189,6 +189,6 @@
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java Sun Nov 16 03:49:06 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;
@@ -98,7 +98,7 @@
information.setDatasourceName(dataSourceName);
String dsType = (String) MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConfigurationConstants.PROP_TYPE,
+ properties, prefix + DataSourceConfigurationConstants.PROP_TYPE,
DataSourceConfigurationConstants.PROP_BASIC_DATA_SOURCE, String.class);
information.setType(dsType);
@@ -236,6 +236,6 @@
*/
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java Sun Nov 16 03:49:06 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;
@@ -66,7 +66,7 @@
for (String dsName : dataSourcesNames) {
- if (dsName == null ) {
+ if (dsName == null) {
continue;
}
DataSourceInformation information =
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java Sun Nov 16 03:49:06 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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java Sun Nov 16 03:49:06 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: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java?rev=718007&r1=718005&r2=718007&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java Sun Nov 16 03:49:06 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;