You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by aj...@apache.org on 2006/03/09 18:34:17 UTC
svn commit: r384564 - in
/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl:
codegen/extension/PolicyEvaluator.java
template/java/InterfaceImplementationTemplate.xsl
template/java/PolicyExtensionTemplate.xsl
Author: ajith
Date: Thu Mar 9 09:34:13 2006
New Revision: 384564
URL: http://svn.apache.org/viewcvs?rev=384564&view=rev
Log:
a minor fix to the templates to handle the policy change properly. However there's room for improvements since the policy code can be made more modular (and perhaps most of the stuff pushed to the PolicyExtensionTemplate.xsl)
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PolicyEvaluator.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/PolicyExtensionTemplate.xsl
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PolicyEvaluator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PolicyEvaluator.java?rev=384564&r1=384563&r2=384564&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PolicyEvaluator.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PolicyEvaluator.java Thu Mar 9 09:34:13 2006
@@ -71,23 +71,13 @@
this.configuration = configuration;
util = new PolicyAttachmentUtil(configuration.getWom());
-
- //////////////////////////////////////////////////////////////////
-
// adding default PolicyExtensions
ns2Exts.put("http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmimeserialization", new MTOMPolicyExtension());
ns2Exts.put("http://schemas.xmlsoap.org/ws/2004/09/policy/encoding", new EncodePolicyExtension());
-
- //////////////////////////////////////////////////////////////////
-
+ //set the policy handling template
configuration.putProperty("policyExtensionTemplate", "/org/apache/axis2/wsdl/template/java/PolicyExtensionTemplate.xsl");
-
-
-
- ////////////////////////////////////////////////////////////////////
-
-
+
String repository = configuration.getRepositoryPath();
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=384564&r1=384563&r2=384564&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Thu Mar 9 09:34:13 2006
@@ -520,8 +520,7 @@
.merge(getPolicyFromString(policyString2));
}
- // /////////////////////////////////////////////////////////////////
-
+
private java.util.ArrayList getModules(java.util.List termsList) {
java.util.ArrayList arrayList = new java.util.ArrayList();
java.util.Iterator iterator = termsList.iterator();
@@ -576,30 +575,15 @@
}
}
-
- ////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-
-
-
-
</xsl:if>
- ///////////////////////////////////////////////////////////////////////
-
-
-
- private javax.xml.namespace.QName[] opNameArray;
-
-
+ private javax.xml.namespace.QName[] opNameArray = null;
private boolean optimizeContent(javax.xml.namespace.QName opName) {
- if (opNameArray == null) {
+ <xsl:if test="stubMethods">
+ setOpNameArray();
+ </xsl:if>
+
+ if (opNameArray == null) {
return false;
}
for (int i = 0; i < opNameArray.length; i++) {
@@ -609,15 +593,8 @@
}
return false;
}
-
-
-
- ////////////////////////////////////////////////////////////////////////
-
-
- //<xsl:apply-templates/>
-
- }
+ //<xsl:apply-templates/>
+ }
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/PolicyExtensionTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/PolicyExtensionTemplate.xsl?rev=384564&r1=384563&r2=384564&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/PolicyExtensionTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/PolicyExtensionTemplate.xsl Thu Mar 9 09:34:13 2006
@@ -33,15 +33,23 @@
<xsl:variable name="optimized">
<xsl:value-of select="//optimizeContent"/>
</xsl:variable>
-
- <xsl:if test="$optimized">
- opNameArray = {
+
+ <xsl:choose>
+ <xsl:when test="$optimized">
+ private void setOpNameArray(){
+ opNameArray = new javax.xml.namespace.QName[] {
<xsl:for-each select="optimizeContent/opName">
<xsl:if test="position()>1">,
</xsl:if>new javax.xml.namespace.QName("<xsl:value-of select="@ns-url"/>","<xsl:value-of select="@localName"/>")
</xsl:for-each>
};
- </xsl:if>
-
+ }
+ </xsl:when>
+ <xsl:otherwise>
+ private void setOpNameArray(){
+ opNameArray = null;
+ }
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
</xsl:stylesheet>