Qpid-246-2 patch applied. Adds serializability to exceptions missed by the first patch.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@493087 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 36 insertions, 26 deletions

diff --git a/dotnet/Qpid.Common/build.xml b/dotnet/Qpid.Common/build.xml
index fa3dd50338..e976859b15 100644
--- a/dotnet/Qpid.Common/build.xml
+++ b/dotnet/Qpid.Common/build.xml
@@ -1,15 +1,9 @@
+<!--
+ This sole purpose of this build script is to generate the framing layer for the .net client from the AMQ spec.
+ -->
 <project name="AMQ Dot Net Framing Layer" default="generate">
-    <property name="amq.home" value="../../.."/>
-    <path id="amq.home.path">
-      <pathelement location="${amq.home}"/>
-    </path>
 
-    <pathconvert targetos="unix" property="amq.home.fixed" refid="amq.home.path"/>
-
-<!--
-    <property name="amq.asl" value="${amq.home.fixed}/amqp.org/specs/amqp.xml"/>
--->
-    <property name="amq.asl" value="amqp.xml"/>
+    <property name="amq.home" value="../.."/>
 
     <property name="stylesheet" value="stylesheets/framing.xsl"/>
     <property name="registry_stylesheet" value="stylesheets/registry.xsl"/>
@@ -20,25 +14,42 @@
     <property name="resources" value="resources"/>
     <property name="base.lib" value="lib"/>
 
-    <path id="project.classpath">
-        <fileset dir="${base.lib}">
-            <include name="**/*.jar"/>
-        </fileset>
+    <path id="amq.home.path">
+      <pathelement location="${amq.home}"/>
     </path>
 
-    <target name="prepare">
-        <mkdir dir="classes"/>
-    </target>
+    <pathconvert targetos="unix" property="amq.home.fixed" refid="amq.home.path"/>
 
-    <target name="regenerate" depends="clean, generate" description="generates code">
+<!-- Some spec changes break the build, reverting to private copy in Qpid.Common temporarily till this is fixed. -->
+<!--    <property name="amq.asl" value="${amq.home.fixed}/specs/amqp.0-8.xml"/> -->
+    <property name="amq.asl" value="amqp.xml"/>
+
+    <target name="clean" description="Deletes the generated sources.">
+        <delete>
+            <fileset dir="${generated.src}" includes="**/*"/>
+        </delete>
     </target>
 
-    <target name="check-generate">
-        <uptodate property="generateNotRequired" targetfile="${generated.src}/results.out" srcfile="${amq.asl}"/>
+    <!-- 
+      Checks if the generation step needs to be performed. It will be skipped if the sources are up to date with the spec and provided that the
+      force flag has not been set. 
+     -->
+    <target name="check-generate" 
+            description="Checks if the generated sources are up-to-date. Use -Dforce=true or the 'forcegen' target to force generation.">
+
+        <condition property="generateNotRequired">
+	    <and>
+	        <uptodate targetfile="${generated.src}/results.out" srcfile="${amq.asl}"/>
+		<not><isset property="force"/></not>
+	    </and>
+	</condition>
     </target>
 
-    <target name="generate" depends="check-generate" unless="${generateNotRequired}" description="generates code">
+    <!-- Applies a transformation to the AMQP spec to generate the framing layer. -->
+    <target name="generate" depends="check-generate" unless="generateNotRequired" description="generates code">
+
         <mkdir dir="${generated.src}"/>
+
         <java jar="${saxon.jar}" fork="true">
             <arg value="-o"/>
             <arg value="${generated.src}/results.out"/>
@@ -47,6 +58,7 @@
             <arg value="asl_base=${asl.base}"/>
             <arg value="registry_name=MainRegistry"/>
         </java>
+
         <java jar="${saxon.jar}" fork="true">
             <arg value="-o"/>
             <arg value="${generated.src}/registry.out"/>
@@ -55,10 +67,8 @@
         </java>
     </target>
 
-    <target name="clean" depends="prepare" description="deletes any products of the compile and generate tasks">
-        <delete>
-            <fileset dir="classes" includes="**/*"/>
-            <fileset dir="${generated.src}" includes="**/*"/>
-        </delete>
+    <!-- Does a clean and forces re-generation of the sources. -->
+    <target name="forcegen" depends="clean, generate" description="Forces clean re-generation of the code.">
     </target>
+
 </project>