Author: scamp
Date: Fri Mar 18 09:05:27 2005
New Revision: 158103
URL: http://svn.apache.org/viewcvs?view=rev&rev=158103
Log: (empty)
Modified:
incubator/apollo/trunk/changing versions.txt
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
incubator/apollo/trunk/src/site/content/example/requests/GetPrinterPropertiesDoc.soap
incubator/apollo/trunk/src/site/content/example/requests/PrintJobRequest.soap
incubator/apollo/trunk/src/site/content/example/test-build.properties
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=158102&r2=158103
==============================================================================
--- incubator/apollo/trunk/changing versions.txt (original)
+++ incubator/apollo/trunk/changing versions.txt Fri Mar 18 09:05:27 2005
@@ -33,4 +33,5 @@
ResourceTerminationEventImpl
+check usages of ResourceDefinition.implementsResourceCapability in all
wsdl2java extensions for spec version checks
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=158102&r2=158103
==============================================================================
--- 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 09:05:27 2005
@@ -571,6 +571,17 @@
}
}
+ /**
+ * Provides a hook for adding to the Velocity Context.
+ *
+ * @param context
+ * @return VelocityContext
+ */
+ protected VelocityContext updateVelociyContext(VelocityContext
context,ResourceDefinition resourceDef)
+ {
+ return context;
+ }
+
private void processTemplates( ResourceDefinition resourceDef,
File wsdlFile, File serviceDir )
throws Exception
@@ -580,9 +591,8 @@
{
VelocityContext context = new VelocityContext();
ServiceProperties props = buildServiceProperties( resourceDef,
wsdlFile, serviceDir );
-
- //add to context
- context.put( "generated", props );
+ context.put( "generated", props );//add this here
+ updateVelociyContext(context,resourceDef);
//generate files
File packageDir = getPackageDir(
resourceDef.getDefinition().getTargetNamespace(), serviceDir );
Modified:
incubator/apollo/trunk/src/site/content/example/requests/GetPrinterPropertiesDoc.soap
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/GetPrinterPropertiesDoc.soap?view=diff&r1=158102&r2=158103
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/requests/GetPrinterPropertiesDoc.soap
(original)
+++
incubator/apollo/trunk/src/site/content/example/requests/GetPrinterPropertiesDoc.soap
Fri Mar 18 09:05:27 2005
@@ -5,7 +5,8 @@
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
<wsa:To
mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action
mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
+ <wsa:Action
mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
+ <wsa:MessageID>http://foo</wsa:MessageID>
</Header>
<Body>
Modified:
incubator/apollo/trunk/src/site/content/example/requests/PrintJobRequest.soap
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/PrintJobRequest.soap?view=diff&r1=158102&r2=158103
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/requests/PrintJobRequest.soap
(original)
+++
incubator/apollo/trunk/src/site/content/example/requests/PrintJobRequest.soap
Fri Mar 18 09:05:27 2005
@@ -15,7 +15,7 @@
<wsrf-pr:job_name>My First Printer Job</wsrf-pr:job_name>
<wsrf-pr:document_format>text/plain</wsrf-pr:document_format>
<wsrf-pr:document_content>
- <xsd:Base64Data>SGVsbG8gV29ybGQh</xsd:Base64Data>
+ <wsrf-pr:Base64Data>SGVsbG8gV29ybGQh</wsrf-pr:Base64Data>
</wsrf-pr:document_content>
</wsrf-pr:Print_JobRequest>
</Body>
Modified: incubator/apollo/trunk/src/site/content/example/test-build.properties
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/test-build.properties?view=diff&r1=158102&r2=158103
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/test-build.properties
(original)
+++ incubator/apollo/trunk/src/site/content/example/test-build.properties Fri
Mar 18 09:05:27 2005
@@ -22,4 +22,4 @@
#
# ***NOTE: To test an external endpoint this should be set to false
##
-runAxis=false
\ No newline at end of file
+runAxis=true
\ No newline at end of file
Modified: incubator/apollo/trunk/src/templates/Resource.vm
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Resource.vm?view=diff&r1=158102&r2=158103
==============================================================================
--- incubator/apollo/trunk/src/templates/Resource.vm (original)
+++ incubator/apollo/trunk/src/templates/Resource.vm Fri Mar 18 09:05:27 2005
@@ -29,7 +29,7 @@
super.init();
#foreach( $includeFile in $generated.ResourceInitIncludeLocations )
- #include( $includeFile )
+ #parse( $includeFile )
#end
// TODO: init all custom properties - this includes setting values,
registering callbacks, and adding prop value changed topics
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
