You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by ip...@apache.org on 2005/02/16 16:50:33 UTC
svn commit: r154035 - in
incubator/apollo/trunk/src/java/org/apache/ws/resource: i18n/ properties/
properties/faults/ properties/impl/ properties/query/
properties/query/impl/ properties/query/xpath/ properties/query/xpath/impl/
properties/v1_2_draft01/porttype/ properties/v1_2_draft01/porttype/impl/
properties/v1_2_draft05/porttype/ properties/v1_2_draft05/porttype/impl/
Author: ips
Date: Wed Feb 16 07:50:15 2005
New Revision: 154035
URL: http://svn.apache.org/viewcvs?view=rev&rev=154035
Log:
more work on multi-version support
Added:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/i18n/Keys.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/ResourcePropertySet.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AnyResourcePropertyMetaData.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetMetaData.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/ExpressionEvaluator.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/InvalidQueryExpressionException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/QueryEngine.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/QueryExpression.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/UnknownQueryExpressionDialectException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/impl/XmlBeansQueryExpression.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/AbstractXPathExpressionEvaluator.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/XPathExpression.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XalanXPathExpressionEvaluator.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XmlBeansXPathExpressionEvaluator.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/GetMultipleResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/GetResourcePropertyPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/QueryResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/SetResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetResourcePropertyPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/NamespaceVersionHolderImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/SetResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/DeleteResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetMultipleResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyDocumentPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/InsertResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/QueryResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/UpdateResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/NamespaceVersionHolderImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/i18n/Keys.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/i18n/Keys.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/i18n/Keys.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/i18n/Keys.java Wed Feb 16 07:50:15 2005
@@ -475,7 +475,7 @@
*/
String FAILED_TO_EXTRACT_SOAP_ENV = "FAILED_TO_EXTRACT_SOAP_ENV";
/**
- * @msg GetResourceProperty request: {0}
+ * @msg Attempting to get resource property: {0} ...
*/
String GET_RP_REQ = "GET_RP_REQ";
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/ResourcePropertySet.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/ResourcePropertySet.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/ResourcePropertySet.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/ResourcePropertySet.java Wed Feb 16 07:50:15 2005
@@ -17,6 +17,7 @@
import org.apache.commons.lang.SerializationException;
import org.w3c.dom.Element;
+
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPElement;
import java.util.Iterator;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java Wed Feb 16 07:50:15 2005
@@ -16,12 +16,12 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.faults.BaseFaultException;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
+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.query.QueryExpression;
import org.apache.ws.resource.properties.query.xpath.XPathExpression;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.i18n.Keys;
+import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java Wed Feb 16 07:50:15 2005
@@ -16,10 +16,10 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.faults.BaseFaultException;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.i18n.MessagesImpl;
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.v1_2_draft01.ResourcePropertiesConstants;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java Wed Feb 16 07:50:15 2005
@@ -19,6 +19,7 @@
import org.apache.ws.resource.properties.MetaDataViolationException;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
+
import javax.xml.namespace.QName;
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java Wed Feb 16 07:50:15 2005
@@ -16,8 +16,8 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.faults.BaseFaultException;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import javax.xml.namespace.QName;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java Wed Feb 16 07:50:15 2005
@@ -16,11 +16,11 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.ResourceUnknownException;
-import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.faults.BaseFaultException;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
+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.v1_2_draft01.ResourcePropertiesConstants;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java Wed Feb 16 07:50:15 2005
@@ -17,8 +17,8 @@
import org.apache.ws.Soap1_1Constants;
import org.apache.ws.resource.faults.BaseFaultException;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import javax.xml.namespace.QName;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java Wed Feb 16 07:50:15 2005
@@ -16,10 +16,10 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.faults.BaseFaultException;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.i18n.MessagesImpl;
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.v1_2_draft01.ResourcePropertiesConstants;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java Wed Feb 16 07:50:15 2005
@@ -17,8 +17,8 @@
import org.apache.ws.resource.faults.BaseFaultException;
import org.apache.ws.resource.i18n.Keys;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import javax.xml.namespace.QName;
import java.net.URI;
Added: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java?view=auto&rev=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java (added)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java Wed Feb 16 07:50:15 2005
@@ -0,0 +1,94 @@
+/*=============================================================================*
+ * Copyright 2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *=============================================================================*/
+package org.apache.ws.resource.properties.impl;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+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;
+
+/**
+ * A version-neutral base class that is extended by all impls of GetRP and GetMultipleRPs portTypes.
+ *
+ * @author Ian Springer
+ */
+public abstract class AbstractGetResourcePropertiesPortType extends AbstractResourcePropertiesPortType
+{
+
+ private static final Log LOG = LogFactory.getLog( AbstractGetResourcePropertiesPortType.class );
+ private static final Messages MSG = MessagesImpl.getInstance();
+
+ protected AbstractGetResourcePropertiesPortType( ResourceContext resourceContext )
+ {
+ super( resourceContext );
+ }
+
+ protected void addPropertyToResponse( ResourceProperty prop, XmlObject response )
+ {
+ Iterator propElemIter = prop.iterator();
+ while ( propElemIter.hasNext() )
+ {
+ XmlObject propElem = (XmlObject) propElemIter.next();
+ XmlBeanUtils.addChildElement( response, propElem );
+ }
+ }
+
+ protected void addPropertiesToResponse( ResourceProperty[] props, XmlObject response )
+ {
+ for ( int i = 0; i < props.length; i++ )
+ {
+ addPropertyToResponse( props[i], response );
+ }
+ }
+
+ protected ResourceProperty[] getMultipleProperties( QName[] propNames )
+ {
+ ResourceProperty[] props = new ResourceProperty[propNames.length];
+ for ( int i = 0; i < propNames.length; i++ )
+ {
+ props[i] = getProperty( propNames[i] );
+ }
+ return props;
+ }
+
+ protected ResourceProperty getProperty( QName propName )
+ {
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( MSG.getMessage( Keys.GET_RP_REQ, propName ) );
+ }
+ ResourceProperty prop = getProperties().get( propName );
+ if ( prop == null )
+ {
+ throw new InvalidResourcePropertyQNameFaultException( getNamespaceSet(), propName );
+ }
+ refreshProperty( prop );
+ return prop;
+ }
+
+ protected abstract NamespaceVersionHolder getNamespaceSet();
+
+}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractResourcePropertiesPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractResourcePropertiesPortType.java Wed Feb 16 07:50:15 2005
@@ -16,23 +16,22 @@
package org.apache.ws.resource.properties.impl;
import org.apache.ws.resource.AbstractPortType;
-import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.PropertiesResource;
+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.ResourceProperty;
import org.apache.ws.resource.properties.ResourcePropertyCallback;
import org.apache.ws.resource.properties.ResourcePropertySet;
import org.apache.ws.util.i18n.Messages;
-import org.apache.ws.util.XmlBeanUtils;
-import org.apache.xmlbeans.XmlObject;
import javax.xml.rpc.JAXRPCException;
import java.util.Iterator;
/**
- * LOG-DONE
- * @author Ian P. Springer
+ * A version-neutral base class that is extended by all portType impls that make use of resource properties.
+ *
+ * @author Ian Springer
*/
public abstract class AbstractResourcePropertiesPortType
extends AbstractPortType
@@ -61,7 +60,6 @@
{
throw new JAXRPCException( MSG.getMessage( Keys.CALL_WSRP_OP_ON_NOPROP) );
}
-
return ( (PropertiesResource) getResource( ) ).getResourcePropertySet( );
}
@@ -73,6 +71,7 @@
refreshProperty((ResourceProperty)iterator.next());
}
}
+
protected void refreshProperty( ResourceProperty prop )
{
ResourcePropertyCallback callBack = prop.getCallBack( );
@@ -82,13 +81,4 @@
}
}
- protected void addPropertyToResponse( ResourceProperty prop, XmlObject response )
- {
- Iterator propElemIter = prop.iterator();
- while ( propElemIter.hasNext() )
- {
- XmlObject propElem = (XmlObject) propElemIter.next();
- XmlBeanUtils.addChildElement( response, propElem );
- }
- }
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java Wed Feb 16 07:50:15 2005
@@ -39,7 +39,9 @@
import java.util.Iterator;
/**
- * TODO
+ * A version-neutral base class that is extended by all impls of SetRP, InsertRPs, DeleteRPs, and UpdateRPs portTypes.
+ *
+ * @author Ian Springer
*/
public abstract class AbstractSetResourcePropertiesPortType extends AbstractResourcePropertiesPortType
{
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AnyResourcePropertyMetaData.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AnyResourcePropertyMetaData.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AnyResourcePropertyMetaData.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AnyResourcePropertyMetaData.java Wed Feb 16 07:50:15 2005
@@ -16,6 +16,7 @@
package org.apache.ws.resource.properties.impl;
import org.apache.xmlbeans.XmlObject;
+
import javax.xml.namespace.QName;
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetMetaData.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetMetaData.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetMetaData.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetMetaData.java Wed Feb 16 07:50:15 2005
@@ -33,9 +33,9 @@
import javax.xml.namespace.QName;
import java.lang.reflect.Method;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.HashSet;
/**
* An Apache XMLBeans-based implementation of resource property set metadata.
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/ExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/ExpressionEvaluator.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/ExpressionEvaluator.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/ExpressionEvaluator.java Wed Feb 16 07:50:15 2005
@@ -17,6 +17,7 @@
import org.apache.ws.resource.properties.ResourcePropertySet;
import org.w3c.dom.Element;
+
import java.net.URI;
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/InvalidQueryExpressionException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/InvalidQueryExpressionException.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/InvalidQueryExpressionException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/InvalidQueryExpressionException.java Wed Feb 16 07:50:15 2005
@@ -15,8 +15,8 @@
*=============================================================================*/
package org.apache.ws.resource.properties.query;
-import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.i18n.Keys;
+import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.util.i18n.Messages;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/QueryEngine.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/QueryEngine.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/QueryEngine.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/QueryEngine.java Wed Feb 16 07:50:15 2005
@@ -17,6 +17,7 @@
import org.apache.ws.resource.properties.ResourcePropertySet;
import org.w3c.dom.Element;
+
import java.net.URI;
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/QueryExpression.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/QueryExpression.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/QueryExpression.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/QueryExpression.java Wed Feb 16 07:50:15 2005
@@ -16,6 +16,7 @@
package org.apache.ws.resource.properties.query;
import org.w3c.dom.Node;
+
import java.net.URI;
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/UnknownQueryExpressionDialectException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/UnknownQueryExpressionDialectException.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/UnknownQueryExpressionDialectException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/UnknownQueryExpressionDialectException.java Wed Feb 16 07:50:15 2005
@@ -15,8 +15,8 @@
*=============================================================================*/
package org.apache.ws.resource.properties.query;
-import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.i18n.Keys;
+import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.util.i18n.Messages;
import java.net.URI;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/impl/XmlBeansQueryExpression.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/impl/XmlBeansQueryExpression.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/impl/XmlBeansQueryExpression.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/impl/XmlBeansQueryExpression.java Wed Feb 16 07:50:15 2005
@@ -27,10 +27,10 @@
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
+import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryExpressionType;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryExpressionType;
import javax.xml.rpc.JAXRPCException;
import java.net.URI;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/AbstractXPathExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/AbstractXPathExpressionEvaluator.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/AbstractXPathExpressionEvaluator.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/AbstractXPathExpressionEvaluator.java Wed Feb 16 07:50:15 2005
@@ -17,14 +17,14 @@
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.query.ExpressionEvaluator;
import org.apache.ws.resource.properties.query.InvalidQueryExpressionException;
import org.apache.ws.resource.properties.query.QueryEvaluationErrorException;
import org.apache.ws.resource.properties.query.QueryExpression;
import org.apache.ws.resource.properties.query.UnknownQueryExpressionDialectException;
-import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.util.i18n.Messages;
import org.w3c.dom.Element;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/XPathExpression.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/XPathExpression.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/XPathExpression.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/XPathExpression.java Wed Feb 16 07:50:15 2005
@@ -16,15 +16,15 @@
package org.apache.ws.resource.properties.query.xpath;
import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.logging.LogFactory;
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.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;
import org.apache.ws.resource.properties.query.UnknownQueryExpressionDialectException;
-import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.util.JaxpUtils;
import org.apache.ws.util.i18n.Messages;
import org.w3c.dom.Element;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XalanXPathExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XalanXPathExpressionEvaluator.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XalanXPathExpressionEvaluator.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XalanXPathExpressionEvaluator.java Wed Feb 16 07:50:15 2005
@@ -15,6 +15,10 @@
*=============================================================================*/
package org.apache.ws.resource.properties.query.xpath.impl;
+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;
@@ -24,15 +28,11 @@
import org.apache.ws.resource.properties.query.UnknownQueryExpressionDialectException;
import org.apache.ws.resource.properties.query.xpath.AbstractXPathExpressionEvaluator;
import org.apache.ws.resource.properties.query.xpath.XPathExpression;
-import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.util.i18n.Messages;
import org.apache.xalan.Version;
import org.apache.xpath.XPathAPI;
import org.apache.xpath.objects.XNodeSet;
import org.apache.xpath.objects.XObject;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XmlBeansXPathExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XmlBeansXPathExpressionEvaluator.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XmlBeansXPathExpressionEvaluator.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XmlBeansXPathExpressionEvaluator.java Wed Feb 16 07:50:15 2005
@@ -15,6 +15,10 @@
*=============================================================================*/
package org.apache.ws.resource.properties.query.xpath.impl;
+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;
@@ -25,13 +29,9 @@
import org.apache.ws.resource.properties.query.UnknownQueryExpressionDialectException;
import org.apache.ws.resource.properties.query.xpath.AbstractXPathExpressionEvaluator;
import org.apache.ws.resource.properties.query.xpath.XPathExpression;
-import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlObject;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/GetMultipleResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/GetMultipleResourcePropertiesPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/GetMultipleResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/GetMultipleResourcePropertiesPortType.java Wed Feb 16 07:50:15 2005
@@ -15,14 +15,14 @@
*=============================================================================*/
package org.apache.ws.resource.properties.v1_2_draft01.porttype;
+import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesResponseDocument;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import javax.xml.namespace.QName;
/**
- * The WSRF-RP GetResourceProperties portType.
+ * The WSRF-RP GetMultipleResourceProperties portType.
*
* @author Ian P. Springer (Hewlett-Packard Company)
*/
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/GetResourcePropertyPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/GetResourcePropertyPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/GetResourcePropertyPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/GetResourcePropertyPortType.java Wed Feb 16 07:50:15 2005
@@ -15,9 +15,9 @@
*=============================================================================*/
package org.apache.ws.resource.properties.v1_2_draft01.porttype;
+import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyResponseDocument;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import javax.xml.namespace.QName;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/QueryResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/QueryResourcePropertiesPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/QueryResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/QueryResourcePropertiesPortType.java Wed Feb 16 07:50:15 2005
@@ -15,9 +15,9 @@
*=============================================================================*/
package org.apache.ws.resource.properties.v1_2_draft01.porttype;
+import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryResourcePropertiesResponseDocument;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import javax.xml.namespace.QName;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/SetResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/SetResourcePropertiesPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/SetResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/SetResourcePropertiesPortType.java Wed Feb 16 07:50:15 2005
@@ -15,9 +15,9 @@
*=============================================================================*/
package org.apache.ws.resource.properties.v1_2_draft01.porttype;
+import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.SetResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.SetResourcePropertiesResponseDocument;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import javax.xml.namespace.QName;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java Wed Feb 16 07:50:15 2005
@@ -15,17 +15,12 @@
*=============================================================================*/
package org.apache.ws.resource.properties.v1_2_draft01.porttype.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
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.resource.properties.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.AbstractGetResourcePropertiesPortType;
import org.apache.ws.resource.properties.v1_2_draft01.porttype.GetMultipleResourcePropertiesPortType;
-import org.apache.ws.util.i18n.Messages;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesResponseDocument;
@@ -37,13 +32,11 @@
* @author Ian P. Springer
*/
public class GetMultipleResourcePropertiesPortTypeImpl
- extends AbstractResourcePropertiesPortType
+ extends AbstractGetResourcePropertiesPortType
implements GetMultipleResourcePropertiesPortType
{
- private static final Log LOG = LogFactory.getLog( GetMultipleResourcePropertiesPortTypeImpl.class );
- private static final Messages MSG = MessagesImpl.getInstance();
- private NamespaceVersionHolder namespaces = new NamespaceVersionHolderImpl() ;
+ private static final NamespaceVersionHolder NAMESPACE_SET = new NamespaceVersionHolderImpl() ;
/**
* Creates a new {@link GetMultipleResourcePropertiesPortTypeImpl} object.
@@ -65,46 +58,26 @@
* @throws InvalidResourcePropertyQNameFaultException
*
* @throws org.apache.ws.resource.faults.ResoureKeyHeaderNotFoundFaultException
- *
*/
public GetMultipleResourcePropertiesResponseDocument getMultipleResourceProperties( GetMultipleResourcePropertiesDocument requestDoc )
{
- if ( LOG.isDebugEnabled() )
- {
- LOG.debug( MSG.getMessage( Keys.GET_MULTI_RP_REQ,
- requestDoc.toString() ) );
- }
-
GetMultipleResourcePropertiesResponseDocument responseDoc = createResponseDocument();
- QName[] propNames =
- requestDoc.getGetMultipleResourceProperties().getResourcePropertyArray();
-
- for ( int i = 0; i < propNames.length; i++ )
- {
- ResourceProperty prop = getProperties().get( propNames[i] );
- if ( prop == null )
- {
- throw new InvalidResourcePropertyQNameFaultException(namespaces, propNames[i] );
- }
- refreshProperty( prop );
- if ( prop == null )
- {
- throw new InvalidResourcePropertyQNameFaultException(namespaces, propNames[i] );
- }
-
- addPropertyToResponse( prop,
- responseDoc.getGetMultipleResourcePropertiesResponse() );
- }
-
+ QName[] propNames = requestDoc.getGetMultipleResourceProperties().getResourcePropertyArray();
+ ResourceProperty[] props = getMultipleProperties( propNames );
+ addPropertiesToResponse( props, responseDoc.getGetMultipleResourcePropertiesResponse() );
return responseDoc;
}
private GetMultipleResourcePropertiesResponseDocument createResponseDocument()
{
- GetMultipleResourcePropertiesResponseDocument responseDoc =
- GetMultipleResourcePropertiesResponseDocument.Factory.newInstance();
+ GetMultipleResourcePropertiesResponseDocument responseDoc = GetMultipleResourcePropertiesResponseDocument.Factory.newInstance();
responseDoc.addNewGetMultipleResourcePropertiesResponse();
return responseDoc;
+ }
+
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return NAMESPACE_SET;
}
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetResourcePropertyPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetResourcePropertyPortTypeImpl.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetResourcePropertyPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetResourcePropertyPortTypeImpl.java Wed Feb 16 07:50:15 2005
@@ -20,19 +20,16 @@
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.ResourceProperty;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
+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.v1_2_draft01.porttype.GetResourcePropertyPortType;
-import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
-import org.apache.xmlbeans.XmlObject;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyResponseDocument;
import javax.xml.namespace.QName;
-import java.util.Iterator;
/**
* An operation provider for wsrp:GetResourceProperty.
@@ -40,13 +37,13 @@
* @author Ian P. Springer
*/
public class GetResourcePropertyPortTypeImpl
- extends AbstractResourcePropertiesPortType
+ extends AbstractGetResourcePropertiesPortType
implements GetResourcePropertyPortType
{
private static final Log LOG = LogFactory.getLog( GetResourcePropertyPortTypeImpl.class );
private static final Messages MSG = MessagesImpl.getInstance();
- private NamespaceVersionHolder namespaces = new NamespaceVersionHolderImpl() ;
+ private static final NamespaceVersionHolder NAMESPACE_SET = new NamespaceVersionHolderImpl() ;
/**
* Creates a new {@link GetResourcePropertyPortTypeImpl} object.
@@ -67,8 +64,7 @@
*
* @throws InvalidResourcePropertyQNameFaultException
*
- * @throws org.apache.ws.resource.faults.ResoureKeyHeaderNotFoundFaultException
- *
+ * @throws org.apache.ws.resource.faults.ResoureKeyHeaderNotFoundFaultException
*/
public GetResourcePropertyResponseDocument getResourceProperty( GetResourcePropertyDocument requestDoc )
{
@@ -78,27 +74,21 @@
}
GetResourcePropertyResponseDocument responseDoc = createResponseDocument();
QName propName = requestDoc.getGetResourceProperty();
- ResourceProperty prop = getProperties().get( propName );
- if ( prop == null )
- {
- throw new InvalidResourcePropertyQNameFaultException(namespaces, propName );
- }
- refreshProperty( prop );
- Iterator propElemIter = prop.iterator();
- while ( propElemIter.hasNext() )
- {
- XmlObject propElem = (XmlObject) propElemIter.next();
- XmlBeanUtils.addChildElement( responseDoc.getGetResourcePropertyResponse(),
- propElem );
- }
+ ResourceProperty prop = getProperty( propName );
+ addPropertyToResponse( prop, responseDoc.getGetResourcePropertyResponse() );
return responseDoc;
}
private GetResourcePropertyResponseDocument createResponseDocument()
{
- GetResourcePropertyResponseDocument responseDoc =
- GetResourcePropertyResponseDocument.Factory.newInstance();
+ GetResourcePropertyResponseDocument responseDoc = GetResourcePropertyResponseDocument.Factory.newInstance();
responseDoc.addNewGetResourcePropertyResponse();
return responseDoc;
}
+
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return NAMESPACE_SET;
+ }
+
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/NamespaceVersionHolderImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/NamespaceVersionHolderImpl.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/NamespaceVersionHolderImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/NamespaceVersionHolderImpl.java Wed Feb 16 07:50:15 2005
@@ -1,12 +1,11 @@
package org.apache.ws.resource.properties.v1_2_draft01.porttype.impl;
+import org.apache.axis.message.addressing.Constants;
+import org.apache.ws.resource.faults.v1_2_draft01.Faults1_2Constants;
+import org.apache.ws.resource.lifetime.v1_2_draft01.ResourceLifetime1_2Constants;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
-import org.apache.ws.resource.lifetime.v1_2_draft01.ResourceLifetime1_2Constants;
-import org.apache.ws.resource.faults.v1_2_draft01.Faults1_2Constants;
import org.apache.ws.resource.servicegroup.v1_2_draft01.ServiceGroup1_2Constants;
-
-import org.apache.axis.message.addressing.Constants;
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/QueryResourcePropertiesPortTypeImpl.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/QueryResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/QueryResourcePropertiesPortTypeImpl.java Wed Feb 16 07:50:15 2005
@@ -20,9 +20,11 @@
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.faults.InvalidQueryExpressionFaultException;
import org.apache.ws.resource.properties.faults.QueryEvaluationErrorFaultException;
import org.apache.ws.resource.properties.faults.UnknownQueryExpressionDialectFaultException;
+import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
import org.apache.ws.resource.properties.query.InvalidQueryExpressionException;
import org.apache.ws.resource.properties.query.QueryEngine;
import org.apache.ws.resource.properties.query.QueryEvaluationErrorException;
@@ -30,8 +32,6 @@
import org.apache.ws.resource.properties.query.impl.QueryEngineImpl;
import org.apache.ws.resource.properties.query.impl.XmlBeansQueryExpression;
import org.apache.ws.resource.properties.v1_2_draft01.porttype.QueryResourcePropertiesPortType;
-import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlObject;
@@ -46,6 +46,8 @@
/**
* LOG-DONE An operation provider for wsrp:QueryResourceProperties.
+ *
+ * TODO: factor out a common base class to be shared across spec versions
*
* @author Ian P. Springer
*/
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/SetResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/SetResourcePropertiesPortTypeImpl.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/SetResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/SetResourcePropertiesPortTypeImpl.java Wed Feb 16 07:50:15 2005
@@ -21,17 +21,17 @@
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.properties.MetaDataViolationException;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.ResourceProperty;
import org.apache.ws.resource.properties.ResourcePropertyCallback;
import org.apache.ws.resource.properties.ResourcePropertyMetaData;
import org.apache.ws.resource.properties.SetResourcePropertyCallback;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
import org.apache.ws.resource.properties.faults.InvalidSetResourcePropertiesRequestContentFaultException;
import org.apache.ws.resource.properties.faults.SetResourcePropertyRequestFailedFaultException;
import org.apache.ws.resource.properties.faults.UnableToModifyResourcePropertyFaultException;
-import org.apache.ws.resource.properties.impl.AnyResourcePropertyMetaData;
import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.AnyResourcePropertyMetaData;
import org.apache.ws.resource.properties.v1_2_draft01.porttype.SetResourcePropertiesPortType;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/DeleteResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/DeleteResourcePropertiesPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/DeleteResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/DeleteResourcePropertiesPortType.java Wed Feb 16 07:50:15 2005
@@ -16,14 +16,6 @@
package org.apache.ws.resource.properties.v1_2_draft05.porttype;
import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesResponseDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentResponseDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentDocument1;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertResourcePropertiesResponseDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertResourcePropertiesDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesResponseDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesResponseDocument;
@@ -31,7 +23,7 @@
/**
- * The WSRF-RP GetResourceProperties portType.
+ * The WSRF-RP DeleteResourceProperties portType.
*
* @author Ian P. Springer (Hewlett-Packard Company)
*/
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetMultipleResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetMultipleResourcePropertiesPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetMultipleResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetMultipleResourcePropertiesPortType.java Wed Feb 16 07:50:15 2005
@@ -16,14 +16,13 @@
package org.apache.ws.resource.properties.v1_2_draft05.porttype;
import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesResponseDocument;
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 GetResourceProperties portType.
+ * The WSRF-RP GetMultipleResourceProperties portType.
*
* @author Ian P. Springer (Hewlett-Packard Company)
*/
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyDocumentPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyDocumentPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyDocumentPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyDocumentPortType.java Wed Feb 16 07:50:15 2005
@@ -16,16 +16,13 @@
package org.apache.ws.resource.properties.v1_2_draft05.porttype;
import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesResponseDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentResponseDocument;
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 GetResourceProperties portType.
+ * The WSRF-RP GetResourcePropertyDocument portType.
*
* @author Ian P. Springer (Hewlett-Packard Company)
*/
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyPortType.java Wed Feb 16 07:50:15 2005
@@ -16,8 +16,8 @@
package org.apache.ws.resource.properties.v1_2_draft05.porttype;
import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyResponseDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocument;
+import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyResponseDocument;
import javax.xml.namespace.QName;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/InsertResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/InsertResourcePropertiesPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/InsertResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/InsertResourcePropertiesPortType.java Wed Feb 16 07:50:15 2005
@@ -16,18 +16,14 @@
package org.apache.ws.resource.properties.v1_2_draft05.porttype;
import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesResponseDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentResponseDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentDocument1;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertResourcePropertiesResponseDocument;
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 GetResourceProperties portType.
+ * The WSRF-RP InsertResourceProperties portType.
*
* @author Ian P. Springer (Hewlett-Packard Company)
*/
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/QueryResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/QueryResourcePropertiesPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/QueryResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/QueryResourcePropertiesPortType.java Wed Feb 16 07:50:15 2005
@@ -17,8 +17,8 @@
import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryResourcePropertiesResponseDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryResourcePropertiesDocument;
+import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryResourcePropertiesResponseDocument;
import javax.xml.namespace.QName;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/UpdateResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/UpdateResourcePropertiesPortType.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/UpdateResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/UpdateResourcePropertiesPortType.java Wed Feb 16 07:50:15 2005
@@ -16,12 +16,6 @@
package org.apache.ws.resource.properties.v1_2_draft05.porttype;
import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesResponseDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentResponseDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentDocument1;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertResourcePropertiesResponseDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesResponseDocument;
@@ -29,7 +23,7 @@
/**
- * The WSRF-RP GetResourceProperties portType.
+ * The WSRF-RP UpdateResourceProperties portType.
*
* @author Ian P. Springer (Hewlett-Packard Company)
*/
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java Wed Feb 16 07:50:15 2005
@@ -1,84 +1,61 @@
package org.apache.ws.resource.properties.v1_2_draft05.porttype.impl;
-import org.apache.ws.resource.properties.v1_2_draft05.porttype.GetMultipleResourcePropertiesPortType;
-import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
-import org.apache.ws.resource.properties.ResourceProperty;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.i18n.Keys;
-import org.apache.ws.util.i18n.Messages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesResponseDocument;
+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.v1_2_draft05.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 Sal Campana
+ * @author Ian Springer
*/
-public class GetMultipleResourcePropertiesPortTypeImpl extends AbstractResourcePropertiesPortType implements GetMultipleResourcePropertiesPortType
+public class GetMultipleResourcePropertiesPortTypeImpl extends AbstractGetResourcePropertiesPortType
+ implements GetMultipleResourcePropertiesPortType
{
- private static final Log LOG = LogFactory.getLog( GetMultipleResourcePropertiesPortTypeImpl.class );
- private static final Messages MSG = MessagesImpl.getInstance();
- private NamespaceVersionHolder namespaces = new NamespaceVersionHolderImpl() ;
+
+ private static final NamespaceVersionHolder NAMESPACE_SET = new NamespaceVersionHolderImpl();
+
/**
- * Creates a new {@link AbstractResourcePropertiesPortType} object.
+ * Creates a new {@link GetMultipleResourcePropertiesPortTypeImpl} object.
*
* @param resourceContext DOCUMENT_ME
*/
- public GetMultipleResourcePropertiesPortTypeImpl(ResourceContext resourceContext)
+ public GetMultipleResourcePropertiesPortTypeImpl( ResourceContext resourceContext )
{
- super(resourceContext);
+ super( resourceContext );
}
-
/**
* DOCUMENT_ME
*
* @param requestDoc DOCUMENT_ME
+ *
* @return DOCUMENT_ME
*/
- public GetMultipleResourcePropertiesResponseDocument getMultipleResourceProperties(GetMultipleResourcePropertiesDocument requestDoc)
+ public GetMultipleResourcePropertiesResponseDocument getMultipleResourceProperties(
+ GetMultipleResourcePropertiesDocument requestDoc )
{
- if ( LOG.isDebugEnabled() )
- {
- LOG.debug( MSG.getMessage( Keys.GET_MULTI_RP_REQ,
- requestDoc.toString() ) );
- }
-
GetMultipleResourcePropertiesResponseDocument responseDoc = createResponseDocument();
- QName[] propNames =
- requestDoc.getGetMultipleResourceProperties().getResourcePropertyArray();
-
- for ( int i = 0; i < propNames.length; i++ )
- {
- ResourceProperty prop = getProperties().get( propNames[i] );
- if ( prop == null )
- {
- throw new InvalidResourcePropertyQNameFaultException(namespaces, propNames[i] );
- }
- refreshProperty( prop );
- if ( prop == null )
- {
- throw new InvalidResourcePropertyQNameFaultException(namespaces, propNames[i] );
- }
-
- addPropertyToResponse( prop,
- responseDoc.getGetMultipleResourcePropertiesResponse() );
- }
-
+ QName[] propNames = requestDoc.getGetMultipleResourceProperties().getResourcePropertyArray();
+ ResourceProperty[] props = getMultipleProperties( propNames );
+ addPropertiesToResponse( props, responseDoc.getGetMultipleResourcePropertiesResponse() );
return responseDoc;
}
+
private GetMultipleResourcePropertiesResponseDocument createResponseDocument()
{
- GetMultipleResourcePropertiesResponseDocument responseDoc =
- GetMultipleResourcePropertiesResponseDocument.Factory.newInstance();
+ GetMultipleResourcePropertiesResponseDocument responseDoc = GetMultipleResourcePropertiesResponseDocument.Factory.newInstance();
responseDoc.addNewGetMultipleResourcePropertiesResponse();
return responseDoc;
+ }
+
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return NAMESPACE_SET;
}
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java Wed Feb 16 07:50:15 2005
@@ -1,18 +1,17 @@
package org.apache.ws.resource.properties.v1_2_draft05.porttype.impl;
-import org.apache.ws.resource.properties.v1_2_draft05.porttype.GetResourcePropertyDocumentPortType;
-import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
-import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
-import org.apache.ws.resource.properties.ResourcePropertySet;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.util.i18n.Messages;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
+import org.apache.ws.resource.properties.v1_2_draft05.porttype.GetResourcePropertyDocumentPortType;
import org.apache.ws.util.XmlBeanUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentResponseDocument;
+import org.apache.ws.util.i18n.Messages;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentDocument1;
+import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentResponseDocument;
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyPortTypeImpl.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyPortTypeImpl.java Wed Feb 16 07:50:15 2005
@@ -15,25 +15,16 @@
*=============================================================================*/
package org.apache.ws.resource.properties.v1_2_draft05.porttype.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
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.ResourceProperty;
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.resource.properties.impl.AbstractGetResourcePropertiesPortType;
import org.apache.ws.resource.properties.v1_2_draft05.porttype.GetResourcePropertyPortType;
-import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
-
-import org.apache.ws.util.XmlBeanUtils;
-import org.apache.ws.util.i18n.Messages;
-import org.apache.xmlbeans.XmlObject;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyResponseDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocument;
+import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyResponseDocument;
import javax.xml.namespace.QName;
-import java.util.Iterator;
/**
* An operation provider for wsrp:GetResourceProperty.
@@ -41,13 +32,11 @@
* @author Ian P. Springer
*/
public class GetResourcePropertyPortTypeImpl
- extends AbstractResourcePropertiesPortType
+ extends AbstractGetResourcePropertiesPortType
implements GetResourcePropertyPortType
{
- private static final Log LOG = LogFactory.getLog( GetResourcePropertyPortTypeImpl.class );
- private static final Messages MSG = MessagesImpl.getInstance();
- private NamespaceVersionHolder namespaces = new NamespaceVersionHolderImpl() ;
+ private static final NamespaceVersionHolder NAMESPACE_SET = new NamespaceVersionHolderImpl() ;
/**
* Creates a new {@link GetResourcePropertyPortTypeImpl} object.
@@ -73,33 +62,23 @@
*/
public GetResourcePropertyResponseDocument getResourceProperty( GetResourcePropertyDocument requestDoc )
{
- if ( LOG.isDebugEnabled() )
- {
- LOG.debug( MSG.getMessage( Keys.GET_RP_REQ, requestDoc.toString() ) );
- }
GetResourcePropertyResponseDocument responseDoc = createResponseDocument();
QName propName = requestDoc.getGetResourceProperty();
- ResourceProperty prop = getProperties().get( propName );
- if ( prop == null )
- {
- throw new InvalidResourcePropertyQNameFaultException(namespaces, propName );
- }
- refreshProperty( prop );
- Iterator propElemIter = prop.iterator();
- while ( propElemIter.hasNext() )
- {
- XmlObject propElem = (XmlObject) propElemIter.next();
- XmlBeanUtils.addChildElement( responseDoc.getGetResourcePropertyResponse(),
- propElem );
- }
+ ResourceProperty prop = getProperty( propName );
+ addPropertyToResponse( prop, responseDoc.getGetResourcePropertyResponse() );
return responseDoc;
}
private GetResourcePropertyResponseDocument createResponseDocument()
{
- GetResourcePropertyResponseDocument responseDoc =
- GetResourcePropertyResponseDocument.Factory.newInstance();
+ GetResourcePropertyResponseDocument responseDoc = GetResourcePropertyResponseDocument.Factory.newInstance();
responseDoc.addNewGetResourcePropertyResponse();
return responseDoc;
}
+
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return NAMESPACE_SET;
+ }
+
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/NamespaceVersionHolderImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/NamespaceVersionHolderImpl.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/NamespaceVersionHolderImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/NamespaceVersionHolderImpl.java Wed Feb 16 07:50:15 2005
@@ -1,11 +1,11 @@
package org.apache.ws.resource.properties.v1_2_draft05.porttype.impl;
+import org.apache.axis.message.addressing.Constants;
+import org.apache.ws.resource.faults.v1_2_draft03.Faults1_2Constants;
+import org.apache.ws.resource.lifetime.v1_2_draft04.ResourceLifetime1_2Constants;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
-import org.apache.ws.resource.lifetime.v1_2_draft04.ResourceLifetime1_2Constants;
-import org.apache.ws.resource.faults.v1_2_draft03.Faults1_2Constants;
import org.apache.ws.resource.servicegroup.v1_2_draft03.ServiceGroup1_2Constants;
-import org.apache.axis.message.addressing.Constants;
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/QueryResourcePropertiesPortTypeImpl.java?view=diff&r1=154034&r2=154035
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/QueryResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/QueryResourcePropertiesPortTypeImpl.java Wed Feb 16 07:50:15 2005
@@ -20,26 +20,24 @@
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.faults.InvalidQueryExpressionFaultException;
+import org.apache.ws.resource.properties.faults.QueryEvaluationErrorFaultException;
+import org.apache.ws.resource.properties.faults.UnknownQueryExpressionDialectFaultException;
+import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.query.InvalidQueryExpressionException;
import org.apache.ws.resource.properties.query.QueryEngine;
-import org.apache.ws.resource.properties.query.UnknownQueryExpressionDialectException;
import org.apache.ws.resource.properties.query.QueryEvaluationErrorException;
-import org.apache.ws.resource.properties.query.InvalidQueryExpressionException;
-
+import org.apache.ws.resource.properties.query.UnknownQueryExpressionDialectException;
import org.apache.ws.resource.properties.query.impl.QueryEngineImpl;
import org.apache.ws.resource.properties.query.impl.XmlBeansQueryExpression;
-
-import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
import org.apache.ws.resource.properties.v1_2_draft05.porttype.QueryResourcePropertiesPortType;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.faults.UnknownQueryExpressionDialectFaultException;
-import org.apache.ws.resource.properties.faults.QueryEvaluationErrorFaultException;
-import org.apache.ws.resource.properties.faults.InvalidQueryExpressionFaultException;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlObject;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryResourcePropertiesResponseDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryResourcePropertiesDocument;
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 javax.xml.rpc.JAXRPCException;
import javax.xml.soap.SOAPEnvelope;
@@ -49,6 +47,8 @@
/**
* LOG-DONE An operation provider for wsrp:QueryResourceProperties.
*
+ * TODO: factor out a common base class to be shared across spec versions
+ *
* @author Ian P. Springer
*/
public class QueryResourcePropertiesPortTypeImpl
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org