Author: scamp
Date: Thu Mar 17 12:51:27 2005
New Revision: 157974
URL: http://svn.apache.org/viewcvs?view=rev&rev=157974
Log:
Jira Apollo-20
Modified:
incubator/apollo/trunk/changing versions.txt
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/impl/ResourceTerminationEventImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
incubator/apollo/trunk/src/templates/AbstractResource.vm
incubator/apollo/trunk/src/templates/Resource.vm
Modified: incubator/apollo/trunk/changing versions.txt
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/changing%20versions.txt?view=diff&r1=157973&r2=157974
==============================================================================
--- incubator/apollo/trunk/changing versions.txt (original)
+++ incubator/apollo/trunk/changing versions.txt Thu Mar 17 12:51:27 2005
@@ -27,6 +27,7 @@
DefaultMethodMap ...add mappings for new methods porttypes
Wsdl2Java register new porttype infos
+Wsdl2Java ..buildServiceProperties - add checks/different versions of
NamespaceVersionHolderr
ResourceCapabilityImpl.validateOperations add check for new version of
ResourceProperties
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=157973&r2=157974
==============================================================================
---
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
Thu Mar 17 12:51:27 2005
@@ -1,6 +1,5 @@
package org.apache.ws.resource.lifetime.impl;
-import org.apache.ws.resource.lifetime.impl.AbstractResourceTerminationEvent;
import org.apache.ws.resource.lifetime.ResourceTerminationEvent;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.xmlbeans.XmlObject;
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=157973&r2=157974
==============================================================================
--- 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
Thu Mar 17 12:51:27 2005
@@ -26,6 +26,7 @@
import org.apache.velocity.app.Velocity;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.ws.resource.ResourceDefinition;
+import
org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.impl.ResourceDefinitionImpl;
@@ -338,7 +339,7 @@
return tempClassesDir;
}
- private ServiceProperties buildServiceProperties( ResourceDefinition
resourceDef,
+ protected ServiceProperties buildServiceProperties( ResourceDefinition
resourceDef,
File wsdlFile,
File serviceDir )
{
@@ -410,7 +411,45 @@
}
}
}
+
+ if(isDraft01Specific(resourceDef))
+ {
+
props.setNamespaceVersionHolder(org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl.class);
+ }
+ else if(isDraft05Specific(resourceDef))
+ {
+
props.setNamespaceVersionHolder(org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl.class);
+ }
+
return props;
+ }
+
+ private boolean isDraft05Specific(ResourceDefinition resourceDef)
+ {
+
if(resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft05.porttype.GetMultipleResourcePropertiesPortType.NAME)
+ ||
resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft05.porttype.GetResourcePropertyDocumentPortType.NAME)
+ ||
resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft05.porttype.DeleteResourcePropertiesPortType.NAME)
+ ||
resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft05.porttype.GetResourcePropertyPortType.NAME)
+ ||
resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft05.porttype.InsertResourcePropertiesPortType.NAME)
+ ||
resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft05.porttype.QueryResourcePropertiesPortType.NAME)
+ ||
resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft05.porttype.SetResourcePropertiesPortType.NAME)
+ ||
resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft05.porttype.UpdateResourcePropertiesPortType.NAME))
+ {
+ return true;
+ }
+ return false;
+ }
+
+ private boolean isDraft01Specific(ResourceDefinition resourceDef)
+ {
+ if(
resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft01.porttype.GetMultipleResourcePropertiesPortType.NAME)
+ ||
resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft01.porttype.GetResourcePropertyPortType.NAME)
+ ||
resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft01.porttype.QueryResourcePropertiesPortType.NAME)
+ ||
resourceDef.implementsResourceCapability(org.apache.ws.resource.properties.v1_2_draft01.porttype.SetResourcePropertiesPortType.NAME))
+ {
+ return true;
+ }
+ return false;
}
private void generateXmlBeans( File wsdlFile )
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java?view=diff&r1=157973&r2=157974
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
Thu Mar 17 12:51:27 2005
@@ -37,6 +37,8 @@
private String m_srcDir;
private String m_jarFileName;
private ResourceDefinition m_resourceDef;
+ private String m_namespaceVersionHolder;
+ public static final String SPEC_NAMESPACE_MEMBER_NAME =
"SPEC_NAMESPACE_SET";
public ServiceProperties(ResourceDefinition resourceDef)
{
@@ -268,4 +270,17 @@
m_abstractResourceInitIncludes.add( abstractResourceInitInclude );
}
+ public String getNamespaceVersionHolder()
+ {
+ return m_namespaceVersionHolder;
+ }
+
+ public void setNamespaceVersionHolder(Class namespaceValueHolder)
+ {
+ if(namespaceValueHolder != null)
+ {
+ String className = namespaceValueHolder.getName();
+ m_namespaceVersionHolder = "public static final "+className+"
"+SPEC_NAMESPACE_MEMBER_NAME+" = new " + className + "();";
+ }
+ }
}
Modified: incubator/apollo/trunk/src/templates/AbstractResource.vm
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/AbstractResource.vm?view=diff&r1=157973&r2=157974
==============================================================================
--- incubator/apollo/trunk/src/templates/AbstractResource.vm (original)
+++ incubator/apollo/trunk/src/templates/AbstractResource.vm Thu Mar 17
12:51:27 2005
@@ -79,10 +79,10 @@
public void destroy()
{
- org.apache.ws.resource.lifetime.ResourceTerminationEvent rte = new
org.apache.ws.resource.lifetime.ResourceTerminationEventImpl(getID(),"Job
Destroyed");
+ org.apache.ws.resource.lifetime.ResourceTerminationEvent rte = new
org.apache.ws.resource.lifetime.impl.ResourceTerminationEventImpl(getID(),"Resource
Destroyed");
for (int i = 0; i < m_terminationListeners.size(); i++)
{
- org.apache.ws.resource.lifetime.ResourceTerminationEventListener
resourceTerminationEventListener =
(org.apache.ws.resource.lifetime.ResourceTerminationEventListener)
m_terminationListeners.get(i);
+ org.apache.ws.resource.lifetime.ResourceTerminationListener
resourceTerminationEventListener =
(org.apache.ws.resource.lifetime.ResourceTerminationListener)
m_terminationListeners.get(i);
resourceTerminationEventListener.terminationOccurred(rte);
}
return;
Modified: incubator/apollo/trunk/src/templates/Resource.vm
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Resource.vm?view=diff&r1=157973&r2=157974
==============================================================================
--- incubator/apollo/trunk/src/templates/Resource.vm (original)
+++ incubator/apollo/trunk/src/templates/Resource.vm Thu Mar 17 12:51:27 2005
@@ -1,5 +1,6 @@
#set( $package = $generated.packageName)
#set( $serviceName = $generated.serviceName)
+#set( $namespaceVersionHolder = $generated.NamespaceVersionHolder)
package $package;
@@ -11,6 +12,14 @@
public class ${serviceName}Resource extends Abstract${serviceName}Resource
{
+
+ #if($namespaceVersionHolder)
+
+ /**
+ * A NamespaceVerionHolder which maintains the QNames of Spec Wsdls
+ */
+ $namespaceVersionHolder
+ #end
/**
* Initializes this resource's state (properties, etc.).
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
