svn commit: r1352416 - in /axis/axis2/java/core/branches/1_5: ./ modules/codegen/src/org/apache/axis2/wsdl/template/c/ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/ut...

[sagara]

Author: sagara
Date: Thu Jun 21 05:44:39 2012
New Revision: 1352416

URL: http://svn.apache.org/viewvc?rev=1352416&view=rev
Log:
AXIS2-5349 - Merged r1352413 to 1.5 branch.

Modified:
    axis/axis2/java/core/branches/1_5/   (props changed)
    
axis/axis2/java/core/branches/1_5/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl
    
axis/axis2/java/core/branches/1_5/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl
    axis/axis2/java/core/branches/1_5/modules/distribution/   (props changed)
    
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
   (props changed)
    
axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
   (props changed)
    axis/axis2/java/core/branches/1_5/modules/parent/   (props changed)
    
axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
   (props changed)
    axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/   (props 
changed)
    axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml   
(props changed)
    
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
   (props changed)
    
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
   (props changed)
    axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/   (props 
changed)
    
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
   (props changed)
    
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
   (props changed)
    axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/   
(props changed)
    axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml   (props 
changed)
    axis/axis2/java/core/branches/1_5/modules/transport/http/src/   (props 
changed)
    axis/axis2/java/core/branches/1_5/modules/transport/local/   (props changed)
    
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
   (props changed)
    
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
   (props changed)

Propchange: axis/axis2/java/core/branches/1_5/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk:r1352413

Modified: 
axis/axis2/java/core/branches/1_5/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl?rev=1352416&r1=1352415&r2=1352416&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_5/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl
 (original)
+++ 
axis/axis2/java/core/branches/1_5/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl
 Thu Jun 21 05:44:39 2012
@@ -32,6 +32,8 @@
      * <xsl:value-of select="@name"/> Axis2/C skeleton for the axisService- 
Header file
      */
 
+    #ifndef <xsl:value-of select="$caps_svc_name"/>_H
+    #define <xsl:value-of select="$caps_svc_name"/>_H
 
        #include &lt;axis2_svc_skeleton.h&gt;
        #include &lt;axutil_log_default.h&gt;
@@ -115,5 +117,7 @@
        #ifdef __cplusplus
        }
        #endif
+
+    #endif
     </xsl:template>
  </xsl:stylesheet>

Modified: 
axis/axis2/java/core/branches/1_5/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl?rev=1352416&r1=1352415&r2=1352416&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_5/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl
 (original)
+++ 
axis/axis2/java/core/branches/1_5/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl
 Thu Jun 21 05:44:39 2012
@@ -38,6 +38,9 @@
         * by the Apache Axis2/Java version: #axisVersion# #today#
         */
 
+        #ifndef <xsl:value-of select="$caps_name"/>_H
+        #define <xsl:value-of select="$caps_name"/>_H
+
         #include &lt;stdio.h&gt;
         #include &lt;axiom.h&gt;
         #include &lt;axutil_utils.h&gt;
@@ -241,5 +244,7 @@
        #ifdef __cplusplus
        }
        #endif
+
+    #endif
    </xsl:template>
 </xsl:stylesheet>

Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk/modules/distribution:r1352413

Propchange: 
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
  Merged 
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:r1352413

Propchange: 
axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
  Merged 
/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:r1352413

Propchange: axis/axis2/java/core/branches/1_5/modules/parent/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk/modules/parent:r1352413

Propchange: 
axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
------------------------------------------------------------------------------
  Merged 
/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:r1352413

Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk/modules/soapmonitor/module:r1352413

Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:r1352413

Propchange: 
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
  Merged 
/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:r1352413

Propchange: 
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
  Merged 
/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:r1352413

Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk/modules/soapmonitor/servlet:r1352413

Propchange: 
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
------------------------------------------------------------------------------
  Merged 
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:r1352413

Propchange: 
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
------------------------------------------------------------------------------
  Merged 
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:r1352413

Propchange: 
axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/
------------------------------------------------------------------------------
  Merged 
/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin:r1352413

Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk/modules/transport/http/pom.xml:r1352413

Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk/modules/transport/http/src:r1352413

Propchange: axis/axis2/java/core/branches/1_5/modules/transport/local/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk/modules/transport/local:r1352413

Propchange: 
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
  Merged 
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:r1352413

Propchange: 
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
  Merged 
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:r1352413