activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r507918 - in /activemq/activemq-dotnet/trunk: ./ src/main/csharp/ActiveMQ/Transport/Tcp/
Date Thu, 15 Feb 2007 13:00:09 GMT
Author: jstrachan
Date: Thu Feb 15 05:00:07 2007
New Revision: 507918

URL: http://svn.apache.org/viewvc?view=rev&rev=507918
Log:
Fixed up the artifact names and added a little script for future use with XBuild

Added:
    activemq/activemq-dotnet/trunk/build-xbuild.sh   (with props)
Modified:
    activemq/activemq-dotnet/trunk/monodevelop-activemq-test.mdp
    activemq/activemq-dotnet/trunk/monodevelop-activemq.mdp
    activemq/activemq-dotnet/trunk/monodevelop-nms-test.mdp
    activemq/activemq-dotnet/trunk/monodevelop-nms.mdp
    activemq/activemq-dotnet/trunk/pom.xml
    activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransportFactory.cs
    activemq/activemq-dotnet/trunk/vs2005-activemq-test.csproj
    activemq/activemq-dotnet/trunk/vs2005-activemq.csproj
    activemq/activemq-dotnet/trunk/vs2005-msmq-test.csproj
    activemq/activemq-dotnet/trunk/vs2005-msmq.csproj
    activemq/activemq-dotnet/trunk/vs2005-nms-test.csproj
    activemq/activemq-dotnet/trunk/vs2005-nms.csproj

Added: activemq/activemq-dotnet/trunk/build-xbuild.sh
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/build-xbuild.sh?view=auto&rev=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/build-xbuild.sh (added)
+++ activemq/activemq-dotnet/trunk/build-xbuild.sh Thu Feb 15 05:00:07 2007
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# 
+# A simple shell script for building on Mono using XBuild.
+#
+# WARNING: At the time of writing XBuild on Mono does not handle cross-project references
+# so it can only manage to build the NMS.dll :(
+#
+
+echo "Building NMS.dll"
+xbuild vs2005-nms.csproj
+
+# echo "Building NMS-test.dll"
+# xbuild vs2005-nms-test.csproj
+
+# echo "Building ActiveMQ.dll"
+# xbuild vs2005-activemq.csproj
+
+#echo "Building ActiveMQ-test.dll"
+#xbuild vs2005-activemq.csproj

Propchange: activemq/activemq-dotnet/trunk/build-xbuild.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-dotnet/trunk/build-xbuild.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: activemq/activemq-dotnet/trunk/build-xbuild.sh
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: activemq/activemq-dotnet/trunk/monodevelop-activemq-test.mdp
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/monodevelop-activemq-test.mdp?view=diff&rev=507918&r1=507917&r2=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/monodevelop-activemq-test.mdp (original)
+++ activemq/activemq-dotnet/trunk/monodevelop-activemq-test.mdp Thu Feb 15 05:00:07 2007
@@ -1,13 +1,13 @@
 <Project name="monodevelop-activemq-test" fileversion="2.0" language="C#" clr-version="Net_1_1"
ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Debug" assembly="activemq-test" />
+      <Output directory="./bin/Debug" assembly="ActiveMQ-test" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1"
/>
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False"
generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters"
/>
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Release" assembly="activemq-test" />
+      <Output directory="./bin/Release" assembly="ActiveMQ-test" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1"
/>
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False"
generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters"
/>

Modified: activemq/activemq-dotnet/trunk/monodevelop-activemq.mdp
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/monodevelop-activemq.mdp?view=diff&rev=507918&r1=507917&r2=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/monodevelop-activemq.mdp (original)
+++ activemq/activemq-dotnet/trunk/monodevelop-activemq.mdp Thu Feb 15 05:00:07 2007
@@ -1,13 +1,13 @@
 <Project name="monodevelop-activemq" fileversion="2.0" language="C#" clr-version="Net_1_1"
ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Debug" assembly="activemq" />
+      <Output directory="./bin/Debug" assembly="ActiveMQ" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1"
/>
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False"
generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters"
/>
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Release" assembly="activemq" />
+      <Output directory="./bin/Release" assembly="ActiveMQ" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1"
/>
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False"
generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters"
/>

Modified: activemq/activemq-dotnet/trunk/monodevelop-nms-test.mdp
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/monodevelop-nms-test.mdp?view=diff&rev=507918&r1=507917&r2=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/monodevelop-nms-test.mdp (original)
+++ activemq/activemq-dotnet/trunk/monodevelop-nms-test.mdp Thu Feb 15 05:00:07 2007
@@ -1,13 +1,13 @@
 <Project name="monodevelop-nms-test" fileversion="2.0" language="C#" clr-version="Net_1_1"
ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Debug" assembly="nms-test" />
+      <Output directory="./bin/Debug" assembly="NMS-test" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1"
/>
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False"
generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters"
/>
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Release" assembly="nms-test" />
+      <Output directory="./bin/Release" assembly="NMS-test" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1"
/>
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False"
generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters"
/>

Modified: activemq/activemq-dotnet/trunk/monodevelop-nms.mdp
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/monodevelop-nms.mdp?view=diff&rev=507918&r1=507917&r2=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/monodevelop-nms.mdp (original)
+++ activemq/activemq-dotnet/trunk/monodevelop-nms.mdp Thu Feb 15 05:00:07 2007
@@ -1,13 +1,13 @@
 <Project name="monodevelop-nms" fileversion="2.0" language="C#" clr-version="Net_1_1"
ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Debug" assembly="nms" />
+      <Output directory="./bin/Debug" assembly="NMS" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1"
/>
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False"
generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters"
/>
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Release" assembly="nms" />
+      <Output directory="./bin/Release" assembly="NMS" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1"
/>
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False"
generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters"
/>

Modified: activemq/activemq-dotnet/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/pom.xml?view=diff&rev=507918&r1=507917&r2=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/pom.xml (original)
+++ activemq/activemq-dotnet/trunk/pom.xml Thu Feb 15 05:00:07 2007
@@ -16,19 +16,16 @@
     limitations under the License.
 -->
 <project>
-  <!--
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
     <version>4.2-SNAPSHOT</version>
   </parent>
-  -->
-  <groupId>org.apache.activemq</groupId>
-  <version>4.2-SNAPSHOT</version>
+  <version>4.2</version>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>activemq-dotnet</artifactId>
-  <packaging>dotnet-library</packaging>
+  <packaging>library</packaging>
 
 
   <repositories>
@@ -55,7 +52,31 @@
 
     <plugins>
 
+      <plugin>
+          <groupId>org.apache.maven.dotnet.plugins</groupId>
+          <artifactId>maven-compile-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+            <!-- <vendor>MONO</vendor> -->
+	          <excludes>
+							<exclude>MSMQ/*.cs</exclude>
+							<exclude>NMS/CommonAssemblyInfo.cs</exclude>
+						</excludes>
+        </configuration>
+      </plugin>
+
+      <plugin>
+         <groupId>org.apache.maven.dotnet.plugins</groupId>
+          <artifactId>maven-test-plugin</artifactId>
+          <configuration>
+            <!-- <vendor>MONO</vendor> -->
+              <!-- <nunitHome>C:\Programs\nunit</nunitHome> -->
+          </configuration>
+      </plugin>
+
+
       <!-- Used to generate the openwire commands and marshallers -->
+			<!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -73,7 +94,7 @@
           </dependency>
         </dependencies>
       </plugin>
-
+		-->
       <!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -166,6 +187,13 @@
   </build>
 
   <dependencies>
+	  <dependency>
+        <groupId>org.nunit</groupId>
+        <artifactId>nunit.framework</artifactId>
+        <version>2.2.8.0</version>
+        <type>library</type>
+    </dependency>
+  
     <!--  example of a system dependency -->
     <!--  dependency>
       <groupId>System</groupId>

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransportFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransportFactory.cs?view=diff&rev=507918&r1=507917&r2=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransportFactory.cs
(original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransportFactory.cs
Thu Feb 15 05:00:07 2007
@@ -66,7 +66,7 @@
                 {
                         // Looping through the AddressList allows different type of connections
to be tried
                         // (IPv4, IPv6 and whatever else may be available).
-                        IPHostEntry hostEntry = Dns.GetHostByName(host);
+                        IPHostEntry hostEntry = Dns.GetHostEntry(host);
                         foreach (IPAddress address in hostEntry.AddressList)
                         {
                                 Socket socket = new Socket(address.AddressFamily, SocketType.Stream,
ProtocolType.Tcp);

Modified: activemq/activemq-dotnet/trunk/vs2005-activemq-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/vs2005-activemq-test.csproj?view=diff&rev=507918&r1=507917&r2=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/vs2005-activemq-test.csproj (original)
+++ activemq/activemq-dotnet/trunk/vs2005-activemq-test.csproj Thu Feb 15 05:00:07 2007
@@ -7,7 +7,7 @@
     <ProjectGuid>{EB943C69-2C9B-45E7-B95B-FB916E7057ED}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>ActiveMQ</RootNamespace>
-    <AssemblyName>activemq-test</AssemblyName>
+    <AssemblyName>ActiveMQ-test</AssemblyName>
     <WarningLevel>4</WarningLevel>
     <StartupObject>
     </StartupObject>

Modified: activemq/activemq-dotnet/trunk/vs2005-activemq.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/vs2005-activemq.csproj?view=diff&rev=507918&r1=507917&r2=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/vs2005-activemq.csproj (original)
+++ activemq/activemq-dotnet/trunk/vs2005-activemq.csproj Thu Feb 15 05:00:07 2007
@@ -7,7 +7,7 @@
     <ProjectGuid>{08321F42-4B3D-4815-B592-95962BAC3B9F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>ActiveMQ</RootNamespace>
-    <AssemblyName>activemq</AssemblyName>
+    <AssemblyName>ActiveMQ</AssemblyName>
     <WarningLevel>4</WarningLevel>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>activemq-dotnet.snk</AssemblyOriginatorKeyFile>

Modified: activemq/activemq-dotnet/trunk/vs2005-msmq-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/vs2005-msmq-test.csproj?view=diff&rev=507918&r1=507917&r2=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/vs2005-msmq-test.csproj (original)
+++ activemq/activemq-dotnet/trunk/vs2005-msmq-test.csproj Thu Feb 15 05:00:07 2007
@@ -7,7 +7,7 @@
     <ProjectGuid>{2F31ED5C-44A2-464A-BD55-2B5B010654E8}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>MSMQ</RootNamespace>
-    <AssemblyName>msmq-test</AssemblyName>
+    <AssemblyName>MSMQ-test</AssemblyName>
     <WarningLevel>4</WarningLevel>
     <StartupObject>
     </StartupObject>

Modified: activemq/activemq-dotnet/trunk/vs2005-msmq.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/vs2005-msmq.csproj?view=diff&rev=507918&r1=507917&r2=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/vs2005-msmq.csproj (original)
+++ activemq/activemq-dotnet/trunk/vs2005-msmq.csproj Thu Feb 15 05:00:07 2007
@@ -7,7 +7,7 @@
     <ProjectGuid>{A5FCA129-991B-4CB2-987A-B25E43B0F5EC}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>MSMQ</RootNamespace>
-    <AssemblyName>msmq</AssemblyName>
+    <AssemblyName>MSMQ</AssemblyName>
     <WarningLevel>4</WarningLevel>
     <StartupObject>
     </StartupObject>

Modified: activemq/activemq-dotnet/trunk/vs2005-nms-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/vs2005-nms-test.csproj?view=diff&rev=507918&r1=507917&r2=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/vs2005-nms-test.csproj (original)
+++ activemq/activemq-dotnet/trunk/vs2005-nms-test.csproj Thu Feb 15 05:00:07 2007
@@ -7,7 +7,7 @@
     <ProjectGuid>{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>NMS.Test</RootNamespace>
-    <AssemblyName>nms-test</AssemblyName>
+    <AssemblyName>NMS-test</AssemblyName>
     <WarningLevel>4</WarningLevel>
     <StartupObject>
     </StartupObject>

Modified: activemq/activemq-dotnet/trunk/vs2005-nms.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/vs2005-nms.csproj?view=diff&rev=507918&r1=507917&r2=507918
==============================================================================
--- activemq/activemq-dotnet/trunk/vs2005-nms.csproj (original)
+++ activemq/activemq-dotnet/trunk/vs2005-nms.csproj Thu Feb 15 05:00:07 2007
@@ -7,7 +7,7 @@
     <ProjectGuid>{300C1716-0674-4D01-8F5D-151E59A504FE}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>NMS</RootNamespace>
-    <AssemblyName>nms</AssemblyName>
+    <AssemblyName>NMS</AssemblyName>
     <WarningLevel>4</WarningLevel>
     <StartupObject>
     </StartupObject>



Mime
View raw message