svn commit: r756770 - in /ode/trunk: axis2/src/main/java/org/apache/ode/axis2/ axis2/src/main/java/org/apache/ode/axis2/httpbinding/ axis2/src/main/java/org/apache/ode/axis2/soapbinding/ utils/src/main/java/org/apache/ode/utils/

[mi...@apache.org]

Author: midon
Date: Fri Mar 20 21:43:18 2009
New Revision: 756770

URL: http://svn.apache.org/viewvc?rev=756770&view=rev
Log:
ODE-551: move Properties class in utils

Added:
    ode/trunk/utils/src/main/java/org/apache/ode/utils/Properties.java
      - copied, changed from r756196, ode/trunk/axis2/src/main/java/org/apache/ode/axis2/Properties.java
Removed:
    ode/trunk/axis2/src/main/java/org/apache/ode/axis2/Properties.java
Modified:
    ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
    ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpExternalService.java
    ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpHelper.java
    ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java
    ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/ProxyConf.java
    ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java?rev=756770&r1=756769&r2=756770&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java Fri Mar 20 21:43:18 2009
@@ -46,10 +46,7 @@
 import org.apache.ode.bpel.iapi.MessageExchange;
 import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
 import org.apache.ode.bpel.iapi.ProcessConf;
-import org.apache.ode.utils.DOMUtils;
-import org.apache.ode.utils.GUID;
-import org.apache.ode.utils.AxisUtils;
-import org.apache.ode.utils.Namespaces;
+import org.apache.ode.utils.*;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpExternalService.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpExternalService.java?rev=756770&r1=756769&r2=756770&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpExternalService.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpExternalService.java Fri Mar 20 21:43:18 2009
@@ -24,14 +24,11 @@
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.URIException;
 import org.apache.commons.httpclient.params.HttpParams;
-import org.apache.commons.httpclient.params.DefaultHttpParams;
-import org.apache.commons.httpclient.params.HostParams;
-import org.apache.commons.httpclient.params.HttpClientParams;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ode.axis2.ExternalService;
 import org.apache.ode.axis2.ODEService;
-import org.apache.ode.axis2.Properties;
+import org.apache.ode.utils.Properties;
 import org.apache.ode.axis2.OdeFault;
 import org.apache.ode.bpel.iapi.BpelServer;
 import org.apache.ode.bpel.iapi.EndpointReference;
@@ -56,7 +53,6 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Map;
-import java.util.Collections;
 import java.util.concurrent.Callable;
 import java.net.URL;
 import java.net.MalformedURLException;

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpHelper.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpHelper.java?rev=756770&r1=756769&r2=756770&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpHelper.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpHelper.java Fri Mar 20 21:43:18 2009
@@ -20,9 +20,7 @@
 package org.apache.ode.axis2.httpbinding;
 
 import org.apache.axis2.transport.http.HttpTransportProperties;
-import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpState;
 import org.apache.commons.httpclient.URI;
 import org.apache.commons.httpclient.URIException;
 import org.apache.commons.httpclient.StatusLine;
@@ -38,15 +36,13 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.lang.StringUtils;
-import org.apache.ode.axis2.Properties;
+import org.apache.ode.utils.Properties;
 import org.apache.ode.utils.DOMUtils;
 import org.apache.ode.utils.http.HttpUtils;
 import static org.apache.ode.utils.http.StatusCode.*;
-import org.apache.ode.bpel.iapi.Message;
 import org.w3c.dom.Element;
 import org.w3c.dom.Document;
 
-import javax.xml.namespace.QName;
 import java.io.IOException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java?rev=756770&r1=756769&r2=756770&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java Fri Mar 20 21:43:18 2009
@@ -33,7 +33,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.ode.axis2.Properties;
+import org.apache.ode.utils.Properties;
 import org.apache.ode.axis2.util.URLEncodedTransformer;
 import org.apache.ode.axis2.util.UrlReplacementTransformer;
 import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/ProxyConf.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/ProxyConf.java?rev=756770&r1=756769&r2=756770&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/ProxyConf.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/ProxyConf.java Fri Mar 20 21:43:18 2009
@@ -28,7 +28,7 @@
 import org.apache.commons.httpclient.URIException;
 import org.apache.commons.httpclient.auth.AuthScope;
 import org.apache.commons.httpclient.params.HttpParams;
-import org.apache.ode.axis2.Properties;
+import org.apache.ode.utils.Properties;
 
 
 /**

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java?rev=756770&r1=756769&r2=756770&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java Fri Mar 20 21:43:18 2009
@@ -28,7 +28,6 @@
 import org.apache.axis2.client.ServiceClient;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.deployment.ServiceBuilder;
 import org.apache.axis2.description.*;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.wsdl.WSDLConstants;
@@ -39,7 +38,7 @@
 import org.apache.neethi.Policy;
 import org.apache.ode.axis2.ExternalService;
 import org.apache.ode.axis2.ODEService;
-import org.apache.ode.axis2.Properties;
+import org.apache.ode.utils.Properties;
 import org.apache.ode.axis2.OdeFault;
 import org.apache.ode.bpel.iapi.Message;
 import org.apache.ode.bpel.iapi.MessageExchange;
@@ -56,7 +55,6 @@
 import org.apache.ode.utils.uuid.UUID;
 import org.apache.ode.utils.wsdl.Messages;
 import org.apache.rampart.RampartMessageData;
-import org.apache.derby.iapi.services.property.PersistentSet;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Copied: ode/trunk/utils/src/main/java/org/apache/ode/utils/Properties.java (from r756196, ode/trunk/axis2/src/main/java/org/apache/ode/axis2/Properties.java)
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/Properties.java?p2=ode/trunk/utils/src/main/java/org/apache/ode/utils/Properties.java&p1=ode/trunk/axis2/src/main/java/org/apache/ode/axis2/Properties.java&r1=756196&r2=756770&rev=756770&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/Properties.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/Properties.java Fri Mar 20 21:43:18 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.ode.axis2;
+package org.apache.ode.utils;
 
 import org.apache.axis2.Constants;
 import org.apache.axis2.util.JavaUtils;
@@ -39,7 +39,6 @@
 
 import java.util.ArrayList;
 import java.util.Map;
-import java.util.List;
 import java.util.Collection;
 
 /**