You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by ip...@apache.org on 2004/12/23 22:39:17 UTC
svn commit: r123230 - in incubator/apollo/trunk/src/java/org/apache/ws: resource/impl resource/lifetime/v1_2/porttype resource/properties/v1_2/porttype util util/velocity
Author: ips
Date: Thu Dec 23 13:39:16 2004
New Revision: 123230
URL: http://svn.apache.org/viewcvs?view=rev&rev=123230
Log:
Added:
incubator/apollo/trunk/src/java/org/apache/ws/util/ImplementsListBuilder.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ConstQNames.java
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&rev=123230&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java&r1=123229&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java&r2=123230
==============================================================================
--- 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 Thu Dec 23 13:39:16 2004
@@ -115,7 +115,7 @@
{
if ( hasProperties() )
{
- if ( !m_implementedResourceDefs.containsKey( GetResourcePropertyPortType.PORT_TYPE_NAME_GET_RESOURCE_PROPERTY ) &&
+ if ( !m_implementedResourceDefs.containsKey( GetResourcePropertyPortType.NAME ) &&
!m_implementedResourceDefs.containsKey( ResourceProperties1_3Constants.PORT_TYPE_NAME_GET_RESOURCE_PROPERTY )
)
{
@@ -124,13 +124,13 @@
}
else
{
- if ( m_implementedResourceDefs.containsKey( GetResourcePropertyPortType.PORT_TYPE_NAME_GET_RESOURCE_PROPERTY ) ||
+ if ( m_implementedResourceDefs.containsKey( GetResourcePropertyPortType.NAME ) ||
m_implementedResourceDefs.containsKey( ResourceProperties1_3Constants.PORT_TYPE_NAME_GET_RESOURCE_PROPERTY ) ||
- m_implementedResourceDefs.containsKey( GetMultipleResourcePropertiesPortType.PORT_TYPE_NAME_GET_MULTIPLE_RESOURCE_PROPERTIES ) ||
+ m_implementedResourceDefs.containsKey( GetMultipleResourcePropertiesPortType.NAME ) ||
m_implementedResourceDefs.containsKey( ResourceProperties1_3Constants.PORT_TYPE_NAME_GET_MULTIPLE_RESOURCE_PROPERTIES ) ||
- m_implementedResourceDefs.containsKey( SetResourcePropertiesPortType.PORT_TYPE_NAME_SET_RESOURCE_PROPERTIES ) ||
+ m_implementedResourceDefs.containsKey( SetResourcePropertiesPortType.NAME ) ||
m_implementedResourceDefs.containsKey( ResourceProperties1_3Constants.PORT_TYPE_NAME_SET_RESOURCE_PROPERTIES ) ||
- m_implementedResourceDefs.containsKey( QueryResourcePropertiesPortType.PORT_TYPE_NAME_QUERY_RESOURCE_PROPERTIES ) ||
+ m_implementedResourceDefs.containsKey( QueryResourcePropertiesPortType.NAME ) ||
m_implementedResourceDefs.containsKey( ResourceProperties1_3Constants.PORT_TYPE_NAME_QUERY_RESOURCE_PROPERTIES )
)
{
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java?view=diff&rev=123230&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java&r1=123229&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java&r2=123230
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java Thu Dec 23 13:39:16 2004
@@ -28,8 +28,10 @@
*/
public interface ImmediateResourceTerminationPortType
{
+
QName NAME = new QName( ResourceLifetime1_2Constants.NSURI_WSRL_WSDL, "ImmediateResourceTermination", ResourceLifetime1_2Constants.NSPREFIX_WSRL_WSDL );
- /**
+
+ /**
* DOCUMENT_ME
*
* @param requestDoc DOCUMENT_ME
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java?view=diff&rev=123230&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java&r1=123229&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java&r2=123230
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java Thu Dec 23 13:39:16 2004
@@ -29,6 +29,8 @@
public interface ScheduledResourceTerminationPortType
{
+ QName NAME = new QName( ResourceLifetime1_2Constants.NSURI_WSRL_WSDL, "ScheduledResourceTermination", ResourceLifetime1_2Constants.NSPREFIX_WSRL_WSDL );
+
/**
* CurrentTime property name.
*/
@@ -38,8 +40,6 @@
* TerminationTime property name.
*/
QName PROP_QNAME_TERMINATION_TIME = new QName( ResourceLifetime1_2Constants.NSURI_WSRL_SCHEMA, "TerminationTime", ResourceLifetime1_2Constants.NSPREFIX_WSRL_SCHEMA );
-
- QName NAME = new QName( ResourceLifetime1_2Constants.NSURI_WSRL_WSDL, "ScheduledResourceTermination", ResourceLifetime1_2Constants.NSPREFIX_WSRL_WSDL );
/**
* DOCUMENT_ME
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java?view=diff&rev=123230&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java&r1=123229&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java&r2=123230
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java Thu Dec 23 13:39:16 2004
@@ -28,7 +28,7 @@
*/
public interface GetMultipleResourcePropertiesPortType
{
- QName PORT_TYPE_NAME_GET_MULTIPLE_RESOURCE_PROPERTIES = new QName( ResourceProperties1_2Constants.NSURI_WSRP_WSDL, "GetMultipleResourceProperties", ResourceProperties1_2Constants.NSPREFIX_WSRP_SCHEMA );
+ QName NAME = new QName( ResourceProperties1_2Constants.NSURI_WSRP_WSDL, "GetMultipleResourceProperties", ResourceProperties1_2Constants.NSPREFIX_WSRP_SCHEMA );
/**
* DOCUMENT_ME
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java?view=diff&rev=123230&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java&r1=123229&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java&r2=123230
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java Thu Dec 23 13:39:16 2004
@@ -28,7 +28,7 @@
*/
public interface GetResourcePropertyPortType
{
- QName PORT_TYPE_NAME_GET_RESOURCE_PROPERTY = new QName( ResourceProperties1_2Constants.NSURI_WSRP_WSDL, "GetResourceProperty", ResourceProperties1_2Constants.NSPREFIX_WSRP_SCHEMA );
+ QName NAME = new QName( ResourceProperties1_2Constants.NSURI_WSRP_WSDL, "GetResourceProperty", ResourceProperties1_2Constants.NSPREFIX_WSRP_SCHEMA );
/**
* DOCUMENT_ME
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java?view=diff&rev=123230&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java&r1=123229&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java&r2=123230
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java Thu Dec 23 13:39:16 2004
@@ -28,7 +28,7 @@
*/
public interface QueryResourcePropertiesPortType
{
- QName PORT_TYPE_NAME_QUERY_RESOURCE_PROPERTIES = new QName( ResourceProperties1_2Constants.NSURI_WSRP_WSDL, "QueryResourceProperties", ResourceProperties1_2Constants.NSPREFIX_WSRP_SCHEMA );
+ QName NAME = new QName( ResourceProperties1_2Constants.NSURI_WSRP_WSDL, "QueryResourceProperties", ResourceProperties1_2Constants.NSPREFIX_WSRP_SCHEMA );
/**
* DOCUMENT_ME
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java?view=diff&rev=123230&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java&r1=123229&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java&r2=123230
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java Thu Dec 23 13:39:16 2004
@@ -28,7 +28,7 @@
*/
public interface SetResourcePropertiesPortType
{
- QName PORT_TYPE_NAME_SET_RESOURCE_PROPERTIES = new QName( ResourceProperties1_2Constants.NSURI_WSRP_WSDL, "SetResourceProperties", ResourceProperties1_2Constants.NSPREFIX_WSRP_SCHEMA );
+ QName NAME = new QName( ResourceProperties1_2Constants.NSURI_WSRP_WSDL, "SetResourceProperties", ResourceProperties1_2Constants.NSPREFIX_WSRP_SCHEMA );
/**
* DOCUMENT_ME
Added: incubator/apollo/trunk/src/java/org/apache/ws/util/ImplementsListBuilder.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/ImplementsListBuilder.java?view=auto&rev=123230
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/ImplementsListBuilder.java Thu Dec 23 13:39:16 2004
@@ -0,0 +1,112 @@
+/*=============================================================================*
+ * 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.util;
+
+import org.apache.ws.resource.ResourceDefinition;
+import org.apache.ws.resource.PropertiesResource;
+import org.apache.ws.resource.Resource;
+import org.apache.ws.resource.lifetime.v1_2.porttype.ImmediateResourceTerminationPortType;
+import org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType;
+import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
+import org.apache.ws.resource.properties.v1_2.porttype.GetMultipleResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2.porttype.GetResourcePropertyPortType;
+import org.apache.ws.resource.properties.v1_2.porttype.QueryResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2.porttype.SetResourcePropertiesPortType;
+
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author Ian Springer (ian DOT springer AT hp DOT com)
+ */
+public class ImplementsListBuilder
+{
+
+ public static String getServiceImplementsList( ResourceDefinition resourceDef )
+ {
+ Iterator ptNameIter = resourceDef.getImplementedResourceCapabilities().keySet().iterator();
+ List interfaceNames = new ArrayList();
+ while ( ptNameIter.hasNext() )
+ {
+ QName ptName = (QName) ptNameIter.next();
+ if ( ptName.equals( GetResourcePropertyPortType.NAME ) )
+ {
+ interfaceNames.add( GetResourcePropertyPortType.class.getName() );
+ }
+ else if ( ptName.equals( GetMultipleResourcePropertiesPortType.NAME ) )
+ {
+ interfaceNames.add( GetMultipleResourcePropertiesPortType.class.getName() );
+ }
+ else if ( ptName.equals( SetResourcePropertiesPortType.NAME ) )
+ {
+ interfaceNames.add( SetResourcePropertiesPortType.class.getName() );
+ }
+ else if ( ptName.equals( QueryResourcePropertiesPortType.NAME ) )
+ {
+ interfaceNames.add( QueryResourcePropertiesPortType.class.getName() );
+ }
+ else if ( ptName.equals( ScheduledResourceTerminationPortType.NAME ) )
+ {
+ interfaceNames.add( ScheduledResourceTerminationPortType.class.getName() );
+ }
+ else if ( ptName.equals( ImmediateResourceTerminationPortType.NAME ) )
+ {
+ interfaceNames.add( ImmediateResourceTerminationPortType.class.getName() );
+ }
+ }
+ return toCommaSeparatedString( interfaceNames );
+ }
+
+ public static String getResourceImplementsList( ResourceDefinition resourceDef )
+ {
+ Iterator ptNameIter = resourceDef.getImplementedResourceCapabilities().keySet().iterator();
+ List interfaceNames = new ArrayList();
+ while ( ptNameIter.hasNext() )
+ {
+ QName ptName = (QName) ptNameIter.next();
+ if ( ptName.equals( GetResourcePropertyPortType.NAME ) )
+ {
+ interfaceNames.add( PropertiesResource.class.getName() );
+ }
+ else if ( ptName.equals( ScheduledResourceTerminationPortType.NAME ) )
+ {
+ interfaceNames.add( ScheduledResourceTerminationResource.class.getName() );
+ }
+ }
+ if ( interfaceNames.isEmpty() )
+ {
+ interfaceNames.add( Resource.class.getName() );
+ }
+ return toCommaSeparatedString( interfaceNames );
+ }
+
+ private static String toCommaSeparatedString( List list )
+ {
+ StringBuffer buf = new StringBuffer();
+ for ( int i = 0; i < list.size() - 1; i++ )
+ {
+ buf.append( list.get( i ) );
+ buf.append( ", " );
+ }
+ buf.append( list.get( list.size() - 1 ) );
+ return buf.toString();
+ }
+
+}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ConstQNames.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ConstQNames.java?view=diff&rev=123230&p1=incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ConstQNames.java&r1=123229&p2=incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ConstQNames.java&r2=123230
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ConstQNames.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ConstQNames.java Thu Dec 23 13:39:16 2004
@@ -17,10 +17,10 @@
*/
public class ConstQNames
{
- public QName multipleResource = GetMultipleResourcePropertiesPortType.PORT_TYPE_NAME_GET_MULTIPLE_RESOURCE_PROPERTIES;
- public QName resource = GetResourcePropertyPortType.PORT_TYPE_NAME_GET_RESOURCE_PROPERTY;
- public QName queryResource = QueryResourcePropertiesPortType.PORT_TYPE_NAME_QUERY_RESOURCE_PROPERTIES;
- public QName setResource = SetResourcePropertiesPortType.PORT_TYPE_NAME_SET_RESOURCE_PROPERTIES;
+ public QName multipleResource = GetMultipleResourcePropertiesPortType.NAME;
+ public QName resource = GetResourcePropertyPortType.NAME;
+ public QName queryResource = QueryResourcePropertiesPortType.NAME;
+ public QName setResource = SetResourcePropertiesPortType.NAME;
public QName scheduledResourceTermination = ScheduledResourceTerminationPortType.NAME;
public QName immediateResourceTermination = ImmediateResourceTerminationPortType.NAME;
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org