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 2007/05/31 20:25:38 UTC
svn commit: r543204 - in /activemq/activemq-cpp/trunk/src/decaf: ./
src/main/ src/main/decaf/net/ src/main/decaf/util/
src/main/decaf/util/concurrent/ src/main/decaf/util/logging/
Author: tabish
Date: Thu May 31 11:25:37 2007
New Revision: 543204
URL: http://svn.apache.org/viewvc?view=rev&rev=543204
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103
Building Decaf lib, remove sub folder from the activemq lib dir, going to top level.
Added:
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Properties.h
Modified:
activemq/activemq-cpp/trunk/src/decaf/Makefile.am
activemq/activemq-cpp/trunk/src/decaf/configure.ac
activemq/activemq-cpp/trunk/src/decaf/src/main/Makefile.am
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/net/SocketError.cpp
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Date.cpp
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Date.h
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/concurrent/Mutex.cpp
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/ConsoleHandler.h
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Handler.h
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.cpp
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.h
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.cpp
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.h
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.cpp
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.h
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LoggerDefines.h
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/SimpleLogger.cpp
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/StreamHandler.h
Modified: activemq/activemq-cpp/trunk/src/decaf/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/Makefile.am?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/decaf/Makefile.am Thu May 31 11:25:37 2007
@@ -18,13 +18,13 @@
# Since we don't strictly follow the GNU standard of having 'NEWS README AUTHORS ChangeLog' files
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src/decaf
+SUBDIRS = src/main
#if BUILD_CPPUNIT_TESTS
-# SUBDIRS += src/test-decaf
+# SUBDIRS += src/test
#endif
#Distribute these directories:
-DIST_SUBDIRS = src/decaf
+DIST_SUBDIRS = src/main
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = decaf.pc
Modified: activemq/activemq-cpp/trunk/src/decaf/configure.ac
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/configure.ac?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/configure.ac (original)
+++ activemq/activemq-cpp/trunk/src/decaf/configure.ac Thu May 31 11:25:37 2007
@@ -20,7 +20,7 @@
## --------------------------------
AC_INIT(decaf, 1, activemq-dev@geronimo.apache.org)
AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_SRCDIR(src/decaf/decaf/lang/Thread.cpp)
+AC_CONFIG_SRCDIR(src/main/decaf/lang/Thread.cpp)
## -----------------------------------------------
## Define the Version variables
@@ -165,11 +165,11 @@
AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(decaf.pc)
-AC_CONFIG_FILES(src/decaf/decaf/Makefile)
+AC_CONFIG_FILES(src/main/Makefile)
#if test x$cppunit = xyes
#then
-# AC_CONFIG_FILES(src/test-decaf/Makefile)
+# AC_CONFIG_FILES(src/test/Makefile)
#fi
AC_OUTPUT
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/Makefile.am?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/Makefile.am Thu May 31 11:25:37 2007
@@ -91,6 +91,7 @@
decaf/util/concurrent/Synchronizable.h \
decaf/util/concurrent/Mutex.h \
decaf/util/Date.h \
+ decaf/util/Properties.h \
decaf/util/logging/Handler.h \
decaf/util/logging/Logger.h \
decaf/util/logging/LoggerCommon.h \
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/net/SocketError.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/net/SocketError.cpp?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/net/SocketError.cpp (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/net/SocketError.cpp Thu May 31 11:25:37 2007
@@ -16,7 +16,7 @@
*/
#include "SocketError.h"
-#include <activemq/util/Config.h>
+#include <decaf/util/Config.h>
#if defined(HAVE_WINSOCK2_H)
#include <Winsock2.h>
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Date.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Date.cpp?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Date.cpp (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Date.cpp Thu May 31 11:25:37 2007
@@ -28,7 +28,7 @@
#include <decaf/lang/exceptions/UnsupportedOperationException.h>
-using namespace stl;
+using namespace std;
using namespace decaf;
using namespace decaf::util;
using namespace decaf::lang::exceptions;
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Date.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Date.h?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Date.h (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Date.h Thu May 31 11:25:37 2007
@@ -18,7 +18,7 @@
#ifndef _DECAF_UTIL_DATE_H_
#define _DECAF_UTIL_DATE_H_
-namespace activemq{
+namespace decaf{
namespace util{
/**
Added: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Properties.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Properties.h?view=auto&rev=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Properties.h (added)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Properties.h Thu May 31 11:25:37 2007
@@ -0,0 +1,203 @@
+/*
+ * 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 _DECAF_UTIL_PROPERTIES_H_
+#define _DECAF_UTIL_PROPERTIES_H_
+
+#include <map>
+#include <vector>
+#include <string>
+#include <sstream>
+
+namespace decaf{
+namespace util{
+
+ /**
+ * Java-like properties class for mapping string names to string values.
+ */
+ class Properties{
+ private:
+
+ std::map< std::string, std::string > properties;
+
+ public:
+
+ virtual ~Properties(){}
+
+ /**
+ * Returns true if the properties object is empty
+ * @return true if empty
+ */
+ virtual bool isEmpty() const {
+ return properties.empty();
+ }
+
+ /**
+ * Looks up the value for the given property.
+ * @param name The name of the property to be looked up.
+ * @return the value of the property with the given name, if it
+ * exists. If it does not exist, returns NULL.
+ */
+ virtual const char* getProperty( const std::string& name ) const{
+
+ std::map< std::string, std::string >::const_iterator iter =
+ properties.find( name );
+ if( iter == properties.end() ){
+ return NULL;
+ }
+
+ return iter->second.c_str();
+ }
+
+ /**
+ * Looks up the value for the given property.
+ * @param name the name of the property to be looked up.
+ * @param defaultValue The value to be returned if the given
+ * property does not exist.
+ * @return The value of the property specified by <code>name</code>, if it
+ * exists, otherwise the <code>defaultValue</code>.
+ */
+ virtual std::string getProperty( const std::string& name,
+ const std::string& defaultValue ) const {
+
+ std::map< std::string, std::string >::const_iterator iter =
+ properties.find( name );
+ if( iter == properties.end() ){
+ return defaultValue;
+ }
+
+ return iter->second;
+ }
+
+ /**
+ * Sets the value for a given property. If the property already
+ * exists, overwrites the value.
+ * @param name The name of the value to be written.
+ * @param value The value to be written.
+ */
+ virtual void setProperty( const std::string& name,
+ const std::string& value ){
+ properties[name] = value;
+ }
+
+ /**
+ * Check to see if the Property exists in the set
+ * @param name - property name to check for in this properties set.
+ * @return true if property exists, false otherwise.
+ */
+ virtual bool hasProperty( const std::string& name ) const
+ {
+ if(properties.find(name) != properties.end())
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Removes the property with the given name.
+ * @param name the name of the property to remove.
+ */
+ virtual void remove( const std::string& name ){
+ properties.erase( name );
+ }
+
+ /**
+ * Method that serializes the contents of the property map to
+ * an arryay.
+ * @return list of pairs where the first is the name and the second
+ * is the value.
+ */
+ virtual std::vector< std::pair< std::string, std::string > > toArray() const{
+
+ // Create a vector big enough to hold all the elements in the map.
+ std::vector< std::pair<std::string, std::string> > vec( properties.size() );
+
+ // Get an iterator at the beginning of the map.
+ std::map< std::string, std::string >::const_iterator iter = properties.begin();
+
+ // Copy all of the elements from the map to the vector.
+ for( int ix=0; iter != properties.end(); ++iter, ++ix ){
+ vec[ix] = *iter;
+ }
+
+ return vec;
+ }
+
+ /**
+ * Copies the contents of the given properties object to this one.
+ * @param source The source properties object.
+ */
+ virtual void copy( const Properties* source ){
+
+ clear();
+
+ std::vector< std::pair< std::string, std::string > > vec =
+ source->toArray();
+ for( unsigned int ix=0; ix<vec.size(); ++ix ){
+ properties[vec[ix].first] = vec[ix].second;
+ }
+ }
+
+ /**
+ * Clones this object.
+ * @returns a replica of this object.
+ */
+ virtual Properties* clone() const{
+
+ Properties* props = new Properties();
+
+ props->properties = properties;
+
+ return props;
+ }
+
+ /**
+ * Clears all properties from the map.
+ */
+ virtual void clear(){
+ properties.clear();
+ }
+
+ /**
+ * Formats the contents of the Properties Object into a string
+ * that can be logged, etc.
+ * @returns string value of this object.
+ */
+ virtual std::string toString() const {
+
+ std::ostringstream stream;
+ std::map< std::string, std::string >::const_iterator iter;
+
+ stream << "Begin Class decaf::util::Properties:" << std::endl;
+
+ for( iter = properties.begin(); iter != properties.end(); ++iter ){
+ stream << " properties[" << iter->first << "] = "
+ << iter->second << std::endl;
+ }
+
+ stream << "End Class decaf::util::Properties:" << std::endl;
+
+ return stream.str();
+ }
+
+ };
+
+}}
+
+#endif /*_DECAF_UTIL_PROPERTIES_H_*/
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/concurrent/Mutex.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/concurrent/Mutex.cpp?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/concurrent/Mutex.cpp (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/concurrent/Mutex.cpp Thu May 31 11:25:37 2007
@@ -66,7 +66,7 @@
#endif
lock_count = 1;
- lock_owner = Thread::getId();
+ lock_owner = lang::Thread::getId();
}
}
@@ -80,7 +80,7 @@
if(!isLockOwner())
{
- throw lang::ActiveMQException(
+ throw lang::Exception(
__FILE__, __LINE__,
"Mutex::unlock - Failed, not Lock Owner!" );
}
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/ConsoleHandler.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/ConsoleHandler.h?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/ConsoleHandler.h (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/ConsoleHandler.h Thu May 31 11:25:37 2007
@@ -18,7 +18,7 @@
#define _DECAF_UTIL_LOGGING_CONSOLEHANDLER_H_
#include <decaf/util/logging/StreamHandler.h>
-#include <activemq/io/StandardErrorOutputStream.h>
+#include <decaf/io/StandardErrorOutputStream.h>
namespace decaf{
namespace util{
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Handler.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Handler.h?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Handler.h (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Handler.h Thu May 31 11:25:37 2007
@@ -17,7 +17,7 @@
#ifndef _DECAF_UTIL_LOGGING_HANDLER_H_
#define _DECAF_UTIL_LOGGING_HANDLER_H_
-#include <cms/Closeable.h>
+#include <decaf/io/Closeable.h>
#include <decaf/util/logging/LogRecord.h>
namespace decaf{
@@ -40,7 +40,7 @@
* values for the Handler's Filter, Formatter, and Level. See the
* specific documentation for each concrete Handler class.
*/
- class Handler : public cms::Closeable {
+ class Handler : public io::Closeable {
public:
virtual ~Handler() {}
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.cpp?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.cpp (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.cpp Thu May 31 11:25:37 2007
@@ -17,14 +17,14 @@
#include "LogManager.h"
#include <decaf/util/logging/PropertiesChangeListener.h>
-#include <activemq/concurrent/Concurrent.h>
-#include <activemq/util/Config.h>
+#include <decaf/util/concurrent/Concurrent.h>
+#include <decaf/util/Config.h>
#include <algorithm>
using namespace std;
-using namespace activemq;
-using namespace activemq::util;
+using namespace decaf;
+using namespace decaf::util;
using namespace decaf::util::logging;
////////////////////////////////////////////////////////////////////////////////
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.h?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.h (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.h Thu May 31 11:25:37 2007
@@ -22,8 +22,8 @@
#include <string>
#include <vector>
-#include <activemq/util/Properties.h>
-#include <activemq/concurrent/Mutex.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/concurrent/Mutex.h>
namespace decaf{
namespace util{
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.cpp?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.cpp (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.cpp Thu May 31 11:25:37 2007
@@ -17,14 +17,16 @@
#include "LogWriter.h"
#include <iostream>
-#include <activemq/concurrent/Thread.h>
-#include <activemq/concurrent/Concurrent.h>
-#include <activemq/concurrent/Mutex.h>
-#include <activemq/util/Config.h>
+#include <decaf/lang/Thread.h>
+#include <decaf/util/concurrent/Concurrent.h>
+#include <decaf/util/concurrent/Mutex.h>
+#include <decaf/util/Config.h>
using namespace std;
-using namespace activemq;
-using namespace activemq::concurrent;
+using namespace decaf;
+using namespace decaf::lang;
+using namespace decaf::util;
+using namespace decaf::util::concurrent;
using namespace decaf::util::logging;
////////////////////////////////////////////////////////////////////////////////
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.h?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.h (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.h Thu May 31 11:25:37 2007
@@ -17,7 +17,7 @@
#ifndef _DECAF_UTIL_LOGGING_LOGWRITER_H_
#define _DECAF_UTIL_LOGGING_LOGWRITER_H_
-#include <activemq/concurrent/Mutex.h>
+#include <decaf/util/concurrent/Mutex.h>
namespace decaf{
namespace util{
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.cpp?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.cpp (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.cpp Thu May 31 11:25:37 2007
@@ -17,12 +17,13 @@
#include "Logger.h"
#include <decaf/util/logging/Handler.h>
-#include <activemq/util/Config.h>
+#include <decaf/util/Config.h>
#include <algorithm>
using namespace std;
-using namespace activemq;
-using namespace activemq::exceptions;
+using namespace decaf;
+using namespace decaf::lang;
+using namespace decaf::lang::exceptions;
using namespace decaf::util::logging;
////////////////////////////////////////////////////////////////////////////////
@@ -129,7 +130,7 @@
const std::string& file AMQCPP_UNUSED,
const int line AMQCPP_UNUSED,
const std::string& message AMQCPP_UNUSED,
- cms::CMSException& ex AMQCPP_UNUSED ) {
+ lang::Exception& ex AMQCPP_UNUSED ) {
}
////////////////////////////////////////////////////////////////////////////////
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.h?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.h (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.h Thu May 31 11:25:37 2007
@@ -19,7 +19,7 @@
#include <decaf/util/logging/LoggerCommon.h>
#include <decaf/util/logging/LogRecord.h>
-#include <activemq/exceptions/IllegalArgumentException.h>
+#include <decaf/lang/exceptions/IllegalArgumentException.h>
#include <list>
#include <string>
@@ -91,7 +91,7 @@
* #throws IllegalArgumentException
*/
virtual void addHandler( Handler* handler )
- throw ( exceptions::IllegalArgumentException );
+ throw ( lang::exceptions::IllegalArgumentException );
/**
* Removes the specified Handler and destroys it
@@ -361,7 +361,7 @@
const std::string& file,
const int line,
const std::string& message,
- cms::CMSException& ex );
+ lang::Exception& ex );
public:
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LoggerDefines.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LoggerDefines.h?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LoggerDefines.h (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LoggerDefines.h Thu May 31 11:25:37 2007
@@ -20,35 +20,35 @@
#include <decaf/util/logging/SimpleLogger.h>
#include <sstream>
-#define LOGCMS_DECLARE(loggerName) \
- static activemq::logger::SimpleLogger loggerName;
+#define LOGDECAF_DECLARE(loggerName) \
+ static decaf::logger::SimpleLogger loggerName;
-#define LOGCMS_INITIALIZE(loggerName, className, loggerFamily) \
- activemq::logger::SimpleLogger className::loggerName(loggerFamily);
+#define LOGDECAF_INITIALIZE(loggerName, className, loggerFamily) \
+ decaf::logger::SimpleLogger className::loggerName(loggerFamily);
-#define LOGCMS_DECLARE_LOCAL(loggerName) \
- activemq::logger::Logger loggerName;
+#define LOGDECAF_DECLARE_LOCAL(loggerName) \
+ decaf::logger::Logger loggerName;
-#define LOGCMS_DEBUG(logger, message) \
+#define LOGDECAF_DEBUG(logger, message) \
logger.debug(__FILE__, __LINE__, message);
-#define LOGCMS_DEBUG_1(logger, message, value); \
- { \
- std::ostringstream ostream; \
- ostream << message << value; \
- logger.debug(__FILE__, __LINE__, ostream.str()); \
+#define LOGDECAF_DEBUG_1(logger, message, value); \
+ { \
+ std::ostringstream ostream; \
+ ostream << message << value; \
+ logger.debug(__FILE__, __LINE__, ostream.str()); \
}
-#define LOGCMS_INFO(logger, message) \
+#define LOGDECAF_INFO(logger, message) \
logger.info(__FILE__, __LINE__, message);
-#define LOGCMS_ERROR(logger, message) \
+#define LOGDECAF_ERROR(logger, message) \
logger.error(__FILE__, __LINE__, message);
-#define LOGCMS_WARN(logger, message) \
+#define LOGDECAF_WARN(logger, message) \
logger.warn(__FILE__, __LINE__, message);
-#define LOGCMS_FATAL(logger, message) \
+#define LOGDECAF_FATAL(logger, message) \
logger.fatal(__FILE__, __LINE__, message);
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/SimpleLogger.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/SimpleLogger.cpp?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/SimpleLogger.cpp (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/SimpleLogger.cpp Thu May 31 11:25:37 2007
@@ -20,8 +20,8 @@
#include <decaf/util/logging/LogWriter.h>
using namespace std;
-using namespace activemq;
-using namespace activemq::concurrent;
+using namespace decaf;
+using namespace decaf::util::concurrent;
using namespace decaf::util::logging;
////////////////////////////////////////////////////////////////////////////////
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/StreamHandler.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/StreamHandler.h?view=diff&rev=543204&r1=543203&r2=543204
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/StreamHandler.h (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/StreamHandler.h Thu May 31 11:25:37 2007
@@ -21,10 +21,10 @@
#include <decaf/util/logging/Handler.h>
#include <decaf/util/logging/Formatter.h>
#include <decaf/util/logging/Filter.h>
-#include <activemq/io/OutputStream.h>
-#include <activemq/exceptions/NullPointerException.h>
-#include <activemq/exceptions/InvalidStateException.h>
-#include <activemq/concurrent/Concurrent.h>
+#include <decaf/io/OutputStream.h>
+#include <decaf/kang/exceptions/NullPointerException.h>
+#include <decaf/lang/exceptions/InvalidStateException.h>
+#include <decaf/util/concurrent/Concurrent.h>
namespace decaf{
namespace util{