You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/02/22 00:29:06 UTC
svn commit: r379623 [11/18] - in /incubator/activemq/trunk: ./
activecluster/ activecluster/src/java/org/apache/activecluster/
activecluster/src/java/org/apache/activecluster/group/
activecluster/src/java/org/apache/activecluster/impl/ activeio/ active...
Modified: incubator/activemq/trunk/jmeter/resource/saveservice.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/resource/saveservice.properties?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/resource/saveservice.properties (original)
+++ incubator/activemq/trunk/jmeter/resource/saveservice.properties Tue Feb 21 15:28:33 2006
@@ -1,90 +1,90 @@
-#---------------------------------------------------------
-# SAVESERVICE PROPERTIES
-#
-# N.B. To ensure backward compatibility, please do not
-# change or delete any entries that have been used.
-# New entries can be added as necessary.
-#
-# Note that keys starting with an underscore are special,
-# and are not used as aliases.
-#
-# version number of this file (automatically generated by CVS)
-_version=$Revision: 1.5 $
-#
-#---------------------------------------------------------
-#
-# The following properties are used to create aliases
-#
-AccessLogSampler=org.apache.jmeter.protocol.http.sampler.AccessLogSampler
-AnchorModifier=org.apache.jmeter.protocol.http.modifier.AnchorModifier
-AuthManager=org.apache.jmeter.protocol.http.control.AuthManager
-BeanShellSampler=org.apache.jmeter.protocol.java.sampler.BeanShellSampler
-ConfigTestElement=org.apache.jmeter.config.ConfigTestElement
-ConstantThroughputTimer=org.apache.jmeter.timers.ConstantThroughputTimer
-ConstantTimer=org.apache.jmeter.timers.ConstantTimer
-CookieManager=org.apache.jmeter.protocol.http.control.CookieManager
-CounterConfig=org.apache.jmeter.modifiers.CounterConfig
-DurationAssertion=org.apache.jmeter.assertions.DurationAssertion
-FloatProperty=org.apache.jmeter.testelement.property.FloatProperty
-FTPSampler=org.apache.jmeter.protocol.ftp.sampler.FTPSampler
-GaussianRandomTimer=org.apache.jmeter.timers.GaussianRandomTimer
-GenericController=org.apache.jmeter.control.GenericController
-HeaderManager=org.apache.jmeter.protocol.http.control.HeaderManager
-HTTPSampler=org.apache.jmeter.protocol.http.sampler.HTTPSampler
-IfController=org.apache.jmeter.control.IfController
-InterleaveControl=org.apache.jmeter.control.InterleaveControl
-JavaConfig=org.apache.jmeter.protocol.java.config.JavaConfig
-JavaSampler=org.apache.jmeter.protocol.java.sampler.JavaSampler
-JDBCSampler=org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler
-LDAPSampler=org.apache.jmeter.protocol.ldap.sampler.LDAPSampler
-LoopController=org.apache.jmeter.control.LoopController
-ModuleController=org.apache.jmeter.control.ModuleController
-OnceOnlyController=org.apache.jmeter.control.OnceOnlyController
-ParamModifier=org.apache.jmeter.protocol.http.modifier.ParamModifier
-RandomController=org.apache.jmeter.control.RandomController
-RecordingController=org.apache.jmeter.protocol.http.control.RecordingController
-RegexExtractor=org.apache.jmeter.extractor.RegexExtractor
-ResponseAssertion=org.apache.jmeter.assertions.ResponseAssertion
-ResultCollector=org.apache.jmeter.reporters.ResultCollector
-SizeAssertion=org.apache.jmeter.assertions.SizeAssertion
-SoapSampler=org.apache.jmeter.protocol.http.sampler.SoapSampler
-TestPlan=org.apache.jmeter.testelement.TestPlan
-ThreadGroup=org.apache.jmeter.threads.ThreadGroup
-ThroughputController=org.apache.jmeter.control.ThroughputController
-UniformRandomTimer=org.apache.jmeter.timers.UniformRandomTimer
-URLRewritingModifier=org.apache.jmeter.protocol.http.modifier.URLRewritingModifier
-UserParameterModifier=org.apache.jmeter.protocol.http.modifier.UserParameterModifier
-UserParameters=org.apache.jmeter.modifiers.UserParameters
-WebServiceSampler=org.apache.jmeter.protocol.http.sampler.WebServiceSampler
-XMLAssertion=org.apache.jmeter.assertions.XMLAssertion
-stringProp=org.apache.jmeter.testelement.property.StringProperty
-intProp=org.apache.jmeter.testelement.property.IntegerProperty
-longProp=org.apache.jmeter.testelement.property.LongProperty
-collectionProp=org.apache.jmeter.testelement.property.CollectionProperty
-mapProp=org.apache.jmeter.testelement.property.MapProperty
-elementProp=org.apache.jmeter.testelement.property.TestElementProperty
-boolProp=org.apache.jmeter.testelement.property.BooleanProperty
-hashTree=org.apache.jorphan.collections.ListedHashTree
-jmeterTestPlan=org.apache.jmeter.save.ScriptWrapper
-sample=org.apache.jmeter.samplers.SampleResult
-httpSample=org.apache.jmeter.protocol.http.sampler.HTTPSampleResult
-testResults=org.apache.jmeter.save.TestResultWrapper
-assertionResult=org.apache.jmeter.assertions.AssertionResult
-monitorStats=org.apache.jmeter.visualizers.MonitorStats
-#
-# Converters to register. Must start line with '_'
-# If the converter is a collection of subitems, set equal to "collection"
-# If the converter needs to know the class mappings but is not a collection of
-# subitems, set it equal to "mapping"
-_org.apache.jmeter.save.converters.StringPropertyConverter=
-_org.apache.jmeter.save.converters.BooleanPropertyConverter=
-_org.apache.jmeter.save.converters.IntegerPropertyConverter=
-_org.apache.jmeter.save.converters.LongPropertyConverter=
-_org.apache.jmeter.save.converters.TestElementConverter=collection
-_org.apache.jmeter.save.converters.MultiPropertyConverter=collection
-_org.apache.jmeter.save.converters.TestElementPropertyConverter=collection
-_org.apache.jmeter.save.converters.HashTreeConverter=collection
-_org.apache.jmeter.save.ScriptWrapperConverter=mapping
-_org.apache.jmeter.save.converters.SampleResultConverter=collection
-_org.apache.jmeter.save.converters.TestResultWrapperConverter=collection
+#---------------------------------------------------------
+# SAVESERVICE PROPERTIES
+#
+# N.B. To ensure backward compatibility, please do not
+# change or delete any entries that have been used.
+# New entries can be added as necessary.
+#
+# Note that keys starting with an underscore are special,
+# and are not used as aliases.
+#
+# version number of this file (automatically generated by CVS)
+_version=$Revision: 1.5 $
+#
+#---------------------------------------------------------
+#
+# The following properties are used to create aliases
+#
+AccessLogSampler=org.apache.jmeter.protocol.http.sampler.AccessLogSampler
+AnchorModifier=org.apache.jmeter.protocol.http.modifier.AnchorModifier
+AuthManager=org.apache.jmeter.protocol.http.control.AuthManager
+BeanShellSampler=org.apache.jmeter.protocol.java.sampler.BeanShellSampler
+ConfigTestElement=org.apache.jmeter.config.ConfigTestElement
+ConstantThroughputTimer=org.apache.jmeter.timers.ConstantThroughputTimer
+ConstantTimer=org.apache.jmeter.timers.ConstantTimer
+CookieManager=org.apache.jmeter.protocol.http.control.CookieManager
+CounterConfig=org.apache.jmeter.modifiers.CounterConfig
+DurationAssertion=org.apache.jmeter.assertions.DurationAssertion
+FloatProperty=org.apache.jmeter.testelement.property.FloatProperty
+FTPSampler=org.apache.jmeter.protocol.ftp.sampler.FTPSampler
+GaussianRandomTimer=org.apache.jmeter.timers.GaussianRandomTimer
+GenericController=org.apache.jmeter.control.GenericController
+HeaderManager=org.apache.jmeter.protocol.http.control.HeaderManager
+HTTPSampler=org.apache.jmeter.protocol.http.sampler.HTTPSampler
+IfController=org.apache.jmeter.control.IfController
+InterleaveControl=org.apache.jmeter.control.InterleaveControl
+JavaConfig=org.apache.jmeter.protocol.java.config.JavaConfig
+JavaSampler=org.apache.jmeter.protocol.java.sampler.JavaSampler
+JDBCSampler=org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler
+LDAPSampler=org.apache.jmeter.protocol.ldap.sampler.LDAPSampler
+LoopController=org.apache.jmeter.control.LoopController
+ModuleController=org.apache.jmeter.control.ModuleController
+OnceOnlyController=org.apache.jmeter.control.OnceOnlyController
+ParamModifier=org.apache.jmeter.protocol.http.modifier.ParamModifier
+RandomController=org.apache.jmeter.control.RandomController
+RecordingController=org.apache.jmeter.protocol.http.control.RecordingController
+RegexExtractor=org.apache.jmeter.extractor.RegexExtractor
+ResponseAssertion=org.apache.jmeter.assertions.ResponseAssertion
+ResultCollector=org.apache.jmeter.reporters.ResultCollector
+SizeAssertion=org.apache.jmeter.assertions.SizeAssertion
+SoapSampler=org.apache.jmeter.protocol.http.sampler.SoapSampler
+TestPlan=org.apache.jmeter.testelement.TestPlan
+ThreadGroup=org.apache.jmeter.threads.ThreadGroup
+ThroughputController=org.apache.jmeter.control.ThroughputController
+UniformRandomTimer=org.apache.jmeter.timers.UniformRandomTimer
+URLRewritingModifier=org.apache.jmeter.protocol.http.modifier.URLRewritingModifier
+UserParameterModifier=org.apache.jmeter.protocol.http.modifier.UserParameterModifier
+UserParameters=org.apache.jmeter.modifiers.UserParameters
+WebServiceSampler=org.apache.jmeter.protocol.http.sampler.WebServiceSampler
+XMLAssertion=org.apache.jmeter.assertions.XMLAssertion
+stringProp=org.apache.jmeter.testelement.property.StringProperty
+intProp=org.apache.jmeter.testelement.property.IntegerProperty
+longProp=org.apache.jmeter.testelement.property.LongProperty
+collectionProp=org.apache.jmeter.testelement.property.CollectionProperty
+mapProp=org.apache.jmeter.testelement.property.MapProperty
+elementProp=org.apache.jmeter.testelement.property.TestElementProperty
+boolProp=org.apache.jmeter.testelement.property.BooleanProperty
+hashTree=org.apache.jorphan.collections.ListedHashTree
+jmeterTestPlan=org.apache.jmeter.save.ScriptWrapper
+sample=org.apache.jmeter.samplers.SampleResult
+httpSample=org.apache.jmeter.protocol.http.sampler.HTTPSampleResult
+testResults=org.apache.jmeter.save.TestResultWrapper
+assertionResult=org.apache.jmeter.assertions.AssertionResult
+monitorStats=org.apache.jmeter.visualizers.MonitorStats
+#
+# Converters to register. Must start line with '_'
+# If the converter is a collection of subitems, set equal to "collection"
+# If the converter needs to know the class mappings but is not a collection of
+# subitems, set it equal to "mapping"
+_org.apache.jmeter.save.converters.StringPropertyConverter=
+_org.apache.jmeter.save.converters.BooleanPropertyConverter=
+_org.apache.jmeter.save.converters.IntegerPropertyConverter=
+_org.apache.jmeter.save.converters.LongPropertyConverter=
+_org.apache.jmeter.save.converters.TestElementConverter=collection
+_org.apache.jmeter.save.converters.MultiPropertyConverter=collection
+_org.apache.jmeter.save.converters.TestElementPropertyConverter=collection
+_org.apache.jmeter.save.converters.HashTreeConverter=collection
+_org.apache.jmeter.save.ScriptWrapperConverter=mapping
+_org.apache.jmeter.save.converters.SampleResultConverter=collection
+_org.apache.jmeter.save.converters.TestResultWrapperConverter=collection
_org.apache.jmeter.protocol.http.util.HTTPResultConverter=collection
Propchange: incubator/activemq/trunk/jmeter/resource/saveservice.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/jmeter/resource/upgrade.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/resource/upgrade.properties?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/resource/upgrade.properties (original)
+++ incubator/activemq/trunk/jmeter/resource/upgrade.properties Tue Feb 21 15:28:33 2006
@@ -1,38 +1,38 @@
-# Class, property and value upgrade equivalences.
-
-## $Id: upgrade.properties,v 1.6 2004/05/19 20:15:42 mstover1 Exp $
-## Copyright 2001-2004 The Apache Software Foundation
-##
-## Licensed under the Apache License, Version 2.0 (the "License");
-## you may not use this file except in compliance with the License.
-## You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-
-#
-# Format is as follows --
-# for renamed test element & GUI classes:
-# old.class.Name=new.class.Name
-# for renamed properties:
-# old.class.Name/Old.propertyName=newPropertyName
-# for renamed values:
-# old.class.Name.old.propertyName/oldValue=newValue
-#
-
-org.apache.jmeter.protocol.http.config.gui.UrlConfigGui=org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui
-org.apache.jmeter.assertions.Assertion=org.apache.jmeter.assertions.ResponseAssertion
-org.apache.jmeter.protocol.http.sampler.HTTPSamplerFull=org.apache.jmeter.protocol.http.sampler.HTTPSampler
-org.apache.jmeter.control.gui.RecordController=org.apache.jmeter.protocol.http.control.gui.RecordController
-
-org.apache.jmeter.timers.gui.ConstantThroughputTimerGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
-org.apache.jmeter.timers.ConstantThroughputTimer/ConstantThroughputTimer.throughput=throughput
-
-org.apache.jmeter.protocol.jdbc.control.gui.JdbcTestSampleGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
-org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler/JDBCSampler.query=query
+# Class, property and value upgrade equivalences.
+
+## $Id: upgrade.properties,v 1.6 2004/05/19 20:15:42 mstover1 Exp $
+## Copyright 2001-2004 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+
+#
+# Format is as follows --
+# for renamed test element & GUI classes:
+# old.class.Name=new.class.Name
+# for renamed properties:
+# old.class.Name/Old.propertyName=newPropertyName
+# for renamed values:
+# old.class.Name.old.propertyName/oldValue=newValue
+#
+
+org.apache.jmeter.protocol.http.config.gui.UrlConfigGui=org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui
+org.apache.jmeter.assertions.Assertion=org.apache.jmeter.assertions.ResponseAssertion
+org.apache.jmeter.protocol.http.sampler.HTTPSamplerFull=org.apache.jmeter.protocol.http.sampler.HTTPSampler
+org.apache.jmeter.control.gui.RecordController=org.apache.jmeter.protocol.http.control.gui.RecordController
+
+org.apache.jmeter.timers.gui.ConstantThroughputTimerGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
+org.apache.jmeter.timers.ConstantThroughputTimer/ConstantThroughputTimer.throughput=throughput
+
+org.apache.jmeter.protocol.jdbc.control.gui.JdbcTestSampleGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
+org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler/JDBCSampler.query=query
org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler.JDBCSampler.dataSource/NULL=
Propchange: incubator/activemq/trunk/jmeter/resource/upgrade.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/jmeter/resource/users.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/resource/users.xml?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/resource/users.xml (original)
+++ incubator/activemq/trunk/jmeter/resource/users.xml Tue Feb 21 15:28:33 2006
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005-2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE allthreads SYSTEM "users.dtd">
-
-<!--
- $Header: /home/cvspublic/jakarta-jmeter/bin/users.xml,v 1.3 2004/02/16 13:34:10 sebb Exp $
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
- <!-- all users, uses round robin selection -->
- <allthreads>
- <!-- unique parameters for each individual thread (ie user) -->
-
- <thread>
- <parameter>
- <paramname>username</paramname>
- <paramvalue>dduck</paramvalue>
- </parameter>
- <parameter>
- <paramname>password</paramname>
- <paramvalue>quack</paramvalue>
- </parameter>
- </thread>
- <thread>
- <parameter>
- <paramname>username</paramname>
- <paramvalue>mmouse</paramvalue>
- </parameter>
- <parameter>
- <paramname>password</paramname>
- <paramvalue>squeak</paramvalue>
- </parameter>
- </thread>
- <thread>
- <parameter>
- <paramname>username</paramname>
- <paramvalue>bbunney</paramvalue>
- </parameter>
- <parameter>
- <paramname>password</paramname>
- <paramvalue>carrot</paramvalue>
- </parameter>
- <parameter>
- <paramname>manager</paramname>
- <paramvalue>yes</paramvalue>
- </parameter>
- </thread>
- </allthreads>
-
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005-2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE allthreads SYSTEM "users.dtd">
+
+<!--
+ $Header: /home/cvspublic/jakarta-jmeter/bin/users.xml,v 1.3 2004/02/16 13:34:10 sebb Exp $
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+ <!-- all users, uses round robin selection -->
+ <allthreads>
+ <!-- unique parameters for each individual thread (ie user) -->
+
+ <thread>
+ <parameter>
+ <paramname>username</paramname>
+ <paramvalue>dduck</paramvalue>
+ </parameter>
+ <parameter>
+ <paramname>password</paramname>
+ <paramvalue>quack</paramvalue>
+ </parameter>
+ </thread>
+ <thread>
+ <parameter>
+ <paramname>username</paramname>
+ <paramvalue>mmouse</paramvalue>
+ </parameter>
+ <parameter>
+ <paramname>password</paramname>
+ <paramvalue>squeak</paramvalue>
+ </parameter>
+ </thread>
+ <thread>
+ <parameter>
+ <paramname>username</paramname>
+ <paramvalue>bbunney</paramvalue>
+ </parameter>
+ <parameter>
+ <paramname>password</paramname>
+ <paramvalue>carrot</paramvalue>
+ </parameter>
+ <parameter>
+ <paramname>manager</paramname>
+ <paramvalue>yes</paramvalue>
+ </parameter>
+ </thread>
+ </allthreads>
+
+
+
Propchange: incubator/activemq/trunk/jmeter/resource/users.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/jmeter/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/openwire-c/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/openwire-c/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/openwire-c/src/examples/main.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/openwire-c/src/libopenwire/ow.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/openwire-c/src/libopenwire/ow.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_buffer.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_marshal.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-c/win32/BUILD.txt
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/win32/BUILD.txt?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/win32/BUILD.txt (original)
+++ incubator/activemq/trunk/openwire-c/win32/BUILD.txt Tue Feb 21 15:28:33 2006
@@ -1,16 +1,16 @@
-==========================================================================
-Setting up MS Visual Studio
-==========================================================================
-
-1) Download Apache APR 1.2.2 from http://apr.apache.org/download.cgi
-2) Follow the Win32 build instructions: http://apr.apache.org/compiling_win32.html
-3) Configure MS Visual Studio so that it know the location of APR:
-
-
- 1) Click Tools->Options...
- 2) Navigate to Projects->VC++ Directories
- 3) Change "show directories for" Library files to "Library files"
- 4) Add the apr library directory to the list
- 5) Change "show directories for" Library files to "Include files"
- 6) Add the apr include directory to the list
+==========================================================================
+Setting up MS Visual Studio
+==========================================================================
+
+1) Download Apache APR 1.2.2 from http://apr.apache.org/download.cgi
+2) Follow the Win32 build instructions: http://apr.apache.org/compiling_win32.html
+3) Configure MS Visual Studio so that it know the location of APR:
+
+
+ 1) Click Tools->Options...
+ 2) Navigate to Projects->VC++ Directories
+ 3) Change "show directories for" Library files to "Library files"
+ 4) Add the apr library directory to the list
+ 5) Change "show directories for" Library files to "Include files"
+ 6) Add the apr include directory to the list
Propchange: incubator/activemq/trunk/openwire-c/win32/BUILD.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-c/win32/main/ReadMe.txt
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/win32/main/ReadMe.txt?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/win32/main/ReadMe.txt (original)
+++ incubator/activemq/trunk/openwire-c/win32/main/ReadMe.txt Tue Feb 21 15:28:33 2006
@@ -1,32 +1,32 @@
-========================================================================
- CONSOLE APPLICATION : main Project Overview
-========================================================================
-
-AppWizard has created this main application for you.
-This file contains a summary of what you will find in each of the files that
-make up your main application.
-
-
-main.vcproj
- This is the main project file for VC++ projects generated using an Application Wizard.
- It contains information about the version of Visual C++ that generated the file, and
- information about the platforms, configurations, and project features selected with the
- Application Wizard.
-
-main.cpp
- This is the main application source file.
-
-/////////////////////////////////////////////////////////////////////////////
-Other standard files:
-
-StdAfx.h, StdAfx.cpp
- These files are used to build a precompiled header (PCH) file
- named main.pch and a precompiled types file named StdAfx.obj.
-
-/////////////////////////////////////////////////////////////////////////////
-Other notes:
-
-AppWizard uses "TODO:" comments to indicate parts of the source code you
-should add to or customize.
-
-/////////////////////////////////////////////////////////////////////////////
+========================================================================
+ CONSOLE APPLICATION : main Project Overview
+========================================================================
+
+AppWizard has created this main application for you.
+This file contains a summary of what you will find in each of the files that
+make up your main application.
+
+
+main.vcproj
+ This is the main project file for VC++ projects generated using an Application Wizard.
+ It contains information about the version of Visual C++ that generated the file, and
+ information about the platforms, configurations, and project features selected with the
+ Application Wizard.
+
+main.cpp
+ This is the main application source file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+ These files are used to build a precompiled header (PCH) file
+ named main.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" comments to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////
Propchange: incubator/activemq/trunk/openwire-c/win32/main/ReadMe.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/BrokerError.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/BrokerError.cpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/BrokerError.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/BrokerError.cpp Tue Feb 21 15:28:33 2006
@@ -1,50 +1,50 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "BrokerError.hpp"
-
-using namespace apache::activemq::client;
-
-/*
- *
- */
-BrokerError::BrokerError()
-{
-}
-
-BrokerError::~BrokerError()
-{
-}
-
-p<string> BrokerError::getExceptionClass()
-{
- return exceptionClass ;
-}
-
-void BrokerError::setExceptionClass(const char* exceptionClass)
-{
- this->exceptionClass->assign(exceptionClass) ;
-}
-
-p<string> BrokerError::getStackTrace()
-{
- return stackTrace ;
-}
-
-void BrokerError::setStackTrace(const char* stackTrace)
-{
- this->stackTrace->assign(stackTrace) ;
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "BrokerError.hpp"
+
+using namespace apache::activemq::client;
+
+/*
+ *
+ */
+BrokerError::BrokerError()
+{
+}
+
+BrokerError::~BrokerError()
+{
+}
+
+p<string> BrokerError::getExceptionClass()
+{
+ return exceptionClass ;
+}
+
+void BrokerError::setExceptionClass(const char* exceptionClass)
+{
+ this->exceptionClass->assign(exceptionClass) ;
+}
+
+p<string> BrokerError::getStackTrace()
+{
+ return stackTrace ;
+}
+
+void BrokerError::setStackTrace(const char* stackTrace)
+{
+ this->stackTrace->assign(stackTrace) ;
+}
Propchange: incubator/activemq/trunk/openwire-cpp/src/BrokerError.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/BrokerError.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/BrokerError.hpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/BrokerError.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/BrokerError.hpp Tue Feb 21 15:28:33 2006
@@ -1,56 +1,56 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef BrokerError_hpp_
-#define BrokerError_hpp_
-
-#include <string>
-#include "util/ifr/p"
-
-namespace apache
-{
- namespace activemq
- {
- namespace client
- {
- using namespace ifr ;
- using namespace std ;
-
-/*
- *
- */
-class BrokerError
-{
-private:
- p<string> exceptionClass ;
- p<string> stackTrace ;
-
-public:
- BrokerError() ;
- virtual ~BrokerError() ;
-
- virtual p<string> getExceptionClass() ;
- virtual void setExceptionClass(const char* exceptionClass) ;
- virtual p<string> getStackTrace() ;
- virtual void setStackTrace(const char* exceptionClass) ;
-} ;
-
-/* namespace */
- }
- }
-}
-
-#endif /*BrokerError_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef BrokerError_hpp_
+#define BrokerError_hpp_
+
+#include <string>
+#include "util/ifr/p"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ using namespace ifr ;
+ using namespace std ;
+
+/*
+ *
+ */
+class BrokerError
+{
+private:
+ p<string> exceptionClass ;
+ p<string> stackTrace ;
+
+public:
+ BrokerError() ;
+ virtual ~BrokerError() ;
+
+ virtual p<string> getExceptionClass() ;
+ virtual void setExceptionClass(const char* exceptionClass) ;
+ virtual p<string> getStackTrace() ;
+ virtual void setStackTrace(const char* exceptionClass) ;
+} ;
+
+/* namespace */
+ }
+ }
+}
+
+#endif /*BrokerError_hpp_*/
Propchange: incubator/activemq/trunk/openwire-cpp/src/BrokerError.hpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/BrokerException.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/BrokerException.cpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/BrokerException.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/BrokerException.cpp Tue Feb 21 15:28:33 2006
@@ -1,46 +1,46 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "BrokerException.hpp"
-
-using namespace apache::activemq::client;
-
-/*
- *
- */
-BrokerException::BrokerException(p<BrokerError> cause)
- : OpenWireException("") // TODO: Add trace
-{
- string message ;
-
- brokerError = cause ;
-
- // Build exception message
- message.assign("The operation failed: Type: ") ;
- message.append( cause->getExceptionClass()->c_str() ) ;
- message.append(" stack: ") ;
- message.append( cause->getStackTrace()->c_str() ) ;
-}
-
-BrokerException::~BrokerException()
-{
- // no-op
-}
-
-p<BrokerError> BrokerException::getCause()
-{
- return brokerError ;
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "BrokerException.hpp"
+
+using namespace apache::activemq::client;
+
+/*
+ *
+ */
+BrokerException::BrokerException(p<BrokerError> cause)
+ : OpenWireException("") // TODO: Add trace
+{
+ string message ;
+
+ brokerError = cause ;
+
+ // Build exception message
+ message.assign("The operation failed: Type: ") ;
+ message.append( cause->getExceptionClass()->c_str() ) ;
+ message.append(" stack: ") ;
+ message.append( cause->getStackTrace()->c_str() ) ;
+}
+
+BrokerException::~BrokerException()
+{
+ // no-op
+}
+
+p<BrokerError> BrokerException::getCause()
+{
+ return brokerError ;
+}
Propchange: incubator/activemq/trunk/openwire-cpp/src/BrokerException.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/BrokerException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/BrokerException.hpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/BrokerException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/BrokerException.hpp Tue Feb 21 15:28:33 2006
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef BrokerException_hpp_
-#define BrokerException_hpp_
-
-#include <string>
-#include "BrokerError.hpp"
-#include "OpenWireException.hpp"
-#include "util/ifr/p"
-
-namespace apache
-{
- namespace activemq
- {
- namespace client
- {
- using namespace std;
- using namespace ifr ;
-
-/*
- *
- */
-class BrokerException : public OpenWireException
-{
-private:
- p<BrokerError> brokerError ;
-
-public:
- BrokerException(p<BrokerError> cause) ;
- virtual ~BrokerException() ;
-
- virtual p<BrokerError> getCause() ;
-};
-
-/* namespace */
- }
- }
-}
-
-#endif /*BrokerException_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef BrokerException_hpp_
+#define BrokerException_hpp_
+
+#include <string>
+#include "BrokerError.hpp"
+#include "OpenWireException.hpp"
+#include "util/ifr/p"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ using namespace std;
+ using namespace ifr ;
+
+/*
+ *
+ */
+class BrokerException : public OpenWireException
+{
+private:
+ p<BrokerError> brokerError ;
+
+public:
+ BrokerException(p<BrokerError> cause) ;
+ virtual ~BrokerException() ;
+
+ virtual p<BrokerError> getCause() ;
+};
+
+/* namespace */
+ }
+ }
+}
+
+#endif /*BrokerException_hpp_*/
Propchange: incubator/activemq/trunk/openwire-cpp/src/BrokerException.hpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/Connection.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/Connection.cpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/Connection.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/Connection.cpp Tue Feb 21 15:28:33 2006
@@ -1,202 +1,202 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "Connection.hpp"
-
-using namespace apache::activemq::client;
-
-
-// --- Constructors -------------------------------------------------
-
-/*
- *
- */
-Connection::Connection(p<ITransport> transport, p<ConnectionInfo> connectionInfo)
-{
- this->transport = transport ;
- this->connectionInfo = connectionInfo ;
- this->connected = false ;
- this->transacted = false ;
- this->closed = false ;
-}
-
-/*
- *
- */
-Connection::~Connection()
-{
-}
-
-
-// --- Attribute methods --------------------------------------------
-
-/*
- *
- */
-p<ITransport> Connection::getTransport()
-{
- return transport ;
-}
-
-/*
- *
- */
-void Connection::setTransport(p<ITransport> transport) throw(OpenWireException)
-{
- this->transport = transport ;
-}
-
-/*
- *
- */
-p<string> Connection::getClientId()
-{
- return connectionInfo->getClientId() ;
-}
-
-/*
- *
- */
-void Connection::setClientId(const char* value)
-{
- if( connected )
- throw OpenWireException("You cannot change the ClientId once a connection is established") ;
-
- connectionInfo->setClientId( value ) ;
-}
-
-/*
- *
- */
-bool Connection::getTransacted()
-{
- return transacted ;
-}
-
-/*
- *
- */
-void Connection::setTransacted(bool tx)
-{
- transacted = tx ;
-}
-
-/*
- *
- */
-AcknowledgementMode Connection::getAcknowledgementMode()
-{
- return acknowledgementMode ;
-}
-
-/*
- *
- */
-void Connection::setAcknowledgementMode(AcknowledgementMode mode)
-{
- acknowledgementMode = mode ;
-}
-
-
-// --- Operation methods --------------------------------------------
-
-/*
- *
- */
-p<ISession> Connection::createSession() throw(OpenWireException)
-{
- return createSession(transacted, acknowledgementMode) ;
-}
-
-/*
- *
- */
-p<ISession> Connection::createSession(bool transacted, AcknowledgementMode mode) throw(OpenWireException)
-{
- checkConnected() ;
-
- p<SessionInfo> sessionInfo = createSessionInfo(transacted, acknowledgementMode) ;
-
- // Send session info to broker
- syncRequest(sessionInfo) ;
-
- p<ISession> session = new Session(this, sessionInfo) ;
- sessions.push_back(session) ;
-
- return session ;
-}
-
-/*
- *
- */
-p<Response> Connection::syncRequest(p<ICommand> command) throw(OpenWireException)
-{
- checkConnected() ;
-
- p<Response> response = transport->request(command) ;
-
- if( response->getCommandType() == ExceptionResponse::TYPE )
- {
- p<ExceptionResponse> exceptionResponse = (p<ExceptionResponse>&)response ;
- p<BrokerError> brokerError = exceptionResponse->getException() ;
- string message ;
-
- // Build error message
- message.assign("Request failed: ") ;
- message.append( brokerError->getExceptionClass()->c_str() ) ;
- message.append(", ") ;
- message.append( brokerError->getStackTrace()->c_str() ) ;
-
- throw new OpenWireException( message.c_str() ) ;
- }
- return response ;
-}
-
-
-// --- Implementation methods ---------------------------------------
-
-/*
- *
- */
-p<SessionInfo> Connection::createSessionInfo(bool transacted, AcknowledgementMode acknowledgementMode)
-{
- p<SessionInfo> sessionInfo = new SessionInfo() ;
- p<SessionId> sessionId = new SessionId() ;
-
- sessionId->setConnectionId ( connectionInfo->getConnectionId()->getValue()->c_str() ) ;
-
- mutex.lock() ;
- sessionId->setValue( ++sessionCounter ) ;
- mutex.unlock() ;
-
- sessionInfo->setSessionId( sessionId ) ;
- return sessionInfo ;
-}
-
-/*
- *
- */
-void Connection::checkConnected() throw(OpenWireException)
-{
- if( closed )
- throw new ConnectionClosedException("Oops! Connection already closed.") ;
-
- if( !connected )
- {
- syncRequest((p<ICommand>&)connectionInfo) ;
- connected = true ;
- }
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "Connection.hpp"
+
+using namespace apache::activemq::client;
+
+
+// --- Constructors -------------------------------------------------
+
+/*
+ *
+ */
+Connection::Connection(p<ITransport> transport, p<ConnectionInfo> connectionInfo)
+{
+ this->transport = transport ;
+ this->connectionInfo = connectionInfo ;
+ this->connected = false ;
+ this->transacted = false ;
+ this->closed = false ;
+}
+
+/*
+ *
+ */
+Connection::~Connection()
+{
+}
+
+
+// --- Attribute methods --------------------------------------------
+
+/*
+ *
+ */
+p<ITransport> Connection::getTransport()
+{
+ return transport ;
+}
+
+/*
+ *
+ */
+void Connection::setTransport(p<ITransport> transport) throw(OpenWireException)
+{
+ this->transport = transport ;
+}
+
+/*
+ *
+ */
+p<string> Connection::getClientId()
+{
+ return connectionInfo->getClientId() ;
+}
+
+/*
+ *
+ */
+void Connection::setClientId(const char* value)
+{
+ if( connected )
+ throw OpenWireException("You cannot change the ClientId once a connection is established") ;
+
+ connectionInfo->setClientId( value ) ;
+}
+
+/*
+ *
+ */
+bool Connection::getTransacted()
+{
+ return transacted ;
+}
+
+/*
+ *
+ */
+void Connection::setTransacted(bool tx)
+{
+ transacted = tx ;
+}
+
+/*
+ *
+ */
+AcknowledgementMode Connection::getAcknowledgementMode()
+{
+ return acknowledgementMode ;
+}
+
+/*
+ *
+ */
+void Connection::setAcknowledgementMode(AcknowledgementMode mode)
+{
+ acknowledgementMode = mode ;
+}
+
+
+// --- Operation methods --------------------------------------------
+
+/*
+ *
+ */
+p<ISession> Connection::createSession() throw(OpenWireException)
+{
+ return createSession(transacted, acknowledgementMode) ;
+}
+
+/*
+ *
+ */
+p<ISession> Connection::createSession(bool transacted, AcknowledgementMode mode) throw(OpenWireException)
+{
+ checkConnected() ;
+
+ p<SessionInfo> sessionInfo = createSessionInfo(transacted, acknowledgementMode) ;
+
+ // Send session info to broker
+ syncRequest(sessionInfo) ;
+
+ p<ISession> session = new Session(this, sessionInfo) ;
+ sessions.push_back(session) ;
+
+ return session ;
+}
+
+/*
+ *
+ */
+p<Response> Connection::syncRequest(p<ICommand> command) throw(OpenWireException)
+{
+ checkConnected() ;
+
+ p<Response> response = transport->request(command) ;
+
+ if( response->getCommandType() == ExceptionResponse::TYPE )
+ {
+ p<ExceptionResponse> exceptionResponse = (p<ExceptionResponse>&)response ;
+ p<BrokerError> brokerError = exceptionResponse->getException() ;
+ string message ;
+
+ // Build error message
+ message.assign("Request failed: ") ;
+ message.append( brokerError->getExceptionClass()->c_str() ) ;
+ message.append(", ") ;
+ message.append( brokerError->getStackTrace()->c_str() ) ;
+
+ throw new OpenWireException( message.c_str() ) ;
+ }
+ return response ;
+}
+
+
+// --- Implementation methods ---------------------------------------
+
+/*
+ *
+ */
+p<SessionInfo> Connection::createSessionInfo(bool transacted, AcknowledgementMode acknowledgementMode)
+{
+ p<SessionInfo> sessionInfo = new SessionInfo() ;
+ p<SessionId> sessionId = new SessionId() ;
+
+ sessionId->setConnectionId ( connectionInfo->getConnectionId()->getValue()->c_str() ) ;
+
+ mutex.lock() ;
+ sessionId->setValue( ++sessionCounter ) ;
+ mutex.unlock() ;
+
+ sessionInfo->setSessionId( sessionId ) ;
+ return sessionInfo ;
+}
+
+/*
+ *
+ */
+void Connection::checkConnected() throw(OpenWireException)
+{
+ if( closed )
+ throw new ConnectionClosedException("Oops! Connection already closed.") ;
+
+ if( !connected )
+ {
+ syncRequest((p<ICommand>&)connectionInfo) ;
+ connected = true ;
+ }
+}
Propchange: incubator/activemq/trunk/openwire-cpp/src/Connection.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/Connection.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/Connection.hpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/Connection.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/Connection.hpp Tue Feb 21 15:28:33 2006
@@ -1,100 +1,100 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef Connection_hpp_
-#define Connection_hpp_
-
-#include <list>
-#include <string>
-
-#include "ISession.hpp"
-#include "IConnection.hpp"
-#include "Session.hpp"
-#include "OpenWireException.hpp"
-#include "ConnectionClosedException.hpp"
-#include "command/ExceptionResponse.hpp"
-#include "command/ConnectionInfo.hpp"
-#include "command/SessionInfo.hpp"
-#include "command/SessionId.hpp"
-#include "transport/ITransport.hpp"
-#include "util/SimpleMutex.hpp"
-#include "util/ifr/p"
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-namespace apache
-{
- namespace activemq
- {
- namespace client
- {
- using namespace std;
- using namespace ifr;
- using namespace apache::activemq::client::command;
- using namespace apache::activemq::client::transport;
- using namespace apache::activemq::client::util;
-
-/*
- *
- */
-class Connection : public IConnection
-{
-private:
- p<ConnectionInfo> connectionInfo ;
- p<ITransport> transport ;
- list< p<ISession> > sessions ;
- bool transacted,
- connected,
- closed ;
- AcknowledgementMode acknowledgementMode ;
- long sessionCounter ;
- SimpleMutex mutex ;
-
-public:
- // Constructors
- Connection(p<ITransport> transport, p<ConnectionInfo> connectionInfo) ;
- ~Connection() ;
-
- // Attribute methods
- virtual AcknowledgementMode getAcknowledgementMode() ;
- virtual void setAcknowledgementMode(AcknowledgementMode mode) ;
- virtual p<string> getClientId() ;
- virtual void setClientId(const char* value) ;
- virtual bool getTransacted() ;
- virtual void setTransacted(bool tx) ;
- virtual p<ITransport> getTransport() ;
- virtual void setTransport(p<ITransport> transport) throw(OpenWireException) ;
-
- // Operation methods
- virtual p<ISession> createSession() throw(OpenWireException) ;
- virtual p<ISession> createSession(bool transacted, AcknowledgementMode mode) throw(OpenWireException) ;
- virtual p<Response> syncRequest(p<ICommand> command) throw(OpenWireException) ;
-
-protected:
- // Implementation methods
- p<SessionInfo> createSessionInfo(bool transacted, AcknowledgementMode mode) ;
- void checkConnected() throw(OpenWireException) ;
-} ;
-
-/* namespace */
- }
- }
-}
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef Connection_hpp_
+#define Connection_hpp_
+
+#include <list>
+#include <string>
+
+#include "ISession.hpp"
+#include "IConnection.hpp"
+#include "Session.hpp"
+#include "OpenWireException.hpp"
+#include "ConnectionClosedException.hpp"
+#include "command/ExceptionResponse.hpp"
+#include "command/ConnectionInfo.hpp"
+#include "command/SessionInfo.hpp"
+#include "command/SessionId.hpp"
+#include "transport/ITransport.hpp"
+#include "util/SimpleMutex.hpp"
+#include "util/ifr/p"
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ using namespace std;
+ using namespace ifr;
+ using namespace apache::activemq::client::command;
+ using namespace apache::activemq::client::transport;
+ using namespace apache::activemq::client::util;
+
+/*
+ *
+ */
+class Connection : public IConnection
+{
+private:
+ p<ConnectionInfo> connectionInfo ;
+ p<ITransport> transport ;
+ list< p<ISession> > sessions ;
+ bool transacted,
+ connected,
+ closed ;
+ AcknowledgementMode acknowledgementMode ;
+ long sessionCounter ;
+ SimpleMutex mutex ;
+
+public:
+ // Constructors
+ Connection(p<ITransport> transport, p<ConnectionInfo> connectionInfo) ;
+ ~Connection() ;
+
+ // Attribute methods
+ virtual AcknowledgementMode getAcknowledgementMode() ;
+ virtual void setAcknowledgementMode(AcknowledgementMode mode) ;
+ virtual p<string> getClientId() ;
+ virtual void setClientId(const char* value) ;
+ virtual bool getTransacted() ;
+ virtual void setTransacted(bool tx) ;
+ virtual p<ITransport> getTransport() ;
+ virtual void setTransport(p<ITransport> transport) throw(OpenWireException) ;
+
+ // Operation methods
+ virtual p<ISession> createSession() throw(OpenWireException) ;
+ virtual p<ISession> createSession(bool transacted, AcknowledgementMode mode) throw(OpenWireException) ;
+ virtual p<Response> syncRequest(p<ICommand> command) throw(OpenWireException) ;
+
+protected:
+ // Implementation methods
+ p<SessionInfo> createSessionInfo(bool transacted, AcknowledgementMode mode) ;
+ void checkConnected() throw(OpenWireException) ;
+} ;
+
+/* namespace */
+ }
+ }
+}
+
#endif /*Connection_hpp_*/
Propchange: incubator/activemq/trunk/openwire-cpp/src/Connection.hpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.cpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.cpp Tue Feb 21 15:28:33 2006
@@ -1,33 +1,33 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "ConnectionClosedException.hpp"
-
-using namespace apache::activemq::client;
-
-/*
- *
- */
-ConnectionClosedException::ConnectionClosedException(const char* message)
- : OpenWireException(message)
-{
- // no-op
-}
-
-ConnectionClosedException::~ConnectionClosedException()
-{
- // no-op
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "ConnectionClosedException.hpp"
+
+using namespace apache::activemq::client;
+
+/*
+ *
+ */
+ConnectionClosedException::ConnectionClosedException(const char* message)
+ : OpenWireException(message)
+{
+ // no-op
+}
+
+ConnectionClosedException::~ConnectionClosedException()
+{
+ // no-op
+}
Propchange: incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.hpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.hpp Tue Feb 21 15:28:33 2006
@@ -1,44 +1,44 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ConnectionClosedException_hpp_
-#define ConnectionClosedException_hpp_
-
-#include "OpenWireException.hpp"
-
-namespace apache
-{
- namespace activemq
- {
- namespace client
- {
-
-/*
- *
- */
-class ConnectionClosedException : public OpenWireException
-{
-public:
- ConnectionClosedException(const char* message) ;
- virtual ~ConnectionClosedException() ;
-};
-
-/* namespace */
- }
- }
-}
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ConnectionClosedException_hpp_
+#define ConnectionClosedException_hpp_
+
+#include "OpenWireException.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+
+/*
+ *
+ */
+class ConnectionClosedException : public OpenWireException
+{
+public:
+ ConnectionClosedException(const char* message) ;
+ virtual ~ConnectionClosedException() ;
+};
+
+/* namespace */
+ }
+ }
+}
+
#endif /*ConnectionClosedException_hpp_*/
Propchange: incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.hpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.cpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.cpp Tue Feb 21 15:28:33 2006
@@ -1,201 +1,201 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "ConnectionFactory.hpp"
-#include "Connection.hpp"
-
-using namespace apache::activemq::client;
-
-/*
- *
- */
-ConnectionFactory::ConnectionFactory()
-{
- host = new string() ;
- host->assign("localhost") ;
- port = 61616 ;
- username = new string() ;
- password = new string() ;
- clientId = new string() ;
-}
-
-/*
- *
- */
-ConnectionFactory::ConnectionFactory(const char* host, int port)
-{
- this->host = new string() ;
- this->host->assign(host) ;
- this->port = port ;
- username = new string() ;
- password = new string() ;
- clientId = new string() ;
-}
-
-/*
- *
- */
-ConnectionFactory::~ConnectionFactory()
-{
-}
-
-
-// --- Attribute methods --------------------------------------------
-
-/*
- *
- */
-p<string> ConnectionFactory::getHost()
-{
- return host ;
-}
-
-/*
- *
- */
-void ConnectionFactory::setHost(const char* host)
-{
- this->host->assign(host) ;
-}
-
-/*
- *
- */
-int ConnectionFactory::getPort()
-{
- return port ;
-}
-
-/*
- *
- */
-void ConnectionFactory::setPort(int port)
-{
- port = port ;
-}
-
-/*
- *
- */
-p<string> ConnectionFactory::getUsername()
-{
- return username ;
-}
-
-/*
- *
- */
-void ConnectionFactory::setUsername(const char* username)
-{
- this->username->assign(username) ;
-}
-
-/*
- *
- */
-p<string> ConnectionFactory::getPassword()
-{
- return password ;
-}
-
-/*
- *
- */
-void ConnectionFactory::setPassword(const char* password)
-{
- this->password->assign(password) ;
-}
-
-/*
- *
- */
-p<string> ConnectionFactory::getClientId()
-{
- return clientId ;
-}
-
-/*
- *
- */
-void ConnectionFactory::setClientId(const char* clientId)
-{
- this->clientId->assign(clientId) ;
-}
-
-
-// --- Operation methods --------------------------------------------
-
-/*
- *
- */
-p<IConnection> ConnectionFactory::createConnection()
-{
- return createConnection(username->c_str(), password->c_str()) ;
-}
-
-/*
- *
- */
-p<IConnection> ConnectionFactory::createConnection(const char* username, const char* password)
-{
- p<ConnectionInfo> connectionInfo ;
- p<ITransport> transport ;
- p<Connection> connection ;
-
- // Set up a new connection object
- connectionInfo = createConnectionInfo(username, password) ;
- transport = createTransport() ;
- connection = new Connection(transport, connectionInfo) ;
- connection->setClientId( clientId->c_str() ) ;
-
- return connection ;
-}
-
-
-// --- Implementation methods ---------------------------------------
-
-/*
- *
- */
-p<ConnectionInfo> ConnectionFactory::createConnectionInfo(const char* username, const char* password)
-{
- p<ConnectionInfo> connectionInfo = new ConnectionInfo() ;
- p<ConnectionId> connectionId = new ConnectionId() ;
-
- connectionId->setValue( createNewConnectionId()->c_str() ) ;
- connectionInfo->setConnectionId( connectionId ) ;
- connectionInfo->setUsername( username ) ;
- connectionInfo->setPassword( password ) ;
-
- return connectionInfo ;
-}
-
-/*
- *
- */
-p<string> ConnectionFactory::createNewConnectionId()
-{
- return Guid::getGuidString() ;
-}
-
-/*
- *
- */
-p<ITransport> ConnectionFactory::createTransport()
-{
- p<ITransport> transport = new SocketTransport(host->c_str(), port) ;
- return transport ;
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "ConnectionFactory.hpp"
+#include "Connection.hpp"
+
+using namespace apache::activemq::client;
+
+/*
+ *
+ */
+ConnectionFactory::ConnectionFactory()
+{
+ host = new string() ;
+ host->assign("localhost") ;
+ port = 61616 ;
+ username = new string() ;
+ password = new string() ;
+ clientId = new string() ;
+}
+
+/*
+ *
+ */
+ConnectionFactory::ConnectionFactory(const char* host, int port)
+{
+ this->host = new string() ;
+ this->host->assign(host) ;
+ this->port = port ;
+ username = new string() ;
+ password = new string() ;
+ clientId = new string() ;
+}
+
+/*
+ *
+ */
+ConnectionFactory::~ConnectionFactory()
+{
+}
+
+
+// --- Attribute methods --------------------------------------------
+
+/*
+ *
+ */
+p<string> ConnectionFactory::getHost()
+{
+ return host ;
+}
+
+/*
+ *
+ */
+void ConnectionFactory::setHost(const char* host)
+{
+ this->host->assign(host) ;
+}
+
+/*
+ *
+ */
+int ConnectionFactory::getPort()
+{
+ return port ;
+}
+
+/*
+ *
+ */
+void ConnectionFactory::setPort(int port)
+{
+ port = port ;
+}
+
+/*
+ *
+ */
+p<string> ConnectionFactory::getUsername()
+{
+ return username ;
+}
+
+/*
+ *
+ */
+void ConnectionFactory::setUsername(const char* username)
+{
+ this->username->assign(username) ;
+}
+
+/*
+ *
+ */
+p<string> ConnectionFactory::getPassword()
+{
+ return password ;
+}
+
+/*
+ *
+ */
+void ConnectionFactory::setPassword(const char* password)
+{
+ this->password->assign(password) ;
+}
+
+/*
+ *
+ */
+p<string> ConnectionFactory::getClientId()
+{
+ return clientId ;
+}
+
+/*
+ *
+ */
+void ConnectionFactory::setClientId(const char* clientId)
+{
+ this->clientId->assign(clientId) ;
+}
+
+
+// --- Operation methods --------------------------------------------
+
+/*
+ *
+ */
+p<IConnection> ConnectionFactory::createConnection()
+{
+ return createConnection(username->c_str(), password->c_str()) ;
+}
+
+/*
+ *
+ */
+p<IConnection> ConnectionFactory::createConnection(const char* username, const char* password)
+{
+ p<ConnectionInfo> connectionInfo ;
+ p<ITransport> transport ;
+ p<Connection> connection ;
+
+ // Set up a new connection object
+ connectionInfo = createConnectionInfo(username, password) ;
+ transport = createTransport() ;
+ connection = new Connection(transport, connectionInfo) ;
+ connection->setClientId( clientId->c_str() ) ;
+
+ return connection ;
+}
+
+
+// --- Implementation methods ---------------------------------------
+
+/*
+ *
+ */
+p<ConnectionInfo> ConnectionFactory::createConnectionInfo(const char* username, const char* password)
+{
+ p<ConnectionInfo> connectionInfo = new ConnectionInfo() ;
+ p<ConnectionId> connectionId = new ConnectionId() ;
+
+ connectionId->setValue( createNewConnectionId()->c_str() ) ;
+ connectionInfo->setConnectionId( connectionId ) ;
+ connectionInfo->setUsername( username ) ;
+ connectionInfo->setPassword( password ) ;
+
+ return connectionInfo ;
+}
+
+/*
+ *
+ */
+p<string> ConnectionFactory::createNewConnectionId()
+{
+ return Guid::getGuidString() ;
+}
+
+/*
+ *
+ */
+p<ITransport> ConnectionFactory::createTransport()
+{
+ p<ITransport> transport = new SocketTransport(host->c_str(), port) ;
+ return transport ;
+}
Propchange: incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.hpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.hpp Tue Feb 21 15:28:33 2006
@@ -1,89 +1,89 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ConnectionFactory_hpp_
-#define ConnectionFactory_hpp_
-
-// Must be included before any STL includes
-#include "util/Guid.hpp"
-
-#include <string>
-#include "IConnection.hpp"
-#include "IConnectionFactory.hpp"
-#include "command/ConnectionInfo.hpp"
-#include "command/ConnectionId.hpp"
-#include "transport/ITransport.hpp"
-#include "transport/SocketTransport.hpp"
-#include "util/ifr/p"
-
-namespace apache
-{
- namespace activemq
- {
- namespace client
- {
- using namespace apache::activemq::client::command;
- using namespace apache::activemq::client::transport;
- using namespace apache::activemq::client::util;
- using namespace ifr;
-
-/*
- *
- */
-class ConnectionFactory : IConnectionFactory
-{
-private:
- p<string> host,
- username,
- password,
- clientId ;
- int port ;
-
-public:
- // Constructors
- ConnectionFactory() ;
- ConnectionFactory(const char* host, int port) ;
- virtual ~ConnectionFactory() ;
-
- // Attribute methods
- virtual p<string> getHost() ;
- virtual void setHost(const char* host) ;
- virtual int getPort() ;
- virtual void setPort(int port) ;
- virtual p<string> getUsername() ;
- virtual void setUsername(const char* username) ;
- virtual p<string> getPassword() ;
- virtual void setPassword(const char* password) ;
- virtual p<string> getClientId() ;
- virtual void setClientId(const char* clientId) ;
-
- // Operation methods
- virtual p<IConnection> createConnection() ;
- virtual p<IConnection> createConnection(const char* username, const char* password) ;
-
-protected:
- // Implementation methods
- virtual p<ConnectionInfo> createConnectionInfo(const char* username, const char* password) ;
- virtual p<string> createNewConnectionId() ;
- virtual p<ITransport> createTransport() ;
-} ;
-
-/* namespace */
- }
- }
-}
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ConnectionFactory_hpp_
+#define ConnectionFactory_hpp_
+
+// Must be included before any STL includes
+#include "util/Guid.hpp"
+
+#include <string>
+#include "IConnection.hpp"
+#include "IConnectionFactory.hpp"
+#include "command/ConnectionInfo.hpp"
+#include "command/ConnectionId.hpp"
+#include "transport/ITransport.hpp"
+#include "transport/SocketTransport.hpp"
+#include "util/ifr/p"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ using namespace apache::activemq::client::command;
+ using namespace apache::activemq::client::transport;
+ using namespace apache::activemq::client::util;
+ using namespace ifr;
+
+/*
+ *
+ */
+class ConnectionFactory : IConnectionFactory
+{
+private:
+ p<string> host,
+ username,
+ password,
+ clientId ;
+ int port ;
+
+public:
+ // Constructors
+ ConnectionFactory() ;
+ ConnectionFactory(const char* host, int port) ;
+ virtual ~ConnectionFactory() ;
+
+ // Attribute methods
+ virtual p<string> getHost() ;
+ virtual void setHost(const char* host) ;
+ virtual int getPort() ;
+ virtual void setPort(int port) ;
+ virtual p<string> getUsername() ;
+ virtual void setUsername(const char* username) ;
+ virtual p<string> getPassword() ;
+ virtual void setPassword(const char* password) ;
+ virtual p<string> getClientId() ;
+ virtual void setClientId(const char* clientId) ;
+
+ // Operation methods
+ virtual p<IConnection> createConnection() ;
+ virtual p<IConnection> createConnection(const char* username, const char* password) ;
+
+protected:
+ // Implementation methods
+ virtual p<ConnectionInfo> createConnectionInfo(const char* username, const char* password) ;
+ virtual p<string> createNewConnectionId() ;
+ virtual p<ITransport> createTransport() ;
+} ;
+
+/* namespace */
+ }
+ }
+}
+
#endif /*ConnectionFactory_hpp_*/
Propchange: incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.hpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.cpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.cpp Tue Feb 21 15:28:33 2006
@@ -1,33 +1,33 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "ConsumerClosedException.hpp"
-
-using namespace apache::activemq::client;
-
-/*
- *
- */
-ConsumerClosedException::ConsumerClosedException(const char* message)
- : OpenWireException(message)
-{
- // no-op
-}
-
-ConsumerClosedException::~ConsumerClosedException()
-{
- // no-op
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "ConsumerClosedException.hpp"
+
+using namespace apache::activemq::client;
+
+/*
+ *
+ */
+ConsumerClosedException::ConsumerClosedException(const char* message)
+ : OpenWireException(message)
+{
+ // no-op
+}
+
+ConsumerClosedException::~ConsumerClosedException()
+{
+ // no-op
+}
Propchange: incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.hpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.hpp Tue Feb 21 15:28:33 2006
@@ -1,44 +1,44 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ConsumerClosedException_hpp_
-#define ConsumerClosedException_hpp_
-
-#include "OpenWireException.hpp"
-
-namespace apache
-{
- namespace activemq
- {
- namespace client
- {
-
-/*
- *
- */
-class ConsumerClosedException : public OpenWireException
-{
-public:
- ConsumerClosedException(const char* message) ;
- ~ConsumerClosedException() ;
-};
-
-/* namespace */
- }
- }
-}
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ConsumerClosedException_hpp_
+#define ConsumerClosedException_hpp_
+
+#include "OpenWireException.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+
+/*
+ *
+ */
+class ConsumerClosedException : public OpenWireException
+{
+public:
+ ConsumerClosedException(const char* message) ;
+ ~ConsumerClosedException() ;
+};
+
+/* namespace */
+ }
+ }
+}
+
#endif /*ConsumerClosedException_hpp_*/
Propchange: incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.hpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/openwire-cpp/src/DestinationFilter.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/DestinationFilter.cpp?rev=379623&r1=379622&r2=379623&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/DestinationFilter.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/DestinationFilter.cpp Tue Feb 21 15:28:33 2006
@@ -1,41 +1,41 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "DestinationFilter.hpp"
-
-using namespace apache::activemq::client;
-
-// Init static constants
-const char* DestinationFilter::ANY_DESCENDENT = ">" ;
-const char* DestinationFilter::ANY_CHILD = "*" ;
-
-/*
- *
- */
-DestinationFilter::DestinationFilter()
-{
-
-}
-
-DestinationFilter::~DestinationFilter()
-{
- // no-op
-}
-
-bool DestinationFilter::matches(p<ActiveMQMessage> message)
-{
- return matches( message->getDestination() ) ;
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "DestinationFilter.hpp"
+
+using namespace apache::activemq::client;
+
+// Init static constants
+const char* DestinationFilter::ANY_DESCENDENT = ">" ;
+const char* DestinationFilter::ANY_CHILD = "*" ;
+
+/*
+ *
+ */
+DestinationFilter::DestinationFilter()
+{
+
+}
+
+DestinationFilter::~DestinationFilter()
+{
+ // no-op
+}
+
+bool DestinationFilter::matches(p<ActiveMQMessage> message)
+{
+ return matches( message->getDestination() ) ;
+}
Propchange: incubator/activemq/trunk/openwire-cpp/src/DestinationFilter.cpp
------------------------------------------------------------------------------
svn:eol-style = native