You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2008/11/12 20:57:43 UTC
svn commit: r713479 - in /synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/config/xml/
core/src/main/java/org/apache/synapse/core/
core/src/main/java/org/apache/synapse/core/axis2/
core/src/main/java/org/apache/synapse/startup/quartz/ ...
Author: ruwan
Date: Wed Nov 12 11:57:40 2008
New Revision: 713479
URL: http://svn.apache.org/viewvc?rev=713479&view=rev
Log:
util package rename - PART II
Reason :- if there are more than one jars which provides the same package name, it conflicts under an OSGi invironment
Added:
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/util/HandlerUtil.java
- copied, changed from r712898, synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/util/HandlerUtil.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java
- copied, changed from r712898, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/PropertyHelper.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/SynapseUtilException.java
- copied, changed from r712898, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/SynapseUtilException.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/TemporaryData.java
- copied, changed from r712898, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/TemporaryData.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilder.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/TextFileDataSourceTest.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
synapse/trunk/java/modules/utils/src/test/java/org/apache/synapse/util/TemporaryDataTest.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java?rev=713479&r1=713478&r2=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java Wed Nov 12 11:57:40 2008
@@ -24,7 +24,7 @@
import org.apache.axiom.om.OMNode;
import org.apache.synapse.Mediator;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.util.PropertyHelper;
+import org.apache.synapse.commons.util.PropertyHelper;
import org.apache.synapse.mediators.ext.ClassMediator;
import javax.xml.namespace.QName;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java?rev=713479&r1=713478&r2=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java Wed Nov 12 11:57:40 2008
@@ -20,11 +20,11 @@
package org.apache.synapse.core;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.commons.util.TemporaryData;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.endpoints.EndpointDefinition;
import org.apache.synapse.mediators.base.SequenceMediator;
import org.apache.synapse.audit.statistics.StatisticsCollector;
-import org.apache.synapse.util.TemporaryData;
import java.util.concurrent.ExecutorService;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?rev=713479&r1=713478&r2=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java Wed Nov 12 11:57:40 2008
@@ -35,10 +35,9 @@
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.endpoints.EndpointDefinition;
-import org.apache.synapse.endpoints.dispatch.Dispatcher;
import org.apache.synapse.mediators.MediatorWorker;
import org.apache.synapse.mediators.base.SequenceMediator;
-import org.apache.synapse.util.TemporaryData;
+import org.apache.synapse.commons.util.TemporaryData;
import org.apache.synapse.util.UUIDGenerator;
import org.apache.synapse.util.concurrent.SynapseThreadPool;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java?rev=713479&r1=713478&r2=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java Wed Nov 12 11:57:40 2008
@@ -4,7 +4,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.ManagedLifecycle;
-import org.apache.synapse.util.PropertyHelper;
+import org.apache.synapse.commons.util.PropertyHelper;
import org.apache.synapse.task.Task;
import org.apache.synapse.core.SynapseEnvironment;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java?rev=713479&r1=713478&r2=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java Wed Nov 12 11:57:40 2008
@@ -20,6 +20,7 @@
package org.apache.synapse.util;
import org.apache.synapse.core.SynapseEnvironment;
+import org.apache.synapse.commons.util.TemporaryData;
import javax.activation.DataSource;
import java.io.IOException;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java?rev=713479&r1=713478&r2=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java Wed Nov 12 11:57:40 2008
@@ -30,6 +30,7 @@
import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axis2.transport.base.BaseConstants;
+import org.apache.synapse.commons.util.TemporaryData;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java?rev=713479&r1=713478&r2=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java Wed Nov 12 11:57:40 2008
@@ -35,8 +35,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.commons.util.TemporaryData;
import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.util.TemporaryData;
import org.apache.synapse.util.TextFileDataSource;
/**
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilder.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilder.java?rev=713479&r1=713478&r2=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilder.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilder.java Wed Nov 12 11:57:40 2008
@@ -32,7 +32,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.util.TemporaryData;
+import org.apache.synapse.commons.util.TemporaryData;
/**
* {@link SourceBuilder} implementation that serializes the AXIOM tree
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/TextFileDataSourceTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/TextFileDataSourceTest.java?rev=713479&r1=713478&r2=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/TextFileDataSourceTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/TextFileDataSourceTest.java Wed Nov 12 11:57:40 2008
@@ -29,6 +29,7 @@
import junit.framework.TestCase;
import org.apache.axiom.om.OMSourcedElement;
+import org.apache.synapse.commons.util.TemporaryData;
public class TextFileDataSourceTest extends TestCase {
private static final Charset UTF8 = Charset.forName("UTF-8");
Copied: synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/util/HandlerUtil.java (from r712898, synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/util/HandlerUtil.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/util/HandlerUtil.java?p2=synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/util/HandlerUtil.java&p1=synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/util/HandlerUtil.java&r1=712898&r2=713479&rev=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/util/HandlerUtil.java (original)
+++ synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/util/HandlerUtil.java Wed Nov 12 11:57:40 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.util;
+package org.apache.synapse.handler.util;
import org.apache.commons.logging.Log;
import org.apache.axis2.context.MessageContext;
Modified: synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java?rev=713479&r1=713478&r2=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java (original)
+++ synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java Wed Nov 12 11:57:40 2008
@@ -23,7 +23,7 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.util.PropertyHelper;
+import org.apache.synapse.commons.util.PropertyHelper;
import javax.xml.namespace.QName;
import java.util.ArrayList;
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java?rev=713479&r1=713478&r2=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java Wed Nov 12 11:57:40 2008
@@ -40,7 +40,7 @@
import org.apache.synapse.transport.nhttp.util.MessageFormatterDecoratorFactory;
import org.apache.synapse.transport.nhttp.util.RESTUtil;
import org.apache.synapse.transport.nhttp.util.NhttpUtil;
-import org.apache.synapse.util.TemporaryData;
+import org.apache.synapse.commons.util.TemporaryData;
import java.io.IOException;
import java.io.OutputStream;
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java (from r712898, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/PropertyHelper.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/PropertyHelper.java&r1=712898&r2=713479&rev=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/PropertyHelper.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java Wed Nov 12 11:57:40 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.util;
+package org.apache.synapse.commons.util;
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/SynapseUtilException.java (from r712898, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/SynapseUtilException.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/SynapseUtilException.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/SynapseUtilException.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/SynapseUtilException.java&r1=712898&r2=713479&rev=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/SynapseUtilException.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/SynapseUtilException.java Wed Nov 12 11:57:40 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;
import org.apache.commons.logging.Log;
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/TemporaryData.java (from r712898, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/TemporaryData.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/TemporaryData.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/TemporaryData.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/TemporaryData.java&r1=712898&r2=713479&rev=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/TemporaryData.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/TemporaryData.java Wed Nov 12 11:57:40 2008
@@ -1,4 +1,4 @@
-package org.apache.synapse.util;
+package org.apache.synapse.commons.util;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
Modified: synapse/trunk/java/modules/utils/src/test/java/org/apache/synapse/util/TemporaryDataTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/test/java/org/apache/synapse/util/TemporaryDataTest.java?rev=713479&r1=713478&r2=713479&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/test/java/org/apache/synapse/util/TemporaryDataTest.java (original)
+++ synapse/trunk/java/modules/utils/src/test/java/org/apache/synapse/util/TemporaryDataTest.java Wed Nov 12 11:57:40 2008
@@ -28,6 +28,7 @@
import java.util.Random;
import org.apache.commons.io.IOUtils;
+import org.apache.synapse.commons.util.TemporaryData;
import junit.framework.TestCase;