ws-wsrf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject svn commit: r293422 - in /webservices/wsrf/trunk/src/java/org/apache/ws/resource: ./ properties/impl/ properties/v2004_06/porttype/impl/
Date Mon, 03 Oct 2005 18:34:08 GMT
Author: ips
Date: Mon Oct  3 11:34:04 2005
New Revision: 293422

URL: http://svn.apache.org/viewcvs?rev=293422&view=rev
Log:
removed abstract getNamespaceSet() method from AbstractPortType

Modified:
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/AbstractPortType.java
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractResourcePropertiesPortType.java
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/AbstractPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/AbstractPortType.java?rev=293422&r1=293421&r2=293422&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/AbstractPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/AbstractPortType.java Mon Oct 
3 11:34:04 2005
@@ -19,6 +19,7 @@
 import org.apache.ws.resource.faults.FaultException;
 import org.apache.ws.resource.i18n.MessagesImpl;
 import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.faults.ResourceUnknownFaultException;
 import org.apache.ws.util.i18n.Messages;
 
 /**
@@ -47,8 +48,7 @@
       }
       catch ( ResourceUnknownException rue )
       {
-         throw new org.apache.ws.resource.properties.faults.ResourceUnknownFaultException(
getNamespaceSet(  ),
-                                                                                        
  rue );
+         throw new ResourceUnknownFaultException( m_resource.getNamespaceSet(), rue );
       }
       catch ( ResourceException re )
       {
@@ -76,10 +76,4 @@
       return m_resourceContext;
    }
 
-   /**
-    * DOCUMENT_ME
-    *
-    * @return DOCUMENT_ME
-    */
-   protected abstract NamespaceVersionHolder getNamespaceSet(  );
 }

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java?rev=293422&r1=293421&r2=293422&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java
(original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java
Mon Oct  3 11:34:04 2005
@@ -20,12 +20,12 @@
 import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.i18n.Keys;
 import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
 import org.apache.ws.resource.properties.ResourceProperty;
 import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
 import org.apache.ws.util.XmlBeanUtils;
 import org.apache.ws.util.i18n.Messages;
 import org.apache.xmlbeans.XmlObject;
+
 import javax.xml.namespace.QName;
 import java.util.Iterator;
 
@@ -71,13 +71,6 @@
    /**
     * DOCUMENT_ME
     *
-    * @return DOCUMENT_ME
-    */
-   protected abstract NamespaceVersionHolder getNamespaceSet(  );
-
-   /**
-    * DOCUMENT_ME
-    *
     * @param propName DOCUMENT_ME
     *
     * @return DOCUMENT_ME
@@ -92,7 +85,7 @@
       ResourceProperty prop = getProperties(  ).get( propName );
       if ( prop == null )
       {
-         throw new InvalidResourcePropertyQNameFaultException( getNamespaceSet(  ), propName
);
+         throw new InvalidResourcePropertyQNameFaultException( getResource().getNamespaceSet(),
propName );
       }
 
       refreshProperty( prop );

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractResourcePropertiesPortType.java?rev=293422&r1=293421&r2=293422&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractResourcePropertiesPortType.java
(original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractResourcePropertiesPortType.java
Mon Oct  3 11:34:04 2005
@@ -95,7 +95,7 @@
          catch ( Exception e )
          {
             LOG.debug( "Refresh Callback Failed", e );
-            throw new ResourcePropertyRetrievalFailedFaultException( getNamespaceSet(  ),
+            throw new ResourcePropertyRetrievalFailedFaultException( getResource().getNamespaceSet(
 ),
                                                                      e.getLocalizedMessage(
 ),
                                                                      Soap1_1Constants.FAULT_SERVER
);
          }

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java?rev=293422&r1=293421&r2=293422&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
(original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
Mon Oct  3 11:34:04 2005
@@ -85,7 +85,7 @@
 
       if ( nameOfPropToBeDeleted == null )
       {
-         throw new DeleteResourcePropertyRequestFailedFaultException( getNamespaceSet(  ),
+         throw new DeleteResourcePropertyRequestFailedFaultException( getResource().getNamespaceSet(
 ),
                                                                       MSG.getMessage( Keys.DEL_MISSING_RP_ATTRIB
) );
       }
 
@@ -98,7 +98,7 @@
          }
          else
          {
-            throw new InvalidResourcePropertyQNameFaultException( getNamespaceSet(  ), nameOfPropToBeDeleted
);
+            throw new InvalidResourcePropertyQNameFaultException( getResource().getNamespaceSet(),
nameOfPropToBeDeleted );
          }
       }
 
@@ -110,7 +110,7 @@
       }
       catch ( RuntimeException re )
       {
-         throw new DeleteResourcePropertyRequestFailedFaultException( getNamespaceSet(  ),
+         throw new DeleteResourcePropertyRequestFailedFaultException( getResource().getNamespaceSet(
 ),
                                                                       re.toString(  ) );
       }
 
@@ -139,7 +139,7 @@
 
       if ( elementNamesNotHomogenous( propElemsToBeInserted ) )
       {
-         throw new InvalidInsertResourcePropertiesRequestContentFaultException( getNamespaceSet(
 ),
+         throw new InvalidInsertResourcePropertiesRequestContentFaultException( getResource().getNamespaceSet(
 ),
                                                                                 MSG.getMessage(
Keys.ERROR_INSERT_ELEMS_NOT_HOMOGENOUS ) );
       }
 
@@ -165,7 +165,7 @@
       }
       catch ( RuntimeException re )
       {
-         throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(  ),
+         throw new SetResourcePropertyRequestFailedFaultException( getResource().getNamespaceSet(
 ),
                                                                    re.toString(  ) );
       }
 
@@ -178,7 +178,7 @@
          }
          catch ( MetaDataViolationException mdve )
          {
-            throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(
 ), mdve );
+            throw new InvalidSetResourcePropertiesRequestContentFaultException( getResource().getNamespaceSet(
 ), mdve );
          }
       }
 
@@ -209,7 +209,7 @@
       throwFaultIfPropertyIsReadOnly( prop );
       if ( elementNamesNotHomogenous( newPropElems ) )
       {
-         throw new InvalidUpdateResourcePropertiesRequestContentFaultException( getNamespaceSet(
 ),
+         throw new InvalidUpdateResourcePropertiesRequestContentFaultException( getResource().getNamespaceSet(
 ),
                                                                                 MSG.getMessage(
Keys.ERROR_UPDATE_ELEMS_NOT_HOMOGENOUS ) );
       }
 
@@ -221,7 +221,7 @@
       }
       catch ( RuntimeException re )
       {
-         throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(  ),
+         throw new SetResourcePropertyRequestFailedFaultException( getResource().getNamespaceSet(
 ),
                                                                    re.toString(  ) );
       }
 
@@ -237,7 +237,7 @@
       }
       catch ( MetaDataViolationException mdve )
       {
-         throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(
 ), mdve );
+         throw new InvalidSetResourcePropertiesRequestContentFaultException( getResource().getNamespaceSet(
 ), mdve );
       }
 
       Object[] newValue = getValue( prop );
@@ -253,7 +253,7 @@
       {
          if ( !getProperties(  ).getMetaData(  ).isOpenContent(  ) )
          {
-            throw new InvalidResourcePropertyQNameFaultException( getNamespaceSet(  ), propName
);
+            throw new InvalidResourcePropertyQNameFaultException( getResource().getNamespaceSet(
 ), propName );
          }
       }
 
@@ -312,7 +312,7 @@
          {
             LOG.debug( MSG.getMessage( Keys.ERROR_DURING_DELETE_CALLBACK, setResourcePropertyCallback
),
                        e );
-            throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(  ),
+            throw new SetResourcePropertyRequestFailedFaultException( getResource().getNamespaceSet(
 ),
                                                                       MSG.getMessage( Keys.ERROR_DURING_DELETE
) );
          }
       }
@@ -358,7 +358,7 @@
          {
             LOG.debug( MSG.getMessage( Keys.ERROR_DURING_INSERT_CALLBACK, setResourcePropertyCallback
),
                        e );
-            throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(  ),
+            throw new SetResourcePropertyRequestFailedFaultException( getResource().getNamespaceSet(
 ),
                                                                       MSG.getMessage( Keys.ERROR_DURING_INSERT
) );
          }
       }
@@ -368,7 +368,7 @@
    {
       if ( prop.getMetaData(  ).getMinOccurs(  ) != 0 )
       {
-         throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(
 ),
+         throw new InvalidSetResourcePropertiesRequestContentFaultException( getResource().getNamespaceSet(
 ),
                                                                              MSG.getMessage(

                                                                                         
    Keys.ERROR_PROPERTY_DELETE_VIOLATES_SCHEMA,
                                                                                         
    prop.getMetaData(  )
@@ -383,7 +383,7 @@
       if ( ( prop.getMetaData(  ).getMaxOccurs(  ) != -1 )
            && ( ( prop.size(  ) + propElemsToBeInserted.length ) > prop.getMetaData(
 ).getMaxOccurs(  ) ) )
       {
-         throw new InvalidInsertResourcePropertiesRequestContentFaultException( getNamespaceSet(
 ),
+         throw new InvalidInsertResourcePropertiesRequestContentFaultException( getResource().getNamespaceSet(
 ),
                                                                                 MSG.getMessage(

                                                                                         
       Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
                                                                                         
       ( ( propElemsToBeInserted.length > 1 )
@@ -397,7 +397,7 @@
    {
       if ( prop.getMetaData(  ).isReadOnly(  ) )
       {
-         throw new UnableToModifyResourcePropertyFaultException( getNamespaceSet(  ),
+         throw new UnableToModifyResourcePropertyFaultException( getResource().getNamespaceSet(
 ),
                                                                  prop.getMetaData(  ).getName(
 ) );
       }
    }
@@ -409,7 +409,7 @@
       if ( ( prop.getMetaData(  ).getMaxOccurs(  ) != -1 )
            && ( newPropElems.length > prop.getMetaData(  ).getMaxOccurs(  ) )
)
       {
-         throw new InvalidUpdateResourcePropertiesRequestContentFaultException( getNamespaceSet(
 ),
+         throw new InvalidUpdateResourcePropertiesRequestContentFaultException( getResource().getNamespaceSet(
 ),
                                                                                 MSG.getMessage(

                                                                                         
       Keys.ERROR_PROPERTY_UPDATE_VIOLATES_SCHEMA,
                                                                                         
       prop.getMetaData(  )
@@ -431,7 +431,7 @@
          {
             LOG.debug( MSG.getMessage( Keys.ERROR_DURING_UPDATE_CALLBACK, setResourcePropertyCallback
),
                        e );
-            throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(  ),
+            throw new SetResourcePropertyRequestFailedFaultException( getResource().getNamespaceSet(
 ),
                                                                       MSG.getMessage( Keys.ERROR_DURING_UPDATE
) );
          }
       }

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=293422&r1=293421&r2=293422&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
Mon Oct  3 11:34:04 2005
@@ -16,13 +16,12 @@
 package org.apache.ws.resource.properties.v2004_06.porttype.impl;
 
 import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
 import org.apache.ws.resource.properties.ResourceProperty;
 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.GetMultipleResourcePropertiesPortType;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesResponseDocument;
+
 import javax.xml.namespace.QName;
 
 /**
@@ -34,7 +33,6 @@
    extends AbstractGetResourcePropertiesPortType
    implements GetMultipleResourcePropertiesPortType
 {
-   private static final NamespaceVersionHolder NAMESPACE_SET = new NamespaceVersionHolderImpl(
 );
 
    /**
     * Creates a new {@link GetMultipleResourcePropertiesPortTypeImpl} object.
@@ -52,10 +50,6 @@
     * @param requestDoc the requestDoc XMLBean
     *
     * @return the response XMLBean
-    *
-    * @throws InvalidResourcePropertyQNameFaultException
-    *
-    * @throws org.apache.ws.resource.faults.ResourceKeyHeaderNotFoundFaultException
     */
    public GetMultipleResourcePropertiesResponseDocument getMultipleResourceProperties( GetMultipleResourcePropertiesDocument
requestDoc )
    {
@@ -66,16 +60,6 @@
       addPropertiesToResponse( props,
                                responseDoc.getGetMultipleResourcePropertiesResponse(  ) );
       return responseDoc;
-   }
-
-   /**
-    * DOCUMENT_ME
-    *
-    * @return DOCUMENT_ME
-    */
-   protected NamespaceVersionHolder getNamespaceSet(  )
-   {
-      return NAMESPACE_SET;
    }
 
    private GetMultipleResourcePropertiesResponseDocument createResponseDocument(  )



Mime
View raw message