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 21:02:18 UTC
svn commit: r123216 - in incubator/apollo/trunk/src/java/org/apache/ws/resource: . impl
Author: ips
Date: Thu Dec 23 12:02:16 2004
New Revision: 123216
URL: http://svn.apache.org/viewcvs?view=rev&rev=123216
Log:
refactored
Added:
incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCapability.java
- copied, changed from r123214, incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceDefinition.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
- copied, changed from r123214, incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java
Removed:
incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceDefinition.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java
Copied: incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCapability.java (from r123214, incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceDefinition.java)
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCapability.java?view=diff&rev=123216&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceDefinition.java&r1=123214&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCapability.java&r2=123216
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceDefinition.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCapability.java Thu Dec 23 12:02:16 2004
@@ -25,8 +25,9 @@
*
* @author Ian Springer
*/
-public interface ResourceDefinition
+public interface ResourceCapability
{
+
/**
* @return the names of all custom operations (i.e. operations that are not derived from a "base"
* ResourceDefinition)
@@ -40,24 +41,33 @@
QName[] getCustomPropertyNames();
/**
- * Returns the JWSDL {@link Definition} for this WS-Resource definition.
+ * Returns the JWSDL {@link Definition} for this WS-Resource capability.
*
* @return
*/
Definition getDefinition();
/**
- * Returns the JWSDL {@link PortType} corresponding to this WS-Resource definition.
+ * Returns the JWSDL {@link PortType} corresponding to this WS-Resource capability.
*
* @return
*/
PortType getPortType();
/**
- * @return a Map of all "base" portTypes that the specified portType implements; the Map's keys are the {@link
- * QName}s of the portTypes, and the values are the {@link PortType}s themselves.
+ * @return a map of any other {@link ResourceCapability}s that this capability implements;
+ * the map's keys are the {@link QName}s of the capability portTypes, and the values
+ * are the ResourceCapabilitys.
*/
- Map getImplementedResourceDefinitions();
+ Map getImplementedResourceCapabilities();
+
+ /**
+ *
+ * @param capabilityName
+ *
+ * @return
+ */
+ boolean implementsResourceCapability( QName capabilityName );
/**
* Returns a list of the QNames of the resource properties that are defined for the specified portType, or null if
Deleted: /incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceDefinition.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceDefinition.java?view=auto&rev=123215
==============================================================================
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java?view=diff&rev=123216&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java&r1=123215&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java&r2=123216
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java Thu Dec 23 12:02:16 2004
@@ -25,6 +25,8 @@
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
+import org.apache.ws.resource.impl.ResourceCapabilityImpl;
+import org.apache.ws.resource.impl.ResourceDefinitionImpl;
import org.apache.ws.util.WsdlUtils;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.impl.common.XmlErrorPrinter;
@@ -160,24 +162,17 @@
{
WSDLReader wsdlReader = WSDLFactory.newInstance( ).newWSDLReader( );
Definition def = wsdlReader.readWSDL( m_wsdlFiles[i].getPath( ) );
- Map services = def.getServices( );
- Iterator iter = services.values( ).iterator( );
- while ( iter.hasNext( ) )
+ Iterator serviceIter = def.getServices( ).values( ).iterator( );
+ while ( serviceIter.hasNext( ) )
{
- Service service = (Service) iter.next( );
- Map portTypes = WsdlUtils.getPortTypes( service );
- Iterator portTypesIter = portTypes.values( ).iterator( );
- while ( portTypesIter.hasNext( ) )
- {
- PortType portType = (PortType) portTypesIter.next( );
- }
+ Service service = (Service) serviceIter.next( );
+ ResourceDefinition resourceDef = new ResourceDefinitionImpl( def, service );
+ //generateSkeletonCode(resourceDef); todo need Ians object for each service
}
- //ResourceDefinition resourceDef = new ResourceDefinitionImpl(def,p);
- //generateSkeletonCode(resourceDef); todo need Ians object for each service
}
}
- /**
+ /**
* DOCUMENT_ME
*
* @param args DOCUMENT_ME
@@ -263,7 +258,7 @@
MSG.getMessage( Keys.OPT_CLASSPATH_SENT_TO_XMLBEANS ) );
}
- private void generateSkeletonCode(ResourceDefinition resourceDef)
+ private void generateSkeletonCode(ResourceCapability resourceDef)
throws Exception
{
initVelocityProperties( );
Copied: incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java (from r123214, incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java)
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java?view=diff&rev=123216&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java&r1=123214&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java&r2=123216
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java Thu Dec 23 12:02:16 2004
@@ -16,7 +16,7 @@
package org.apache.ws.resource.impl;
import org.apache.ws.resource.InvalidWsrfWsdlException;
-import org.apache.ws.resource.ResourceDefinition;
+import org.apache.ws.resource.ResourceCapability;
import org.apache.ws.resource.properties.v1_2.ResourceProperties1_2Constants;
import org.apache.ws.resource.properties.v1_3.ResourceProperties1_3Constants;
import org.apache.ws.util.WsdlUtils;
@@ -39,12 +39,12 @@
import java.util.Set;
/**
- * A {@link ResourceDefinition} implementation.
+ * A {@link ResourceCapability} implementation.
*
* @author Ian Springer
*/
-public class ResourceDefinitionImpl
- implements ResourceDefinition
+public class ResourceCapabilityImpl
+ implements ResourceCapability
{
private Definition m_def;
@@ -55,11 +55,11 @@
private QName[] m_customPropNames;
/**
- * Creates a new {@link ResourceDefinitionImpl} based on the specified JWSDL definition and portType.
+ * Creates a new {@link ResourceCapabilityImpl} based on the specified JWSDL definition and portType.
*
* @param def a JWSDL definition
*/
- public ResourceDefinitionImpl( Definition def, PortType portType ) throws InvalidWsrfWsdlException
+ public ResourceCapabilityImpl( Definition def, PortType portType ) throws InvalidWsrfWsdlException
{
m_def = def;
m_portType = portType;
@@ -80,7 +80,7 @@
Iterator defIter = m_implementedResourceDefs.values().iterator();
while ( defIter.hasNext() )
{
- ResourceDefinition def = (ResourceDefinition) defIter.next();
+ ResourceCapability def = (ResourceCapability) defIter.next();
if ( def.hasProperties() )
{
QName[] propNames = def.getPropertyNames();
@@ -157,7 +157,7 @@
m_customPropNames = (QName[]) customPropNames.toArray( new QName[0] );
}
- public Map getImplementedResourceDefinitions()
+ public Map getImplementedResourceCapabilities()
{
return m_implementedResourceDefs;
}
@@ -203,7 +203,7 @@
private void initImplementedPortTypes() throws InvalidWsrfWsdlException
{
m_implementedResourceDefs = new HashMap();
- ResourceDefinition[] importedResourceDefs = getImportedResourceDefinitions();
+ ResourceCapability[] importedResourceDefs = getImportedResourceDefinitions();
for ( int i = 0; i < importedResourceDefs.length; i++ )
{
PortType importedPortType = importedResourceDefs[i].getPortType();
@@ -215,7 +215,7 @@
}
}
- private ResourceDefinition[] getImportedResourceDefinitions() throws InvalidWsrfWsdlException
+ private ResourceCapability[] getImportedResourceDefinitions() throws InvalidWsrfWsdlException
{
List importedResourceDefs = new ArrayList();
Import[] imports = getImports( m_def );
@@ -227,10 +227,10 @@
while ( portTypeIter.hasNext() )
{
PortType portType = (PortType) portTypeIter.next();
- importedResourceDefs.add( new ResourceDefinitionImpl( def, portType ) );
+ importedResourceDefs.add( new ResourceCapabilityImpl( def, portType ) );
}
}
- return (ResourceDefinition[]) importedResourceDefs.toArray( new ResourceDefinition[0] );
+ return (ResourceCapability[]) importedResourceDefs.toArray( new ResourceCapability[0] );
}
/**
@@ -392,7 +392,7 @@
Iterator defIter = m_implementedResourceDefs.values().iterator();
while ( defIter.hasNext() )
{
- ResourceDefinition def = (ResourceDefinition) defIter.next();
+ ResourceCapability def = (ResourceCapability) defIter.next();
List ops = def.getPortType().getOperations();
for ( int i = 0; i < ops.size(); i++ )
{
@@ -408,7 +408,7 @@
Iterator defIter = m_implementedResourceDefs.values().iterator();
while ( defIter.hasNext() )
{
- ResourceDefinition def = (ResourceDefinition) defIter.next();
+ ResourceCapability def = (ResourceCapability) defIter.next();
if ( def.hasProperties() )
{
QName[] propNames = def.getPropertyNames();
@@ -434,10 +434,10 @@
String wsdlPath = "C:\\Projects\\Apache\\apollo\\trunk\\target\\wsrf\\wsdl\\FileSystem.wsdl";
Definition def = wsdlReader.readWSDL( wsdlPath );
PortType portType = (PortType) def.getPortTypes().values().toArray()[0];
- ResourceDefinition wsResourceDef = null;
+ ResourceCapability wsResourceDef = null;
try
{
- wsResourceDef = new ResourceDefinitionImpl( def, portType );
+ wsResourceDef = new ResourceCapabilityImpl( def, portType );
}
catch ( InvalidWsrfWsdlException iwwe )
{
@@ -446,12 +446,17 @@
}
System.out.println( wsResourceDef );
- Map implementedResourceDefs = wsResourceDef.getImplementedResourceDefinitions();
+ Map implementedResourceDefs = wsResourceDef.getImplementedResourceCapabilities();
Iterator specDefs = implementedResourceDefs.values().iterator();
while ( specDefs.hasNext() )
{
- System.out.println( (ResourceDefinition) specDefs.next() );
+ System.out.println( (ResourceCapability) specDefs.next() );
}
+ }
+
+ public boolean implementsResourceCapability( QName capabilityName )
+ {
+ return m_implementedResourceDefs.containsKey( capabilityName );
}
}
Deleted: /incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java?view=auto&rev=123215
==============================================================================
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org