You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-commits@ws.apache.org by ip...@apache.org on 2005/10/05 00:53:21 UTC
svn commit: r294940 [1/2] - in /webservices/wsrf/trunk/src:
examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/
examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/
java/org/apache/ws/resource/ java/...
Author: ips
Date: Tue Oct 4 15:52:49 2005
New Revision: 294940
URL: http://svn.apache.org/viewcvs?rev=294940&view=rev
Log:
various
Added:
webservices/wsrf/trunk/src/java/org/apache/ws/resource/NamespaceVersionHolder.java
- copied, changed from r293366, webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/NamespaceVersionHolder.java
Removed:
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/NamespaceVersionHolder.java
Modified:
webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/AbstractFilesystemResource.java
webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemHome.java
webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemService.java
webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_spring-jndi-config.xml
webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/MountDeviceBusyFaultException.java
webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/ClientErrorNotPossibleFaultException.java
webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java
webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java
webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/AbstractPortType.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/JndiConstants.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/Resource.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/ResourceHome.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/WsrfRuntime.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/BaseFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/AxisResourceContext.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/ResourceContextImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/UnsupportedVersionException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceNotDestroyedFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceUnknownFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/impl/AbstractResourceTerminationEvent.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/impl/ResourceTerminationEventImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_06/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_06/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_11/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_11/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/metadataexchange/v2004_09/porttype/impl/MetadataExchangePortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/ResourcePropertyValueChangeListener.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InsertResourcePropertyRequestFailedFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/ResourcePropertyRetrievalFailedFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UpdateResourcePropertyRequestFailedFaultException.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/impl/NamespaceVersionHolderImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetResourcePropertyPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/impl/NamespaceVersionHolderImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/InsertResourcePropertiesPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/SpringJndiPopulator.java
webservices/wsrf/trunk/src/templates/AbstractResource.vm
webservices/wsrf/trunk/src/templates/BaseFaultExtension.vm
webservices/wsrf/trunk/src/templates/Home.vm
webservices/wsrf/trunk/src/templates/Service.vm
webservices/wsrf/trunk/src/templates/spring-jndi-config.xml.vm
webservices/wsrf/trunk/src/test/org/apache/ws/resource/WsrfRuntimeTestCase.java
webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiHome.java
webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiResource.java
webservices/wsrf/trunk/src/test/spring-jndi-config.xml
Modified: webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/AbstractFilesystemResource.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/AbstractFilesystemResource.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/AbstractFilesystemResource.java (original)
+++ webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/AbstractFilesystemResource.java Tue Oct 4 15:52:49 2005
@@ -1,7 +1,7 @@
package org.apache.ws.resource.example.filesystem;
import org.apache.ws.addressing.EndpointReference;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
/**
* **** WARNING: This file will be overwritten during generation ****
Modified: webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemHome.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemHome.java (original)
+++ webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemHome.java Tue Oct 4 15:52:49 2005
@@ -73,7 +73,7 @@
return RESOURCE_KEY_NAME;
}
- public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder()
+ public org.apache.ws.resource.NamespaceVersionHolder getNamespaceVersionHolder()
{
return SPEC_NAMESPACE_SET;
}
Modified: webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemService.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemService.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemService.java (original)
+++ webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemService.java Tue Oct 4 15:52:49 2005
@@ -38,7 +38,7 @@
* @return A NamespaceVersionHolder impl which represents the collection of spec namespaces associated with this
* service.
*/
- protected org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceSet()
+ protected org.apache.ws.resource.NamespaceVersionHolder getNamespaceSet()
{
return SPEC_NAMESPACE_SET;
}
Modified: webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_spring-jndi-config.xml
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_spring-jndi-config.xml?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_spring-jndi-config.xml (original)
+++ webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_spring-jndi-config.xml Tue Oct 4 15:52:49 2005
@@ -7,6 +7,7 @@
<beans>
<bean name="resource/filesystem" class="org.apache.ws.resource.example.filesystem.FilesystemHome" init-method="init">
+ <property name="portComponentName"><value>filesystem</value></property>
<property name="serviceClass"><value>org.apache.ws.resource.example.filesystem.FilesystemService</value></property>
<property name="resourceClass"><value>org.apache.ws.resource.example.filesystem.FilesystemResource</value></property>
<property name="resourceIdentifierReferenceParameterName"><value>{http://ws.apache.org/resource/example/filesystem}ResourceIdentifier</value></property>
Modified: webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/MountDeviceBusyFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/MountDeviceBusyFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/MountDeviceBusyFaultException.java (original)
+++ webservices/wsrf/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/MountDeviceBusyFaultException.java Tue Oct 4 15:52:49 2005
@@ -1,13 +1,9 @@
package org.apache.ws.resource.example.filesystem;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
/**
* **** WARNING: This file will be overwritten during generation ****
@@ -15,9 +11,6 @@
public class MountDeviceBusyFaultException
extends AbstractBaseFaultException
{
-
- private static final Messages MSG = MessagesImpl.getInstance();
- private static final Log LOG = LogFactory.getLog( MountDeviceBusyFaultException.class );
private QName m_name;
Modified: webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/ClientErrorNotPossibleFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/ClientErrorNotPossibleFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/ClientErrorNotPossibleFaultException.java (original)
+++ webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/ClientErrorNotPossibleFaultException.java Tue Oct 4 15:52:49 2005
@@ -2,7 +2,8 @@
import org.apache.ws.resource.faults.BaseFaultException;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import javax.xml.namespace.QName;
Modified: webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java (original)
+++ webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java Tue Oct 4 15:52:49 2005
@@ -19,7 +19,7 @@
import org.apache.ws.resource.IllegalResourceTypeException;
import org.apache.ws.resource.JndiConstants;
import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.MimeMediaTypeType;
import javax.xml.namespace.QName;
Modified: webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java (original)
+++ webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java Tue Oct 4 15:52:49 2005
@@ -16,7 +16,8 @@
package org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl;
import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import javax.xml.namespace.QName;
import java.io.Serializable;
Modified: webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java (original)
+++ webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java Tue Oct 4 15:52:49 2005
@@ -21,8 +21,9 @@
import org.apache.ws.resource.ResourceContextException;
import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import javax.xml.namespace.QName;
import java.io.Serializable;
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=294940&r1=294939&r2=294940&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 Tue Oct 4 15:52:49 2005
@@ -18,7 +18,6 @@
import org.apache.ws.Soap1_1Constants;
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;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/JndiConstants.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/JndiConstants.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/JndiConstants.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/JndiConstants.java Tue Oct 4 15:52:49 2005
@@ -59,22 +59,22 @@
/**
* JNDI path to the default work manager
*/
- String KEY_NAME_DEFAULT_WORK_MANAGER = CONTEXT_NAME_GLOBAL + "/wm/ContainerWorkManager";
+ String CONTEXT_NAME_DEFAULT_WORK_MANAGER = CONTEXT_NAME_GLOBAL + "/wm/ContainerWorkManager";
/**
* JNDI path to the default timer manager
*/
- String KEY_NAME_DEFAULT_TIMER = CONTEXT_NAME_GLOBAL + "/timer/ContainerTimer";
+ String CONTEXT_NAME_DEFAULT_TIMER = CONTEXT_NAME_GLOBAL + "/timer/ContainerTimer";
/**
* JNDI path to the default query engine
*/
- String KEY_NAME_DEFAULT_QUERY_ENGINE = CONTEXT_NAME_GLOBAL + "/query/ContainerQueryEngine";
+ String CONTEXT_NAME_DEFAULT_QUERY_ENGINE = CONTEXT_NAME_GLOBAL + "/query/ContainerQueryEngine";
/**
* JNDI path to the default topic expression engine
*/
- String KEY_NAME_DEFAULT_TOPIC_EXPRESSION_ENGINE = CONTEXT_NAME_GLOBAL + "/topic/ContainerTopicExpressionEngine";
+ String CONTEXT_NAME_DEFAULT_TOPIC_EXPRESSION_ENGINE = CONTEXT_NAME_GLOBAL + "/topic/ContainerTopicExpressionEngine";
/**
* JNDI path to the default topic expression evaluator
Copied: webservices/wsrf/trunk/src/java/org/apache/ws/resource/NamespaceVersionHolder.java (from r293366, webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/NamespaceVersionHolder.java)
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/NamespaceVersionHolder.java?p2=webservices/wsrf/trunk/src/java/org/apache/ws/resource/NamespaceVersionHolder.java&p1=webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/NamespaceVersionHolder.java&r1=293366&r2=294940&rev=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/NamespaceVersionHolder.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/NamespaceVersionHolder.java Tue Oct 4 15:52:49 2005
@@ -13,8 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*=============================================================================*/
-package org.apache.ws.resource.properties;
-
+package org.apache.ws.resource;
/**
* Interface used for maintaining a set of versions of namespaces for
@@ -22,7 +21,7 @@
*
* The point to this interface is as each draft of the WSRF specifications
* come out, we can have an impl which will point us to all the correct
- * namespaces for use in polymorphic-versionless class....
+ * namespaces for use in polymorphic-versionless class...
*
* @author Sal Campana
*/
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/Resource.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/Resource.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/Resource.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/Resource.java Tue Oct 4 15:52:49 2005
@@ -17,7 +17,6 @@
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.resource.lifetime.ResourceTerminationListener;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
/**
* A WS-Resource.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/ResourceHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/ResourceHome.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/ResourceHome.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/ResourceHome.java Tue Oct 4 15:52:49 2005
@@ -27,6 +27,16 @@
extends ResourceCreation,
ResourceDestruction
{
+
+ /**
+ * Returns the name of the JSR-109 port component corresponding to this home.
+ * Note, the port component name ends up being the last path component of the
+ * service endpoint URL.
+ *
+ * @return the name of the JSR-109 port component corresponding to this home
+ */
+ String getPortComponentName( );
+
/**
* Sets the classname of the Resource Impl.
*
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/WsrfRuntime.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/WsrfRuntime.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/WsrfRuntime.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/WsrfRuntime.java Tue Oct 4 15:52:49 2005
@@ -30,6 +30,9 @@
import org.springframework.core.io.ClassPathResource;
import javax.xml.namespace.QName;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.NameNotFoundException;
import java.io.InputStream;
import java.net.URL;
import java.util.Properties;
@@ -84,7 +87,7 @@
else if ( jndiConfigDialect.equals( CONFIG_DIALECT_SPRING_BEANS ) )
{
createBeanFactory( jndiConfigLocation );
- SpringJndiPopulator.populateContext( XmlBeanJndiUtils.initWsrfContext(), m_beanFactory );
+ SpringJndiPopulator.populateJndi( m_beanFactory );
}
else
{
@@ -98,29 +101,36 @@
}
}
- public synchronized void destroy()
- {
- // reserved for future use.
- }
-
-
public String getVersion()
{
return VERSION;
}
- public String getHomeJndiName( String serviceName )
+ /**
+ * Returns the <code>ResourceHome</code> for the JSR-109 portComponent with the specified name.
+ *
+ * @param portComponentName a JSR-109 portComponent name
+ *
+ * @return the <code>ResourceHome</code> for the JSR-109 portComponent with the specified name
+ *
+ * @throws ResourceException if no home is configured for the specified portComponent name
+ */
+ public ResourceHome getResourceHome( String portComponentName ) throws ResourceException
{
- String homeJndiName;
- if ( m_beanFactory != null ) // new way
+ ResourceHome home;
+ try
{
- homeJndiName = JndiConstants.CONTEXT_NAME_RESOURCE + "/" + serviceName;
+ home = (ResourceHome) new InitialContext( ).lookup( getResourceHomeJndiName( portComponentName ) );
}
- else // old way
+ catch ( NameNotFoundException nnfe )
{
- homeJndiName = JndiConstants.CONTEXT_NAME_SERVICES + "/" + serviceName + "/" + JndiConstants.ATOMIC_NAME_HOME;
+ throw new ResourceException( "There is no resource home configured for a portComponent named " + portComponentName + "." );
}
- return homeJndiName;
+ catch ( NamingException ne )
+ {
+ throw new RuntimeException( "Unable to lookup resource home from JNDI using name " + portComponentName + ".", ne );
+ }
+ return home;
}
/**
@@ -144,6 +154,20 @@
m_baseWebappUrl = baseWebappUrl;
}
+ private String getResourceHomeJndiName( String portComponentName )
+ {
+ String homeJndiName;
+ if ( m_beanFactory != null ) // new way
+ {
+ homeJndiName = JndiConstants.CONTEXT_NAME_RESOURCE + "/" + portComponentName;
+ }
+ else // old way
+ {
+ homeJndiName = JndiConstants.CONTEXT_NAME_SERVICES + "/" + portComponentName + "/" + JndiConstants.ATOMIC_NAME_HOME;
+ }
+ return homeJndiName;
+ }
+
private void createBeanFactory( String jndiConfigLocation )
{
m_beanFactory = new XmlBeanFactory( new ClassPathResource( jndiConfigLocation ) );
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java Tue Oct 4 15:52:49 2005
@@ -21,7 +21,8 @@
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.impl.UnsupportedVersionException;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.util.XmlBeanNameUtils;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/BaseFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/BaseFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/BaseFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/BaseFaultException.java Tue Oct 4 15:52:49 2005
@@ -15,7 +15,7 @@
*=============================================================================*/
package org.apache.ws.resource.faults;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import javax.xml.namespace.QName;
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/AxisResourceContext.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/AxisResourceContext.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/AxisResourceContext.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/AxisResourceContext.java Tue Oct 4 15:52:49 2005
@@ -15,11 +15,8 @@
*=============================================================================*/
package org.apache.ws.resource.handler.axis;
-import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.impl.ResourceContextImpl;
-import org.apache.ws.util.i18n.Messages;
-import javax.xml.rpc.handler.MessageContext;
import javax.xml.rpc.handler.soap.SOAPMessageContext;
import java.net.MalformedURLException;
import java.net.URL;
@@ -33,9 +30,8 @@
public class AxisResourceContext
extends ResourceContextImpl
{
- //private static final Log LOG = LogFactory.getLog( AxisResourceContext.class.getName( ) );
- private static final Messages MSG = MessagesImpl.getInstance( );
- public static final java.lang.String PROP_AXIS_TRANS_URL = "transport.url";
+
+ private static final String PROP_AXIS_TRANS_URL = "transport.url";
/**
* Creates a new {@link AxisResourceContext} object.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java Tue Oct 4 15:52:49 2005
@@ -163,6 +163,8 @@
private List m_destructionListeners = new ArrayList();
private Class m_resourceClass;
private Class m_serviceClass;
+ private String m_portComponentName;
+ private static final String CONTEXT_NAME_J2EE_TIMER_MANAGER = "java:comp/env/tm/TimerManager";
/**
* DOCUMENT_ME
@@ -189,7 +191,7 @@
*
* @return DOCUMENT_ME
*/
- public abstract org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder();
+ public abstract org.apache.ws.resource.NamespaceVersionHolder getNamespaceVersionHolder();
/**
* Returns the EndpointReference associated with this Resource. Only the required fields will be filled in (i.e.
@@ -809,6 +811,16 @@
return m_destructionListeners.remove( listener );
}
+ public String getPortComponentName()
+ {
+ return m_portComponentName;
+ }
+
+ public void setPortComponentName( String portComponentName )
+ {
+ m_portComponentName = portComponentName;
+ }
+
/**
* DOCUMENT_ME
*
@@ -990,13 +1002,13 @@
TimerManager timerManager;
try
{
- timerManager = (TimerManager) initialContext.lookup( "java:comp/env/tm/TimerManager" );
+ timerManager = (TimerManager) initialContext.lookup( CONTEXT_NAME_J2EE_TIMER_MANAGER );
}
catch ( NamingException ne )
{
try
{
- timerManager = (TimerManager) initialContext.lookup( JndiConstants.KEY_NAME_DEFAULT_TIMER );
+ timerManager = (TimerManager) initialContext.lookup( JndiConstants.CONTEXT_NAME_DEFAULT_TIMER );
}
catch ( NamingException ne2 )
{
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/ResourceContextImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/ResourceContextImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/ResourceContextImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/ResourceContextImpl.java Tue Oct 4 15:52:49 2005
@@ -18,10 +18,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.Soap1_1Constants;
-import org.apache.ws.addressing.AddressingUtils;
import org.apache.ws.resource.Resource;
import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.ResourceContextException;
import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.ResourceHome;
import org.apache.ws.resource.WsrfRuntime;
@@ -31,14 +29,8 @@
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.util.i18n.Messages;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.xml.namespace.QName;
import javax.xml.rpc.handler.MessageContext;
import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPHeaderElement;
import javax.xml.soap.SOAPMessage;
import java.net.MalformedURLException;
import java.net.URI;
@@ -54,13 +46,13 @@
public class ResourceContextImpl
implements ResourceContext
{
- private static final Log LOG = LogFactory.getLog(ResourceContextImpl.class.getName());
+ private static final Log LOG = LogFactory.getLog( ResourceContextImpl.class.getName() );
private static final Messages MSG = MessagesImpl.getInstance();
private SOAPMessage m_msg;
private ResourceHome m_home;
private String m_serviceName;
private URL m_serviceURL;
- private Map m_propsMap = Collections.synchronizedMap(new HashMap());
+ private Map m_propsMap = Collections.synchronizedMap( new HashMap() );
private String m_action;
private SOAPMessageContext m_msgContext;
@@ -73,50 +65,18 @@
*
* @param soapMsgContext SOAP message context corresponding to a particular request
*/
- public ResourceContextImpl(SOAPMessageContext soapMsgContext)
- throws Exception
+ public ResourceContextImpl( SOAPMessageContext soapMsgContext ) throws Exception
{
- if (soapMsgContext == null)
+ if ( soapMsgContext == null )
{
- throw new IllegalArgumentException(MSG.getMessage(Keys.NULL_SOAPMSGCTX));
+ throw new IllegalArgumentException( MSG.getMessage( Keys.NULL_SOAPMSGCTX ) );
}
-
m_msgContext = soapMsgContext;
m_msg = soapMsgContext.getMessage();
+ extractFields( soapMsgContext );
+ m_home = WsrfRuntime.getRuntime().getResourceHome( getServiceName() );
+ initializeResourceHome();
extractFields(soapMsgContext);
- lookupHome();
- }
-
- /**
- * Look up the ResourceHome by first calling {@see ResourceContextImpl#getResourceHomeLocation}
- * @throws Exception
- */
- protected void lookupHome()
- throws Exception
- {
- try
- {
- m_home = (ResourceHome) new InitialContext().lookup(getResourceHomeLocation());
- }
- catch (NamingException ne)
- {
- LOG.debug("A NamingException Occurred.",ne);
- throw new ResourceContextException(ne);
- }
-
- if (m_home instanceof AbstractResourceHome)
- {
- AbstractResourceHome abstractResourceHome = ((AbstractResourceHome) m_home);
-
- //check if home has been initialized
- synchronized (abstractResourceHome)
- {
- if (!abstractResourceHome.isInitialized())
- {
- abstractResourceHome.init();
- }
- }
- }
}
/**
@@ -125,21 +85,22 @@
* @param name DOCUMENT_ME
* @param value DOCUMENT_ME
*/
- public void setProperty(String name,
- Object value)
+ public void setProperty( String name,
+ Object value )
{
- m_propsMap.put(name, value);
+ m_propsMap.put( name, value );
}
/**
* DOCUMENT_ME
*
* @param name DOCUMENT_ME
+ *
* @return DOCUMENT_ME
*/
- public Object getProperty(String name)
+ public Object getProperty( String name )
{
- return this.m_propsMap.get(name);
+ return this.m_propsMap.get( name );
}
/**
@@ -169,8 +130,8 @@
throws ResourceException
{
ResourceHome home = getResourceHome();
- Object id = home.extractResourceIdentifier(this);
- return home.find(id);
+ Object id = home.extractResourceIdentifier( this );
+ return home.find( id );
}
/**
@@ -184,25 +145,13 @@
}
/**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public synchronized String getResourceHomeLocation()
- {
- String homeLocation = WsrfRuntime.getRuntime().getHomeJndiName(getServiceName());
- LOG.debug(MSG.getMessage(Keys.JNDI_HOME_LOCATION, homeLocation));
- return homeLocation;
- }
-
- /**
* @see ResourceContext#setResponseAction(java.net.URI)
*/
- public void setResponseAction(URI action)
+ public void setResponseAction( URI action )
{
- if (action != null)
+ if ( action != null )
{
- m_msgContext.setProperty(WSAddressingHandler.CONTEXT_PROP_WSA_RESPONSE_ACTION, action.toString());
+ m_msgContext.setProperty( WSAddressingHandler.CONTEXT_PROP_WSA_RESPONSE_ACTION, action.toString() );
}
}
@@ -247,11 +196,12 @@
* DOCUMENT_ME
*
* @param name DOCUMENT_ME
+ *
* @return DOCUMENT_ME
*/
- public boolean containsProperty(String name)
+ public boolean containsProperty( String name )
{
- return this.m_propsMap.containsKey(name);
+ return this.m_propsMap.containsKey( name );
}
/**
@@ -259,20 +209,21 @@
*
* @param name DOCUMENT_ME
*/
- public void removeProperty(String name)
+ public void removeProperty( String name )
{
- this.m_propsMap.remove(name);
+ this.m_propsMap.remove( name );
}
/**
* Returns the value of the WS-Addressing Action header element.
*
* @param msgContext the context for the current SOAP request; must not be null
+ *
* @return
*/
- protected String getAddressingAction(SOAPMessageContext msgContext)
+ protected String getAddressingAction( SOAPMessageContext msgContext )
{
- return WSAddressingHandler.getAddressingAction(msgContext);
+ return WSAddressingHandler.getAddressingAction( msgContext );
}
/**
@@ -280,7 +231,7 @@
*
* @param serviceName m_serviceName name.
*/
- protected void setServiceName(String serviceName)
+ protected void setServiceName( String serviceName )
{
m_serviceName = serviceName;
}
@@ -289,14 +240,14 @@
* DOCUMENT_ME
*
* @param msgContext DOCUMENT_ME
+ *
* @return DOCUMENT_ME
*/
- protected String getServiceName(MessageContext msgContext)
+ protected String getServiceName( MessageContext msgContext )
{
- URL serviceURL = (m_serviceURL != null) ? m_serviceURL : getServiceURL((SOAPMessageContext)msgContext);
- //extract just the service name from the url
+ URL serviceURL = ( m_serviceURL != null ) ? m_serviceURL : getServiceURL( (SOAPMessageContext) msgContext );
String serviceName = serviceURL.toString();
- serviceName = serviceName.substring(serviceName.lastIndexOf("/") + 1);
+ serviceName = serviceName.substring( serviceName.lastIndexOf( "/" ) + 1 );
return serviceName;
}
@@ -304,70 +255,70 @@
* DOCUMENT_ME
*
* @param msgContext the context for the current SOAP request; must not be null
+ *
* @return DOCUMENT_ME
*/
- protected URL getServiceURL(SOAPMessageContext msgContext)
+ protected URL getServiceURL( SOAPMessageContext msgContext )
{
- String addressingTo = WSAddressingHandler.getAddressingTo(msgContext);
- if(addressingTo != null)
+ String addressingTo = WSAddressingHandler.getAddressingTo( msgContext );
+ if ( addressingTo != null )
{
- try
- {
- LOG.debug(MSG.getMessage(Keys.GET_SERVICE_URL_FROM_ADDR_HDR, addressingTo));
- return new URL(addressingTo);
- }
- catch (MalformedURLException murle)
- {
- LOG.debug(MSG.getMessage(Keys.INVALID_WSA_TO, addressingTo));
- throw new FaultException(Soap1_1Constants.FAULT_CLIENT,
- "The WS-Addressing destination specified in the SOAP header (i.e. wsa:To header element) is not a valid URI.");
- }
+ try
+ {
+ LOG.debug( MSG.getMessage( Keys.GET_SERVICE_URL_FROM_ADDR_HDR, addressingTo ) );
+ return new URL( addressingTo );
+ }
+ catch ( MalformedURLException murle )
+ {
+ LOG.debug( MSG.getMessage( Keys.INVALID_WSA_TO, addressingTo ) );
+ throw new FaultException( Soap1_1Constants.FAULT_CLIENT,
+ "The WS-Addressing destination specified in the SOAP header (i.e. wsa:To header element) is not a valid URI." );
+ }
}
- return null;
+ return null; // should an exception be thrown here instead of returning null?
}
- protected String getBaseURL(URL serviceURL)
+ protected String getBaseURL( URL serviceURL )
{
String s = serviceURL.toString();
- s = s.substring(0,
- s.lastIndexOf("/"));
+ s = s.substring( 0,
+ s.lastIndexOf( "/" ) );
return s;
}
- private void extractFields(SOAPMessageContext msgContext)
+ private void extractFields( SOAPMessageContext msgContext )
{
//extract the properties first so subclasses can look for platform specific props
- extractProperties(msgContext);
- m_action = getAddressingAction(msgContext);
- m_serviceURL = getServiceURL(msgContext);
- m_serviceName = getServiceName(msgContext);
+ extractProperties( msgContext );
+ m_action = getAddressingAction( msgContext );
+ m_serviceURL = getServiceURL( msgContext );
+ m_serviceName = getServiceName( msgContext );
}
- private String getAddressingNamespaceURI(SOAPMessageContext msgContext)
- {
- return WSAddressingHandler.getAddressingNamespaceURI(msgContext);
- }
-
- private SOAPHeader getSOAPHeader(SOAPMessageContext msgContext)
+ private void initializeResourceHome()
+ throws Exception
{
- try
+ if ( m_home instanceof AbstractResourceHome )
{
- return msgContext.getMessage().getSOAPHeader();
- }
- catch (SOAPException soape)
- {
- throw new RuntimeException("Failed to extract header from SOAP message.", soape);
+ AbstractResourceHome abstractResourceHome = ( (AbstractResourceHome) m_home );
+ synchronized ( abstractResourceHome )
+ {
+ if ( !abstractResourceHome.isInitialized() )
+ {
+ abstractResourceHome.init();
+ }
+ }
}
}
- protected void extractProperties(MessageContext msgContext)
+ protected void extractProperties( MessageContext msgContext )
{
Iterator propertyNames = msgContext.getPropertyNames();
- while (propertyNames.hasNext())
+ while ( propertyNames.hasNext() )
{
String keyName = (String) propertyNames.next();
- m_propsMap.put(keyName,
- msgContext.getProperty(keyName));
+ m_propsMap.put( keyName,
+ msgContext.getProperty( keyName ) );
}
}
-}
\ No newline at end of file
+}
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/UnsupportedVersionException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/UnsupportedVersionException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/UnsupportedVersionException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/UnsupportedVersionException.java Tue Oct 4 15:52:49 2005
@@ -15,7 +15,7 @@
*=============================================================================*/
package org.apache.ws.resource.impl;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
/**
* An exception to be thrown when a version is unknown...This can be used to help flush out incomplete
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceNotDestroyedFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceNotDestroyedFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceNotDestroyedFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceNotDestroyedFaultException.java Tue Oct 4 15:52:49 2005
@@ -16,10 +16,11 @@
package org.apache.ws.resource.lifetime.faults;
import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
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.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceUnknownFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceUnknownFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceUnknownFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceUnknownFaultException.java Tue Oct 4 15:52:49 2005
@@ -16,10 +16,11 @@
package org.apache.ws.resource.lifetime.faults;
import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
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.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java Tue Oct 4 15:52:49 2005
@@ -16,10 +16,11 @@
package org.apache.ws.resource.lifetime.faults;
import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
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.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java Tue Oct 4 15:52:49 2005
@@ -19,7 +19,7 @@
import org.apache.ws.resource.faults.AbstractBaseFaultException;
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.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/impl/AbstractResourceTerminationEvent.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/impl/AbstractResourceTerminationEvent.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/impl/AbstractResourceTerminationEvent.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/impl/AbstractResourceTerminationEvent.java Tue Oct 4 15:52:49 2005
@@ -16,7 +16,8 @@
package org.apache.ws.resource.lifetime.impl;
import org.apache.ws.resource.lifetime.ResourceTerminationEvent;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.xmlbeans.XmlObject;
import java.util.Calendar;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/impl/ResourceTerminationEventImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/impl/ResourceTerminationEventImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/impl/ResourceTerminationEventImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/impl/ResourceTerminationEventImpl.java Tue Oct 4 15:52:49 2005
@@ -16,7 +16,7 @@
package org.apache.ws.resource.lifetime.impl;
import org.apache.ws.resource.lifetime.ResourceTerminationEvent;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlString;
import java.util.Calendar;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_06/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_06/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_06/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_06/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java Tue Oct 4 15:52:49 2005
@@ -24,7 +24,7 @@
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.lifetime.faults.ResourceNotDestroyedFaultException;
import org.apache.ws.resource.lifetime.v2004_06.porttype.ImmediateResourceTerminationPortType;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.properties.v2004_06.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.i18n.Messages;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.DestroyDocument;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_06/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_06/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_06/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_06/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java Tue Oct 4 15:52:49 2005
@@ -24,7 +24,7 @@
import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
import org.apache.ws.resource.lifetime.faults.UnableToSetTerminationTimeFaultException;
import org.apache.ws.resource.lifetime.v2004_06.porttype.ScheduledResourceTerminationPortType;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
import org.apache.ws.resource.properties.v2004_06.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.i18n.Messages;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_11/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_11/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_11/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_11/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java Tue Oct 4 15:52:49 2005
@@ -24,7 +24,7 @@
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.lifetime.faults.ResourceNotDestroyedFaultException;
import org.apache.ws.resource.lifetime.v2004_11.porttype.ImmediateResourceTerminationPortType;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.i18n.Messages;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.DestroyDocument;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_11/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_11/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_11/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/lifetime/v2004_11/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java Tue Oct 4 15:52:49 2005
@@ -19,12 +19,13 @@
import org.apache.commons.logging.LogFactory;
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.ResourceException;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
import org.apache.ws.resource.lifetime.faults.UnableToSetTerminationTimeFaultException;
import org.apache.ws.resource.lifetime.v2004_11.porttype.ScheduledResourceTerminationPortType;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.i18n.Messages;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/metadataexchange/v2004_09/porttype/impl/MetadataExchangePortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/metadataexchange/v2004_09/porttype/impl/MetadataExchangePortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/metadataexchange/v2004_09/porttype/impl/MetadataExchangePortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/metadataexchange/v2004_09/porttype/impl/MetadataExchangePortTypeImpl.java Tue Oct 4 15:52:49 2005
@@ -19,7 +19,7 @@
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.metadataexchange.v2004_09.MetadataExchangeConstants;
import org.apache.ws.resource.metadataexchange.v2004_09.porttype.MetadataExchangePortType;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.jndi.tools.MetadataConfig;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/ResourcePropertyValueChangeListener.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/ResourcePropertyValueChangeListener.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/ResourcePropertyValueChangeListener.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/ResourcePropertyValueChangeListener.java Tue Oct 4 15:52:49 2005
@@ -18,7 +18,7 @@
import java.util.EventListener;
/**
- * @author Ian P. Springer (Hewlett-Packard Company)
+ * A listener that can be registered to listen for {@link ResourcePropertyValueChangeEvent}s.
*/
public interface ResourcePropertyValueChangeListener
extends EventListener
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java Tue Oct 4 15:52:49 2005
@@ -16,7 +16,7 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import javax.xml.namespace.QName;
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InsertResourcePropertyRequestFailedFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InsertResourcePropertyRequestFailedFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InsertResourcePropertyRequestFailedFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InsertResourcePropertyRequestFailedFaultException.java Tue Oct 4 15:52:49 2005
@@ -17,7 +17,9 @@
import org.apache.ws.resource.faults.AbstractBaseFaultException;
import org.apache.ws.resource.faults.Description;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+
import javax.xml.namespace.QName;
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java Tue Oct 4 15:52:49 2005
@@ -16,7 +16,9 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+
import javax.xml.namespace.QName;
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java Tue Oct 4 15:52:49 2005
@@ -18,9 +18,10 @@
import org.apache.ws.resource.faults.AbstractBaseFaultException;
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.NamespaceVersionHolder;
import org.apache.ws.resource.properties.query.QueryExpression;
import org.apache.ws.resource.properties.query.xpath.XPathExpression;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java Tue Oct 4 15:52:49 2005
@@ -18,7 +18,8 @@
import org.apache.ws.resource.faults.AbstractBaseFaultException;
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.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java Tue Oct 4 15:52:49 2005
@@ -17,7 +17,9 @@
import org.apache.ws.resource.faults.AbstractBaseFaultException;
import org.apache.ws.resource.properties.MetaDataViolationException;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+
import javax.xml.namespace.QName;
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java Tue Oct 4 15:52:49 2005
@@ -16,7 +16,9 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+
import javax.xml.namespace.QName;
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java Tue Oct 4 15:52:49 2005
@@ -16,7 +16,9 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+
import javax.xml.namespace.QName;
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/ResourcePropertyRetrievalFailedFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/ResourcePropertyRetrievalFailedFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/ResourcePropertyRetrievalFailedFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/ResourcePropertyRetrievalFailedFaultException.java Tue Oct 4 15:52:49 2005
@@ -16,8 +16,9 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.NamespaceConstants;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import javax.xml.namespace.QName;
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java Tue Oct 4 15:52:49 2005
@@ -16,10 +16,11 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
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.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java Tue Oct 4 15:52:49 2005
@@ -17,7 +17,7 @@
import org.apache.ws.Soap1_1Constants;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import javax.xml.namespace.QName;
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java Tue Oct 4 15:52:49 2005
@@ -18,7 +18,8 @@
import org.apache.ws.resource.faults.AbstractBaseFaultException;
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.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java Tue Oct 4 15:52:49 2005
@@ -18,7 +18,8 @@
import org.apache.ws.resource.faults.AbstractBaseFaultException;
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.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
import java.net.URI;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UpdateResourcePropertyRequestFailedFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UpdateResourcePropertyRequestFailedFaultException.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UpdateResourcePropertyRequestFailedFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/faults/UpdateResourcePropertyRequestFailedFaultException.java Tue Oct 4 15:52:49 2005
@@ -17,7 +17,9 @@
import org.apache.ws.resource.faults.AbstractBaseFaultException;
import org.apache.ws.resource.faults.Description;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+
import javax.xml.namespace.QName;
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java Tue Oct 4 15:52:49 2005
@@ -56,7 +56,7 @@
*/
private static final Log LOG = LogFactory.getLog( QueryEngineImpl.class.getName( ) );
private static final Messages MSG = MessagesImpl.getInstance( );
- private static String QUERY_EVALUATOR_CONTEXT = JndiConstants.CONTEXT_NAME_WSRF + "/query/eval";
+ private static String COTEXT_NAME_QUERY_EVALUATOR = JndiConstants.CONTEXT_NAME_WSRF + "/query/eval";
private Map m_evaluators = Collections.synchronizedMap( new HashMap( ) );
/**
@@ -121,21 +121,20 @@
Context initialContext = new InitialContext( );
try
{
- list = initialContext.list( QUERY_EVALUATOR_CONTEXT );
+ list = initialContext.list( COTEXT_NAME_QUERY_EVALUATOR );
}
catch ( NamingException ne )
{
// ignore
}
-
- if ( ( list != null ) && list.hasMore( ) )
+ if ( list != null && list.hasMore( ) )
{
while ( list.hasMore( ) )
{
NameClassPair pair = (NameClassPair) list.next( );
ExpressionEvaluator evaluator =
(ExpressionEvaluator) XmlBeanJndiUtils.lookup( initialContext,
- QUERY_EVALUATOR_CONTEXT + "/" + pair.getName( ),
+ COTEXT_NAME_QUERY_EVALUATOR + "/" + pair.getName( ),
ExpressionEvaluator.class );
registerEvaluator( evaluator );
}
@@ -185,7 +184,7 @@
* @param dialect
* @param evaluator
*
- * @throws UnknownQueryExpressionDialectFaultException
+ * @throws UnknownQueryExpressionDialectException
*
*/
public void registerEvaluator( URI dialect,
@@ -201,7 +200,6 @@
isSupportedDialect = true;
}
}
-
if ( isSupportedDialect )
{
m_evaluators.put( dialect, evaluator );
@@ -223,4 +221,5 @@
return evaluator;
}
-}
\ No newline at end of file
+
+}
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/impl/NamespaceVersionHolderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/impl/NamespaceVersionHolderImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/impl/NamespaceVersionHolderImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/impl/NamespaceVersionHolderImpl.java Tue Oct 4 15:52:49 2005
@@ -19,9 +19,10 @@
import org.apache.ws.resource.faults.v2004_06.FaultsConstants;
import org.apache.ws.resource.lifetime.v2004_06.ResourceLifetimeConstants;
import org.apache.ws.resource.metadataexchange.v2004_09.MetadataExchangeConstants;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants;
import org.apache.ws.resource.servicegroup.v2004_06.ServiceGroupConstants;
+import org.apache.ws.resource.NamespaceVersionHolder;
/**
* The set of namespace URIs associated with the 2004/06 draft of WSRF.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetResourcePropertyPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetResourcePropertyPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetResourcePropertyPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetResourcePropertyPortTypeImpl.java Tue Oct 4 15:52:49 2005
@@ -18,9 +18,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.resource.ResourceContext;
+import org.apache.ws.resource.NamespaceVersionHolder;
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.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;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/QueryResourcePropertiesPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/QueryResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/QueryResourcePropertiesPortTypeImpl.java Tue Oct 4 15:52:49 2005
@@ -20,7 +20,7 @@
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.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;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java Tue Oct 4 15:52:49 2005
@@ -20,7 +20,7 @@
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.NamespaceVersionHolder;
import org.apache.ws.resource.properties.faults.DeleteResourcePropertyRequestFailedFaultException;
import org.apache.ws.resource.properties.faults.InsertResourcePropertyRequestFailedFaultException;
import org.apache.ws.resource.properties.faults.InvalidInsertResourcePropertiesRequestContentFaultException;
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/impl/NamespaceVersionHolderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/impl/NamespaceVersionHolderImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/impl/NamespaceVersionHolderImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/impl/NamespaceVersionHolderImpl.java Tue Oct 4 15:52:49 2005
@@ -19,9 +19,10 @@
import org.apache.ws.resource.faults.v2004_11.FaultsConstants;
import org.apache.ws.resource.lifetime.v2004_11.ResourceLifetimeConstants;
import org.apache.ws.resource.metadataexchange.v2004_09.MetadataExchangeConstants;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.properties.v2004_11.ResourcePropertiesConstants;
import org.apache.ws.resource.servicegroup.v2004_11.ServiceGroupConstants;
+import org.apache.ws.resource.NamespaceVersionHolder;
/**
* The set of namespace URIs associated with the 2004/11 draft of WSRF.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java Tue Oct 4 15:52:49 2005
@@ -16,7 +16,8 @@
package org.apache.ws.resource.properties.v2004_11.porttype.impl;
import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
import org.apache.ws.resource.properties.impl.AbstractXmlBeansResourcePropertyValueChangeEvent;
import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;