You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2011/10/31 19:27:17 UTC

svn commit: r1195599 - in /activemq/activemq-dotnet: Apache.NMS.ActiveMQ/branches/1.5.x/ Apache.NMS.EMS/branches/1.5.x/ Apache.NMS.MSMQ/branches/1.5.x/ Apache.NMS.Stomp/branches/1.5.x/ Apache.NMS.WCF/branches/1.5.x/ Apache.NMS/branches/1.5.x/

Author: tabish
Date: Mon Oct 31 18:27:16 2011
New Revision: 1195599

URL: http://svn.apache.org/viewvc?rev=1195599&view=rev
Log:
Add missing framework exists check.

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/nant-common.xml   (contents, props changed)
    activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.5.x/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.5.x/nant-common.xml   (contents, props changed)
    activemq/activemq-dotnet/Apache.NMS.MSMQ/branches/1.5.x/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.MSMQ/branches/1.5.x/nant-common.xml   (contents, props changed)
    activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.5.x/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.5.x/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.WCF/branches/1.5.x/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.WCF/branches/1.5.x/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS/branches/1.5.x/   (props changed)
    activemq/activemq-dotnet/Apache.NMS/branches/1.5.x/nant-common.xml

Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 31 18:27:16 2011
@@ -1,3 +1,3 @@
 /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0:692591,693525
 /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0:788230,788233,790183
-/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk:1144402-1144406
+/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk:1144402-1144406,1195539

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/nant-common.xml?rev=1195599&r1=1195598&r2=1195599&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/nant-common.xml Mon Oct 31 18:27:16 2011
@@ -230,7 +230,9 @@
         <property name="current.build.framework.sign" value="true" />
         <property name="link.sdkdoc.version" value="SDK_v7_0" />
         <property name="link.sdkdoc.web" value="true" />
-        <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        <if test="${framework::exists(current.build.framework)}">
+            <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        </if>
     </target>
 
     <target name="set-netcf-2.0-framework-configuration">

Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/nant-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 31 18:27:16 2011
@@ -1,2 +1,2 @@
 /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0/nant-common.xml:788230,788233,790183
-/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml:1082721-1083055
+/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml:1082721-1083055,1195539

Propchange: activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 31 18:27:16 2011
@@ -3,3 +3,4 @@ obj
 *.suo
 lib
 package
+.project

Propchange: activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.5.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /activemq/activemq-dotnet/Apache.NMS.EMS/trunk:1195587-1195590

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.5.x/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.5.x/nant-common.xml?rev=1195599&r1=1195598&r2=1195599&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.5.x/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.5.x/nant-common.xml Mon Oct 31 18:27:16 2011
@@ -230,7 +230,9 @@
         <property name="current.build.framework.sign" value="true" />
         <property name="link.sdkdoc.version" value="SDK_v7_0" />
         <property name="link.sdkdoc.web" value="true" />
-        <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        <if test="${framework::exists(current.build.framework)}">
+            <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        </if>
     </target>
 
     <target name="set-netcf-2.0-framework-configuration">

Propchange: activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.5.x/nant-common.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 31 18:27:16 2011
@@ -1 +1,2 @@
 /activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0:705776-705779
+/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk:1195539

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/branches/1.5.x/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/branches/1.5.x/nant-common.xml?rev=1195599&r1=1195598&r2=1195599&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/branches/1.5.x/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/branches/1.5.x/nant-common.xml Mon Oct 31 18:27:16 2011
@@ -230,7 +230,9 @@
         <property name="current.build.framework.sign" value="true" />
         <property name="link.sdkdoc.version" value="SDK_v7_0" />
         <property name="link.sdkdoc.web" value="true" />
-        <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        <if test="${framework::exists(current.build.framework)}">
+            <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        </if>
     </target>
 
     <target name="set-netcf-2.0-framework-configuration">

Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/branches/1.5.x/nant-common.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 31 18:27:16 2011
@@ -1 +1 @@
-/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk:1062960,1063057-1063852
+/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk:1062960,1063057-1063852,1195539

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.5.x/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.5.x/nant-common.xml?rev=1195599&r1=1195598&r2=1195599&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.5.x/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.5.x/nant-common.xml Mon Oct 31 18:27:16 2011
@@ -230,7 +230,9 @@
         <property name="current.build.framework.sign" value="true" />
         <property name="link.sdkdoc.version" value="SDK_v7_0" />
         <property name="link.sdkdoc.web" value="true" />
-        <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        <if test="${framework::exists(current.build.framework)}">
+            <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        </if>
     </target>
 
     <target name="set-netcf-2.0-framework-configuration">

Propchange: activemq/activemq-dotnet/Apache.NMS.WCF/branches/1.5.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /activemq/activemq-dotnet/Apache.NMS.WCF/trunk:1195539

Modified: activemq/activemq-dotnet/Apache.NMS.WCF/branches/1.5.x/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/branches/1.5.x/nant-common.xml?rev=1195599&r1=1195598&r2=1195599&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/branches/1.5.x/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/branches/1.5.x/nant-common.xml Mon Oct 31 18:27:16 2011
@@ -230,7 +230,9 @@
         <property name="current.build.framework.sign" value="true" />
         <property name="link.sdkdoc.version" value="SDK_v7_0" />
         <property name="link.sdkdoc.web" value="true" />
-        <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        <if test="${framework::exists(current.build.framework)}">
+            <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        </if>
     </target>
 
     <target name="set-netcf-2.0-framework-configuration">

Propchange: activemq/activemq-dotnet/Apache.NMS/branches/1.5.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /activemq/activemq-dotnet/Apache.NMS/trunk:1195539

Modified: activemq/activemq-dotnet/Apache.NMS/branches/1.5.x/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/branches/1.5.x/nant-common.xml?rev=1195599&r1=1195598&r2=1195599&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/branches/1.5.x/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/branches/1.5.x/nant-common.xml Mon Oct 31 18:27:16 2011
@@ -230,7 +230,9 @@
         <property name="current.build.framework.sign" value="true" />
         <property name="link.sdkdoc.version" value="SDK_v7_0" />
         <property name="link.sdkdoc.web" value="true" />
-        <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        <if test="${framework::exists(current.build.framework)}">
+            <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        </if>
     </target>
 
     <target name="set-netcf-2.0-framework-configuration">