Author: ips
Date: Fri Mar 18 15:10:34 2005
New Revision: 158159
URL: http://svn.apache.org/viewcvs?view=rev&rev=158159
Log:
package name refactoring
Added:
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ResourceKeyHeaderNotFoundFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/v2004_06/
incubator/apollo/trunk/src/java/org/apache/ws/resource/v2004_06/WsrfConstants.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/v2004_11/
incubator/apollo/trunk/src/java/org/apache/ws/resource/v2004_11/WsrfConstants.java
Removed:
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ResoureKeyHeaderNotFoundFaultException.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/DefaultMethodMap.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/impl/ResourceTerminationEventImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
incubator/apollo/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java?view=diff&r1=158158&r2=158159
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java
(original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java
Fri Mar 18 15:10:34 2005
@@ -15,7 +15,7 @@
*=============================================================================*/
package org.apache.ws.resource;
-import org.apache.ws.resource.faults.ResoureKeyHeaderNotFoundFaultException;
+import org.apache.ws.resource.faults.ResourceKeyHeaderNotFoundFaultException;
import javax.xml.namespace.QName;
import javax.xml.rpc.handler.soap.SOAPMessageContext;
@@ -89,7 +89,7 @@
public abstract ResourceKey getResourceKey( QName keyName,
Class keyClass )
throws ResourceContextException,
- ResoureKeyHeaderNotFoundFaultException;
+ ResourceKeyHeaderNotFoundFaultException;
/**
* Gets <code>SOAPHeaderElement</code> that contains the resource key for
the service using <code>ResourceHome</code>
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java?view=diff&r1=158158&r2=158159
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
Fri Mar 18 15:10:34 2005
@@ -227,7 +227,7 @@
private void populateBaseFaultXmlBean( XmlObject baseFaultXBean )
{
- if ( m_namespaceSet instanceof
org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl )
+ if ( m_namespaceSet instanceof
org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl )
{
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultType
baseFaultType =
(org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultType)
baseFaultXBean;
baseFaultType.setTimestamp( m_timestamp );
@@ -265,7 +265,7 @@
// TODO
}
}
- else if ( m_namespaceSet instanceof
org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl )
+ else if ( m_namespaceSet instanceof
org.apache.ws.resource.properties.v2004_06.impl.NamespaceVersionHolderImpl )
{
org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSBaseFaults12Draft01.BaseFaultType
baseFaultType =
(org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSBaseFaults12Draft01.BaseFaultType)
baseFaultXBean;
baseFaultType.setTimestamp( m_timestamp );
Added:
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ResourceKeyHeaderNotFoundFaultException.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ResourceKeyHeaderNotFoundFaultException.java?view=auto&rev=158159
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ResourceKeyHeaderNotFoundFaultException.java
(added)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ResourceKeyHeaderNotFoundFaultException.java
Fri Mar 18 15:10:34 2005
@@ -0,0 +1,68 @@
+/*=============================================================================*
+ * Copyright 2004 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.faults;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.Soap1_1Constants;
+import org.apache.ws.resource.NamespaceConstants;
+import org.apache.ws.resource.i18n.Keys;
+import org.apache.ws.resource.i18n.MessagesImpl;
+import org.apache.ws.util.XmlBeanUtils;
+import org.apache.ws.util.i18n.Messages;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
+
+import javax.xml.namespace.QName;
+
+/**
+ * A fault that is thrown when the expected resourceKey header is not found in
a SOAP request.
+ *
+ * @author Ian P. Springer
+ */
+public class ResourceKeyHeaderNotFoundFaultException
+ extends FaultException
+{
+ private static final Messages MSG = MessagesImpl.getInstance();
+ private static final Log LOG = LogFactory.getLog(
ResourceKeyHeaderNotFoundFaultException.class );
+ /**
+ * DOCUMENT_ME
+ */
+ private static final String FAULT_LOCAL_NAME =
"ResoureKeyHeaderNotFoundFault";
+
+ /**
+ * Creates a new [EMAIL PROTECTED]
ResourceKeyHeaderNotFoundFaultException} object.
+ *
+ * @param expectedHeaderName DOCUMENT_ME
+ */
+ public ResourceKeyHeaderNotFoundFaultException( QName expectedHeaderName )
+ {
+ super( Soap1_1Constants.FAULT_CLIENT, null );
+ try
+ {
+ XmlObject xBean = XmlObject.Factory.parse(
+ "<" + FAULT_LOCAL_NAME + " xmlns=\"" +
NamespaceConstants.NSURI_APACHE_WS_RESOURCE + "\" />" );
+ XmlBeanUtils.setValue( xBean,
+ MSG.getMessage( Keys.EXPECTED_ADDRESSING_HEADER,
String.valueOf( expectedHeaderName ) ) );
+ addDetailEntry( xBean );
+ }
+ catch ( XmlException xe )
+ {
+ LOG.error( xe );
+ }
+ }
+
+}
\ No newline at end of file
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/DefaultMethodMap.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/DefaultMethodMap.java?view=diff&r1=158158&r2=158159
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/DefaultMethodMap.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/DefaultMethodMap.java
Fri Mar 18 15:10:34 2005
@@ -42,32 +42,32 @@
private static void addWsrpOperations( Map map )
{
//draft 01
- map.put( new QName(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"GetResourceProperty",
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"GetResourceProperty",
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
"getResourceProperty" );
- map.put( new QName(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"QueryResourceProperties",
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"QueryResourceProperties",
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
"queryResourceProperties" );
- map.put( new QName(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"SetResourceProperties",
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"SetResourceProperties",
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
"setResourceProperties" );
- map.put( new QName(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"GetMultipleResourceProperties",
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"GetMultipleResourceProperties",
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
"getMultipleResourceProperties" );
//draft 05
- map.put( new QName(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"GetResourceProperty",
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"GetResourceProperty",
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
"getResourceProperty" );
- map.put( new QName(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"QueryResourceProperties",
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"QueryResourceProperties",
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
"queryResourceProperties" );
- map.put( new QName(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"SetResourceProperties",
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"SetResourceProperties",
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
"setResourceProperties" );
- map.put( new QName(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"GetMultipleResourceProperties",
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"GetMultipleResourceProperties",
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
"getMultipleResourceProperties" );
- map.put( new QName(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"GetResourcePropertyDocument",
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"GetResourcePropertyDocument",
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
"getResourcePropertyDocument" );
- map.put( new QName(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"InsertResourceProperties",
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"InsertResourceProperties",
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
"insertResourceProperties" );
- map.put( new QName(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"UpdateResourceProperties",
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"UpdateResourceProperties",
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
"updateResourceProperties" );
- map.put( new QName(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"DeleteResourceProperties",
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_SCHEMA,
"DeleteResourceProperties",
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA
),
"deleteResourceProperties" );
}
@@ -75,15 +75,15 @@
private static void addWsrlOperations( Map map )
{
//draft 01
- map.put( new QName(
org.apache.ws.resource.lifetime.v1_2_draft01.ResourceLifetime1_2Constants.NSURI_WSRL_SCHEMA,
"SetTerminationTime",
org.apache.ws.resource.lifetime.v1_2_draft01.ResourceLifetime1_2Constants.NSPREFIX_WSRL_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.lifetime.v2004_06.ResourceLifetimeConstants.NSURI_WSRL_SCHEMA,
"SetTerminationTime",
org.apache.ws.resource.lifetime.v2004_06.ResourceLifetimeConstants.NSPREFIX_WSRL_SCHEMA
),
"setTerminationTime" );
- map.put( new QName(
org.apache.ws.resource.lifetime.v1_2_draft01.ResourceLifetime1_2Constants.NSURI_WSRL_SCHEMA,
"Destroy",
org.apache.ws.resource.lifetime.v1_2_draft01.ResourceLifetime1_2Constants.NSPREFIX_WSRL_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.lifetime.v2004_06.ResourceLifetimeConstants.NSURI_WSRL_SCHEMA,
"Destroy",
org.apache.ws.resource.lifetime.v2004_06.ResourceLifetimeConstants.NSPREFIX_WSRL_SCHEMA
),
"destroy" );
//draft 04
- map.put( new QName(
org.apache.ws.resource.lifetime.v1_2_draft04.ResourceLifetime1_2Constants.NSURI_WSRL_SCHEMA,
"SetTerminationTime",
org.apache.ws.resource.lifetime.v1_2_draft04.ResourceLifetime1_2Constants.NSPREFIX_WSRL_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.lifetime.v2004_11.ResourceLifetimeConstants.NSURI_WSRL_SCHEMA,
"SetTerminationTime",
org.apache.ws.resource.lifetime.v2004_11.ResourceLifetimeConstants.NSPREFIX_WSRL_SCHEMA
),
"setTerminationTime" );
- map.put( new QName(
org.apache.ws.resource.lifetime.v1_2_draft04.ResourceLifetime1_2Constants.NSURI_WSRL_SCHEMA,
"Destroy",
org.apache.ws.resource.lifetime.v1_2_draft04.ResourceLifetime1_2Constants.NSPREFIX_WSRL_SCHEMA
),
+ map.put( new QName(
org.apache.ws.resource.lifetime.v2004_11.ResourceLifetimeConstants.NSURI_WSRL_SCHEMA,
"Destroy",
org.apache.ws.resource.lifetime.v2004_11.ResourceLifetimeConstants.NSPREFIX_WSRL_SCHEMA
),
"destroy" );
}
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java?view=diff&r1=158158&r2=158159
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java
Fri Mar 18 15:10:34 2005
@@ -19,7 +19,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.resource.*;
-import org.apache.ws.resource.faults.ResoureKeyHeaderNotFoundFaultException;
+import org.apache.ws.resource.faults.ResourceKeyHeaderNotFoundFaultException;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.util.i18n.Messages;
@@ -259,7 +259,7 @@
public ResourceKey getResourceKey( QName keyName,
Class keyClass )
throws ResourceContextException,
- ResoureKeyHeaderNotFoundFaultException
+ ResourceKeyHeaderNotFoundFaultException
{
if ( keyName == null )
{
@@ -270,7 +270,7 @@
SOAPHeaderElement headerElem = getResourceKeyHeader( keyName );
if ( headerElem == null )
{
- throw new ResoureKeyHeaderNotFoundFaultException( keyName );
+ throw new ResourceKeyHeaderNotFoundFaultException( keyName );
}
try
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java?view=diff&r1=158158&r2=158159
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
Fri Mar 18 15:10:34 2005
@@ -123,7 +123,7 @@
{
if ( hasProperties() )
{
- if ( !m_implementedResourceDefs.containsKey(
org.apache.ws.resource.properties.v1_2_draft05.porttype.GetResourcePropertyPortType.NAME
) && !m_implementedResourceDefs.containsKey(
org.apache.ws.resource.properties.v1_2_draft01.porttype.GetResourcePropertyPortType.NAME
) )
+ if ( !m_implementedResourceDefs.containsKey(
org.apache.ws.resource.properties.v2004_11.porttype.GetResourcePropertyPortType.NAME
) && !m_implementedResourceDefs.containsKey(
org.apache.ws.resource.properties.v2004_06.porttype.GetResourcePropertyPortType.NAME
) )
{
throw new InvalidWsrfWsdlException(
"PortType " + m_portType.getQName() +
@@ -136,8 +136,8 @@
while ( resourceDefNames.hasNext() )
{
QName resourceDefName = (QName) resourceDefNames.next();
- if ( resourceDefName.getNamespaceURI().equals(
org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants.NSURI_WSRP_WSDL
) ||
- resourceDefName.getNamespaceURI().equals(
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_WSDL
))
+ if ( resourceDefName.getNamespaceURI().equals(
org.apache.ws.resource.properties.v2004_11.ResourcePropertiesConstants.NSURI_WSRP_WSDL
) ||
+ resourceDefName.getNamespaceURI().equals(
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.NSURI_WSRP_WSDL
))
{
throw new InvalidWsrfWsdlException(
"PortType " + m_portType.getQName() +
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/impl/ResourceTerminationEventImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/impl/ResourceTerminationEventImpl.java?view=diff&r1=158158&r2=158159
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/impl/ResourceTerminationEventImpl.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/impl/ResourceTerminationEventImpl.java
Fri Mar 18 15:10:34 2005
@@ -57,7 +57,7 @@
((XmlString) reason).setStringValue(reason.toString());
}
- if (namespaces instanceof
org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl)
+ if (namespaces instanceof
org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl)
{
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.TerminationNotificationDocument
notifDoc =
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.TerminationNotificationDocument.Factory.newInstance();
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.TerminationNotificationDocument.TerminationNotification
terminationNotification = notifDoc.addNewTerminationNotification();
@@ -70,7 +70,7 @@
return notifDoc;
}
- else if (namespaces instanceof
org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl)
+ else if (namespaces instanceof
org.apache.ws.resource.properties.v2004_06.impl.NamespaceVersionHolderImpl)
{
org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.TerminationNotificationDocument
notifDoc =
org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.TerminationNotificationDocument.Factory.newInstance();
org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.TerminationNotificationDocument.TerminationNotification
terminationNotification = notifDoc.addNewTerminationNotification();
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=158158&r2=158159
==============================================================================
---
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
Fri Mar 18 15:10:34 2005
@@ -33,7 +33,7 @@
import
org.apache.ws.resource.properties.faults.DeleteResourcePropertyRequestFailedFaultException;
import
org.apache.ws.resource.properties.faults.InvalidInsertResourcePropertiesRequestContentFaultException;
import
org.apache.ws.resource.properties.faults.InvalidUpdateResourcePropertiesRequestContentFaultException;
-import
org.apache.ws.resource.properties.v1_2_draft05.impl.XmlBeansResourcePropertyValueChangeEvent;
+import
org.apache.ws.resource.properties.v2004_11.impl.XmlBeansResourcePropertyValueChangeEvent;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlObject;
@@ -158,7 +158,7 @@
}
}
Object[] newValue = getValue( prop );
- firePropChangeEvents( prop, oldValue, newValue );
+ firePropChangeEvents( prop, oldValue, newValue );
}
/**
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java?view=diff&r1=158158&r2=158159
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
(original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
Fri Mar 18 15:10:34 2005
@@ -501,25 +501,25 @@
private void initPortTypeInfoMap()
{
//draft 01
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft01.GetResourcePropertyPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft01.GetMultipleResourcePropertiesPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft01.SetResourcePropertiesPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft01.QueryResourcePropertiesPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft01.ImmediateResourceTerminationPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft01.ScheduledResourceTerminationPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_06.GetResourcePropertyPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_06.GetMultipleResourcePropertiesPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_06.SetResourcePropertiesPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_06.QueryResourcePropertiesPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_06.ImmediateResourceTerminationPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_06.ScheduledResourceTerminationPortType2JavaInfo()
);
//draft 05
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft05.GetResourcePropertyPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft05.GetMultipleResourcePropertiesPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft05.SetResourcePropertiesPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft05.QueryResourcePropertiesPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft05.ImmediateResourceTerminationPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft05.ScheduledResourceTerminationPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_11.GetResourcePropertyPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_11.GetMultipleResourcePropertiesPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_11.SetResourcePropertiesPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_11.QueryResourcePropertiesPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_11.ImmediateResourceTerminationPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_11.ScheduledResourceTerminationPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft05.InsertResourcePropertiesPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft05.UpdateResourcePropertiesPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft05.DeleteResourcePropertiesPortType2JavaInfo()
);
- addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v1_2_draft05.GetResourcePropertyDocumentPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_11.InsertResourcePropertiesPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_11.UpdateResourcePropertiesPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_11.DeleteResourcePropertiesPortType2JavaInfo()
);
+ addPortType2JavaInfo( new
org.apache.ws.resource.tool.porttype.v2004_11.GetResourcePropertyDocumentPortType2JavaInfo()
);
}
private void initVelocity()
Added:
incubator/apollo/trunk/src/java/org/apache/ws/resource/v2004_06/WsrfConstants.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/v2004_06/WsrfConstants.java?view=auto&rev=158159
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/v2004_06/WsrfConstants.java
(added)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/v2004_06/WsrfConstants.java
Fri Mar 18 15:10:34 2005
@@ -0,0 +1,29 @@
+/*=============================================================================*
+ * 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.v2004_06;
+
+/**
+ * Constants that are applicable to all of the Jun 2004 WSRF specifications.
+ */
+public interface WsrfConstants
+{
+
+ /**
+ * The base URI for all URIs defined by the WSRF specs.
+ */
+ String BASE_URI_WSRF = "http://docs.oasis-open.org/wsrf/2004/06/";;
+
+}
Added:
incubator/apollo/trunk/src/java/org/apache/ws/resource/v2004_11/WsrfConstants.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/v2004_11/WsrfConstants.java?view=auto&rev=158159
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/v2004_11/WsrfConstants.java
(added)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/v2004_11/WsrfConstants.java
Fri Mar 18 15:10:34 2005
@@ -0,0 +1,29 @@
+/*=============================================================================*
+ * 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.v2004_11;
+
+/**
+ * Constants that are applicable to all of the Nov 2004 WSRF specifications.
+ */
+public interface WsrfConstants
+{
+
+ /**
+ * The base URI for all URIs defined by the WSRF specs.
+ */
+ String BASE_URI_WSRF = "http://docs.oasis-open.org/wsrf/2004/11/";;
+
+}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java?view=diff&r1=158158&r2=158159
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java
(original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java Fri
Mar 18 15:10:34 2005
@@ -333,12 +333,12 @@
{
Map extAttribs = portType.getExtensionAttributes();
QName rpDocDefQName = (QName) extAttribs.get(
-
org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants.RESOURCE_PROPERTIES_PORTTYPE_ATTRIB
);
+
org.apache.ws.resource.properties.v2004_11.ResourcePropertiesConstants.RESOURCE_PROPERTIES_PORTTYPE_ATTRIB
);
if ( rpDocDefQName == null )
{
rpDocDefQName =
(QName) extAttribs.get(
-
org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.RESOURCE_PROPERTIES_PORTTYPE_ATTRIB
);
+
org.apache.ws.resource.properties.v2004_06.ResourcePropertiesConstants.RESOURCE_PROPERTIES_PORTTYPE_ATTRIB
);
}
return rpDocDefQName;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
