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 2010/06/28 22:52:29 UTC

svn commit: r958724 [1/2] - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq: util/ wireformat/ wireformat/openwire/ wireformat/openwire/marshal/ wireformat/openwire/utils/

Author: tabish
Date: Mon Jun 28 20:52:28 2010
New Revision: 958724

URL: http://svn.apache.org/viewvc?rev=958724&view=rev
Log:
Remove throw specifier from the classes in the library

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/CompositeData.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/CompositeData.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveList.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveList.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueConverter.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueConverter.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueNode.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueNode.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/URISupport.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/URISupport.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/MarshalAware.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormat.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatFactory.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatNegotiator.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatRegistry.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatRegistry.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireResponseBuilder.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/DataStreamMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/HexTable.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/HexTable.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/CompositeData.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/CompositeData.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/CompositeData.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/CompositeData.cpp Mon Jun 28 20:52:28 2010
@@ -37,7 +37,7 @@ CompositeData::~CompositeData() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-URI CompositeData::toURI() const throw( decaf::net::URISyntaxException ) {
+URI CompositeData::toURI() const {
 
     ostringstream sb;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/CompositeData.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/CompositeData.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/CompositeData.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/CompositeData.h Mon Jun 28 20:52:28 2010
@@ -102,7 +102,10 @@ namespace util {
             this->host = host;
         }
 
-        URI toURI() const throw( decaf::net::URISyntaxException );
+        /**
+         * @throws decaf::net::URISyntaxException
+         */
+        URI toURI() const;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.cpp Mon Jun 28 20:52:28 2010
@@ -38,8 +38,7 @@ MarshallingSupport::~MarshallingSupport(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MarshallingSupport::writeString( decaf::io::DataOutputStream& dataOut, const std::string& value )
-    throw( decaf::io::IOException ) {
+void MarshallingSupport::writeString( decaf::io::DataOutputStream& dataOut, const std::string& value ) {
 
     try{
 
@@ -57,8 +56,7 @@ void MarshallingSupport::writeString( de
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MarshallingSupport::writeString16( decaf::io::DataOutputStream& dataOut, const std::string& value )
-    throw( decaf::io::IOException ) {
+void MarshallingSupport::writeString16( decaf::io::DataOutputStream& dataOut, const std::string& value ) {
 
     try{
 
@@ -81,8 +79,7 @@ void MarshallingSupport::writeString16( 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MarshallingSupport::writeString32( decaf::io::DataOutputStream& dataOut, const std::string& value )
-    throw( decaf::io::IOException ) {
+void MarshallingSupport::writeString32( decaf::io::DataOutputStream& dataOut, const std::string& value ) {
 
     try{
 
@@ -105,8 +102,7 @@ void MarshallingSupport::writeString32( 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string MarshallingSupport::readString16( decaf::io::DataInputStream& dataIn )
-    throw( decaf::io::IOException ) {
+std::string MarshallingSupport::readString16( decaf::io::DataInputStream& dataIn ) {
 
     try{
         int utfLength = dataIn.readShort();
@@ -124,8 +120,7 @@ std::string MarshallingSupport::readStri
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string MarshallingSupport::readString32( decaf::io::DataInputStream& dataIn )
-    throw( decaf::io::IOException ) {
+std::string MarshallingSupport::readString32( decaf::io::DataInputStream& dataIn ) {
 
     try{
         int utfLength = dataIn.readInt();
@@ -143,8 +138,7 @@ std::string MarshallingSupport::readStri
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string MarshallingSupport::asciiToModifiedUtf8( const std::string& asciiString )
-    throw( decaf::io::UTFDataFormatException ) {
+std::string MarshallingSupport::asciiToModifiedUtf8( const std::string& asciiString ) {
 
     try {
 
@@ -210,8 +204,7 @@ std::string MarshallingSupport::asciiToM
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string MarshallingSupport::modifiedUtf8ToAscii( const std::string modifiedUtf8String )
-    throw( decaf::io::UTFDataFormatException ) {
+std::string MarshallingSupport::modifiedUtf8ToAscii( const std::string modifiedUtf8String ) {
 
     try {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/MarshallingSupport.h Mon Jun 28 20:52:28 2010
@@ -51,8 +51,7 @@ namespace util {
          *
          * @throws IOException if an I/O error occurs while writing the string.
          */
-        static void writeString( decaf::io::DataOutputStream& dataOut, const std::string& value )
-            throw( decaf::io::IOException );
+        static void writeString( decaf::io::DataOutputStream& dataOut, const std::string& value );
 
         /**
          * Write the string object to the given DataOutputStream as Raw bytes, no string
@@ -67,8 +66,7 @@ namespace util {
          *
          * @throws IOException if an I/O error occurs while writing the string.
          */
-        static void writeString16( decaf::io::DataOutputStream& dataOut, const std::string& value )
-            throw( decaf::io::IOException );
+        static void writeString16( decaf::io::DataOutputStream& dataOut, const std::string& value );
 
         /**
          * Write the string object to the given DataOutputStream as Raw bytes, no string
@@ -83,8 +81,7 @@ namespace util {
          *
          * @throws IOException if an I/O error occurs while writing the string.
          */
-        static void writeString32( decaf::io::DataOutputStream& dataOut, const std::string& value )
-            throw( decaf::io::IOException );
+        static void writeString32( decaf::io::DataOutputStream& dataOut, const std::string& value );
 
         /**
          * Reads an Openwire encoded string from the provided DataInputStream.  No string
@@ -101,8 +98,7 @@ namespace util {
          *
          * @throws IOException if an I/O error occurs while writing the string.
          */
-        static std::string readString16( decaf::io::DataInputStream& dataIn )
-            throw( decaf::io::IOException );
+        static std::string readString16( decaf::io::DataInputStream& dataIn );
 
         /**
          * Reads an Openwire encoded string from the provided DataInputStream.  No string
@@ -119,8 +115,7 @@ namespace util {
          *
          * @throws IOException if an I/O error occurs while writing the string.
          */
-        static std::string readString32( decaf::io::DataInputStream& dataIn )
-            throw( decaf::io::IOException );
+        static std::string readString32( decaf::io::DataInputStream& dataIn );
 
     public:  // Static Utility Methods.
 
@@ -138,8 +133,7 @@ namespace util {
          * @throws UTFDataFormatException if the length of the encoded string would exceed the
          *         size of an signed integer.
          */
-        static std::string asciiToModifiedUtf8( const std::string& asciiString )
-            throw( decaf::io::UTFDataFormatException );
+        static std::string asciiToModifiedUtf8( const std::string& asciiString );
 
         /**
          * Given a string that contains bytes in the Java Modified UTF-8 format convert
@@ -156,8 +150,7 @@ namespace util {
          * @throws UTFDataFormatException if the provided string contains invalid data or the
          *         character values encoded in the string exceed ASCII value 255.
          */
-        static std::string modifiedUtf8ToAscii( const std::string modifiedUtf8String )
-            throw( decaf::io::UTFDataFormatException );
+        static std::string modifiedUtf8ToAscii( const std::string modifiedUtf8String );
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveList.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveList.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveList.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveList.cpp Mon Jun 28 20:52:28 2010
@@ -63,16 +63,14 @@ std::string PrimitiveList::toString() co
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool PrimitiveList::getBool( std::size_t index ) const
-    throw( IndexOutOfBoundsException, UnsupportedOperationException ){
+bool PrimitiveList::getBool( std::size_t index ) const {
 
     PrimitiveValueNode node = this->get( index );
     return converter.convert<bool>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveList::setBool( std::size_t index, bool value )
-    throw( IndexOutOfBoundsException ){
+void PrimitiveList::setBool( std::size_t index, bool value ) {
 
     PrimitiveValueNode node;
     node.setBool( value );
@@ -81,16 +79,14 @@ void PrimitiveList::setBool( std::size_t
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-unsigned char PrimitiveList::getByte( std::size_t index ) const
-    throw( IndexOutOfBoundsException, UnsupportedOperationException ){
+unsigned char PrimitiveList::getByte( std::size_t index ) const {
 
     PrimitiveValueNode node = this->get( index );
     return converter.convert<unsigned char>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveList::setByte( std::size_t index, unsigned char value )
-    throw( IndexOutOfBoundsException ){
+void PrimitiveList::setByte( std::size_t index, unsigned char value ) {
 
     PrimitiveValueNode node;
     node.setByte( value );
@@ -99,16 +95,14 @@ void PrimitiveList::setByte( std::size_t
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-char PrimitiveList::getChar( std::size_t index ) const
-    throw( IndexOutOfBoundsException, UnsupportedOperationException ){
+char PrimitiveList::getChar( std::size_t index ) const {
 
     PrimitiveValueNode node = this->get( index );
     return converter.convert<char>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveList::setChar( std::size_t index, char value )
-    throw( IndexOutOfBoundsException ){
+void PrimitiveList::setChar( std::size_t index, char value ) {
 
     PrimitiveValueNode node;
     node.setChar( value );
@@ -117,16 +111,14 @@ void PrimitiveList::setChar( std::size_t
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-short PrimitiveList::getShort( std::size_t index ) const
-    throw( IndexOutOfBoundsException, UnsupportedOperationException ){
+short PrimitiveList::getShort( std::size_t index ) const {
 
     PrimitiveValueNode node = this->get( index );
     return converter.convert<short>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveList::setShort( std::size_t index, short value )
-    throw( IndexOutOfBoundsException ){
+void PrimitiveList::setShort( std::size_t index, short value ) {
 
     PrimitiveValueNode node;
     node.setShort( value );
@@ -135,16 +127,14 @@ void PrimitiveList::setShort( std::size_
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int PrimitiveList::getInt( std::size_t index ) const
-    throw( IndexOutOfBoundsException, UnsupportedOperationException ){
+int PrimitiveList::getInt( std::size_t index ) const {
 
     PrimitiveValueNode node = this->get( index );
     return converter.convert<int>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveList::setInt( std::size_t index, int value )
-    throw( IndexOutOfBoundsException ){
+void PrimitiveList::setInt( std::size_t index, int value ) {
 
     PrimitiveValueNode node;
     node.setInt( value );
@@ -153,16 +143,14 @@ void PrimitiveList::setInt( std::size_t 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-long long PrimitiveList::getLong( std::size_t index ) const
-    throw( IndexOutOfBoundsException, UnsupportedOperationException ){
+long long PrimitiveList::getLong( std::size_t index ) const {
 
     PrimitiveValueNode node = this->get( index );
     return converter.convert<long long>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveList::setLong( std::size_t index, long long value )
-    throw( IndexOutOfBoundsException ){
+void PrimitiveList::setLong( std::size_t index, long long value ) {
 
     PrimitiveValueNode node;
     node.setLong( value );
@@ -171,16 +159,14 @@ void PrimitiveList::setLong( std::size_t
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-double PrimitiveList::getDouble( std::size_t index ) const
-    throw( IndexOutOfBoundsException, UnsupportedOperationException ){
+double PrimitiveList::getDouble( std::size_t index ) const {
 
     PrimitiveValueNode node = this->get( index );
     return converter.convert<double>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveList::setDouble( std::size_t index, double value )
-    throw( IndexOutOfBoundsException ){
+void PrimitiveList::setDouble( std::size_t index, double value ) {
 
     PrimitiveValueNode node;
     node.setDouble( value );
@@ -189,16 +175,14 @@ void PrimitiveList::setDouble( std::size
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-float PrimitiveList::getFloat( std::size_t index ) const
-    throw( IndexOutOfBoundsException, UnsupportedOperationException ){
+float PrimitiveList::getFloat( std::size_t index ) const {
 
     PrimitiveValueNode node = this->get( index );
     return converter.convert<float>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveList::setFloat( std::size_t index, float value )
-    throw( IndexOutOfBoundsException ){
+void PrimitiveList::setFloat( std::size_t index, float value ) {
 
     PrimitiveValueNode node;
     node.setFloat( value );
@@ -207,16 +191,14 @@ void PrimitiveList::setFloat( std::size_
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-string PrimitiveList::getString( std::size_t index ) const
-    throw( IndexOutOfBoundsException, UnsupportedOperationException ){
+string PrimitiveList::getString( std::size_t index ) const {
 
     PrimitiveValueNode node = this->get( index );
     return converter.convert<std::string>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveList::setString( std::size_t index, const string& value )
-    throw( IndexOutOfBoundsException ){
+void PrimitiveList::setString( std::size_t index, const string& value ) {
 
     PrimitiveValueNode node;
     node.setString( value );
@@ -225,17 +207,14 @@ void PrimitiveList::setString( std::size
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::vector<unsigned char> PrimitiveList::getByteArray( std::size_t index ) const
-    throw( IndexOutOfBoundsException, UnsupportedOperationException ) {
+std::vector<unsigned char> PrimitiveList::getByteArray( std::size_t index ) const  {
 
     PrimitiveValueNode node = this->get( index );
     return converter.convert< std::vector<unsigned char> >( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveList::setByteArray( std::size_t index,
-                                  const std::vector<unsigned char>& value )
-    throw( IndexOutOfBoundsException ){
+void PrimitiveList::setByteArray( std::size_t index, const std::vector<unsigned char>& value ) {
 
     PrimitiveValueNode node;
     node.setByteArray( value );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveList.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveList.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveList.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveList.h Mon Jun 28 20:52:28 2010
@@ -74,9 +74,7 @@ namespace util{
          * @throw UnsupportedOperationException if the type at index is not of the
          * type that this method is to return or can convert to.
          */
-        virtual bool getBool( std::size_t index ) const
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual bool getBool( std::size_t index ) const;
 
         /**
          * Sets the value at the given index to the new value specified,
@@ -87,8 +85,7 @@ namespace util{
          * @param value - the new value to assign to the element at index
          * @throw IndexOutOfBoundsException if index > size().
          */
-        virtual void setBool( std::size_t index, bool value )
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException );
+        virtual void setBool( std::size_t index, bool value );
 
         /**
          * Gets the Byte value at the specified index.
@@ -98,9 +95,7 @@ namespace util{
          * @throw UnsupportedOperationException if the type at index is not of the
          * type that this method is to return or can convert to.
          */
-        virtual unsigned char getByte( std::size_t index ) const
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual unsigned char getByte( std::size_t index ) const;
 
         /**
          * Sets the value at the given index to the new value specified,
@@ -111,8 +106,7 @@ namespace util{
          * @param value - the new value to assign to the element at index
          * @throw IndexOutOfBoundsException if index > size().
          */
-        virtual void setByte( std::size_t index, unsigned char value )
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException );
+        virtual void setByte( std::size_t index, unsigned char value );
 
         /**
          * Gets the Character value at the specified index.
@@ -122,9 +116,7 @@ namespace util{
          * @throw UnsupportedOperationException if the type at index is not of the
          * type that this method is to return or can convert to.
          */
-        virtual char getChar( std::size_t index ) const
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual char getChar( std::size_t index ) const;
 
         /**
          * Sets the value at the given index to the new value specified,
@@ -135,8 +127,7 @@ namespace util{
          * @param value - the new value to assign to the element at index
          * @throw IndexOutOfBoundsException if index > size().
          */
-        virtual void setChar( std::size_t index, char value )
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException );
+        virtual void setChar( std::size_t index, char value );
 
         /**
          * Gets the Short value at the specified index.
@@ -146,9 +137,7 @@ namespace util{
          * @throw UnsupportedOperationException if the type at index is not of the
          * type that this method is to return or can convert to.
          */
-        virtual short getShort( std::size_t index ) const
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual short getShort( std::size_t index ) const;
 
         /**
          * Sets the value at the given index to the new value specified,
@@ -159,8 +148,7 @@ namespace util{
          * @param value - the new value to assign to the element at index
          * @throw IndexOutOfBoundsException if index > size().
          */
-        virtual void setShort( std::size_t index, short value )
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException );
+        virtual void setShort( std::size_t index, short value );
 
         /**
          * Gets the Integer value at the specified index.
@@ -170,9 +158,7 @@ namespace util{
          * @throw UnsupportedOperationException if the type at index is not of the
          * type that this method is to return or can convert to.
          */
-        virtual int getInt( std::size_t index ) const
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual int getInt( std::size_t index ) const;
 
         /**
          * Sets the value at the given index to the new value specified,
@@ -183,8 +169,7 @@ namespace util{
          * @param value - the new value to assign to the element at index
          * @throw IndexOutOfBoundsException if index > size().
          */
-        virtual void setInt( std::size_t index, int value )
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException );
+        virtual void setInt( std::size_t index, int value );
 
         /**
          * Gets the Long value at the specified index.
@@ -194,9 +179,7 @@ namespace util{
          * @throw UnsupportedOperationException if the type at index is not of the
          * type that this method is to return or can convert to.
          */
-        virtual long long getLong( std::size_t index ) const
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual long long getLong( std::size_t index ) const;
 
         /**
          * Sets the value at the given index to the new value specified,
@@ -207,8 +190,7 @@ namespace util{
          * @param value - the new value to assign to the element at index
          * @throw IndexOutOfBoundsException if index > size().
          */
-        virtual void setLong( std::size_t index, long long value )
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException );
+        virtual void setLong( std::size_t index, long long value );
 
         /**
          * Gets the Float value at the specified index.
@@ -218,9 +200,7 @@ namespace util{
          * @throw UnsupportedOperationException if the type at index is not of the
          * type that this method is to return or can convert to.
          */
-        virtual float getFloat( std::size_t index ) const
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual float getFloat( std::size_t index ) const;
 
         /**
          * Sets the value at the given index to the new value specified,
@@ -231,8 +211,7 @@ namespace util{
          * @param value - the new value to assign to the element at index
          * @throw IndexOutOfBoundsException if index > size().
          */
-        virtual void setFloat( std::size_t index, float value )
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException );
+        virtual void setFloat( std::size_t index, float value );
 
         /**
          * Gets the Double value at the specified index.
@@ -242,9 +221,7 @@ namespace util{
          * @throw UnsupportedOperationException if the type at index is not of the
          * type that this method is to return or can convert to.
          */
-        virtual double getDouble( std::size_t index ) const
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual double getDouble( std::size_t index ) const;
 
         /**
          * Sets the value at the given index to the new value specified,
@@ -255,8 +232,7 @@ namespace util{
          * @param value - the new value to assign to the element at index
          * @throw IndexOutOfBoundsException if index > size().
          */
-        virtual void setDouble( std::size_t index, double value )
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException );
+        virtual void setDouble( std::size_t index, double value );
 
         /**
          * Gets the String value at the specified index.
@@ -266,9 +242,7 @@ namespace util{
          * @throw UnsupportedOperationException if the type at index is not of the
          * type that this method is to return or can convert to.
          */
-        virtual std::string getString( std::size_t index ) const
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual std::string getString( std::size_t index ) const;
 
         /**
          * Sets the value at the given index to the new value specified,
@@ -279,8 +253,7 @@ namespace util{
          * @param value - the new value to assign to the element at index
          * @throw IndexOutOfBoundsException if index > size().
          */
-        virtual void setString( std::size_t index, const std::string& value )
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException );
+        virtual void setString( std::size_t index, const std::string& value );
 
         /**
          * Gets the Byte Array value at the specified index.
@@ -290,9 +263,7 @@ namespace util{
          * @throw UnsupportedOperationException if the type at index is not of the
          * type that this method is to return or can convert to.
          */
-        virtual std::vector<unsigned char> getByteArray( std::size_t index ) const
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual std::vector<unsigned char> getByteArray( std::size_t index ) const;
 
         /**
          * Sets the value at the given index to the new value specified,
@@ -303,8 +274,7 @@ namespace util{
          * @param value - the new value to assign to the element at index
          * @throw IndexOutOfBoundsException if index > size().
          */
-        virtual void setByteArray( std::size_t index, const std::vector<unsigned char>& value )
-            throw( decaf::lang::exceptions::IndexOutOfBoundsException );
+        virtual void setByteArray( std::size_t index, const std::vector<unsigned char>& value );
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.cpp Mon Jun 28 20:52:28 2010
@@ -64,15 +64,14 @@ std::string PrimitiveMap::toString() con
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool PrimitiveMap::getBool( const string& key ) const
-    throw( NoSuchElementException, UnsupportedOperationException ){
+bool PrimitiveMap::getBool( const string& key ) const {
 
     PrimitiveValueNode node = this->get( key );
     return converter.convert<bool>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveMap::setBool( const string& key, bool value ){
+void PrimitiveMap::setBool( const string& key, bool value ) {
 
     PrimitiveValueNode node;
     node.setBool( value );
@@ -81,15 +80,14 @@ void PrimitiveMap::setBool( const string
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-unsigned char PrimitiveMap::getByte( const string& key ) const
-    throw( NoSuchElementException, UnsupportedOperationException ){
+unsigned char PrimitiveMap::getByte( const string& key ) const {
 
     PrimitiveValueNode node = this->get( key );
     return converter.convert<unsigned char>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveMap::setByte( const string& key, unsigned char value ){
+void PrimitiveMap::setByte( const string& key, unsigned char value ) {
     PrimitiveValueNode node;
     node.setByte( value );
 
@@ -97,15 +95,14 @@ void PrimitiveMap::setByte( const string
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-char PrimitiveMap::getChar( const string& key ) const
-    throw( NoSuchElementException, UnsupportedOperationException ){
+char PrimitiveMap::getChar( const string& key ) const {
 
     PrimitiveValueNode node = this->get( key );
     return converter.convert<char>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveMap::setChar( const string& key, char value ){
+void PrimitiveMap::setChar( const string& key, char value ) {
     PrimitiveValueNode node;
     node.setChar( value );
 
@@ -113,15 +110,14 @@ void PrimitiveMap::setChar( const string
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-short PrimitiveMap::getShort( const string& key ) const
-    throw( NoSuchElementException, UnsupportedOperationException ){
+short PrimitiveMap::getShort( const string& key ) const {
 
     PrimitiveValueNode node = this->get( key );
     return converter.convert<short>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveMap::setShort( const string& key, short value ){
+void PrimitiveMap::setShort( const string& key, short value ) {
     PrimitiveValueNode node;
     node.setShort( value );
 
@@ -129,15 +125,14 @@ void PrimitiveMap::setShort( const strin
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int PrimitiveMap::getInt( const string& key ) const
-    throw( NoSuchElementException, UnsupportedOperationException ){
+int PrimitiveMap::getInt( const string& key ) const {
 
     PrimitiveValueNode node = this->get( key );
     return converter.convert<int>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveMap::setInt( const string& key, int value ){
+void PrimitiveMap::setInt( const string& key, int value ) {
     PrimitiveValueNode node;
     node.setInt( value );
 
@@ -145,15 +140,14 @@ void PrimitiveMap::setInt( const string&
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-long long PrimitiveMap::getLong( const string& key ) const
-    throw( NoSuchElementException, UnsupportedOperationException ){
+long long PrimitiveMap::getLong( const string& key ) const {
 
     PrimitiveValueNode node = this->get( key );
     return converter.convert<long long>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveMap::setLong( const string& key, long long value ){
+void PrimitiveMap::setLong( const string& key, long long value ) {
     PrimitiveValueNode node;
     node.setLong( value );
 
@@ -161,15 +155,14 @@ void PrimitiveMap::setLong( const string
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-double PrimitiveMap::getDouble( const string& key ) const
-    throw( NoSuchElementException, UnsupportedOperationException ){
+double PrimitiveMap::getDouble( const string& key ) const {
 
     PrimitiveValueNode node = this->get( key );
     return converter.convert<double>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveMap::setDouble( const string& key, double value ){
+void PrimitiveMap::setDouble( const string& key, double value ) {
     PrimitiveValueNode node;
     node.setDouble( value );
 
@@ -177,15 +170,14 @@ void PrimitiveMap::setDouble( const stri
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-float PrimitiveMap::getFloat( const string& key ) const
-    throw( NoSuchElementException, UnsupportedOperationException ){
+float PrimitiveMap::getFloat( const string& key ) const {
 
     PrimitiveValueNode node = this->get( key );
     return converter.convert<float>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveMap::setFloat( const string& key, float value ){
+void PrimitiveMap::setFloat( const string& key, float value ) {
     PrimitiveValueNode node;
     node.setFloat( value );
 
@@ -193,15 +185,14 @@ void PrimitiveMap::setFloat( const strin
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-string PrimitiveMap::getString( const string& key ) const
-    throw( NoSuchElementException, UnsupportedOperationException ){
+string PrimitiveMap::getString( const string& key ) const {
 
     PrimitiveValueNode node = this->get( key );
     return converter.convert<std::string>( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveMap::setString( const string& key, const string& value ){
+void PrimitiveMap::setString( const string& key, const string& value ) {
     PrimitiveValueNode node;
     node.setString( value );
 
@@ -209,16 +200,14 @@ void PrimitiveMap::setString( const stri
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::vector<unsigned char> PrimitiveMap::getByteArray( const std::string& key ) const
-    throw( NoSuchElementException, UnsupportedOperationException ){
+std::vector<unsigned char> PrimitiveMap::getByteArray( const std::string& key ) const {
 
     PrimitiveValueNode node = this->get( key );
     return converter.convert< std::vector<unsigned char> >( node );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PrimitiveMap::setByteArray( const std::string& key,
-                                 const std::vector<unsigned char>& value ) {
+void PrimitiveMap::setByteArray( const std::string& key, const std::vector<unsigned char>& value ) {
 
     PrimitiveValueNode node;
     node.setByteArray( value );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveMap.h Mon Jun 28 20:52:28 2010
@@ -82,9 +82,7 @@ namespace util{
          * @throw UnSupportedOperationException if the value cannot be converted
          *                                      to the type this method returns
          */
-        virtual bool getBool( const std::string& key ) const
-            throw( decaf::lang::exceptions::NoSuchElementException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual bool getBool( const std::string& key ) const;
 
         /**
          * Sets the value at key to the specified type. Overwrites any data
@@ -105,9 +103,7 @@ namespace util{
          * @throw UnSupportedOperationException if the value cannot be converted
          *                                      to the type this method returns
          */
-        virtual unsigned char getByte( const std::string& key ) const
-            throw( decaf::lang::exceptions::NoSuchElementException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual unsigned char getByte( const std::string& key ) const;
 
         /**
          * Sets the value at key to the specified type. Overwrites any data
@@ -128,9 +124,7 @@ namespace util{
          * @throw UnSupportedOperationException if the value cannot be converted
          *                                      to the type this method returns
          */
-        virtual char getChar( const std::string& key ) const
-            throw( decaf::lang::exceptions::NoSuchElementException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual char getChar( const std::string& key ) const;
 
         /**
          * Sets the value at key to the specified type. Overwrites any data
@@ -151,9 +145,7 @@ namespace util{
          * @throw UnSupportedOperationException if the value cannot be converted
          *                                      to the type this method returns
          */
-        virtual short getShort( const std::string& key ) const
-            throw( decaf::lang::exceptions::NoSuchElementException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual short getShort( const std::string& key ) const;
 
         /**
          * Sets the value at key to the specified type. Overwrites any data
@@ -174,9 +166,7 @@ namespace util{
          * @throw UnSupportedOperationException if the value cannot be converted
          *                                      to the type this method returns
          */
-        virtual int getInt( const std::string& key ) const
-            throw( decaf::lang::exceptions::NoSuchElementException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual int getInt( const std::string& key ) const;
 
         /**
          * Sets the value at key to the specified type. Overwrites any data
@@ -197,9 +187,7 @@ namespace util{
          * @throw UnSupportedOperationException if the value cannot be converted
          *                                      to the type this method returns
          */
-        virtual long long getLong( const std::string& key ) const
-            throw( decaf::lang::exceptions::NoSuchElementException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual long long getLong( const std::string& key ) const;
 
         /**
          * Sets the value at key to the specified type. Overwrites any data
@@ -220,9 +208,7 @@ namespace util{
          * @throw UnSupportedOperationException if the value cannot be converted
          *                                      to the type this method returns
          */
-        virtual float getFloat( const std::string& key ) const
-            throw( decaf::lang::exceptions::NoSuchElementException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual float getFloat( const std::string& key ) const;
 
         /**
          * Sets the value at key to the specified type. Overwrites any data
@@ -243,9 +229,7 @@ namespace util{
          * @throw UnSupportedOperationException if the value cannot be converted
          *                                      to the type this method returns
          */
-        virtual double getDouble( const std::string& key ) const
-            throw( decaf::lang::exceptions::NoSuchElementException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual double getDouble( const std::string& key ) const;
 
         /**
          * Sets the value at key to the specified type. Overwrites any data
@@ -266,9 +250,7 @@ namespace util{
          * @throw UnSupportedOperationException if the value cannot be converted
          *                                      to the type this method returns
          */
-        virtual std::string getString( const std::string& key ) const
-            throw( decaf::lang::exceptions::NoSuchElementException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual std::string getString( const std::string& key ) const;
 
         /**
          * Sets the value at key to the specified type. Overwrites any data
@@ -289,9 +271,7 @@ namespace util{
          * @throw UnSupportedOperationException if the value cannot be converted
          *                                      to the type this method returns
          */
-        virtual std::vector<unsigned char> getByteArray( const std::string& key ) const
-            throw( decaf::lang::exceptions::NoSuchElementException,
-                   decaf::lang::exceptions::UnsupportedOperationException );
+        virtual std::vector<unsigned char> getByteArray( const std::string& key ) const;
 
         /**
          * Sets the value at key to the specified type. Overwrites any data

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueConverter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueConverter.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueConverter.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueConverter.cpp Mon Jun 28 20:52:28 2010
@@ -31,8 +31,7 @@ namespace util{
 
 ////////////////////////////////////////////////////////////////////////////////
 template<>
-bool PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-    throw( decaf::lang::exceptions::UnsupportedOperationException ) {
+bool PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const {
 
     switch( value.getType() ) {
         case PrimitiveValueNode::BOOLEAN_TYPE:
@@ -52,8 +51,7 @@ bool PrimitiveValueConverter::convert( c
 
 ////////////////////////////////////////////////////////////////////////////////
 template<>
-unsigned char PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-    throw( decaf::lang::exceptions::UnsupportedOperationException ) {
+unsigned char PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const {
 
     switch( value.getType() ) {
         case PrimitiveValueNode::BYTE_TYPE:
@@ -73,8 +71,7 @@ unsigned char PrimitiveValueConverter::c
 
 ////////////////////////////////////////////////////////////////////////////////
 template<>
-char PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-    throw( decaf::lang::exceptions::UnsupportedOperationException ) {
+char PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const {
 
     switch( value.getType() ) {
         case PrimitiveValueNode::CHAR_TYPE:
@@ -94,8 +91,7 @@ char PrimitiveValueConverter::convert( c
 
 ////////////////////////////////////////////////////////////////////////////////
 template<>
-short PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-    throw( decaf::lang::exceptions::UnsupportedOperationException ) {
+short PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const {
 
     switch( value.getType() ) {
         case PrimitiveValueNode::BYTE_TYPE:
@@ -117,8 +113,7 @@ short PrimitiveValueConverter::convert( 
 
 ////////////////////////////////////////////////////////////////////////////////
 template<>
-int PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-    throw( decaf::lang::exceptions::UnsupportedOperationException ) {
+int PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const {
 
     switch( value.getType() ) {
         case PrimitiveValueNode::BYTE_TYPE:
@@ -142,8 +137,7 @@ int PrimitiveValueConverter::convert( co
 
 ////////////////////////////////////////////////////////////////////////////////
 template<>
-long long PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-    throw( decaf::lang::exceptions::UnsupportedOperationException ) {
+long long PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const {
 
     switch( value.getType() ) {
         case PrimitiveValueNode::BYTE_TYPE:
@@ -169,8 +163,7 @@ long long PrimitiveValueConverter::conve
 
 ////////////////////////////////////////////////////////////////////////////////
 template<>
-float PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-    throw( decaf::lang::exceptions::UnsupportedOperationException ) {
+float PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const {
 
     switch( value.getType() ) {
         case PrimitiveValueNode::FLOAT_TYPE:
@@ -190,8 +183,7 @@ float PrimitiveValueConverter::convert( 
 
 ////////////////////////////////////////////////////////////////////////////////
 template<>
-double PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-    throw( decaf::lang::exceptions::UnsupportedOperationException ) {
+double PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const {
 
     switch( value.getType() ) {
         case PrimitiveValueNode::FLOAT_TYPE:
@@ -213,8 +205,7 @@ double PrimitiveValueConverter::convert(
 
 ////////////////////////////////////////////////////////////////////////////////
 template<>
-std::string PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-    throw( decaf::lang::exceptions::UnsupportedOperationException ) {
+std::string PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const {
 
     switch( value.getType() ) {
         case PrimitiveValueNode::BOOLEAN_TYPE:
@@ -244,8 +235,7 @@ std::string PrimitiveValueConverter::con
 
 ////////////////////////////////////////////////////////////////////////////////
 template<>
-std::vector<unsigned char> PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-    throw( decaf::lang::exceptions::UnsupportedOperationException ) {
+std::vector<unsigned char> PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const {
 
     switch( value.getType() ) {
         case PrimitiveValueNode::BYTE_ARRAY_TYPE:

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueConverter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueConverter.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueConverter.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueConverter.h Mon Jun 28 20:52:28 2010
@@ -58,8 +58,7 @@ namespace util {
         virtual ~PrimitiveValueConverter() {}
 
         template< typename TO>
-        TO convert( const PrimitiveValueNode& value ) const
-            throw ( decaf::lang::exceptions::UnsupportedOperationException ) {
+        TO convert( const PrimitiveValueNode& value ) const {
 
             throw decaf::lang::exceptions::UnsupportedOperationException(
                 __FILE__, __LINE__, "Invalid Conversion" );
@@ -68,35 +67,25 @@ namespace util {
     };
 
     template<>
-    bool PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-        throw( decaf::lang::exceptions::UnsupportedOperationException );
+    bool PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const;
     template<>
-    unsigned char PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-        throw( decaf::lang::exceptions::UnsupportedOperationException );
+    unsigned char PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const;
     template<>
-    char PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-        throw( decaf::lang::exceptions::UnsupportedOperationException );
+    char PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const;
     template<>
-    short PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-        throw( decaf::lang::exceptions::UnsupportedOperationException );
+    short PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const;
     template<>
-    int PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-        throw( decaf::lang::exceptions::UnsupportedOperationException );
+    int PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const;
     template<>
-    long long PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-        throw( decaf::lang::exceptions::UnsupportedOperationException );
+    long long PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const;
     template<>
-    float PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-        throw( decaf::lang::exceptions::UnsupportedOperationException );
+    float PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const;
     template<>
-    double PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-        throw( decaf::lang::exceptions::UnsupportedOperationException );
+    double PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const;
     template<>
-    std::string PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-        throw( decaf::lang::exceptions::UnsupportedOperationException );
+    std::string PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const;
     template<>
-    std::vector<unsigned char> PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const
-        throw( decaf::lang::exceptions::UnsupportedOperationException );
+    std::vector<unsigned char> PrimitiveValueConverter::convert( const PrimitiveValueNode& value ) const;
 
 }}
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueNode.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueNode.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueNode.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueNode.cpp Mon Jun 28 20:52:28 2010
@@ -243,8 +243,7 @@ void PrimitiveValueNode::setBool( bool l
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool PrimitiveValueNode::getBool() const
-    throw( decaf::lang::exceptions::NoSuchElementException ) {
+bool PrimitiveValueNode::getBool() const {
 
     if( valueType != BOOLEAN_TYPE ){
         throw decaf::lang::exceptions::NoSuchElementException(
@@ -262,8 +261,7 @@ void PrimitiveValueNode::setByte( unsign
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-unsigned char PrimitiveValueNode::getByte() const
-    throw( decaf::lang::exceptions::NoSuchElementException ) {
+unsigned char PrimitiveValueNode::getByte() const {
 
     if( valueType != BYTE_TYPE ){
         throw decaf::lang::exceptions::NoSuchElementException(
@@ -281,8 +279,7 @@ void PrimitiveValueNode::setChar( char l
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-char PrimitiveValueNode::getChar() const
-    throw( decaf::lang::exceptions::NoSuchElementException ) {
+char PrimitiveValueNode::getChar() const {
 
     if( valueType != CHAR_TYPE ){
         throw decaf::lang::exceptions::NoSuchElementException(
@@ -300,8 +297,7 @@ void PrimitiveValueNode::setShort( short
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-short PrimitiveValueNode::getShort()
-    const throw( decaf::lang::exceptions::NoSuchElementException ) {
+short PrimitiveValueNode::getShort() const {
 
     if( valueType != SHORT_TYPE ){
         throw decaf::lang::exceptions::NoSuchElementException(
@@ -319,8 +315,7 @@ void PrimitiveValueNode::setInt( int lva
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int PrimitiveValueNode::getInt() const
-    throw( decaf::lang::exceptions::NoSuchElementException ) {
+int PrimitiveValueNode::getInt() const {
 
     if( valueType != INTEGER_TYPE ){
         throw decaf::lang::exceptions::NoSuchElementException(
@@ -338,8 +333,7 @@ void PrimitiveValueNode::setLong( long l
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-long long PrimitiveValueNode::getLong() const
-    throw( decaf::lang::exceptions::NoSuchElementException ) {
+long long PrimitiveValueNode::getLong() const {
 
     if( valueType != LONG_TYPE ){
         throw decaf::lang::exceptions::NoSuchElementException(
@@ -357,8 +351,7 @@ void PrimitiveValueNode::setDouble( doub
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-double PrimitiveValueNode::getDouble() const
-    throw( decaf::lang::exceptions::NoSuchElementException ) {
+double PrimitiveValueNode::getDouble() const {
 
     if( valueType != DOUBLE_TYPE ){
         throw decaf::lang::exceptions::NoSuchElementException(
@@ -376,8 +369,7 @@ void PrimitiveValueNode::setFloat( float
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-float PrimitiveValueNode::getFloat() const
-    throw( decaf::lang::exceptions::NoSuchElementException ) {
+float PrimitiveValueNode::getFloat() const {
 
     if( valueType != FLOAT_TYPE ){
         throw decaf::lang::exceptions::NoSuchElementException(
@@ -395,8 +387,7 @@ void PrimitiveValueNode::setString( cons
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string PrimitiveValueNode::getString() const
-    throw( decaf::lang::exceptions::NoSuchElementException ) {
+std::string PrimitiveValueNode::getString() const {
 
     if( valueType != STRING_TYPE ){
         throw decaf::lang::exceptions::NoSuchElementException(
@@ -418,8 +409,7 @@ void PrimitiveValueNode::setByteArray( c
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::vector<unsigned char> PrimitiveValueNode::getByteArray() const
-    throw( decaf::lang::exceptions::NoSuchElementException ) {
+std::vector<unsigned char> PrimitiveValueNode::getByteArray() const {
 
     if( valueType != BYTE_ARRAY_TYPE ){
         throw decaf::lang::exceptions::NoSuchElementException(
@@ -442,8 +432,7 @@ void PrimitiveValueNode::setList( const 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const decaf::util::List<PrimitiveValueNode>& PrimitiveValueNode::getList() const
-    throw( decaf::lang::exceptions::NoSuchElementException ) {
+const decaf::util::List<PrimitiveValueNode>& PrimitiveValueNode::getList() const {
 
     if( valueType != LIST_TYPE ){
         throw decaf::lang::exceptions::NoSuchElementException(
@@ -470,8 +459,7 @@ void PrimitiveValueNode::setMap(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const decaf::util::Map<std::string, PrimitiveValueNode>& PrimitiveValueNode::getMap() const
-    throw( decaf::lang::exceptions::NoSuchElementException ) {
+const decaf::util::Map<std::string, PrimitiveValueNode>& PrimitiveValueNode::getMap() const {
 
     if( valueType != MAP_TYPE ){
         throw decaf::lang::exceptions::NoSuchElementException(

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueNode.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueNode.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueNode.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/PrimitiveValueNode.h Mon Jun 28 20:52:28 2010
@@ -239,8 +239,7 @@ namespace util{
          * @throw NoSuchElementException this node cannot be returned as the
          * requested type.
          */
-        bool getBool() const
-            throw( decaf::lang::exceptions::NoSuchElementException );
+        bool getBool() const;
 
         /**
          * Sets the value of this value node to the new value specified,
@@ -256,8 +255,7 @@ namespace util{
          * @throw NoSuchElementException this node cannot be returned as the
          * requested type.
          */
-        unsigned char getByte() const
-            throw( decaf::lang::exceptions::NoSuchElementException );
+        unsigned char getByte() const;
 
         /**
          * Sets the value of this value node to the new value specified,
@@ -273,8 +271,7 @@ namespace util{
          * @throw NoSuchElementException this node cannot be returned as the
          * requested type.
          */
-        char getChar() const
-            throw( decaf::lang::exceptions::NoSuchElementException );
+        char getChar() const;
 
         /**
          * Sets the value of this value node to the new value specified,
@@ -290,8 +287,7 @@ namespace util{
          * @throw NoSuchElementException this node cannot be returned as the
          * requested type.
          */
-        short getShort() const
-            throw( decaf::lang::exceptions::NoSuchElementException );
+        short getShort() const;
 
         /**
          * Sets the value of this value node to the new value specified,
@@ -307,8 +303,7 @@ namespace util{
          * @throw NoSuchElementException this node cannot be returned as the
          * requested type.
          */
-        int getInt() const
-            throw( decaf::lang::exceptions::NoSuchElementException );
+        int getInt() const;
 
         /**
          * Sets the value of this value node to the new value specified,
@@ -324,8 +319,7 @@ namespace util{
          * @throw NoSuchElementException this node cannot be returned as the
          * requested type.
          */
-        long long getLong() const
-            throw( decaf::lang::exceptions::NoSuchElementException );
+        long long getLong() const;
 
         /**
          * Sets the value of this value node to the new value specified,
@@ -341,8 +335,7 @@ namespace util{
          * @throw NoSuchElementException this node cannot be returned as the
          * requested type.
          */
-        float getFloat() const
-            throw( decaf::lang::exceptions::NoSuchElementException );
+        float getFloat() const;
 
         /**
          * Sets the value of this value node to the new value specified,
@@ -358,8 +351,7 @@ namespace util{
          * @throw NoSuchElementException this node cannot be returned as the
          * requested type.
          */
-        double getDouble() const
-            throw(decaf::lang::exceptions::NoSuchElementException );
+        double getDouble() const;
 
         /**
          * Sets the value of this value node to the new value specified,
@@ -375,8 +367,7 @@ namespace util{
          * @throw NoSuchElementException this node cannot be returned as the
          * requested type.
          */
-        std::string getString() const
-            throw( decaf::lang::exceptions::NoSuchElementException );
+        std::string getString() const;
 
         /**
          * Sets the value of this value node to the new value specified,
@@ -392,8 +383,7 @@ namespace util{
          * @throw NoSuchElementException this node cannot be returned as the
          * requested type.
          */
-        std::vector<unsigned char> getByteArray() const
-            throw( decaf::lang::exceptions::NoSuchElementException );
+        std::vector<unsigned char> getByteArray() const;
 
         /**
          * Sets the value of this value node to the new value specified,
@@ -409,8 +399,7 @@ namespace util{
          * @throw NoSuchElementException this node cannot be returned as the
          * requested type.
          */
-        const decaf::util::List<PrimitiveValueNode>& getList() const
-            throw( decaf::lang::exceptions::NoSuchElementException );
+        const decaf::util::List<PrimitiveValueNode>& getList() const;
 
         /**
          * Sets the value of this value node to the new value specified,
@@ -426,8 +415,7 @@ namespace util{
          * @throw NoSuchElementException this node cannot be returned as the
          * requested type.
          */
-        const decaf::util::Map<std::string, PrimitiveValueNode>& getMap() const
-            throw( decaf::lang::exceptions::NoSuchElementException );
+        const decaf::util::Map<std::string, PrimitiveValueNode>& getMap() const;
 
         /**
          * Creates a string representation of this value.

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/URISupport.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/URISupport.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/URISupport.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/URISupport.cpp Mon Jun 28 20:52:28 2010
@@ -36,8 +36,7 @@ using namespace decaf::lang::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
 void URISupport::parseURL( const std::string& URI,
-                           decaf::util::Properties& properties )
-    throw ( decaf::lang::exceptions::IllegalArgumentException ) {
+                           decaf::util::Properties& properties ) {
 
     try{
 
@@ -91,8 +90,7 @@ void URISupport::parseURL( const std::st
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-Properties URISupport::parseQuery( std::string query )
-    throw ( IllegalArgumentException ) {
+Properties URISupport::parseQuery( std::string query ) {
 
     try {
 
@@ -106,8 +104,7 @@ Properties URISupport::parseQuery( std::
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void URISupport::parseQuery( std::string query, Properties* properties )
-    throw ( IllegalArgumentException ) {
+void URISupport::parseQuery( std::string query, Properties* properties ) {
 
     try {
 
@@ -165,8 +162,7 @@ void URISupport::parseQuery( std::string
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string URISupport::replaceEnvValues( const std::string& value )
-    throw ( decaf::lang::exceptions::IllegalArgumentException ) {
+std::string URISupport::replaceEnvValues( const std::string& value ) {
 
     try {
 
@@ -203,8 +199,7 @@ std::string URISupport::replaceEnvValues
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string URISupport::createQueryString( const Properties& options )
-    throw( URISyntaxException ) {
+std::string URISupport::createQueryString( const Properties& options ) {
 
     try {
 
@@ -262,8 +257,7 @@ bool URISupport::checkParenthesis( const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-CompositeData URISupport::parseComposite( const URI& uri )
-    throw( decaf::net::URISyntaxException ) {
+CompositeData URISupport::parseComposite( const URI& uri ) {
 
     CompositeData result;
     result.setScheme( uri.getScheme() );
@@ -274,8 +268,7 @@ CompositeData URISupport::parseComposite
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void URISupport::parseComposite( const URI& uri, CompositeData& rc, const std::string& ssp )
-    throw( decaf::net::URISyntaxException ) {
+void URISupport::parseComposite( const URI& uri, CompositeData& rc, const std::string& ssp ) {
 
     std::string componentString;
     std::string params;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/URISupport.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/URISupport.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/URISupport.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/URISupport.h Mon Jun 28 20:52:28 2010
@@ -38,8 +38,7 @@ namespace util{
          * @throws IllegalArgumentException if the passed URI is invalid
          */
         static void parseURL( const std::string& URI,
-                              decaf::util::Properties& properties )
-            throw ( decaf::lang::exceptions::IllegalArgumentException );
+                              decaf::util::Properties& properties );
 
         /**
          * Parses a Composite URI into a Composite Data instance, the Composite URI
@@ -51,8 +50,7 @@ namespace util{
          *
          * @throw URISyntaxException if the URI is not well formed.
          */
-        static CompositeData parseComposite( const URI& uri )
-            throw( decaf::net::URISyntaxException );
+        static CompositeData parseComposite( const URI& uri );
 
         /**
          * Parse the Query portion of a URI String and return a Simple
@@ -66,8 +64,7 @@ namespace util{
          *
          * @throw IllegalArgumentException if the Query string is not well formed.
          */
-        static decaf::util::Properties parseQuery( std::string query )
-            throw ( decaf::lang::exceptions::IllegalArgumentException );
+        static decaf::util::Properties parseQuery( std::string query );
 
         /**
          * Parse the Query portion of a URI String and return a Simple
@@ -79,8 +76,7 @@ namespace util{
          * @throw IllegalArgumentException if the Query string is not well formed.
          */
         static void parseQuery( std::string query,
-                                decaf::util::Properties* properties )
-            throw ( decaf::lang::exceptions::IllegalArgumentException );
+                                decaf::util::Properties* properties );
 
         /**
          * Given a properties object create a string that can be appended to a URI
@@ -94,8 +90,7 @@ namespace util{
          * @throw URISyntaxException if the string in the Properties object
          *        can't be encoded into a valid URI Query string.
          */
-        static std::string createQueryString( const Properties& options )
-            throw( decaf::net::URISyntaxException );
+        static std::string createQueryString( const Properties& options );
 
     private:
 
@@ -109,8 +104,7 @@ namespace util{
          *
          * @throw URISyntaxException if the URI is not well formed.
          */
-        static void parseComposite( const URI& uri, CompositeData& rc, const std::string& ssp )
-            throw( decaf::net::URISyntaxException );
+        static void parseComposite( const URI& uri, CompositeData& rc, const std::string& ssp );
 
         /**
          * Splits all the Component URIs in a Composite URI into individual strings which
@@ -150,8 +144,7 @@ namespace util{
          * @returns the env var if value points to an env var else returns value
          * @throws IllegalArgumentException if the var is not set or has bad syntax
          */
-        static std::string replaceEnvValues( const std::string& value )
-            throw ( decaf::lang::exceptions::IllegalArgumentException );
+        static std::string replaceEnvValues( const std::string& value );
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/MarshalAware.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/MarshalAware.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/MarshalAware.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/MarshalAware.h Mon Jun 28 20:52:28 2010
@@ -38,6 +38,7 @@ namespace wireformat{
          * want to be marshal aware you just wouldn't implement this interface
          * but since this is C++ and we don't have true interfaces we need
          * a flat inheritance hierarchy, so we always implement this.
+         *
          * @returns true if this class cares about marshaling.
          */
         virtual bool isMarshalAware() const = 0;
@@ -45,48 +46,69 @@ namespace wireformat{
         /**
          * Called before marshaling is started to prepare the object to be
          * marshaled.
-         * @param wireFormat - the wireformat object to control marshaling
+         *
+         * @param wireFormat
+         *      The wireformat object to control marshaling
+         *
+         * @throws IOException if an I/O error occurs.
          */
-        virtual void beforeMarshal( WireFormat* wireFormat )
-            throw ( decaf::io::IOException ) = 0;
+        virtual void beforeMarshal( WireFormat* wireFormat ) = 0;
 
         /**
          * Called after marshaling is started to cleanup the object being
          * marshaled.
-         * @param wireFormat - the wireformat object to control marshaling
+         *
+         * @param wireFormat
+         *      The wireformat object to control marshaling
+         *
+         * @throws IOException if an I/O error occurs.
          */
-        virtual void afterMarshal( WireFormat* wireFormat )
-            throw ( decaf::io::IOException ) = 0;
+        virtual void afterMarshal( WireFormat* wireFormat ) = 0;
 
         /**
          * Called before unmarshaling is started to prepare the object to be
          * unmarshaled.
-         * @param wireFormat - the wireformat object to control unmarshaling
+         *
+         * @param wireFormat
+         *      The wireformat object to control marshaling
+         *
+         * @throws IOException if an I/O error occurs.
          */
-        virtual void beforeUnmarshal( WireFormat* wireFormat )
-            throw ( decaf::io::IOException ) = 0;
+        virtual void beforeUnmarshal( WireFormat* wireFormat ) = 0;
 
         /**
          * Called after unmarshaling is started to cleanup the object being
          * unmarshaled.
-         * @param wireFormat - the wireformat object to control unmarshaling
+         *
+         * @param wireFormat
+         *      The wireformat object to control marshaling
+         *
+         * @throws IOException if an I/O error occurs.
          */
-        virtual void afterUnmarshal( WireFormat* wireFormat )
-            throw ( decaf::io::IOException ) = 0;
+        virtual void afterUnmarshal( WireFormat* wireFormat ) = 0;
 
         /**
          * Called to set the data to this object that will contain the objects
          * marshaled form.
          * @param wireFormat - the wireformat object to control unmarshaling
          * @param data - vector of object binary data
+         *
+         * @param wireFormat
+         *      The wireformat object to control marshaling
+         * @param data
+         *      A vector of bytes that contains the object in marshaled form.
+         *
+         * @throws IOException if an I/O error occurs.
          */
-        virtual void setMarshaledForm( WireFormat* wireFormat,
-                                       const std::vector<char>& data ) = 0;
+        virtual void setMarshaledForm( WireFormat* wireFormat, const std::vector<char>& data ) = 0;
 
         /**
          * Called to get the data to this object that will contain the objects
          * marshaled form.
-         * @param wireFormat - the wireformat object to control unmarshaling
+         *
+         * @param wireFormat
+         *      The wireformat object to control unmarshaling
+         *
          * @return buffer that holds the objects data.
          */
         virtual std::vector<unsigned char> getMarshaledForm( WireFormat* wireFormat ) = 0;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormat.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormat.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormat.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormat.h Mon Jun 28 20:52:28 2010
@@ -58,26 +58,28 @@ namespace wireformat{
          * @param out
          *      The output stream to write the command to.
          *
-         * @throws IOException
+         * @throws IOException if an I/O error occurs.
          */
         virtual void marshal( const Pointer<commands::Command>& command,
                               const activemq::transport::Transport* transport,
-                              decaf::io::DataOutputStream* out )
-            throw ( decaf::io::IOException ) = 0;
+                              decaf::io::DataOutputStream* out ) = 0;
 
         /**
          * Stream based unmarshaling, blocks on reads on the input stream until a complete
          * command has been read and unmarshaled into the correct form.  Returns a Pointer
          * to the newly unmarshaled Command.
          *
-         * @param transport - Pointer to the transport that is making this request.
-         * @param in - the input stream to read the command from.
+         * @param transport
+         *      Pointer to the transport that is making this request.
+         * @param in
+         *      The input stream to read the command from.
+         *
          * @returns the newly marshaled Command, caller owns the pointer
-         * @throws IOException
+         *
+         * @throws IOException if an I/O error occurs.
          */
         virtual Pointer<commands::Command> unmarshal( const activemq::transport::Transport* transport,
-                                                      decaf::io::DataInputStream* in )
-            throw ( decaf::io::IOException ) = 0;
+                                                      decaf::io::DataInputStream* in ) = 0;
 
         /**
          * Set the Version
@@ -89,6 +91,7 @@ namespace wireformat{
 
         /**
          * Get the Version
+         *
          * @return the version of the wire format
          */
         virtual int getVersion() const = 0;
@@ -115,13 +118,15 @@ namespace wireformat{
          * If the Transport Provides a Negotiator this method will create and return
          * a new instance of the Negotiator.
          *
-         * @param transport - the Transport to Wrap the Negotiator around.
+         * @param transport
+         *      The Transport to Wrap the Negotiator around.
+         *
          * @returns new instance of a WireFormatNegotiator as a Pointer<Transport>.
+         *
          * @throws UnsupportedOperationException if the WireFormat doesn't have a Negotiator.
          */
         virtual Pointer<transport::Transport> createNegotiator(
-            const Pointer<transport::Transport>& transport )
-                throw( decaf::lang::exceptions::UnsupportedOperationException ) = 0;
+            const Pointer<transport::Transport>& transport ) = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatFactory.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatFactory.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatFactory.h Mon Jun 28 20:52:28 2010
@@ -44,11 +44,14 @@ namespace wireformat{
          * Creates a new WireFormat Object passing it a set of
          * properties from which it can obtain any optional settings
          *
-         * @param properties - the Properties for this WireFormat
+         * @param properties
+         *      The Properties for this WireFormat.
+         *
          * @return Pointer to a new instance of a WireFormat object.
+         *
+         * @throws IllegalStateException if the factory has not been initialized.
          */
-        virtual Pointer<WireFormat> createWireFormat( const decaf::util::Properties& properties )
-            throw ( decaf::lang::exceptions::IllegalStateException ) = 0;
+        virtual Pointer<WireFormat> createWireFormat( const decaf::util::Properties& properties ) = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatNegotiator.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatNegotiator.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatNegotiator.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatNegotiator.h Mon Jun 28 20:52:28 2010
@@ -34,8 +34,10 @@ namespace wireformat {
     public:
 
         /**
-         * Constructor.
-         * @param next - the next Transport in the chain
+         * Creates a new instance of a WireFormat Negotiator wrapping the Transport passed.
+         *
+         * @param next
+         *      The next Transport in the chain
          */
         WireFormatNegotiator( const Pointer<transport::Transport>& next ) :
             transport::TransportFilter( next ) {}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatRegistry.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatRegistry.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatRegistry.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatRegistry.cpp Mon Jun 28 20:52:28 2010
@@ -43,8 +43,7 @@ WireFormatRegistry::~WireFormatRegistry(
  }
 
 ////////////////////////////////////////////////////////////////////////////////
-WireFormatFactory* WireFormatRegistry::findFactory( const std::string& name ) const
-    throw( decaf::lang::exceptions::NoSuchElementException ) {
+WireFormatFactory* WireFormatRegistry::findFactory( const std::string& name ) const {
 
     if( !this->registry.containsKey( name ) ) {
         throw NoSuchElementException( __FILE__, __LINE__,
@@ -55,9 +54,7 @@ WireFormatFactory* WireFormatRegistry::f
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void WireFormatRegistry::registerFactory( const std::string& name, WireFormatFactory* factory )
-    throw( decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::NullPointerException ) {
+void WireFormatRegistry::registerFactory( const std::string& name, WireFormatFactory* factory ) {
 
     if( name == "" ) {
         throw IllegalArgumentException( __FILE__, __LINE__,

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatRegistry.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatRegistry.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatRegistry.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/WireFormatRegistry.h Mon Jun 28 20:52:28 2010
@@ -71,8 +71,7 @@ namespace wireformat {
          *
          * @throws NoSuchElementException if no factory is registered with that name.
          */
-        WireFormatFactory* findFactory( const std::string& name ) const
-            throw( decaf::lang::exceptions::NoSuchElementException );
+        WireFormatFactory* findFactory( const std::string& name ) const;
 
         /**
          * Registers a new WireFormatFactory with this Registry.  If a Factory with the
@@ -88,9 +87,7 @@ namespace wireformat {
          * @throws IllegalArgumentException is name is the empty string.
          * @throws NullPointerException if the Factory is Null.
          */
-        void registerFactory( const std::string& name, WireFormatFactory* factory )
-            throw( decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::NullPointerException );
+        void registerFactory( const std::string& name, WireFormatFactory* factory );
 
         /**
          * Unregisters the Factory with the given name and deletes that instance of the