Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 88692 invoked from network); 25 May 2007 14:02:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 May 2007 14:02:42 -0000 Received: (qmail 48319 invoked by uid 500); 25 May 2007 14:02:47 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 48287 invoked by uid 500); 25 May 2007 14:02:47 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 48278 invoked by uid 99); 25 May 2007 14:02:47 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 May 2007 07:02:47 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 May 2007 07:02:40 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D74471A981A; Fri, 25 May 2007 07:02:19 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r541658 [1/2] - in /activemq/activemq-cpp/trunk/vs2005-build: vs2005-activemq-example.vcproj vs2005-activemq-integration-tests.vcproj vs2005-activemq-unittests.vcproj vs2005-activemq.vcproj Date: Fri, 25 May 2007 14:02:19 -0000 To: commits@activemq.apache.org From: nmittler@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070525140219.D74471A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nmittler Date: Fri May 25 07:02:18 2007 New Revision: 541658 URL: http://svn.apache.org/viewvc?view=rev&rev=541658 Log: AMQCPP-115 - creating CMSProperties to remove the dependency of CMS on activemq code Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj?view=diff&rev=541658&r1=541657&r2=541658 ============================================================================== --- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj (original) +++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj Fri May 25 07:02:18 2007 @@ -1,3 +1,389 @@ +<<<<<<< .mine + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +======= <<<<<<< .mine >>>>>>> .r541612 +>>>>>>> .r541657 Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj?view=diff&rev=541658&r1=541657&r2=541658 ============================================================================== --- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj (original) +++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj Fri May 25 07:02:18 2007 @@ -1,3 +1,534 @@ +<<<<<<< .mine + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +======= <<<<<<< .mine >>>>>>> .r541612 +>>>>>>> .r541657 Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj?view=diff&rev=541658&r1=541657&r2=541658 ============================================================================== --- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj (original) +++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj Fri May 25 07:02:18 2007 @@ -1,3 +1,1076 @@ +<<<<<<< .mine + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +======= <<<<<<< .mine >>>>>>> .r541612 +>>>>>>> .r541657