Author: ruwan
Date: Wed Nov 12 19:42:08 2008
New Revision: 23749
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=23749
Log:
rename the util packages of the util module and the handler module, otherwise
there will be a package conflict
Added:
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/util/
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/util/HandlerUtil.java
- copied, changed from r23659,
/branches/synapse/modules/handler/src/main/java/org/apache/synapse/util/HandlerUtil.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java
- copied, changed from r23659,
/branches/synapse/modules/utils/src/main/java/org/apache/synapse/util/PropertyHelper.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/SynapseUtilException.java
- copied, changed from r23659,
/branches/synapse/modules/utils/src/main/java/org/apache/synapse/util/SynapseUtilException.java
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/TemporaryData.java
- copied, changed from r23659,
/branches/synapse/modules/utils/src/main/java/org/apache/synapse/util/TemporaryData.java
Removed:
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/util/
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/util/
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
branches/synapse/1.2.wso2v1/modules/core/src/test/java/org/apache/synapse/util/TemporaryDataTest.java
branches/synapse/1.2.wso2v1/modules/core/src/test/java/org/apache/synapse/util/TextFileDataSourceTest.java
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/SynapseInHandler.java
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/SynapseOutHandler.java
branches/synapse/1.2.wso2v1/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java
branches/synapse/1.2.wso2v1/modules/utils/pom.xml
branches/synapse/1.2.wso2v1/modules/utils/src/test/java/org/apache/synapse/util/TemporaryDataTest.java
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java
Wed Nov 12 19:42:08 2008
@@ -53,11 +53,13 @@
SequenceMediator mainmediator = new SequenceMediator();
mainmediator.addChild(new LogMediator());
mainmediator.addChild(new DropMediator());
+ mainmediator.setName(SynapseConstants.MAIN_SEQUENCE_KEY);
config.addSequence(SynapseConstants.MAIN_SEQUENCE_KEY, mainmediator);
SequenceMediator faultmediator = new SequenceMediator();
LogMediator fault = new LogMediator();
fault.setLogLevel(LogMediator.FULL);
faultmediator.addChild(fault);
+ faultmediator.setName(SynapseConstants.FAULT_SEQUENCE_KEY);
config.addSequence(SynapseConstants.FAULT_SEQUENCE_KEY, faultmediator);
return config;
}
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
Wed Nov 12 19:42:08 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:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java
Wed Nov 12 19:42:08 2008
@@ -24,7 +24,7 @@
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.endpoints.EndpointDefinition;
import org.apache.synapse.mediators.base.SequenceMediator;
-import org.apache.synapse.util.TemporaryData;
+import org.apache.synapse.commons.util.TemporaryData;
import java.util.concurrent.ExecutorService;
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
Wed Nov 12 19:42:08 2008
@@ -30,6 +30,7 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.commons.util.TemporaryData;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.endpoints.EndpointDefinition;
@@ -39,7 +40,6 @@
import org.apache.synapse.statistics.StatisticsCollector;
import org.apache.synapse.statistics.StatisticsUtils;
import org.apache.synapse.util.UUIDGenerator;
-import org.apache.synapse.util.TemporaryData;
import org.apache.synapse.util.concurrent.SynapseThreadPool;
import java.util.concurrent.ExecutorService;
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
Wed Nov 12 19:42:08 2008
@@ -34,6 +34,7 @@
import org.apache.axis2.AxisFault;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.commons.util.TemporaryData;
import org.apache.synapse.config.Entry;
import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.mediators.AbstractMediator;
@@ -41,7 +42,6 @@
import org.apache.synapse.util.xpath.SynapseXPath;
import org.apache.synapse.util.AXIOMUtils;
import org.apache.synapse.util.TextFileDataSource;
-import org.apache.synapse.util.TemporaryData;
import org.jaxen.JaxenException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
Wed Nov 12 19:42:08 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:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java
Wed Nov 12 19:42:08 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:
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
Wed Nov 12 19:42:08 2008
@@ -30,6 +30,7 @@
import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.synapse.transport.base.BaseConstants;
+import org.apache.synapse.commons.util.TemporaryData;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/test/java/org/apache/synapse/util/TemporaryDataTest.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/test/java/org/apache/synapse/util/TemporaryDataTest.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/test/java/org/apache/synapse/util/TemporaryDataTest.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/test/java/org/apache/synapse/util/TemporaryDataTest.java
Wed Nov 12 19:42:08 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;
Modified:
branches/synapse/1.2.wso2v1/modules/core/src/test/java/org/apache/synapse/util/TextFileDataSourceTest.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/test/java/org/apache/synapse/util/TextFileDataSourceTest.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/core/src/test/java/org/apache/synapse/util/TextFileDataSourceTest.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/core/src/test/java/org/apache/synapse/util/TextFileDataSourceTest.java
Wed Nov 12 19:42:08 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");
Modified:
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/SynapseInHandler.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/SynapseInHandler.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/SynapseInHandler.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/SynapseInHandler.java
Wed Nov 12 19:42:08 2008
@@ -28,7 +28,7 @@
import org.apache.synapse.SynapseException;
import org.apache.synapse.FaultHandler;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.util.HandlerUtil;
+import org.apache.synapse.handler.util.HandlerUtil;
/**
* This is the InHandler which injects the Axis2MC in to Synapse after
converting the message
Modified:
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/SynapseOutHandler.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/SynapseOutHandler.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/SynapseOutHandler.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/SynapseOutHandler.java
Wed Nov 12 19:42:08 2008
@@ -22,7 +22,7 @@
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.AxisFault;
-import org.apache.synapse.util.HandlerUtil;
+import org.apache.synapse.handler.util.HandlerUtil;
import org.apache.synapse.core.axis2.MessageContextCreatorForAxis2;
import org.apache.synapse.SynapseException;
import org.apache.synapse.FaultHandler;
Copied:
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/util/HandlerUtil.java
(from r23659,
/branches/synapse/modules/handler/src/main/java/org/apache/synapse/util/HandlerUtil.java)
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/util/HandlerUtil.java?rev=23749&r1=23659&r2=23749&view=diff
==============================================================================
---
/branches/synapse/modules/handler/src/main/java/org/apache/synapse/util/HandlerUtil.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/handler/src/main/java/org/apache/synapse/handler/util/HandlerUtil.java
Wed Nov 12 19:42:08 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:
branches/synapse/1.2.wso2v1/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java
Wed Nov 12 19:42:08 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: branches/synapse/1.2.wso2v1/modules/utils/pom.xml
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/pom.xml?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
--- branches/synapse/1.2.wso2v1/modules/utils/pom.xml (original)
+++ branches/synapse/1.2.wso2v1/modules/utils/pom.xml Wed Nov 12 19:42:08 2008
@@ -59,7 +59,7 @@
<Bundle-Description>${pom.description}</Bundle-Description>
<Bundle-SymbolicName>org.apache.synapse.utils</Bundle-SymbolicName>
<Export-Package>
-
org.apache.synapse.util.*;-split-package:=merge-last,
+
org.apache.synapse.commons.util.*;-split-package:=merge-last,
</Export-Package>
<Import-Package>
!javax.xml.namespace,
Copied:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java
(from r23659,
/branches/synapse/modules/utils/src/main/java/org/apache/synapse/util/PropertyHelper.java)
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java?rev=23749&r1=23659&r2=23749&view=diff
==============================================================================
---
/branches/synapse/modules/utils/src/main/java/org/apache/synapse/util/PropertyHelper.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java
Wed Nov 12 19:42:08 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:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/SynapseUtilException.java
(from r23659,
/branches/synapse/modules/utils/src/main/java/org/apache/synapse/util/SynapseUtilException.java)
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/SynapseUtilException.java?rev=23749&r1=23659&r2=23749&view=diff
==============================================================================
---
/branches/synapse/modules/utils/src/main/java/org/apache/synapse/util/SynapseUtilException.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/SynapseUtilException.java
Wed Nov 12 19:42: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;
import org.apache.commons.logging.Log;
Copied:
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/TemporaryData.java
(from r23659,
/branches/synapse/modules/utils/src/main/java/org/apache/synapse/util/TemporaryData.java)
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/TemporaryData.java?rev=23749&r1=23659&r2=23749&view=diff
==============================================================================
---
/branches/synapse/modules/utils/src/main/java/org/apache/synapse/util/TemporaryData.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/TemporaryData.java
Wed Nov 12 19:42:08 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:
branches/synapse/1.2.wso2v1/modules/utils/src/test/java/org/apache/synapse/util/TemporaryDataTest.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/test/java/org/apache/synapse/util/TemporaryDataTest.java?rev=23749&r1=23748&r2=23749&view=diff
==============================================================================
---
branches/synapse/1.2.wso2v1/modules/utils/src/test/java/org/apache/synapse/util/TemporaryDataTest.java
(original)
+++
branches/synapse/1.2.wso2v1/modules/utils/src/test/java/org/apache/synapse/util/TemporaryDataTest.java
Wed Nov 12 19:42:08 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;
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://mailman.wso2.org/cgi-bin/mailman/listinfo/esb-java-dev