ws-wsrf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r326958 [5/9] - in /webservices/wsrf/trunk/src: examples/filesystem/ examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/ java/org/apache/ws/addressing/ java/org/apache/ws/addressing/handler/ java/org/apache/ws/addressing...
Date Thu, 20 Oct 2005 17:51:37 GMT
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java Thu Oct 20 10:50:00 2005
@@ -15,17 +15,6 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.query.impl;
 
-import java.net.URI;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameClassPair;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.resource.JndiConstants;
@@ -42,6 +31,15 @@
 import org.apache.ws.resource.properties.query.xpath.impl.XalanXPathExpressionEvaluator;
 import org.apache.ws.util.i18n.Messages;
 import org.apache.ws.util.jndi.XmlBeanJndiUtils;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameClassPair;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import java.net.URI;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Executes queries on resource property sets. The engine looks for evaluators under the "wsrf/query/eval" JNDI
@@ -55,10 +53,11 @@
    /**
     * DOCUMENT_ME
     */
-   private static final Log      LOG                     = LogFactory.getLog( QueryEngineImpl.class.getName(  ) );
-   private static final Messages MSG                     = MessagesImpl.getInstance(  );
+   private static final Log      LOG                         =
+      LogFactory.getLog( QueryEngineImpl.class.getName(  ) );
+   private static final Messages MSG                         = MessagesImpl.getInstance(  );
    private static String         COTEXT_NAME_QUERY_EVALUATOR = JndiConstants.CONTEXT_NAME_WSRF + "/query/eval";
-   private Map                   m_evaluators            = Collections.synchronizedMap( new HashMap(  ) );
+   private Map                   m_evaluators                = Collections.synchronizedMap( new HashMap(  ) );
 
    /**
     * Creates a new {@link QueryEngineImpl} object.
@@ -128,15 +127,16 @@
          {
             // ignore
          }
-         if ( list != null && list.hasMore(  ) )
+
+         if ( ( list != null ) && list.hasMore(  ) )
          {
             while ( list.hasMore(  ) )
             {
                NameClassPair       pair      = (NameClassPair) list.next(  );
                ExpressionEvaluator evaluator =
                   (ExpressionEvaluator) XmlBeanJndiUtils.lookup( initialContext,
-                                                          COTEXT_NAME_QUERY_EVALUATOR + "/" + pair.getName(  ),
-                                                          ExpressionEvaluator.class );
+                                                                 COTEXT_NAME_QUERY_EVALUATOR + "/"
+                                                                 + pair.getName(  ), ExpressionEvaluator.class );
                registerEvaluator( evaluator );
             }
          }
@@ -201,6 +201,7 @@
             isSupportedDialect = true;
          }
       }
+
       if ( isSupportedDialect )
       {
          m_evaluators.put( dialect, evaluator );
@@ -222,5 +223,4 @@
 
       return evaluator;
    }
-
-}
+}
\ No newline at end of file

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/XmlBeansQueryExpression.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/XmlBeansQueryExpression.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/XmlBeansQueryExpression.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/XmlBeansQueryExpression.java Thu Oct 20 10:50:00 2005
@@ -15,9 +15,6 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.query.impl;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -33,6 +30,8 @@
 import org.apache.ws.util.xml.impl.DomNamespaceContext;
 import org.apache.xmlbeans.XmlObject;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryExpressionType;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 /**
  * A QueryExpression impl that wraps a QueryExpressionType XMLBean.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/XPathExpression.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/XPathExpression.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/XPathExpression.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/XPathExpression.java Thu Oct 20 10:50:00 2005
@@ -20,7 +20,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.resource.i18n.Keys;
 import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.properties.faults.UnknownQueryExpressionDialectFaultException;
 import org.apache.ws.resource.properties.query.InvalidQueryExpressionException;
 import org.apache.ws.resource.properties.query.QueryConstants;
 import org.apache.ws.resource.properties.query.QueryExpression;

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/JaxenXPathExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/JaxenXPathExpressionEvaluator.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/JaxenXPathExpressionEvaluator.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/JaxenXPathExpressionEvaluator.java Thu Oct 20 10:50:00 2005
@@ -15,8 +15,6 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.query.xpath.impl;
 
-import java.net.URI;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.resource.i18n.Keys;
@@ -35,6 +33,7 @@
 import org.jaxen.XPath;
 import org.jaxen.dom.DOMXPath;
 import org.w3c.dom.Node;
+import java.net.URI;
 
 /**
  * An XPath expression evaluator that utilizes the Jaxen XPath evaluation engine.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XalanXPathExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XalanXPathExpressionEvaluator.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XalanXPathExpressionEvaluator.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XalanXPathExpressionEvaluator.java Thu Oct 20 10:50:00 2005
@@ -15,17 +15,11 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.query.xpath.impl;
 
-import java.net.URI;
-
-import javax.xml.transform.TransformerException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.resource.i18n.Keys;
 import org.apache.ws.resource.i18n.MessagesImpl;
 import org.apache.ws.resource.properties.ResourcePropertySet;
-import org.apache.ws.resource.properties.faults.InvalidQueryExpressionFaultException;
-import org.apache.ws.resource.properties.faults.QueryEvaluationErrorFaultException;
 import org.apache.ws.resource.properties.query.InvalidQueryExpressionException;
 import org.apache.ws.resource.properties.query.QueryConstants;
 import org.apache.ws.resource.properties.query.QueryEvaluationErrorException;
@@ -41,6 +35,8 @@
 import org.apache.xpath.objects.XObject;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import javax.xml.transform.TransformerException;
+import java.net.URI;
 
 /**
  * An XPath expression evaluator that utilizes the Xalan-J {@link XPathAPI}

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/ResourcePropertiesConstants.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/ResourcePropertiesConstants.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/ResourcePropertiesConstants.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/ResourcePropertiesConstants.java Thu Oct 20 10:50:00 2005
@@ -15,9 +15,8 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_06;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.v2004_06.WsrfConstants;
+import javax.xml.namespace.QName;
 
 /**
  * Constants for namespaces defined by the 2004/06 version of the WSRF ResourceProperties specification.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetMultipleResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetMultipleResourcePropertiesPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetMultipleResourcePropertiesPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetMultipleResourcePropertiesPortType.java Thu Oct 20 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_06.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-RP GetMultipleResourceProperties portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetResourcePropertyPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetResourcePropertyPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetResourcePropertyPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetResourcePropertyPortType.java Thu Oct 20 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_06.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyDocument;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-RP GetResourceProperty portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/QueryResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/QueryResourcePropertiesPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/QueryResourcePropertiesPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/QueryResourcePropertiesPortType.java Thu Oct 20 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_06.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryResourcePropertiesResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-RP QueryResourceProperties portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/SetResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/SetResourcePropertiesPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/SetResourcePropertiesPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/SetResourcePropertiesPortType.java Thu Oct 20 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_06.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.SetResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.SetResourcePropertiesResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-RP SetResourceProperties portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java Thu Oct 20 10:50:00 2005
@@ -15,14 +15,13 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_06.porttype.impl;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.properties.ResourceProperty;
 import org.apache.ws.resource.properties.impl.AbstractGetResourcePropertiesPortType;
 import org.apache.ws.resource.properties.v2004_06.porttype.GetMultipleResourcePropertiesPortType;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * LOG-DONE An operation provider for wsrp:GetMultipleResourceProperties.
@@ -33,7 +32,6 @@
    extends AbstractGetResourcePropertiesPortType
    implements GetMultipleResourcePropertiesPortType
 {
-
    /**
     * Creates a new {@link GetMultipleResourcePropertiesPortTypeImpl} object.
     *

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetResourcePropertyPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetResourcePropertyPortTypeImpl.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetResourcePropertyPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetResourcePropertyPortTypeImpl.java Thu Oct 20 10:50:00 2005
@@ -15,8 +15,6 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_06.porttype.impl;
 
-import javax.xml.namespace.QName;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.resource.NamespaceVersionHolder;
@@ -24,13 +22,13 @@
 import org.apache.ws.resource.i18n.Keys;
 import org.apache.ws.resource.i18n.MessagesImpl;
 import org.apache.ws.resource.properties.ResourceProperty;
-import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
 import org.apache.ws.resource.properties.impl.AbstractGetResourcePropertiesPortType;
 import org.apache.ws.resource.properties.v2004_06.impl.NamespaceVersionHolderImpl;
 import org.apache.ws.resource.properties.v2004_06.porttype.GetResourcePropertyPortType;
 import org.apache.ws.util.i18n.Messages;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyDocument;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * An operation provider for wsrp:GetResourceProperty.
@@ -41,7 +39,8 @@
    extends AbstractGetResourcePropertiesPortType
    implements GetResourcePropertyPortType
 {
-   private static final Log                    LOG = LogFactory.getLog( GetResourcePropertyPortTypeImpl.class );
+   private static final Log                    LOG           =
+      LogFactory.getLog( GetResourcePropertyPortTypeImpl.class );
    private static final Messages               MSG           = MessagesImpl.getInstance(  );
    private static final NamespaceVersionHolder NAMESPACE_SET = new NamespaceVersionHolderImpl(  );
 

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/QueryResourcePropertiesPortTypeImpl.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/QueryResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/QueryResourcePropertiesPortTypeImpl.java Thu Oct 20 10:50:00 2005
@@ -15,8 +15,6 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_06.porttype.impl;
 
-import java.lang.reflect.Array;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.resource.NamespaceVersionHolder;
@@ -41,6 +39,7 @@
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryExpressionType;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryResourcePropertiesResponseDocument;
+import java.lang.reflect.Array;
 
 /**
  * LOG-DONE An operation provider for wsrp:QueryResourceProperties.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java Thu Oct 20 10:50:00 2005
@@ -51,7 +51,8 @@
    extends AbstractSetResourcePropertiesPortType
    implements SetResourcePropertiesPortType
 {
-   private static final Log                    LOG = LogFactory.getLog( SetResourcePropertiesPortTypeImpl.class );
+   private static final Log                    LOG           =
+      LogFactory.getLog( SetResourcePropertiesPortTypeImpl.class );
    private static final Messages               MSG           = MessagesImpl.getInstance(  );
    private static final NamespaceVersionHolder NAMESPACE_SET = new NamespaceVersionHolderImpl(  );
 

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/ResourcePropertiesConstants.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/ResourcePropertiesConstants.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/ResourcePropertiesConstants.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/ResourcePropertiesConstants.java Thu Oct 20 10:50:00 2005
@@ -15,9 +15,8 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.v2004_11.WsrfConstants;
+import javax.xml.namespace.QName;
 
 /**
  * Constants for namespaces defined by the 2004/11 version of the WSRF ResourceProperties specification.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/DeleteResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/DeleteResourcePropertiesPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/DeleteResourcePropertiesPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/DeleteResourcePropertiesPortType.java Thu Oct 20 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_11.ResourcePropertiesConstants;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-RP DeleteResourceProperties portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/GetMultipleResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/GetMultipleResourcePropertiesPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/GetMultipleResourcePropertiesPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/GetMultipleResourcePropertiesPortType.java Thu Oct 20 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_11.ResourcePropertiesConstants;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-RP GetMultipleResourceProperties portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/GetResourcePropertyDocumentPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/GetResourcePropertyDocumentPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/GetResourcePropertyDocumentPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/GetResourcePropertyDocumentPortType.java Thu Oct 20 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_11.ResourcePropertiesConstants;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentDocument1;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-RP GetResourcePropertyDocument portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/GetResourcePropertyPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/GetResourcePropertyPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/GetResourcePropertyPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/GetResourcePropertyPortType.java Thu Oct 20 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_11.ResourcePropertiesConstants;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocument;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-RP GetResourceProperty portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/InsertResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/InsertResourcePropertiesPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/InsertResourcePropertiesPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/InsertResourcePropertiesPortType.java Thu Oct 20 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_11.ResourcePropertiesConstants;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertResourcePropertiesResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-RP InsertResourceProperties portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/QueryResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/QueryResourcePropertiesPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/QueryResourcePropertiesPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/QueryResourcePropertiesPortType.java Thu Oct 20 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_11.ResourcePropertiesConstants;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryResourcePropertiesResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-RP QueryResourceProperties portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/SetResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/SetResourcePropertiesPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/SetResourcePropertiesPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/SetResourcePropertiesPortType.java Thu Oct 20 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_11.ResourcePropertiesConstants;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.SetResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.SetResourcePropertiesResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-RP SetResourceProperties portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/UpdateResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/UpdateResourcePropertiesPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/UpdateResourcePropertiesPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/UpdateResourcePropertiesPortType.java Thu Oct 20 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_11.ResourcePropertiesConstants;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-RP UpdateResourceProperties portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java Thu Oct 20 10:50:00 2005
@@ -15,8 +15,6 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11.porttype.impl;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
@@ -26,6 +24,7 @@
 import org.apache.ws.resource.properties.v2004_11.porttype.DeleteResourcePropertiesPortType;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * @author Ian Springer

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java Thu Oct 20 10:50:00 2005
@@ -15,8 +15,6 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11.porttype.impl;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.properties.ResourceProperty;
@@ -25,6 +23,7 @@
 import org.apache.ws.resource.properties.v2004_11.porttype.GetMultipleResourcePropertiesPortType;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * @author Ian Springer

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyPortTypeImpl.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyPortTypeImpl.java Thu Oct 20 10:50:00 2005
@@ -15,17 +15,15 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11.porttype.impl;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.properties.ResourceProperty;
-import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
 import org.apache.ws.resource.properties.impl.AbstractGetResourcePropertiesPortType;
 import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;
 import org.apache.ws.resource.properties.v2004_11.porttype.GetResourcePropertyPortType;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocument;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * An operation provider for wsrp:GetResourceProperty.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/QueryResourcePropertiesPortTypeImpl.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/QueryResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/QueryResourcePropertiesPortTypeImpl.java Thu Oct 20 10:50:00 2005
@@ -15,8 +15,6 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.v2004_11.porttype.impl;
 
-import java.lang.reflect.Array;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.resource.NamespaceVersionHolder;
@@ -41,6 +39,7 @@
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryExpressionType;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryResourcePropertiesResponseDocument;
+import java.lang.reflect.Array;
 
 /**
  * LOG-DONE An operation provider for wsrp:QueryResourceProperties.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java Thu Oct 20 10:50:00 2005
@@ -24,7 +24,6 @@
 import org.apache.ws.resource.properties.faults.DeleteResourcePropertyRequestFailedFaultException;
 import org.apache.ws.resource.properties.faults.InsertResourcePropertyRequestFailedFaultException;
 import org.apache.ws.resource.properties.faults.InvalidInsertResourcePropertiesRequestContentFaultException;
-import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
 import org.apache.ws.resource.properties.faults.InvalidSetResourcePropertiesRequestContentFaultException;
 import org.apache.ws.resource.properties.faults.InvalidUpdateResourcePropertiesRequestContentFaultException;
 import org.apache.ws.resource.properties.faults.SetResourcePropertyRequestFailedFaultException;
@@ -52,7 +51,8 @@
    extends AbstractSetResourcePropertiesPortType
    implements SetResourcePropertiesPortType
 {
-   private static final Log                    LOG = LogFactory.getLog( SetResourcePropertiesPortTypeImpl.class );
+   private static final Log                    LOG           =
+      LogFactory.getLog( SetResourcePropertiesPortTypeImpl.class );
    private static final Messages               MSG           = MessagesImpl.getInstance(  );
    private static final NamespaceVersionHolder NAMESPACE_SET = new NamespaceVersionHolderImpl(  );
 

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupEntryPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupEntryPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupEntryPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupEntryPortType.java Thu Oct 20 10:50:00 2005
@@ -15,10 +15,9 @@
  *=============================================================================*/
 package org.apache.ws.resource.servicegroup.v2004_06.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_06.porttype.GetResourcePropertyPortType;
 import org.apache.ws.resource.servicegroup.v2004_06.ServiceGroupConstants;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-SG ServiceGroupEntry portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupPortType.java Thu Oct 20 10:50:00 2005
@@ -15,10 +15,9 @@
  *=============================================================================*/
 package org.apache.ws.resource.servicegroup.v2004_06.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_06.porttype.GetResourcePropertyPortType;
 import org.apache.ws.resource.servicegroup.v2004_06.ServiceGroupConstants;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-SG ServiceGroup portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupRegistrationPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupRegistrationPortType.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupRegistrationPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupRegistrationPortType.java Thu Oct 20 10:50:00 2005
@@ -15,12 +15,11 @@
  *=============================================================================*/
 package org.apache.ws.resource.servicegroup.v2004_06.porttype;
 
-import javax.xml.namespace.QName;
-
 import org.apache.ws.resource.properties.v2004_06.porttype.GetResourcePropertyPortType;
 import org.apache.ws.resource.servicegroup.v2004_06.ServiceGroupConstants;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSServiceGroup12Draft01.AddDocument;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSServiceGroup12Draft01.AddResponseDocument;
+import javax.xml.namespace.QName;
 
 /**
  * The WSRF-SG ServiceGroupRegistration portType.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java Thu Oct 20 10:50:00 2005
@@ -15,15 +15,13 @@
  *=============================================================================*/
 package org.apache.ws.resource.tool;
 
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.wsdl.Operation;
-
 import org.apache.ws.resource.ResourceDefinition;
 import org.apache.ws.util.OperationInfo;
 import org.apache.xmlbeans.impl.common.NameUtil;
+import javax.wsdl.Operation;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
 
 /**
  * A set of utility methods that are utilized by Wsdl2Java.
@@ -62,8 +60,9 @@
          Operation     op     = resourceDef.getPortType(  ).getOperation( opNames[i], null, null );
          OperationInfo opInfo = new OperationInfo( op,
                                                    resourceDef.getDefinition(  ).getTargetNamespace(  ) );
-          // TODO: handle operations that have no input element (e.g. wsx:Get) - we can't have a null key
-          opInfoMap.put( opInfo.getRequestElementName(  ),
+
+         // TODO: handle operations that have no input element (e.g. wsx:Get) - we can't have a null key
+         opInfoMap.put( opInfo.getRequestElementName(  ),
                         opInfo );
       }
 

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java Thu Oct 20 10:50:00 2005
@@ -15,33 +15,6 @@
  *=============================================================================*/
 package org.apache.ws.resource.tool;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
@@ -70,6 +43,31 @@
 import org.apache.xmlbeans.impl.common.NameUtil;
 import org.apache.xmlbeans.impl.common.XmlErrorPrinter;
 import org.apache.xmlbeans.impl.tool.SchemaCompiler;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
+import javax.wsdl.Message;
+import javax.wsdl.Part;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
 
 /**
  * Generates Java Web service types and skeletons from a WSRF WSDL. The types are
@@ -79,7 +77,6 @@
  */
 public class Wsdl2Java
 {
-
    private static final Messages MSG = MessagesImpl.getInstance(  );
 
    /**
@@ -92,57 +89,58 @@
       initCmdLineOptions(  );
    }
 
-   private File[]           m_wsdlFiles;
-   private Wsdl2JavaOptions m_options;
-   private Map              m_portTypeInfoMap = new HashMap(  );
-   private WSDLReader       m_wsdlReader;
-   private File             m_outputDir;
-   private File[]           m_classpath;
-   private File             m_xmlbeansDir;
+   private static final String   WEBAPP_NAME                    = "wsrf";
 
-   private static final String WEBAPP_NAME = "wsrf";
+   /** DOCUMENT_ME */
    protected static final String VELOCITY_CONTEXT_KEY_GENERATED = "generated";
+   private File[]                m_wsdlFiles;
+   private Wsdl2JavaOptions      m_options;
+   private Map                   m_portTypeInfoMap = new HashMap(  );
+   private WSDLReader            m_wsdlReader;
+   private File                  m_outputDir;
+   private File[]                m_classpath;
+   private File                  m_xmlbeansDir;
+
+   /**
+    * Creates a new {@link Wsdl2Java} object.
+    *
+    * @param wsdlFiles      DOCUMENT_ME
+    * @param outputDir      DOCUMENT_ME
+    * @param classpathFiles
+    * @param options        DOCUMENT_ME
+    */
+   public Wsdl2Java( File[]           wsdlFiles,
+                     File             outputDir,
+                     File[]           classpathFiles,
+                     Wsdl2JavaOptions options )
+   throws Exception
+   {
+      m_wsdlFiles = wsdlFiles;
+      if ( m_wsdlFiles.length == 0 )
+      {
+         System.out.println( MSG.getMessage( Keys.WARN_EMPTY_WSDLS ) );
+      }
+
+      for ( int i = 0; i < wsdlFiles.length; i++ )
+      {
+         File wsdlFile = wsdlFiles[i];
+         if ( !wsdlFile.getName(  ).endsWith( ".wsdl" ) )
+         {
+            System.out.println( MSG.getMessage( Keys.ERROR_ONLY_WSDLS,
+                                                wsdlFile.getName(  ) ) );
+            System.exit( 0 );
+         }
+      }
 
-    /**
-     * Creates a new {@link Wsdl2Java} object.
-     *
-     * @param wsdlFiles      DOCUMENT_ME
-     * @param outputDir      DOCUMENT_ME
-     * @param classpathFiles
-     * @param options        DOCUMENT_ME
-     */
-    public Wsdl2Java( File[]           wsdlFiles,
-                      File             outputDir,
-                      File[]           classpathFiles,
-                      Wsdl2JavaOptions options )
-    throws Exception
-    {
-       m_wsdlFiles = wsdlFiles;
-       if ( m_wsdlFiles.length == 0 )
-       {
-          System.out.println( MSG.getMessage( Keys.WARN_EMPTY_WSDLS ) );
-       }
-
-       for ( int i = 0; i < wsdlFiles.length; i++ )
-       {
-          File wsdlFile = wsdlFiles[i];
-          if ( !wsdlFile.getName(  ).endsWith( ".wsdl" ) )
-          {
-             System.out.println( MSG.getMessage( Keys.ERROR_ONLY_WSDLS,
-                                                 wsdlFile.getName(  ) ) );
-             System.exit( 0 );
-          }
-       }
-
-       m_outputDir      = outputDir;
-       m_xmlbeansDir    = new File( m_outputDir, ".xmlbeans" );
-       m_classpath      = classpathFiles;
-       validateClasspath(  );
-       m_options       = ( options != null ) ? options : new Wsdl2JavaOptions(  );
-       m_wsdlReader    = WSDLFactory.newInstance(  ).newWSDLReader(  );
-       initVelocity(  );
-       initPortTypeInfoMap(  );
-    }
+      m_outputDir      = outputDir;
+      m_xmlbeansDir    = new File( m_outputDir, ".xmlbeans" );
+      m_classpath      = classpathFiles;
+      validateClasspath(  );
+      m_options       = ( options != null ) ? options : new Wsdl2JavaOptions(  );
+      m_wsdlReader    = WSDLFactory.newInstance(  ).newWSDLReader(  );
+      initVelocity(  );
+      initPortTypeInfoMap(  );
+   }
 
    /**
     * DOCUMENT_ME
@@ -233,6 +231,23 @@
    /**
     * DOCUMENT_ME
     *
+    * @param targetNamespace DOCUMENT_ME
+    * @param serviceDir DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   protected File getPackageDir( String targetNamespace,
+                                 File   serviceDir )
+   {
+      String javaPackageName = GenerationUtils.getJavaPackageName( targetNamespace );
+      File   javaDir = new File( serviceDir, "src/java" );
+      return new File( javaDir,
+                       javaPackageName.replace( '.', '/' ) );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
     * @param ptName DOCUMENT_ME
     * @return DOCUMENT_ME
     */
@@ -319,8 +334,9 @@
             String propName = getJavaConstantName( propertyName, propMap );
             propMap.put( propName, propertyName );
          }
+
          props.setPropertyMap( propMap );
-         props.setCustomPropertyNames( resourceDef.getCustomPropertyNames() );
+         props.setCustomPropertyNames( resourceDef.getCustomPropertyNames(  ) );
       }
 
       if ( resourceDef.implementsResourceCapability( MetadataExchangePortType.NAME ) )
@@ -375,8 +391,8 @@
          }
          else
          {
-            System.err.println( "\n\nUnable to find a port type info for the implemented capability: "
-                                + ptName + "!\n\n" );
+            System.err.println( "\n\nUnable to find a port type info for the implemented capability: " + ptName
+                                + "!\n\n" );
          }
       }
 
@@ -401,30 +417,174 @@
       QName serviceQname = new QName( targetNamespace, serviceName );
       props.setServiceQName( serviceQname );
 
-      props.setWsdlServiceName( resourceDef.getWsdlServiceName());
+      props.setWsdlServiceName( resourceDef.getWsdlServiceName(  ) );
 
-      props.setServiceMethodMap(resourceDef.getAllOperations());
+      props.setServiceMethodMap( resourceDef.getAllOperations(  ) );
       return props;
    }
 
-    /**
-     * Provides a hook for adding to the Velocity Context.
-     *
-     * @param context
-     * @return VelocityContext
-     */
-    protected VelocityContext updateVelocityContext( VelocityContext    context,
-                                                     ResourceDefinition resourceDef )
-    {
-       //dummy endpoint vars for jsr109...
-       context.put("jsr109EndpointClassName", DummyEndpointImpl.class.getName());
-       context.put("jsr109EndpointInterfaceName", DummyEndpoint.class.getName());
-       context.put("jsr109EndpointDummyJavaOperation", DummyEndpoint.class.getMethods()[0].getName());
-
-       //handler var for jsr109
-       context.put("resourceHandlerClassName", ResourceHandler.class.getName());
-       return context;
-    }
+   /**
+    *
+    * @param context
+    * @param templateLocation
+    * @param outputFile
+    * @throws Exception
+    */
+   protected void processTemplate( VelocityContext context,
+                                   String          templateLocation,
+                                   File            outputFile )
+   throws Exception
+   {
+      /*
+       *  get the Template object.  This is the parsed version of your
+       *  template input file.  Note that getTemplate() can throw
+       *   ResourceNotFoundException : if it doesn't find the template
+       *   ParseErrorException : if there is something wrong with the VTL
+       *   Exception : if something else goes wrong (this is generally
+       *        indicative of a serious problem...)
+       */
+      try
+      {
+         Template template = Velocity.getTemplate( templateLocation );
+
+         /*
+          *  Now have the template engine process your template using the
+          *  data placed into the context. Think of it as a  'merge'
+          *  of the template and the data to produce the output stream.
+          */
+         FileWriter writer = new FileWriter( outputFile );
+         if ( template != null )
+         {
+            template.merge( context, writer );
+         }
+
+         writer.close(  );
+      }
+      catch ( Exception e )
+      {
+         System.err.println( "Error processing template " + templateLocation );
+         e.printStackTrace(  );
+      }
+   }
+
+   /**
+    *
+    * @param resourceDef
+    * @param wsdlFile
+    * @param serviceDir
+    * @throws Exception
+    */
+   protected void processTemplates( ResourceDefinition resourceDef,
+                                    File               wsdlFile,
+                                    File               serviceDir )
+   throws Exception
+   {
+      String capitalizedServiceName = getValidJavaName( resourceDef );
+      try
+      {
+         VelocityContext   context = new VelocityContext(  );
+         ServiceProperties props = buildServiceProperties( resourceDef, wsdlFile, serviceDir );
+         context.put( VELOCITY_CONTEXT_KEY_GENERATED, props );
+         updateVelocityContext( context, resourceDef );
+
+         //generate files
+         File packageDir = getPackageDir( resourceDef.getDefinition(  ).getTargetNamespace(  ),
+                                          serviceDir );
+         packageDir.mkdirs(  );
+         File outputFile = new File( packageDir, "Abstract" + capitalizedServiceName + "Service.java" );
+         processTemplate( context, "templates/AbstractService.vm", outputFile );
+
+         outputFile = new File( packageDir, capitalizedServiceName + "Service.java" );
+
+         if ( !outputFile.exists(  ) )
+         {
+            processTemplate( context, "templates/Service.vm", outputFile );
+         }
+
+         generateFaultClasses( context, props, packageDir );
+
+         outputFile = new File( packageDir, "Abstract" + capitalizedServiceName + "Resource.java" );
+         processTemplate( context, "templates/AbstractResource.vm", outputFile );
+
+         outputFile = new File( packageDir, capitalizedServiceName + "Resource.java" );
+
+         if ( !outputFile.exists(  ) )
+         {
+            processTemplate( context, "templates/Resource.vm", outputFile );
+         }
+
+         outputFile = new File( packageDir, "Abstract" + capitalizedServiceName + "Home.java" );
+         processTemplate( context, "templates/AbstractHome.vm", outputFile );
+
+         outputFile = new File( packageDir, capitalizedServiceName + "Home.java" );
+
+         if ( !outputFile.exists(  ) )
+         {
+            processTemplate( context, "templates/Home.vm", outputFile );
+         }
+
+         if ( resourceDef.hasProperties(  ) )
+         {
+            outputFile = new File( packageDir, capitalizedServiceName + "PropertyQNames.java" );
+            processTemplate( context, "templates/PropertyQNames.vm", outputFile );
+         }
+
+         outputFile = new File( packageDir, capitalizedServiceName + "_deploy.wsdd" );
+         processTemplate( context, "templates/deploy.wsdd.vm", outputFile );
+
+         outputFile = new File( packageDir, capitalizedServiceName + "_wsrf-config.xml" );
+         processTemplate( context, "templates/wsrf-config.xml.vm", outputFile );
+
+         outputFile = new File( packageDir, capitalizedServiceName + "CustomOperationsPortType.java" );
+         processTemplate( context, "templates/CustomOperationsPortType.vm", outputFile );
+
+         outputFile = new File( serviceDir, "build.xml" );
+         processTemplate( context, "templates/build.xml.vm", outputFile );
+
+         outputFile = new File( serviceDir, "build.properties" );
+         if ( !outputFile.exists(  ) )
+         {
+            processTemplate( context, "templates/build.properties.vm", outputFile );
+         }
+
+         /*
+            //jsr109 artifacts
+            outputFile = new File( packageDir, "web.xml" );
+            processTemplate( context, "templates/jsr109/web.vm", outputFile );
+            outputFile = new File( packageDir, "webservices.xml" );
+            processTemplate( context, "templates/jsr109/webservices.vm", outputFile );
+            outputFile = new File( packageDir, capitalizedServiceName + "_jaxrpc-mapping.xml" );
+            processTemplate( context, "templates/jsr109/jaxrpc-mapping.vm", outputFile );
+          */
+      }
+      catch ( Exception e )
+      {
+         e.printStackTrace(  );
+      }
+   }
+
+   /**
+    * Provides a hook for adding to the Velocity Context.
+    *
+    * @param context
+    * @return VelocityContext
+    */
+   protected VelocityContext updateVelocityContext( VelocityContext    context,
+                                                    ResourceDefinition resourceDef )
+   {
+      //dummy endpoint vars for jsr109...
+      context.put( "jsr109EndpointClassName",
+                   DummyEndpointImpl.class.getName(  ) );
+      context.put( "jsr109EndpointInterfaceName",
+                   DummyEndpoint.class.getName(  ) );
+      context.put( "jsr109EndpointDummyJavaOperation",
+                   DummyEndpoint.class.getMethods(  )[0].getName(  ) );
+
+      //handler var for jsr109
+      context.put( "resourceHandlerClassName",
+                   ResourceHandler.class.getName(  ) );
+      return context;
+   }
 
    /**
     * DOCUMENT_ME
@@ -594,14 +754,6 @@
       return constName;
    }
 
-   protected File getPackageDir( String targetNamespace,
-                               File   serviceDir )
-   {
-      String javaPackageName = GenerationUtils.getJavaPackageName( targetNamespace );
-      File   javaDir = new File( serviceDir, "src/java" );
-      return new File( javaDir, javaPackageName.replace( '.', '/' ) );
-   }
-
    private File getTempDir(  )
    {
       String userTempDir = System.getProperty( "java.io.tmpdir" );
@@ -664,8 +816,8 @@
 
             String faultClassName = NameUtil.getClassNameFromQName( faultName );
             faultClassName = faultClassName.substring( faultClassName.lastIndexOf( "." ) + 1 );
-            QName  newFaultName       = new QName( faultName.getNamespaceURI(  ),
-                                                   faultClassName );
+            QName  newFaultName = new QName( faultName.getNamespaceURI(  ),
+                                             faultClassName );
             String exceptionFaultName = faultClassName + "Exception";
 
             //ok here's the file we'll generate
@@ -790,146 +942,6 @@
       Velocity.init(  );
    }
 
-    /**
-     *
-     * @param context
-     * @param templateLocation
-     * @param outputFile
-     * @throws Exception
-     */
-   protected void processTemplate( VelocityContext context,
-                                   String          templateLocation,
-                                   File            outputFile )
-   throws Exception
-   {
-      /*
-       *  get the Template object.  This is the parsed version of your
-       *  template input file.  Note that getTemplate() can throw
-       *   ResourceNotFoundException : if it doesn't find the template
-       *   ParseErrorException : if there is something wrong with the VTL
-       *   Exception : if something else goes wrong (this is generally
-       *        indicative of a serious problem...)
-       */
-      try
-      {
-         Template template = Velocity.getTemplate( templateLocation );
-
-         /*
-          *  Now have the template engine process your template using the
-          *  data placed into the context. Think of it as a  'merge'
-          *  of the template and the data to produce the output stream.
-          */
-         FileWriter writer = new FileWriter( outputFile );
-         if ( template != null )
-         {
-            template.merge( context, writer );
-         }
-
-         writer.close(  );
-      }
-      catch ( Exception e )
-      {
-         System.err.println( "Error processing template " + templateLocation );
-         e.printStackTrace(  );
-      }
-   }
-
-    /**
-     *
-     * @param resourceDef
-     * @param wsdlFile
-     * @param serviceDir
-     * @throws Exception
-     */
-   protected void processTemplates( ResourceDefinition resourceDef,
-                                    File               wsdlFile,
-                                    File               serviceDir )
-   throws Exception
-   {
-      String capitalizedServiceName = getValidJavaName( resourceDef );
-      try
-      {
-         VelocityContext   context = new VelocityContext(  );
-         ServiceProperties props = buildServiceProperties( resourceDef, wsdlFile, serviceDir );
-         context.put( VELOCITY_CONTEXT_KEY_GENERATED, props );
-         updateVelocityContext( context, resourceDef );
-
-         //generate files
-         File packageDir = getPackageDir( resourceDef.getDefinition(  ).getTargetNamespace(  ),
-                                          serviceDir );
-         packageDir.mkdirs(  );
-         File outputFile = new File( packageDir, "Abstract" + capitalizedServiceName + "Service.java" );
-         processTemplate( context, "templates/AbstractService.vm", outputFile );
-
-         outputFile = new File( packageDir, capitalizedServiceName + "Service.java" );
-
-         if ( !outputFile.exists(  ) )
-         {
-            processTemplate( context, "templates/Service.vm", outputFile );
-         }
-
-         generateFaultClasses( context, props, packageDir );
-
-         outputFile = new File( packageDir, "Abstract" + capitalizedServiceName + "Resource.java" );
-         processTemplate( context, "templates/AbstractResource.vm", outputFile );
-
-         outputFile = new File( packageDir, capitalizedServiceName + "Resource.java" );
-
-         if ( !outputFile.exists(  ) )
-         {
-            processTemplate( context, "templates/Resource.vm", outputFile );
-         }
-
-         outputFile = new File( packageDir, "Abstract" + capitalizedServiceName + "Home.java" );
-         processTemplate( context, "templates/AbstractHome.vm", outputFile );
-
-         outputFile = new File( packageDir, capitalizedServiceName + "Home.java" );
-
-         if ( !outputFile.exists(  ) )
-         {
-            processTemplate( context, "templates/Home.vm", outputFile );
-         }
-
-         if ( resourceDef.hasProperties(  ) )
-         {
-            outputFile = new File( packageDir, capitalizedServiceName + "PropertyQNames.java" );
-            processTemplate( context, "templates/PropertyQNames.vm", outputFile );
-         }
-
-         outputFile = new File( packageDir, capitalizedServiceName + "_deploy.wsdd" );
-         processTemplate( context, "templates/deploy.wsdd.vm", outputFile );
-
-         outputFile = new File( packageDir, capitalizedServiceName + "_wsrf-config.xml" );
-         processTemplate( context, "templates/wsrf-config.xml.vm", outputFile );
-
-         outputFile = new File( packageDir, capitalizedServiceName + "CustomOperationsPortType.java" );
-         processTemplate( context, "templates/CustomOperationsPortType.vm", outputFile );
-
-         outputFile = new File( serviceDir, "build.xml" );
-         processTemplate( context, "templates/build.xml.vm", outputFile );
-
-         outputFile = new File( serviceDir, "build.properties" );
-         if ( !outputFile.exists(  ) )
-         {
-            processTemplate( context, "templates/build.properties.vm", outputFile );
-         }
-
-         /*
-         //jsr109 artifacts
-         outputFile = new File( packageDir, "web.xml" );
-         processTemplate( context, "templates/jsr109/web.vm", outputFile );
-         outputFile = new File( packageDir, "webservices.xml" );
-         processTemplate( context, "templates/jsr109/webservices.vm", outputFile );
-         outputFile = new File( packageDir, capitalizedServiceName + "_jaxrpc-mapping.xml" );
-         processTemplate( context, "templates/jsr109/jaxrpc-mapping.vm", outputFile );
-         */
-      }
-      catch ( Exception e )
-      {
-         e.printStackTrace(  );
-      }
-   }
-
    private void processWsdlFile( File wsdlFile )
    throws Exception
    {
@@ -948,12 +960,12 @@
          while ( iterator.hasNext(  ) )
          {
             Port               port        = (Port) iterator.next(  );
-            ResourceDefinition resourceDef = new ResourceDefinitionImpl( def,
-                                                                         service.getQName(),
-                                                                         port,
-                                                                         wsdlFile.toURL(  ) );
-            File               serviceDir  = new File( m_outputDir,
-                                                       resourceDef.getName(  ) );
+            ResourceDefinition resourceDef =
+               new ResourceDefinitionImpl( def,
+                                           service.getQName(  ), port,
+                                           wsdlFile.toURL(  ) );
+            File serviceDir = new File( m_outputDir,
+                                        resourceDef.getName(  ) );
             System.out.println( "Processing WSRF WSDL port \"" + resourceDef.getName(  ) + "\"..." );
             processTemplates( resourceDef, wsdlFile, serviceDir );
             copyWsdlFile( wsdlFile, serviceDir );

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2JavaTask.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2JavaTask.java?rev=326958&r1=326957&r2=326958&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2JavaTask.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2JavaTask.java Thu Oct 20 10:50:00 2005
@@ -15,10 +15,6 @@
  *=============================================================================*/
 package org.apache.ws.resource.tool;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.FileScanner;
 import org.apache.tools.ant.taskdefs.MatchingTask;
@@ -26,6 +22,9 @@
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Ant task that wraps {@link Wsdl2Java}.

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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,10 +15,9 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,10 +15,9 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,10 +15,9 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,10 +15,9 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,10 +15,9 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,10 +15,9 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,10 +15,9 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,10 +15,9 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,11 +15,10 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,10 +15,9 @@
  *=============================================================================*/
 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=326958&r1=326957&r2=326958&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 10:50:00 2005
@@ -15,17 +15,15 @@
  *=============================================================================*/
 package org.apache.ws.resource.tool.velocity;
 
-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;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Provides utility methods for building up the "implements ..." lists for



Mime
View raw message