You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-commits@ws.apache.org by sc...@apache.org on 2005/10/20 18:33:21 UTC
svn commit: r326936 [3/3] - in
/webservices/wsrf/trunk/src/java/org/apache/ws: addressing/
addressing/handler/ resource/ resource/faults/ resource/handler/
resource/handler/axis/ resource/handler/websphere/ resource/impl/
resource/lifetime/ resource/li...
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/GetMultipleResourcePropertiesPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/GetMultipleResourcePropertiesPortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/GetMultipleResourcePropertiesPortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/GetMultipleResourcePropertiesPortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,9 +15,10 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_06;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.properties.v2004_06.porttype.GetMultipleResourcePropertiesPortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WSRP GetMultipleResourceProperties portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/GetResourcePropertyPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/GetResourcePropertyPortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/GetResourcePropertyPortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/GetResourcePropertyPortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,10 +15,11 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_06;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.PropertiesResource;
import org.apache.ws.resource.properties.v2004_06.porttype.GetResourcePropertyPortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WSRP GetResourceProperty portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/ImmediateResourceTerminationPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/ImmediateResourceTerminationPortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/ImmediateResourceTerminationPortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/ImmediateResourceTerminationPortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,9 +15,10 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_06;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.lifetime.v2004_06.porttype.ImmediateResourceTerminationPortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WSRL ImmediateResourceTermination portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/QueryResourcePropertiesPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/QueryResourcePropertiesPortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/QueryResourcePropertiesPortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/QueryResourcePropertiesPortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,9 +15,10 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_06;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.properties.v2004_06.porttype.QueryResourcePropertiesPortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WSRP QueryResourceProperties portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/ScheduledResourceTerminationPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/ScheduledResourceTerminationPortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/ScheduledResourceTerminationPortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/ScheduledResourceTerminationPortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,10 +15,11 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_06;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
import org.apache.ws.resource.lifetime.v2004_06.porttype.ScheduledResourceTerminationPortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WSRL ScheduledResourceTermination portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/SetResourcePropertiesPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/SetResourcePropertiesPortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/SetResourcePropertiesPortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_06/SetResourcePropertiesPortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,9 +15,10 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_06;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.properties.v2004_06.porttype.SetResourcePropertiesPortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WSRP SetResourceProperties portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_09/MetadataExchangePortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_09/MetadataExchangePortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_09/MetadataExchangePortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_09/MetadataExchangePortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,9 +15,10 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_09;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.metadataexchange.v2004_09.porttype.MetadataExchangePortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WS-MEX MetadataExchange portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/GetMultipleResourcePropertiesPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/GetMultipleResourcePropertiesPortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/GetMultipleResourcePropertiesPortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/GetMultipleResourcePropertiesPortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,9 +15,10 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_11;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.properties.v2004_11.porttype.GetMultipleResourcePropertiesPortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WSRP GetMultipleResourceProperties portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/GetResourcePropertyPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/GetResourcePropertyPortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/GetResourcePropertyPortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/GetResourcePropertyPortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,10 +15,11 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_11;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.PropertiesResource;
import org.apache.ws.resource.properties.v2004_11.porttype.GetResourcePropertyPortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WSRP GetResourceProperty portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/ImmediateResourceTerminationPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/ImmediateResourceTerminationPortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/ImmediateResourceTerminationPortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/ImmediateResourceTerminationPortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,9 +15,10 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_11;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.lifetime.v2004_11.porttype.ImmediateResourceTerminationPortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WSRL ImmediateResourceTermination portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/QueryResourcePropertiesPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/QueryResourcePropertiesPortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/QueryResourcePropertiesPortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/QueryResourcePropertiesPortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,9 +15,10 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_11;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.properties.v2004_11.porttype.QueryResourcePropertiesPortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WSRP GetMultipleResourceProperties portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/ScheduledResourceTerminationPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/ScheduledResourceTerminationPortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/ScheduledResourceTerminationPortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/ScheduledResourceTerminationPortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,10 +15,11 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_11;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
import org.apache.ws.resource.lifetime.v2004_11.porttype.ScheduledResourceTerminationPortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WSRL ScheduledResourceTermination portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/SetResourcePropertiesPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/SetResourcePropertiesPortType2JavaInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/SetResourcePropertiesPortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/porttype/v2004_11/SetResourcePropertiesPortType2JavaInfo.java Thu Oct 20 09:31:40 2005
@@ -15,9 +15,10 @@
*=============================================================================*/
package org.apache.ws.resource.tool.porttype.v2004_11;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.properties.v2004_11.porttype.SetResourcePropertiesPortType;
import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
/**
* Java mapping info for the WSRP SetResourceProperties portType.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ImplementsListBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ImplementsListBuilder.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ImplementsListBuilder.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ImplementsListBuilder.java Thu Oct 20 09:31:40 2005
@@ -15,15 +15,17 @@
*=============================================================================*/
package org.apache.ws.resource.tool.velocity;
-import org.apache.ws.resource.Resource;
-import org.apache.ws.resource.ResourceDefinition;
-import org.apache.ws.resource.handler.WsrfService;
-import org.apache.ws.resource.tool.PortType2JavaInfo;
-import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.ws.resource.Resource;
+import org.apache.ws.resource.ResourceDefinition;
+import org.apache.ws.resource.handler.WsrfService;
+import org.apache.ws.resource.tool.PortType2JavaInfo;
/**
* Provides utility methods for building up the "implements ..." lists for
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java Thu Oct 20 09:31:40 2005
@@ -15,15 +15,16 @@
*=============================================================================*/
package org.apache.ws.resource.tool.velocity;
-import org.apache.ws.resource.NamespaceVersionHolder;
-import org.apache.ws.resource.ResourceDefinition;
-import org.apache.ws.util.XmlBeanNameUtils;
-
-import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.ResourceDefinition;
+import org.apache.ws.util.XmlBeanNameUtils;
/**
* A bean that contains all properties that are needed by our Velocity templates.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/webapp/WsrfServer.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/webapp/WsrfServer.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/webapp/WsrfServer.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/webapp/WsrfServer.java Thu Oct 20 09:31:40 2005
@@ -15,13 +15,14 @@
*=============================================================================*/
package org.apache.ws.resource.webapp;
+import java.io.File;
+import java.io.IOException;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.PosixParser;
import org.mortbay.http.SocketListener;
import org.mortbay.jetty.Server;
import org.mortbay.util.MultiException;
-import java.io.File;
-import java.io.IOException;
/**
* A standalone WSRF server that uses Jetty as the HTTP server and servlet container
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/webapp/WsrfServletContextListener.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/webapp/WsrfServletContextListener.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/webapp/WsrfServletContextListener.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/webapp/WsrfServletContextListener.java Thu Oct 20 09:31:40 2005
@@ -15,14 +15,15 @@
*=============================================================================*/
package org.apache.ws.resource.webapp;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.resource.WsrfRuntime;
+import java.util.Enumeration;
+import java.util.Properties;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import java.util.Enumeration;
-import java.util.Properties;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.resource.WsrfRuntime;
/**
* A servlet context listener for the WSRF webapp that provides the hook for initializing the WSRF JNDI context. Note,
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/IoUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/IoUtils.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/IoUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/IoUtils.java Thu Oct 20 09:31:40 2005
@@ -15,11 +15,6 @@
*=============================================================================*/
package org.apache.ws.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.util.i18n.Keys;
-import org.apache.ws.util.i18n.Messages;
-import org.apache.ws.util.i18n.MessagesImpl;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
@@ -28,6 +23,12 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.util.i18n.Keys;
+import org.apache.ws.util.i18n.Messages;
+import org.apache.ws.util.i18n.MessagesImpl;
/**
* Generic I/O utility methods.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/JaxpUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/JaxpUtils.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/JaxpUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/JaxpUtils.java Thu Oct 20 09:31:40 2005
@@ -15,6 +15,20 @@
*=============================================================================*/
package org.apache.ws.util;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.util.i18n.Keys;
@@ -24,18 +38,6 @@
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
/**
* A set of generic JAXP utility methods.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/NameUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/NameUtils.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/NameUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/NameUtils.java Thu Oct 20 09:31:40 2005
@@ -15,17 +15,19 @@
*=============================================================================*/
package org.apache.ws.util;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.util.i18n.Keys;
import org.apache.ws.util.i18n.Messages;
import org.apache.ws.util.i18n.MessagesImpl;
-import javax.xml.namespace.QName;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import java.util.Hashtable;
-import java.util.Map;
/**
* @author Ian P. Springer (Hewlett-Packard Company), Sal Campana (Hewlett-Packard Company)
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/OperationInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/OperationInfo.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/OperationInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/OperationInfo.java Thu Oct 20 09:31:40 2005
@@ -15,8 +15,8 @@
*=============================================================================*/
package org.apache.ws.util;
-import org.apache.commons.lang.StringUtils;
-import org.apache.ws.resource.tool.GenerationUtils;
+import java.util.Iterator;
+import java.util.Map;
import javax.wsdl.Fault;
import javax.wsdl.Input;
@@ -24,8 +24,9 @@
import javax.wsdl.Output;
import javax.wsdl.Part;
import javax.xml.namespace.QName;
-import java.util.Iterator;
-import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.ws.resource.tool.GenerationUtils;
/**
* The Java method signature info for a WSDL operation.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/SaajUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/SaajUtils.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/SaajUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/SaajUtils.java Thu Oct 20 09:31:40 2005
@@ -15,11 +15,10 @@
*=============================================================================*/
package org.apache.ws.util;
-import org.apache.ws.util.helper.Dom2SaajConverter;
-import org.apache.ws.util.i18n.Keys;
-import org.apache.ws.util.i18n.Messages;
-import org.apache.ws.util.i18n.MessagesImpl;
-import org.w3c.dom.Element;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import javax.xml.namespace.QName;
import javax.xml.soap.Detail;
import javax.xml.soap.DetailEntry;
@@ -28,9 +27,12 @@
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFactory;
import javax.xml.soap.Text;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+
+import org.apache.ws.util.helper.Dom2SaajConverter;
+import org.apache.ws.util.i18n.Keys;
+import org.apache.ws.util.i18n.Messages;
+import org.apache.ws.util.i18n.MessagesImpl;
+import org.w3c.dom.Element;
/**
* LOG-DONE
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/WsdlUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/WsdlUtils.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/WsdlUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/WsdlUtils.java Thu Oct 20 09:31:40 2005
@@ -15,6 +15,10 @@
*=============================================================================*/
package org.apache.ws.util;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
import javax.wsdl.Import;
import javax.wsdl.Input;
import javax.wsdl.Message;
@@ -23,9 +27,6 @@
import javax.wsdl.Port;
import javax.wsdl.PortType;
import javax.wsdl.Service;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
* Generic utility methods for working with various JWSDL objects.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java Thu Oct 20 09:31:40 2005
@@ -15,6 +15,21 @@
*=============================================================================*/
package org.apache.ws.util;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import javax.wsdl.Definition;
+import javax.wsdl.Operation;
+import javax.wsdl.PortType;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.schema.Schema;
+import javax.xml.namespace.QName;
+
import org.apache.ws.resource.InvalidWsrfWsdlException;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xml.utils.PrefixResolverDefault;
@@ -23,20 +38,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Operation;
-import javax.wsdl.PortType;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.schema.Schema;
-import javax.xml.namespace.QName;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
/**
* Utility methods for working with a WSRF WSDL definition.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanNameUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanNameUtils.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanNameUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanNameUtils.java Thu Oct 20 09:31:40 2005
@@ -15,8 +15,9 @@
*=============================================================================*/
package org.apache.ws.util;
-import org.apache.xmlbeans.impl.common.NameUtil;
import javax.xml.namespace.QName;
+
+import org.apache.xmlbeans.impl.common.NameUtil;
/**
* A set of utility methods for obtaining the names of the Java classes associated with
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java Thu Oct 20 09:31:40 2005
@@ -15,6 +15,18 @@
*=============================================================================*/
package org.apache.ws.util;
+import java.io.File;
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPElement;
+
import org.apache.ws.util.i18n.Keys;
import org.apache.ws.util.i18n.Messages;
import org.apache.ws.util.i18n.MessagesImpl;
@@ -28,17 +40,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPElement;
-import java.io.File;
-import java.io.InputStream;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* Generic utility methods for working with Apache XMLBeans.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/ant/FileTask.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/ant/FileTask.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/ant/FileTask.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/ant/FileTask.java Thu Oct 20 09:31:40 2005
@@ -15,12 +15,13 @@
*=============================================================================*/
package org.apache.ws.util.ant;
+import java.io.File;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.ws.util.i18n.Keys;
import org.apache.ws.util.i18n.Messages;
import org.apache.ws.util.i18n.MessagesImpl;
-import java.io.File;
/**
* LOG-DONE
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/helper/Dom2SaajConverter.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/helper/Dom2SaajConverter.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/helper/Dom2SaajConverter.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/helper/Dom2SaajConverter.java Thu Oct 20 09:31:40 2005
@@ -15,17 +15,18 @@
*=============================================================================*/
package org.apache.ws.util.helper;
-import org.apache.ws.util.NameUtils;
-import org.apache.ws.util.XmlConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.NodeList;
import javax.xml.soap.Detail;
import javax.xml.soap.DetailEntry;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFactory;
+
+import org.apache.ws.util.NameUtils;
+import org.apache.ws.util.XmlConstants;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
/**
* LOG-DONE
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/helper/Saaj2StringConverter.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/helper/Saaj2StringConverter.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/helper/Saaj2StringConverter.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/helper/Saaj2StringConverter.java Thu Oct 20 09:31:40 2005
@@ -15,10 +15,12 @@
*=============================================================================*/
package org.apache.ws.util.helper;
-import org.apache.ws.util.XmlConstants;
-import org.apache.ws.util.i18n.Keys;
-import org.apache.ws.util.i18n.Messages;
-import org.apache.ws.util.i18n.MessagesImpl;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
import javax.xml.soap.Name;
import javax.xml.soap.Node;
import javax.xml.soap.SOAPBody;
@@ -28,11 +30,11 @@
import javax.xml.soap.SOAPFactory;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.Text;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+
+import org.apache.ws.util.XmlConstants;
+import org.apache.ws.util.i18n.Keys;
+import org.apache.ws.util.i18n.Messages;
+import org.apache.ws.util.i18n.MessagesImpl;
/** LOG-DONE
* @author Ian P. Springer (Hewlett-Packard Company)
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/i18n/ProjectResourceBundle.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/i18n/ProjectResourceBundle.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/i18n/ProjectResourceBundle.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/i18n/ProjectResourceBundle.java Thu Oct 20 09:31:40 2005
@@ -15,8 +15,6 @@
*=============================================================================*/
package org.apache.ws.util.i18n;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Hashtable;
@@ -24,6 +22,9 @@
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* <p>Wrapper class for resource bundles. Property files are used to store
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/j2ee/WebDDMergeTask.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/j2ee/WebDDMergeTask.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/j2ee/WebDDMergeTask.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/j2ee/WebDDMergeTask.java Thu Oct 20 09:31:40 2005
@@ -15,19 +15,20 @@
*=============================================================================*/
package org.apache.ws.util.j2ee;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
import noNamespace.ServletMappingType;
import noNamespace.ServletType;
import noNamespace.WebAppDocument;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
import org.apache.xmlbeans.XmlOptions;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
/**
* An Ant task that merges one or more source J2EE web.xml's into a target web.xml.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/j2ee/WebservicesDDMergeTask.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/j2ee/WebservicesDDMergeTask.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/j2ee/WebservicesDDMergeTask.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/j2ee/WebservicesDDMergeTask.java Thu Oct 20 09:31:40 2005
@@ -15,19 +15,20 @@
*=============================================================================*/
package org.apache.ws.util.j2ee;
-import com.sun.java.xml.ns.j2Ee.WebserviceDescriptionType;
-import com.sun.java.xml.ns.j2Ee.WebservicesDocument;
-import com.sun.java.xml.ns.j2Ee.WebservicesType;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
import org.apache.xmlbeans.XmlOptions;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import com.sun.java.xml.ns.j2Ee.WebserviceDescriptionType;
+import com.sun.java.xml.ns.j2Ee.WebservicesDocument;
+import com.sun.java.xml.ns.j2Ee.WebservicesType;
/**
* An Ant task that merges one or more source J2EE webservices.xml's into a target webservices.xml.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BasicBeanFactory.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BasicBeanFactory.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BasicBeanFactory.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BasicBeanFactory.java Thu Oct 20 09:31:40 2005
@@ -15,12 +15,14 @@
*=============================================================================*/
package org.apache.ws.util.jndi;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.Hashtable;
+
import javax.naming.Context;
import javax.naming.Name;
import javax.naming.NamingException;
-import java.util.Hashtable;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* An extension of the Commons Naming {@link org.apache.naming.factory.BeanFactory}
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BeanFactory.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BeanFactory.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BeanFactory.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BeanFactory.java Thu Oct 20 09:31:40 2005
@@ -15,14 +15,15 @@
*=============================================================================*/
package org.apache.ws.util.jndi;
-import org.apache.axis.AxisEngine;
-import org.apache.axis.MessageContext;
+import java.util.Hashtable;
import javax.naming.Context;
import javax.naming.Name;
import javax.naming.NamingException;
import javax.security.auth.Subject;
-import java.util.Hashtable;
+
+import org.apache.axis.AxisEngine;
+import org.apache.axis.MessageContext;
/**
* Bean factory.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/SpringJndiPopulator.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/SpringJndiPopulator.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/SpringJndiPopulator.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/SpringJndiPopulator.java Thu Oct 20 09:31:40 2005
@@ -15,19 +15,19 @@
*=============================================================================*/
package org.apache.ws.util.jndi;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.resource.JndiConstants;
-import org.apache.ws.resource.ResourceHome;
-import org.apache.ws.util.spring.SpringBeanObjectFactory;
-import org.springframework.beans.factory.ListableBeanFactory;
-
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NameAlreadyBoundException;
import javax.naming.NamingException;
import javax.naming.Reference;
import javax.naming.StringRefAddr;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.resource.JndiConstants;
+import org.apache.ws.resource.ResourceHome;
+import org.apache.ws.util.spring.SpringBeanObjectFactory;
+import org.springframework.beans.factory.ListableBeanFactory;
/**
* Provides the ability to populate a JNDI context with the beans from a Spring listable bean factory.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/XmlBeanNamingContext.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/XmlBeanNamingContext.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/XmlBeanNamingContext.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/XmlBeanNamingContext.java Thu Oct 20 09:31:40 2005
@@ -15,6 +15,16 @@
*=============================================================================*/
package org.apache.ws.util.jndi;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.LinkRef;
+import javax.naming.NamingException;
+import javax.naming.RefAddr;
+import javax.naming.Reference;
+import javax.naming.StringRefAddr;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.naming.ResourceRef;
@@ -23,15 +33,6 @@
import org.apache.ws.util.jndi.tools.Resource;
import org.apache.ws.util.jndi.tools.ResourceLink;
import org.apache.ws.util.jndi.tools.ResourceParameters;
-
-import javax.naming.Context;
-import javax.naming.LinkRef;
-import javax.naming.NamingException;
-import javax.naming.RefAddr;
-import javax.naming.Reference;
-import javax.naming.StringRefAddr;
-import java.util.Iterator;
-import java.util.Set;
/**
* JNDI naming context.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/JndiConfigUpdater.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/JndiConfigUpdater.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/JndiConfigUpdater.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/JndiConfigUpdater.java Thu Oct 20 09:31:40 2005
@@ -15,6 +15,12 @@
*=============================================================================*/
package org.apache.ws.util.jndi.tools;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.taskdefs.MatchingTask;
@@ -22,12 +28,6 @@
import org.apache.wsfx.wsrf.jndi.config.JndiConfigDocument;
import org.apache.wsfx.wsrf.jndi.config.ServiceDocument;
import org.apache.xmlbeans.XmlOptions;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* @author Sal Campana
Added: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataEntry.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataEntry.java?rev=326936&view=auto
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataEntry.java (added)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataEntry.java Thu Oct 20 09:31:40 2005
@@ -0,0 +1,203 @@
+/*=============================================================================*
+ * Copyright 2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *=============================================================================*/
+package org.apache.ws.util.jndi.tools;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.addressing.XmlBeansEndpointReference;
+import org.apache.ws.addressing.v2004_08.AddressingConstants;
+import org.apache.xmlbeans.XmlObject;
+import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceDocument;
+import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
+import org.xmlsoap.schemas.ws.x2004.x09.mex.LocationDocument;
+import org.xmlsoap.schemas.ws.x2004.x09.mex.MetadataReferenceDocument;
+
+/**
+ * A WS-MEX metadata entry.
+ */
+public class MetadataEntry
+{
+
+ private static final Log LOG = LogFactory.getLog( MetadataEntry.class );
+
+ private String m_dialect;
+ private String m_identifier;
+ private String m_location;
+ private XmlObject m_metadata;
+
+ public String getDialect()
+ {
+ return m_dialect;
+ }
+
+ public void setDialect( String dialect )
+ {
+ m_dialect = dialect;
+ }
+
+ public String getIdentifier()
+ {
+ return m_identifier;
+ }
+
+ public void setIdentifier( String identifier )
+ {
+ m_identifier = identifier;
+ }
+
+ public String getLocation()
+ {
+ return m_location;
+ }
+
+ public void setLocation( String location )
+ {
+ m_location = location;
+ }
+
+ public synchronized XmlObject getMetadata()
+ {
+ if ( m_metadata == null )
+ {
+ initMetadata();
+ }
+ return m_metadata;
+ }
+
+ /**
+ * This method will return either a MetadataReferenceDocument, LocationDocument or an XmlObject which has the
+ * metadata document parsed into it.
+ * <p/>
+ * The operation ALWAYS avoids loading the file if the metadata contains a MetadataReference. The operation ALWAYS
+ * avoids loading the file if the metadata contains a Location which is a standard Http URL.
+ * <p/>
+ * The operation WILL load the file if it is a file or a file URL. The operation WILL load the file if it is located
+ * in the classpath.
+ * <p/>
+ * Note: The "load" scenarios are handled last, and if the documents are un-loadable, null will be returned
+ */
+ private void initMetadata()
+ {
+ //check for MetadataReference...if its there, we're finished.
+ XmlObject metadata = null;
+
+ //determine if its a valid URL
+ if ( m_location != null )
+ {
+ try
+ {
+ URL url = new URL( m_location );
+
+ //if we get here then is it a file url??? if so load it
+ if ( url.getProtocol().equals( "file" ) )
+ {
+ try
+ {
+ metadata = XmlObject.Factory.parse( url );
+ }
+ catch ( Exception e )
+ {
+ LOG.fatal( "*********Unable to load file from file url: " + url + " CAUSE:", e );
+ }
+ }
+ else //if not then return a Location...let them do it....
+ {
+ LocationDocument locationDocument = LocationDocument.Factory.newInstance();
+ locationDocument.setLocation( m_location );
+ metadata = locationDocument;
+ }
+ }
+ catch ( MalformedURLException e )
+ {
+ //not valid..is it a file withoud url prefix? ...load it
+ File f = new File( m_location );
+ if ( f.exists() )
+ {
+ try
+ {
+ metadata = XmlObject.Factory.parse( f );
+ }
+ catch ( Exception e1 )
+ {
+ LOG.fatal( "*********Unable to load file: " + f + " CAUSE:", e );
+ }
+ }
+ else //check classpath
+ {
+ URL resource = this.getClass().getClassLoader().getResource( m_location );
+ try
+ {
+ metadata = XmlObject.Factory.parse( resource );
+ }
+ catch ( Exception e1 )
+ {
+ LOG.fatal( "*********Unable to load file: " + resource + " from classpath." + " CAUSE:", e );
+ }
+ }
+ }
+ metadata = wrapEndpointReferenceType( metadata );
+ }
+ m_metadata = metadata;
+ }
+
+ private XmlObject wrapEndpointReferenceType( XmlObject metadata )
+ {
+ if ( m_dialect.equals( AddressingConstants.NSURI_ADDRESSING_SCHEMA ) )
+ {
+ if ( metadata instanceof EndpointReferenceDocument )
+ {
+ EndpointReferenceDocument metadataReferenceDoc = (EndpointReferenceDocument) metadata;
+ metadata = createMetadataReferenceDocument(
+ metadataReferenceDoc.getEndpointReference() );
+ }
+ else
+ {
+ LOG.error( "Error resolving MetadataEntry - dialect was " + m_dialect + ", but document at location " +
+ m_location + " was not of type {" + m_dialect + "}EndpointReference" );
+ }
+ }
+ else if ( m_dialect.equals( org.apache.ws.addressing.v2003_03.AddressingConstants.NSURI_ADDRESSING_SCHEMA ) )
+ {
+ if ( metadata instanceof org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument )
+ {
+ org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument metadataReferenceDoc = (org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument) metadata;
+ XmlBeansEndpointReference xmlBeansEndpointReference = new XmlBeansEndpointReference(
+ metadataReferenceDoc.getEndpointReference() );
+ EndpointReferenceType epr = (EndpointReferenceType) xmlBeansEndpointReference
+ .getXmlObject( AddressingConstants.NSURI_ADDRESSING_SCHEMA );
+ metadata = createMetadataReferenceDocument( epr );
+ }
+ else
+ {
+ LOG.error( "Error resolving MetadataEntry - dialect was " + m_dialect + ", but document at location " +
+ m_location + " was not of type {" + m_dialect + "}EndpointReference" );
+ }
+ }
+ return metadata;
+ }
+
+ private MetadataReferenceDocument createMetadataReferenceDocument( EndpointReferenceType epr )
+ {
+ MetadataReferenceDocument metadataReferenceDoc = MetadataReferenceDocument.Factory.newInstance();
+ metadataReferenceDoc.setMetadataReference( epr );
+ return metadataReferenceDoc;
+ }
+
+}
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jsr109/DummyEndpointImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jsr109/DummyEndpointImpl.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jsr109/DummyEndpointImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jsr109/DummyEndpointImpl.java Thu Oct 20 09:31:40 2005
@@ -1,7 +1,8 @@
package org.apache.ws.util.jsr109;
-import javax.xml.soap.SOAPElement;
import java.rmi.RemoteException;
+
+import javax.xml.soap.SOAPElement;
/**
* A dummy Service Endpoint to be configured as the servlet-class in web.xml for a JSR109 deployment of the JAX-RPC
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/lock/Lock.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/lock/Lock.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/lock/Lock.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/lock/Lock.java Thu Oct 20 09:31:40 2005
@@ -15,12 +15,13 @@
*=============================================================================*/
package org.apache.ws.util.lock;
-import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.util.i18n.Keys;
import org.apache.ws.util.i18n.Messages;
import org.apache.ws.util.i18n.MessagesImpl;
+
+import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
/**
* LOG-DONE
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/lock/LockManager.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/lock/LockManager.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/lock/LockManager.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/lock/LockManager.java Thu Oct 20 09:31:40 2005
@@ -15,13 +15,14 @@
*=============================================================================*/
package org.apache.ws.util.lock;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.util.i18n.Keys;
import org.apache.ws.util.i18n.Messages;
import org.apache.ws.util.i18n.MessagesImpl;
-import java.util.HashMap;
-import java.util.Map;
/**
* Manages a set of locks.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/JaxRpcPlatform.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/JaxRpcPlatform.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/JaxRpcPlatform.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/JaxRpcPlatform.java Thu Oct 20 09:31:40 2005
@@ -15,16 +15,16 @@
*=============================================================================*/
package org.apache.ws.util.platform;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+
+import org.apache.ws.resource.ResourceContext;
+import org.apache.ws.resource.handler.axis.AxisConstants;
import org.apache.ws.util.platform.axis.AxisJaxRpcPlatform;
+import org.apache.ws.util.platform.jboss.JBossJaxRpcPlatform;
import org.apache.ws.util.platform.weblogic.WeblogicJaxRpcPlatform;
import org.apache.ws.util.platform.websphere.WebsphereJaxRpcPlatform;
-import org.apache.ws.util.platform.jboss.JBossJaxRpcPlatform;
-import org.apache.ws.resource.handler.axis.AxisConstants;
-import org.apache.ws.resource.ResourceContext;
-
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
/**
* An Enumeration of JAX-RPC platform types supported by Apache WSRF.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/axis/AxisJaxRpcPlatform.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/axis/AxisJaxRpcPlatform.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/axis/AxisJaxRpcPlatform.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/axis/AxisJaxRpcPlatform.java Thu Oct 20 09:31:40 2005
@@ -15,11 +15,11 @@
*=============================================================================*/
package org.apache.ws.util.platform.axis;
-import org.apache.ws.util.platform.JaxRpcPlatform;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.handler.axis.AxisResourceContext;
-
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import org.apache.ws.util.platform.JaxRpcPlatform;
/**
* @author Sal Campana
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/axis/tool/WsddUpdater.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/axis/tool/WsddUpdater.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/axis/tool/WsddUpdater.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/axis/tool/WsddUpdater.java Thu Oct 20 09:31:40 2005
@@ -15,6 +15,11 @@
*=============================================================================*/
package org.apache.ws.util.platform.axis.tool;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.axis.AxisEngine;
import org.apache.axis.MessageContext;
import org.apache.axis.configuration.FileProvider;
@@ -26,10 +31,6 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.ws.util.JaxpUtils;
import org.w3c.dom.Element;
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.List;
/**
* Utility class that allows for easy deployment of new entries (e.g. deploy.wsdd)
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/jboss/JBossJaxRpcPlatform.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/jboss/JBossJaxRpcPlatform.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/jboss/JBossJaxRpcPlatform.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/jboss/JBossJaxRpcPlatform.java Thu Oct 20 09:31:40 2005
@@ -1,10 +1,10 @@
package org.apache.ws.util.platform.jboss;
-import org.apache.ws.util.platform.JaxRpcPlatform;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.impl.ResourceContextImpl;
-
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import org.apache.ws.util.platform.JaxRpcPlatform;
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/weblogic/WeblogicJaxRpcPlatform.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/weblogic/WeblogicJaxRpcPlatform.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/weblogic/WeblogicJaxRpcPlatform.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/weblogic/WeblogicJaxRpcPlatform.java Thu Oct 20 09:31:40 2005
@@ -15,11 +15,11 @@
*=============================================================================*/
package org.apache.ws.util.platform.weblogic;
-import org.apache.ws.util.platform.JaxRpcPlatform;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.impl.ResourceContextImpl;
-
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import org.apache.ws.util.platform.JaxRpcPlatform;
/**
* @author Sal Campana
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/websphere/WebsphereJaxRpcPlatform.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/websphere/WebsphereJaxRpcPlatform.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/websphere/WebsphereJaxRpcPlatform.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/websphere/WebsphereJaxRpcPlatform.java Thu Oct 20 09:31:40 2005
@@ -1,10 +1,10 @@
package org.apache.ws.util.platform.websphere;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.handler.websphere.WASResourceContext;
import org.apache.ws.util.platform.JaxRpcPlatform;
-
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/soap/SoapClient.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/soap/SoapClient.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/soap/SoapClient.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/soap/SoapClient.java Thu Oct 20 09:31:40 2005
@@ -15,11 +15,6 @@
*=============================================================================*/
package org.apache.ws.util.soap;
-import org.apache.commons.io.CopyUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.ws.util.i18n.Keys;
-import org.apache.ws.util.i18n.Messages;
-import org.apache.ws.util.i18n.MessagesImpl;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -29,6 +24,12 @@
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URL;
+
+import org.apache.commons.io.CopyUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.ws.util.i18n.Keys;
+import org.apache.ws.util.i18n.Messages;
+import org.apache.ws.util.i18n.MessagesImpl;
/**
* LOG-DONE
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/soap/SoapClientTask.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/soap/SoapClientTask.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/soap/SoapClientTask.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/soap/SoapClientTask.java Thu Oct 20 09:31:40 2005
@@ -15,16 +15,17 @@
*=============================================================================*/
package org.apache.ws.util.soap;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.apache.ws.util.i18n.Keys;
-import org.apache.ws.util.i18n.Messages;
-import org.apache.ws.util.i18n.MessagesImpl;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.ws.util.i18n.Keys;
+import org.apache.ws.util.i18n.Messages;
+import org.apache.ws.util.i18n.MessagesImpl;
/**
* LOG-DONE
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/spring/QNameEditor.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/spring/QNameEditor.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/spring/QNameEditor.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/spring/QNameEditor.java Thu Oct 20 09:31:40 2005
@@ -15,8 +15,9 @@
*=============================================================================*/
package org.apache.ws.util.spring;
-import javax.xml.namespace.QName;
import java.beans.PropertyEditorSupport;
+
+import javax.xml.namespace.QName;
/**
* A {@link org.springframework.beans.factory.BeanFactory} property editor for {@link QName}s.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/spring/SpringBeanObjectFactory.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/spring/SpringBeanObjectFactory.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/spring/SpringBeanObjectFactory.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/spring/SpringBeanObjectFactory.java Thu Oct 20 09:31:40 2005
@@ -15,15 +15,16 @@
*=============================================================================*/
package org.apache.ws.util.spring;
-import org.apache.ws.resource.WsrfRuntime;
-import org.springframework.beans.factory.ListableBeanFactory;
+import java.util.Hashtable;
import javax.naming.Context;
import javax.naming.Name;
import javax.naming.RefAddr;
import javax.naming.Reference;
import javax.naming.spi.ObjectFactory;
-import java.util.Hashtable;
+
+import org.apache.ws.resource.WsrfRuntime;
+import org.springframework.beans.factory.ListableBeanFactory;
/**
* A JNDI object factory for retrieving beans from the WSRF Spring bean factory.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/spring/SpringBeansXmlMergeTask.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/spring/SpringBeansXmlMergeTask.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/spring/SpringBeansXmlMergeTask.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/spring/SpringBeansXmlMergeTask.java Thu Oct 20 09:31:40 2005
@@ -15,6 +15,21 @@
*=============================================================================*/
package org.apache.ws.util.spring;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
@@ -25,20 +40,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
/**
* An Ant task that merges one or more source spring-beans.xml's into a target spring-beans.xml.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/test/axis/AbstractAxisTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/test/axis/AbstractAxisTestCase.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/test/axis/AbstractAxisTestCase.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/test/axis/AbstractAxisTestCase.java Thu Oct 20 09:31:40 2005
@@ -15,15 +15,17 @@
*=============================================================================*/
package org.apache.ws.util.test.axis;
+import java.net.MalformedURLException;
+import java.net.ServerSocket;
+import java.net.URL;
+
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
+
import org.apache.axis.ConfigurationException;
import org.apache.axis.configuration.FileProvider;
import org.apache.ws.util.rpc.JaxRpcConstants;
import org.apache.ws.util.soap.SaajConstants;
-import java.net.MalformedURLException;
-import java.net.ServerSocket;
-import java.net.URL;
/**
* Provides some conviencence functionality for easier testing of web services.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/test/axis/NotSoSimpleAxisServer.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/test/axis/NotSoSimpleAxisServer.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/test/axis/NotSoSimpleAxisServer.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/test/axis/NotSoSimpleAxisServer.java Thu Oct 20 09:31:40 2005
@@ -15,6 +15,13 @@
*=============================================================================*/
package org.apache.ws.util.test.axis;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Map;
+
import org.apache.axis.EngineConfiguration;
import org.apache.axis.collections.LRUMap;
import org.apache.axis.components.logger.LogFactory;
@@ -30,12 +37,6 @@
import org.apache.axis.utils.NetworkUtils;
import org.apache.axis.utils.Options;
import org.apache.commons.logging.Log;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Map;
/**
* This is a simple implementation of an HTTP server for processing SOAP requests via Apache's xml-axis. This is not
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/test/axis/NotSoSimpleAxisWorker.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/test/axis/NotSoSimpleAxisWorker.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/test/axis/NotSoSimpleAxisWorker.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/test/axis/NotSoSimpleAxisWorker.java Thu Oct 20 09:31:40 2005
@@ -15,6 +15,21 @@
*=============================================================================*/
package org.apache.ws.util.test.axis;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MimeHeader;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPMessage;
+
import org.apache.axis.AxisFault;
import org.apache.axis.Constants;
import org.apache.axis.Message;
@@ -33,19 +48,6 @@
import org.apache.axis.utils.XMLUtils;
import org.apache.ws.util.IoUtils;
import org.w3c.dom.Document;
-import javax.xml.namespace.QName;
-import javax.xml.soap.MimeHeader;
-import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPMessage;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.Iterator;
/**
* Web server that supports SOAP POST requests and arbitrary GET requests.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerImpl.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerImpl.java Thu Oct 20 09:31:40 2005
@@ -15,14 +15,15 @@
*=============================================================================*/
package org.apache.ws.util.timer;
-import commonj.timers.CancelTimerListener;
-import commonj.timers.Timer;
-import commonj.timers.TimerListener;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.util.i18n.Keys;
import org.apache.ws.util.i18n.Messages;
import org.apache.ws.util.i18n.MessagesImpl;
+
+import commonj.timers.CancelTimerListener;
+import commonj.timers.Timer;
+import commonj.timers.TimerListener;
/**
* DOCUMENT_ME
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerManagerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerManagerImpl.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerManagerImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerManagerImpl.java Thu Oct 20 09:31:40 2005
@@ -15,20 +15,22 @@
*=============================================================================*/
package org.apache.ws.util.timer;
-import commonj.timers.StopTimerListener;
-import commonj.timers.Timer;
-import commonj.timers.TimerListener;
-import commonj.timers.TimerManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.util.i18n.Keys;
-import org.apache.ws.util.i18n.Messages;
-import org.apache.ws.util.i18n.MessagesImpl;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.util.i18n.Keys;
+import org.apache.ws.util.i18n.Messages;
+import org.apache.ws.util.i18n.MessagesImpl;
+
+import commonj.timers.StopTimerListener;
+import commonj.timers.Timer;
+import commonj.timers.TimerListener;
+import commonj.timers.TimerManager;
/**
* LOG-DONE
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerTaskImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerTaskImpl.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerTaskImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerTaskImpl.java Thu Oct 20 09:31:40 2005
@@ -15,9 +15,10 @@
*=============================================================================*/
package org.apache.ws.util.timer;
+import java.util.TimerTask;
+
import commonj.timers.Timer;
import commonj.timers.TimerListener;
-import java.util.TimerTask;
/**
* LOG-DONE
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkManagerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkManagerImpl.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkManagerImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkManagerImpl.java Thu Oct 20 09:31:40 2005
@@ -15,7 +15,20 @@
*=============================================================================*/
package org.apache.ws.util.work;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Vector;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.util.i18n.Keys;
+import org.apache.ws.util.i18n.Messages;
+import org.apache.ws.util.i18n.MessagesImpl;
+
import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
+
import commonj.work.Work;
import commonj.work.WorkEvent;
import commonj.work.WorkException;
@@ -23,16 +36,6 @@
import commonj.work.WorkListener;
import commonj.work.WorkManager;
import commonj.work.WorkRejectedException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.util.i18n.Keys;
-import org.apache.ws.util.i18n.Messages;
-import org.apache.ws.util.i18n.MessagesImpl;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
/**
* LOG-DONE
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/BasicNamespaceContext.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/BasicNamespaceContext.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/BasicNamespaceContext.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/BasicNamespaceContext.java Thu Oct 20 09:31:40 2005
@@ -15,14 +15,14 @@
*=============================================================================*/
package org.apache.ws.util.xml.impl;
-import org.apache.ws.util.xml.NamespaceContext;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ws.util.xml.NamespaceContext;
/**
* TODO
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/DomNamespaceContext.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/DomNamespaceContext.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/DomNamespaceContext.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/DomNamespaceContext.java Thu Oct 20 09:31:40 2005
@@ -15,12 +15,13 @@
*=============================================================================*/
package org.apache.ws.util.xml.impl;
-import org.apache.ws.util.xml.NamespaceContext;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
+import org.apache.ws.util.xml.NamespaceContext;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
/**
* A namespace context based on a DOM {@link Node}.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/XmlBeansNamespaceContext.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/XmlBeansNamespaceContext.java?rev=326936&r1=326935&r2=326936&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/XmlBeansNamespaceContext.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/XmlBeansNamespaceContext.java Thu Oct 20 09:31:40 2005
@@ -15,12 +15,13 @@
*=============================================================================*/
package org.apache.ws.util.xml.impl;
-import org.apache.ws.util.xml.NamespaceContext;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
+import org.apache.ws.util.xml.NamespaceContext;
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlObject;
/**
* A namespace context based on an XMLBeans {@link XmlObject}.