Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 40895 invoked from network); 30 Sep 2006 04:18:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Sep 2006 04:18:26 -0000 Received: (qmail 50691 invoked by uid 500); 30 Sep 2006 04:18:26 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 50672 invoked by uid 500); 30 Sep 2006 04:18:26 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 50663 invoked by uid 99); 30 Sep 2006 04:18:26 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Sep 2006 21:18:26 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:64049] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id EC/D1-23383-D00FD154 for ; Fri, 29 Sep 2006 21:18:22 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 803CD1A981A; Fri, 29 Sep 2006 21:18:19 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r451537 - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp: ./ src/main/activemq/network/ src/main/activemq/util/ Date: Sat, 30 Sep 2006 04:18:18 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060930041819.803CD1A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chirino Date: Fri Sep 29 21:18:15 2006 New Revision: 451537 URL: http://svn.apache.org/viewvc?view=rev&rev=451537 Log: Got activemq and the example to build and run. Also tidied up some header #define handling Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-cpp.sln incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-example.vcproj incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq.vcproj Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac?view=diff&rev=451537&r1=451536&r2=451537 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac Fri Sep 29 21:18:15 2006 @@ -58,6 +58,12 @@ AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) +AC_CHECK_HEADERS([uuid.h]) +AC_CHECK_HEADERS([uuid/uuid.h]) +AC_CHECK_HEADERS([objbase.h]) +AC_CHECK_HEADERS([repcdce.h]) +##AC_CHECK_HEADERS([Winsock2.h]) + #save_LIBS="${LIBS}" #AC_CHECK_LIB(rt, clock_gettime, [rt_libs=" -lrt"]) #LIBS="${LIBS}${rt_libs}" Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp?view=diff&rev=451537&r1=451536&r2=451537 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp Fri Sep 29 21:18:15 2006 @@ -14,9 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include -#if (defined(unix) || defined(__APPLE__)) && !defined(__CYGWIN__) - #include +#if defined(HAVE_WINSOCK2_H) + #include + #include + #include + #define stat _stat +#else + #include #include #include #include @@ -25,11 +31,6 @@ #include #include extern int errno; -#else - #include - #include - #include - #define stat _stat #endif #include @@ -38,6 +39,7 @@ #include #include #include + #include "TcpSocket.h" #include "SocketInputStream.h" #include "SocketOutputStream.h" Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h?view=diff&rev=451537&r1=451536&r2=451537 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h Fri Sep 29 21:18:15 2006 @@ -1,31 +1,51 @@ -/* - * 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. - */ -#ifndef ACTIVEMQ_UTIL_CONFIG_H_ -#define ACTIVEMQ_UTIL_CONFIG_H_ - -// -// The purpose of this header is to try to detect the supported headers -// of the platform when the ./configure script is not being used to generate -// the config.h file. -// - -#if !( defined( unix ) || defined(__APPLE__) ) || defined( __CYGWIN__ ) -#define HAVE_WINSOCK2_H -#endif - - -#endif /*ACTIVEMQ_UTIL_CONFIG_H_*/ +/* + * 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. + */ +#ifndef ACTIVEMQ_UTIL_CONFIG_H_ +#define ACTIVEMQ_UTIL_CONFIG_H_ + +// +// The purpose of this header is to try to detect the supported headers +// of the platform when the ./configure script is not being used to generate +// the config.h file. +// +#if defined(HAVE_CONFIG_H) + + // config.h is generated by the ./configure script and it only + // used by unix like systems (includeing cygwin) + #include + + +#else /* !defined(HAVE_CONFIG_H) */ + + // Not using ./configure script and make system.. chances are your using the native build tools + // of Windows or OS X to do this build + #if defined(__APPLE__) + #define HAVE_UUID_H + #elif defined(_WIN32) || defined( __CYGWIN__ ) + #define HAVE_OBJBASE_H + #define HAVE_RPCDCE_H + #define HAVE_WINSOCK2_H + #elif defined( unix ) + #define HAVE_UUID_UUID_H + #else + #error "Unknown Platform" + #endif + +#endif /* !defined(HAVE_CONFIG_H) */ + + +#endif /*ACTIVEMQ_UTIL_CONFIG_H_*/ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h?view=diff&rev=451537&r1=451536&r2=451537 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h Fri Sep 29 21:18:15 2006 @@ -17,17 +17,22 @@ #ifndef ACTIVEMQ_UTIL_GUID_H #define ACTIVEMQ_UTIL_GUID_H -#if defined( unix ) || defined(__APPLE__) && !defined( __CYGWIN__ ) +#include +#include +#include + +#if defined(HAVE_UUID_UUID_H) #include -#elif defined(_WIN32) || defined( __CYGWIN__ ) +#endif +#if defined(HAVE_UUID_H) + #include "uuid.h" +#endif +#if defined(HAVE_OBJBASE_H) #include +#endif +#if defined(HAVE_RPCDCE_H) #include -#else // defined MACOSX - #include "uuid.h" #endif - -#include -#include #include Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-cpp.sln URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-cpp.sln?view=diff&rev=451537&r1=451536&r2=451537 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-cpp.sln (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-cpp.sln Fri Sep 29 21:18:15 2006 @@ -1,11 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2005-activemq-test", "vs2005-cms.vcproj", "{10ACADC6-66E6-4B3E-8A6A-611486588107}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2005-activemq", "vs2005-activemq.vcproj", "{60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2005-activemq-example", "vs2005-activemq-example.vcproj", "{23EFE0EC-D277-4AC0-9DDC-0E0C588B54B8}" + ProjectSection(ProjectDependencies) = postProject + {60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26} = {60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,10 +14,6 @@ Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {10ACADC6-66E6-4B3E-8A6A-611486588107}.Debug|Win32.ActiveCfg = Debug|Win32 - {10ACADC6-66E6-4B3E-8A6A-611486588107}.Debug|Win32.Build.0 = Debug|Win32 - {10ACADC6-66E6-4B3E-8A6A-611486588107}.Release|Win32.ActiveCfg = Release|Win32 - {10ACADC6-66E6-4B3E-8A6A-611486588107}.Release|Win32.Build.0 = Release|Win32 {60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26}.Debug|Win32.ActiveCfg = Debug|Win32 {60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26}.Debug|Win32.Build.0 = Debug|Win32 {60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26}.Release|Win32.ActiveCfg = Release|Win32 Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-example.vcproj URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-example.vcproj?view=diff&rev=451537&r1=451536&r2=451537 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-example.vcproj (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-example.vcproj Fri Sep 29 21:18:15 2006 @@ -41,15 +41,13 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""C:\sandbox\activemq-cpp-trunk\activemq-cpp\src\main"" - PreprocessorDefinitions="WIN32 NDEBUG _LIB WIN32_LEAN_AND_MEAN _CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="2" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" - DisableSpecificWarnings="4290" /> - - - @@ -98,7 +86,7 @@ Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" + ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1" > @@ -119,14 +107,14 @@ /> - - - @@ -519,6 +493,10 @@ > + + @@ -791,11 +769,11 @@ >