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/01 18:55:38 UTC

svn commit: r534155 - /activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/

Author: tabish
Date: Tue May  1 09:55:37 2007
New Revision: 534155

URL: http://svn.apache.org/viewvc?view=rev&rev=534155
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103

Building Decaf lib

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IllegalMonitorStateException.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IllegalStateException.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IndexOutOfBoundsException.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/InterruptedException.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/InvalidStateException.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/NoSuchElementException.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/NullPointerException.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/RuntimeException.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/UnsupportedOperationException.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IllegalMonitorStateException.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IllegalMonitorStateException.h?view=diff&rev=534155&r1=534154&r2=534155
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IllegalMonitorStateException.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IllegalMonitorStateException.h Tue May  1 09:55:37 2007
@@ -14,19 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef ACTIVEMQ_EXCEPTIONS_ILLEGALMONITORSTATEEXCEPTION_H_
-#define ACTIVEMQ_EXCEPTIONS_ILLEGALMONITORSTATEEXCEPTION_H_
+#ifndef _DECAF_LANG_EXCEPTIONS_ILLEGALMONITORSTATEEXCEPTION_H_
+#define _DECAF_LANG_EXCEPTIONS_ILLEGALMONITORSTATEEXCEPTION_H_
 
-#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Exception.h>
 
-namespace activemq{
+namespace decaf{
+namespace lang{
 namespace exceptions{
 
     /*
      * Thrown when an error occurs from calling a method from syncronizable
      * and the caller doesn't hold a lock on the object.
      */
-    class IllegalMonitorStateException : public ActiveMQException
+    class IllegalMonitorStateException : public Exception
     {
     public:
 
@@ -39,38 +40,38 @@
          * Conversion Constructor from some other ActiveMQException
          * @param An exception that should become this type of Exception
          */
-        IllegalMonitorStateException(const ActiveMQException& ex) throw()
-        : ActiveMQException()
+        IllegalMonitorStateException(const Exception& ex) throw()
+        : Exception()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Copy Constructor
          */
         IllegalMonitorStateException(const IllegalMonitorStateException& ex) throw()
-        : ActiveMQException()
+        : Exception()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Constructor - Initializes the file name and line number where
-         * this message occured.  Sets the message to report, using an 
+         * this message occured.  Sets the message to report, using an
          * optional list of arguments to parse into the message
          * @param file name where exception occurs
          * @param line number where the exception occurred.
          * @param message to report
          * @param list of primitives that are formatted into the message
          */
-        IllegalMonitorStateException( const char* file, 
+        IllegalMonitorStateException( const char* file,
                                       const int lineNumber,
                                       const char* msg, ...) throw()
         {
             va_list vargs;
             va_start(vargs, msg);
             buildMessage(msg, vargs);
-            
+
             // Set the first mark for this exception.
             setMark(file, lineNumber);
         }
@@ -80,7 +81,7 @@
          * to preserve the type of the original exception as well as the message.
          * All subclasses should override.
          */
-        virtual ActiveMQException* clone() const{
+        virtual IllegalMonitorStateException* clone() const{
             return new IllegalMonitorStateException(*this);
         }
 
@@ -88,6 +89,6 @@
 
    };
 
-}}
+}}}
 
-#endif /*ACTIVEMQ_EXCEPTIONS_ILLEGALMONITORSTATEEXCEPTION_H_*/
+#endif /*_DECAF_LANG_EXCEPTIONS_ILLEGALMONITORSTATEEXCEPTION_H_*/

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IllegalStateException.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IllegalStateException.h?view=diff&rev=534155&r1=534154&r2=534155
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IllegalStateException.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IllegalStateException.h Tue May  1 09:55:37 2007
@@ -14,19 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef ACTIVEMQ_EXCEPTIONS_ILLEGALSTATEEXCEPTION_H_
-#define ACTIVEMQ_EXCEPTIONS_ILLEGALSTATEEXCEPTION_H_
+#ifndef _DECAF_LANG_EXCEPTIONS_ILLEGALSTATEEXCEPTION_H_
+#define _DECAF_LANG_EXCEPTIONS_ILLEGALSTATEEXCEPTION_H_
 
-#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Exception.h>
 
-namespace activemq{
+namespace decaf{
+namespace lang{
 namespace exceptions{
 
     /*
      * Thrown when an error occurs from calling a method from syncronizable
      * and the caller doesn't hold a lock on the object.
      */
-    class IllegalStateException : public ActiveMQException
+    class IllegalStateException : public Exception
     {
     public:
 
@@ -39,39 +40,39 @@
          * Conversion Constructor from some other ActiveMQException
          * @param An exception that should become this type of Exception
          */
-        IllegalStateException(const ActiveMQException& ex) throw()
-        : ActiveMQException()
+        IllegalStateException(const Exception& ex) throw()
+        : Exception()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Copy Constructor
          */
         IllegalStateException(const IllegalStateException& ex) throw()
-        : ActiveMQException()
+        : Exception()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Constructor - Initializes the file name and line number where
-         * this message occured.  Sets the message to report, using an 
+         * this message occured.  Sets the message to report, using an
          * optional list of arguments to parse into the message
          * @param file name where exception occurs
          * @param line number where the exception occurred.
          * @param message to report
          * @param list of primitives that are formatted into the message
          */
-        IllegalStateException( const char* file, 
+        IllegalStateException( const char* file,
                                const int lineNumber,
                                const char* msg, ...) throw()
-        : ActiveMQException()
+        : Exception()
         {
             va_list vargs;
             va_start(vargs, msg);
             buildMessage(msg, vargs);
-            
+
             // Set the first mark for this exception.
             setMark(file, lineNumber);
         }
@@ -81,7 +82,7 @@
          * to preserve the type of the original exception as well as the message.
          * All subclasses should override.
          */
-        virtual ActiveMQException* clone() const{
+        virtual IllegalStateException* clone() const{
             return new IllegalStateException(*this);
         }
 
@@ -91,4 +92,4 @@
 
 }}
 
-#endif /*ACTIVEMQ_EXCEPTIONS_ILLEGALSTATEEXCEPTION_H_*/
+#endif /*_DECAF_LANG_EXCEPTIONS_ILLEGALSTATEEXCEPTION_H_*/

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IndexOutOfBoundsException.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IndexOutOfBoundsException.h?view=diff&rev=534155&r1=534154&r2=534155
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IndexOutOfBoundsException.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/IndexOutOfBoundsException.h Tue May  1 09:55:37 2007
@@ -14,48 +14,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef ACTIVEMQ_EXCEPTIONS_INDEXOUTOFBOUNDSEXCEPTION_H_
-#define ACTIVEMQ_EXCEPTIONS_INDEXOUTOFBOUNDSEXCEPTION_H_
+#ifndef _DECAF_LANG_EXCEPTIONS_INDEXOUTOFBOUNDSEXCEPTION_H_
+#define _DECAF_LANG_EXCEPTIONS_INDEXOUTOFBOUNDSEXCEPTION_H_
 
-#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Exception.h>
 
-namespace activemq{
+namespace decaf{
+namespace lang{
 namespace exceptions{
 
     /*
      * Thrown when an illegal argument was passed into a method.
      */
-    class IndexOutOfBoundsException : public ActiveMQException
+    class IndexOutOfBoundsException : public Exception
     {
     public:
-    
+
       /**
        * Default Constructor
        */
-      IndexOutOfBoundsException() throw() {};
-      
+      IndexOutOfBoundsException() throw() {}
+
       /**
        * Conversion Constructor from some other ActiveMQException
        * @param An exception that should become this type of Exception
        */
-      IndexOutOfBoundsException( const ActiveMQException& ex ) throw()
-      : ActiveMQException()
+      IndexOutOfBoundsException( const Exception& ex ) throw()
+      : Exception()
       {
-         *(ActiveMQException*)this = ex;
+         *(Exception*)this = ex;
       }
-      
+
       /**
        * Copy Constructor
        */
       IndexOutOfBoundsException( const IndexOutOfBoundsException& ex ) throw()
-      : ActiveMQException()
+      : Exception()
       {
-         *(ActiveMQException*)this = ex;
+         *(Exception*)this = ex;
       }
-        
+
       /**
        * Constructor - Initializes the file name and line number where
-       * this message occured.  Sets the message to report, using an 
+       * this message occured.  Sets the message to report, using an
        * optional list of arguments to parse into the message
        * @param file name where exception occurs
        * @param line number where the exception occurred.
@@ -64,7 +65,7 @@
        */
       IndexOutOfBoundsException(const char* file, const int lineNumber,
          const char* msg, ...) throw()
-      : ActiveMQException()
+      : Exception()
       {
          va_list vargs ;
          va_start(vargs, msg) ;
@@ -73,23 +74,23 @@
          // Set the first mark for this exception.
          setMark( file, lineNumber );
       }
-        
+
       /**
        * Clones this exception.  This is useful for cases where you need
        * to preserve the type of the original exception as well as the message.
        * All subclasses should override.
        */
-      virtual ActiveMQException* clone() const{
+      virtual IndexOutOfBoundsException* clone() const{
          return new IndexOutOfBoundsException( *this );
       }
-      
+
       /**
        * Destructor
        */
       virtual ~IndexOutOfBoundsException() throw() {}
-        
+
     };
 
 }}
 
-#endif /*ACTIVEMQ_EXCEPTIONS_INDEXOUTOFBOUNDSEXCEPTION_H_*/
+#endif /*_DECAF_LANG_EXCEPTIONS_INDEXOUTOFBOUNDSEXCEPTION_H_*/

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/InterruptedException.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/InterruptedException.h?view=diff&rev=534155&r1=534154&r2=534155
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/InterruptedException.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/InterruptedException.h Tue May  1 09:55:37 2007
@@ -14,18 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef ACTIVEMQ_EXCEPTIONS_INTERRUPTEDENTEXCEPTION_H_
-#define ACTIVEMQ_EXCEPTIONS_INTERRUPTEDENTEXCEPTION_H_
+#ifndef _DECAF_LANG_EXCEPTIONS_INTERRUPTEDENTEXCEPTION_H_
+#define _DECAF_LANG_EXCEPTIONS_INTERRUPTEDENTEXCEPTION_H_
 
-#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Exception.h>
 
-namespace activemq{
+namespace decaf{
+namespace lang{
 namespace exceptions{
 
     /*
      * Thrown when an Thread is interrupted during a wait.
      */
-    class InterruptedException : public ActiveMQException
+    class InterruptedException : public Exception
     {
     public:
 
@@ -33,44 +34,44 @@
          * Default Constructor
          */
         InterruptedException() throw() {};
-        
+
         /**
          * Conversion Constructor from some other ActiveMQException
          * @param An exception that should become this type of Exception
          */
-        InterruptedException(const ActiveMQException& ex) throw()
-        : ActiveMQException()
+        InterruptedException(const Exception& ex) throw()
+        : Exception()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Copy Constructor
          */
         InterruptedException(const InterruptedException& ex) throw()
-        : ActiveMQException()
+        : Exception()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Constructor - Initializes the file name and line number where
-         * this message occured.  Sets the message to report, using an 
+         * this message occured.  Sets the message to report, using an
          * optional list of arguments to parse into the message
          * @param file name where exception occurs
          * @param line number where the exception occurred.
          * @param message to report
          * @param list of primitives that are formatted into the message
          */
-        InterruptedException( const char* file, 
+        InterruptedException( const char* file,
                               const int lineNumber,
                               const char* msg, ... ) throw()
-        : ActiveMQException()
+        : Exception()
         {
             va_list vargs;
             va_start(vargs, msg);
             buildMessage(msg, vargs);
-            
+
             // Set the first mark for this exception.
             setMark(file, lineNumber);
         }
@@ -80,7 +81,7 @@
          * to preserve the type of the original exception as well as the message.
          * All subclasses should override.
          */
-        virtual ActiveMQException* clone() const{
+        virtual InterruptedException* clone() const{
             return new InterruptedException(*this);
         }
 
@@ -90,4 +91,4 @@
 
 }}
 
-#endif /*ACTIVEMQ_EXCEPTIONS_INTERRUPTEDENTEXCEPTION_H_*/
+#endif /*_DECAF_LANG_EXCEPTIONS_INTERRUPTEDENTEXCEPTION_H_*/

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/InvalidStateException.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/InvalidStateException.h?view=diff&rev=534155&r1=534154&r2=534155
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/InvalidStateException.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/InvalidStateException.h Tue May  1 09:55:37 2007
@@ -14,19 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef _ACTIVEMQ_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_
-#define _ACTIVEMQ_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_
+#ifndef _DECAF_LANG_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_
+#define _DECAF_LANG_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_
 
-#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Exception.h>
 
-namespace activemq{
+namespace decaf{
+namespace lang{
 namespace exceptions{
 
     /*
      * Thrown when an operation is requested, but the state of the object
      * servicing the request is not correct for that request.
      */
-    class InvalidStateException : public ActiveMQException
+    class InvalidStateException : public Exception
     {
     public:
 
@@ -36,42 +37,42 @@
         InvalidStateException() throw() {}
 
         /**
-         * Conversion Constructor from some other ActiveMQException
+         * Conversion Constructor from some other Exception
          * @param An exception that should become this type of Exception
          */
-        InvalidStateException(const ActiveMQException& ex) throw()
-        : ActiveMQException()
+        InvalidStateException(const Exception& ex) throw()
+        : Exception()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Copy Constructor
          */
         InvalidStateException( const InvalidStateException& ex ) throw()
-        : ActiveMQException()
+        : Exception()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Constructor - Initializes the file name and line number where
-         * this message occured.  Sets the message to report, using an 
+         * this message occured.  Sets the message to report, using an
          * optional list of arguments to parse into the message
          * @param file name where exception occurs
          * @param line number where the exception occurred.
          * @param message to report
          * @param list of primitives that are formatted into the message
          */
-        InvalidStateException( const char* file, 
+        InvalidStateException( const char* file,
                                const int lineNumber,
                                const char* msg, ... ) throw()
-        : ActiveMQException()
+        : Exception()
         {
             va_list vargs;
             va_start( vargs, msg );
             buildMessage( msg, vargs );
-            
+
             // Set the first mark for this exception.
             setMark( file, lineNumber );
         }
@@ -81,14 +82,14 @@
          * to preserve the type of the original exception as well as the message.
          * All subclasses should override.
          */
-        virtual ActiveMQException* clone() const{
+        virtual InvalidStateException* clone() const{
             return new InvalidStateException(*this);
         }
 
         virtual ~InvalidStateException() throw() {}
-      
+
     };
 
 }}
 
-#endif /*_ACTIVEMQ_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_*/
+#endif /*_DECAF_LANG_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_*/

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/NoSuchElementException.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/NoSuchElementException.h?view=diff&rev=534155&r1=534154&r2=534155
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/NoSuchElementException.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/NoSuchElementException.h Tue May  1 09:55:37 2007
@@ -14,19 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef ACTIVEMQ_EXCEPTIONS_NOSUCHELEMENTEXCEPTION_H_
-#define ACTIVEMQ_EXCEPTIONS_NOSUCHELEMENTEXCEPTION_H_
+#ifndef _DECAF_LANG_EXCEPTIONS_NOSUCHELEMENTEXCEPTION_H_
+#define _DECAF_LANG_EXCEPTIONS_NOSUCHELEMENTEXCEPTION_H_
 
-#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Exception.h>
 
-namespace activemq{
+namespace decaf{
+namespace lang{
 namespace exceptions{
 
     /*
      * Thrown from an operation that attempts to access some element that does
      * not exist.
      */
-    class NoSuchElementException : public ActiveMQException
+    class NoSuchElementException : public Exception
     {
     public:
 
@@ -39,39 +40,39 @@
          * Conversion Constructor from some other ActiveMQException
          * @param An exception that should become this type of Exception
          */
-        NoSuchElementException( const ActiveMQException& ex ) throw()
-        : ActiveMQException()
+        NoSuchElementException( const Exception& ex ) throw()
+        : Exception()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Copy Constructor
          */
         NoSuchElementException( const NoSuchElementException& ex ) throw()
-        : ActiveMQException()
+        : Exception()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Constructor - Initializes the file name and line number where
-         * this message occured.  Sets the message to report, using an 
+         * this message occured.  Sets the message to report, using an
          * optional list of arguments to parse into the message
          * @param file name where exception occurs
          * @param line number where the exception occurred.
          * @param message to report
          * @param list of primitives that are formatted into the message
          */
-        NoSuchElementException( const char* file, 
+        NoSuchElementException( const char* file,
                                 const int lineNumber,
                                 const char* msg, ... ) throw()
-        : ActiveMQException()
+        : Exception()
         {
             va_list vargs;
             va_start( vargs, msg );
             buildMessage( msg, vargs );
-            
+
             // Set the first mark for this exception.
             setMark( file, lineNumber );
         }
@@ -81,7 +82,7 @@
          * to preserve the type of the original exception as well as the message.
          * All subclasses should override.
          */
-        virtual ActiveMQException* clone() const{
+        virtual NoSuchElementException* clone() const{
             return new NoSuchElementException(*this);
         }
 
@@ -91,4 +92,4 @@
 
 }}
 
-#endif /*ACTIVEMQ_EXCEPTIONS_NOSUCHELEMENTEXCEPTION_H_*/
+#endif /*_DECAF_LANG_EXCEPTIONS_NOSUCHELEMENTEXCEPTION_H_*/

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/NullPointerException.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/NullPointerException.h?view=diff&rev=534155&r1=534154&r2=534155
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/NullPointerException.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/NullPointerException.h Tue May  1 09:55:37 2007
@@ -14,18 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef ACTIVEMQ_EXCEPTIONS_NULLPOINTERENTEXCEPTION_H_
-#define ACTIVEMQ_EXCEPTIONS_NULLPOINTERENTEXCEPTION_H_
+#ifndef _DECAF_LANG_EXCEPTIONS_NULLPOINTERENTEXCEPTION_H_
+#define _DECAF_LANG_EXCEPTIONS_NULLPOINTERENTEXCEPTION_H_
 
-#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Exception.h>
 
-namespace activemq{
+namespace decaf{
+namespace lang{
 namespace exceptions{
 
     /*
      * Thrown when an error occurs that involves a pointer being NULL
      */
-    class NullPointerException : public ActiveMQException
+    class NullPointerException : public Exception
     {
     public:
 
@@ -38,8 +39,8 @@
          * Conversion Constructor from some other ActiveMQException
          * @param An exception that should become this type of Exception
          */
-        NullPointerException( const ActiveMQException& ex ) throw()
-        : ActiveMQException()
+        NullPointerException( const Exception& ex ) throw()
+        : Exception()
         {
             *(ActiveMQException*)this = ex;
         }
@@ -48,29 +49,29 @@
          * Copy Constructor
          */
         NullPointerException(const NullPointerException& ex) throw()
-        : ActiveMQException()
+        : Exception()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Constructor - Initializes the file name and line number where
-         * this message occured.  Sets the message to report, using an 
+         * this message occured.  Sets the message to report, using an
          * optional list of arguments to parse into the message
          * @param file name where exception occurs
          * @param line number where the exception occurred.
          * @param message to report
          * @param list of primitives that are formatted into the message
          */
-        NullPointerException( const char* file, 
+        NullPointerException( const char* file,
                               const int lineNumber,
                               const char* msg, ... ) throw()
-        : ActiveMQException()
+        : Exception()
         {
             va_list vargs;
             va_start( vargs, msg );
             buildMessage( msg, vargs );
-            
+
             // Set the first mark for this exception.
             setMark( file, lineNumber );
         }
@@ -80,7 +81,7 @@
          * to preserve the type of the original exception as well as the message.
          * All subclasses should override.
          */
-        virtual ActiveMQException* clone() const{
+        virtual NullPointerException* clone() const{
             return new NullPointerException( *this );
         }
 
@@ -90,4 +91,4 @@
 
 }}
 
-#endif /*ACTIVEMQ_EXCEPTIONS_NULLPOINTERENTEXCEPTION_H_*/
+#endif /*_DECAF_LANG_EXCEPTIONS_NULLPOINTERENTEXCEPTION_H_*/

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/RuntimeException.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/RuntimeException.h?view=diff&rev=534155&r1=534154&r2=534155
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/RuntimeException.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/RuntimeException.h Tue May  1 09:55:37 2007
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef ACTIVEMQ_EXCEPTIONS_RUNTIMEENTEXCEPTION_H_
-#define ACTIVEMQ_EXCEPTIONS_RUNTIMEENTEXCEPTION_H_
+#ifndef _DECAF_LANG_EXCEPTIONS_RUNTIMEENTEXCEPTION_H_
+#define _DECAF_LANG_EXCEPTIONS_RUNTIMEENTEXCEPTION_H_
 
-#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Exception.h>
 
-namespace activemq{
+namespace decaf{
+namespace lang{
 namespace exceptions{
 
     /*
@@ -27,7 +28,7 @@
      * This could be a memory allocation exception or some other generally
      * unrecoverable exception.
      */
-    class RuntimeException : public ActiveMQException
+    class RuntimeException : public Exception
     {
     public:
 
@@ -40,8 +41,8 @@
          * Conversion Constructor from some other ActiveMQException
          * @param An exception that should become this type of Exception
          */
-        RuntimeException( const ActiveMQException& ex ) throw()
-        : ActiveMQException()
+        RuntimeException( const Exception& ex ) throw()
+        : Exception()
         {
             *(ActiveMQException*)this = ex;
         }
@@ -50,29 +51,29 @@
          * Copy Constructor
          */
         RuntimeException( const RuntimeException& ex ) throw()
-        : ActiveMQException()
+        : Exception()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Constructor - Initializes the file name and line number where
-         * this message occured.  Sets the message to report, using an 
+         * this message occured.  Sets the message to report, using an
          * optional list of arguments to parse into the message
          * @param file name where exception occurs
          * @param line number where the exception occurred.
          * @param message to report
          * @param list of primitives that are formatted into the message
          */
-        RuntimeException( const char* file, 
+        RuntimeException( const char* file,
                           const int lineNumber,
                           const char* msg, ... ) throw()
-        : ActiveMQException()
+        : Exception()
         {
             va_list vargs;
             va_start(vargs, msg);
             buildMessage(msg, vargs);
-            
+
             // Set the first mark for this exception.
             setMark(file, lineNumber);
         }
@@ -82,7 +83,7 @@
          * to preserve the type of the original exception as well as the message.
          * All subclasses should override.
          */
-        virtual ActiveMQException* clone() const{
+        virtual RuntimeException* clone() const{
             return new RuntimeException( *this );
         }
 
@@ -92,4 +93,4 @@
 
 }}
 
-#endif /*ACTIVEMQ_EXCEPTIONS_RUNTIMEENTEXCEPTION_H_*/
+#endif /*_DECAF_LANG_EXCEPTIONS_RUNTIMEENTEXCEPTION_H_*/

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/UnsupportedOperationException.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/UnsupportedOperationException.h?view=diff&rev=534155&r1=534154&r2=534155
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/UnsupportedOperationException.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/exceptions/UnsupportedOperationException.h Tue May  1 09:55:37 2007
@@ -14,34 +14,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef ACTIVEMQ_EXCEPTIONS_UNSUPPORTEDOPERATIONEXCEPTION_H_
-#define ACTIVEMQ_EXCEPTIONS_UNSUPPORTEDOPERATIONEXCEPTION_H_
+#ifndef _DECAF_LANG_EXCEPTIONS_UNSUPPORTEDOPERATIONEXCEPTION_H_
+#define _DECAF_LANG_EXCEPTIONS_UNSUPPORTEDOPERATIONEXCEPTION_H_
 
-#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Exception.h>
 
-namespace activemq{
+namespace decaf{
+namespace lang{
 namespace exceptions{
 
     /*
      * Thrown when an unsupported method is called.
      */
-    class UnsupportedOperationException : public ActiveMQException
+    class UnsupportedOperationException : public Exception
     {
     public:
-   
+
         /**
          * Default Constructor
          */
         UnsupportedOperationException() throw() {};
-      
+
         /**
-         * Conversion Constructor from some other ActiveMQException
+         * Conversion Constructor from some other Exception
          * @param An exception that should become this type of Exception
          */
-        UnsupportedOperationException( const ActiveMQException& ex ) throw()
+        UnsupportedOperationException( const Exception& ex ) throw()
         : ActiveMQException()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
@@ -50,44 +51,44 @@
         UnsupportedOperationException( const UnsupportedOperationException& ex ) throw()
         : ActiveMQException()
         {
-            *(ActiveMQException*)this = ex;
+            *(Exception*)this = ex;
         }
 
         /**
          * Constructor - Initializes the file name and line number where
-         * this message occured.  Sets the message to report, using an 
+         * this message occured.  Sets the message to report, using an
          * optional list of arguments to parse into the message
          * @param file name where exception occurs
          * @param line number where the exception occurred.
          * @param message to report
          * @param list of primitives that are formatted into the message
          */
-        UnsupportedOperationException( const char* file, 
+        UnsupportedOperationException( const char* file,
                                        const int lineNumber,
                                        const char* msg, ... ) throw()
-        : ActiveMQException()
+        : Exception()
         {
             va_list vargs;
             va_start( vargs, msg );
             buildMessage( msg, vargs );
-            
+
             // Set the first mark for this exception.
             setMark( file, lineNumber );
         }
-        
+
         /**
          * Clones this exception.  This is useful for cases where you need
          * to preserve the type of the original exception as well as the message.
          * All subclasses should override.
          */
-        virtual ActiveMQException* clone() const{
+        virtual UnsupportedOperationException* clone() const{
             return new UnsupportedOperationException( *this );
         }
 
         virtual ~UnsupportedOperationException() throw() {}
-        
+
     };
 
 }}
 
-#endif /*ACTIVEMQ_EXCEPTIONS_UNSUPPORTEDOPERATIONEXCEPTION_H_*/
+#endif /*_DECAF_LANG_EXCEPTIONS_UNSUPPORTEDOPERATIONEXCEPTION_H_*/