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/11/14 22:17:39 UTC
svn commit: r474986 [5/6] - in /incubator/activemq/branches/activemq-4.1: ./
activemq-console/src/main/java/org/apache/activemq/console/
activemq-console/src/main/resources/META-INF/
activemq-console/src/test/resources/ activemq-core/src/main/java/org/...
Modified: incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-topic-nonpersistent.properties
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-topic-nonpersistent.properties?view=diff&rev=474986&r1=474985&r2=474986
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-topic-nonpersistent.properties (original)
+++ incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-topic-nonpersistent.properties Tue Nov 14 13:17:31 2006
@@ -1,92 +1,92 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# Consumer System Settings
-sysTest.spiClass=org.apache.activemq.tool.spi.ActiveMQReflectionSPI
-sysTest.reportType=xml
-sysTest.destDistro=all
-sysTest.samplers=tp
-sysTest.numClients=10
-sysTest.totalDests=1
-sysTest.reportDir=./
-
-# Consumer Client Settings
-producer.deliveryMode=nonpersistent
-producer.messageSize=1024
-producer.destName=topic://TEST.FOO
-producer.sessTransacted=false
-producer.sessAckMode=autoAck
-producer.createNewMsg=false
-producer.destComposite=false
-# 5 mins send duration
-producer.sendType=time
-producer.sendDuration=300000
-# 1 million messages send
-# producer.sendType=count
-# producer.sendCount=1000000
-
-# Throughput Sampler Settings
-# 5 mins sampling duration
-# 1 min ramp up and ramp down time
-# 1 sec sampling interval
-tpSampler.duration=300000
-tpSampler.rampUpTime=60000
-tpSampler.rampDownTime=60000
-tpSampler.interval=1000
-
-# CPU Sampler Settings
-# 5 mins sampling duration
-# 1 min ramp up and ramp down time
-# 1 sec sampling interval
-# cpuSampler.duration=300000
-# cpuSampler.rampUpTime=60000
-# cpuSampler.rampDownTime=60000
-# cpuSampler.interval=1000
-
-# AMQ Connection Factory Settings
-# Use default settings
-# factory.brokerURL=tcp://localhost:61616
-# factory.useAsyncSend=false
-# factory.asyncDispatch=false
-# factory.alwaysSessionAsync=true
-# factory.useCompression=false
-# factory.optimizeAcknowledge=false
-# factory.objectMessageSerializationDefered=false
-# factory.disableTimeStampsByDefault=false
-# factory.optimizedMessageDispatch=true
-# factory.useRetroactiveConsumer=false
-# factory.copyMessageOnSend=true
-# factory.closeTimeout=15000
-
-# factory.userName=null
-# factory.clientID=null
-# factory.password=null
-
-# factory.prefetchPolicy.durableTopicPrefetch=100
-# factory.prefetchPolicy.topicPrefetch=32766
-# factory.prefetchPolicy.queueBrowserPrefetch=500
-# factory.prefetchPolicy.queuePrefetch=1000
-# factory.prefetchPolicy.inputStreamPrefetch=100
-# factory.prefetchPolicy.maximumPendingMessageLimit=0
-# factory.prefetchPolicy.optimizeDurableTopicPrefetch=1000
-
-# factory.redeliveryPolicy.initialRedeliveryDelay=1000
-# factory.redeliveryPolicy.maximumRedeliveries=5
-# factory.redeliveryPolicy.useCollisionAvoidance=false
-# factory.redeliveryPolicy.useExponentialBackOff=false
-# factory.redeliveryPolicy.collisionAvoidancePercent=15
-# factory.redeliveryPolicy.backOffMultiplier=5
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+# Consumer System Settings
+sysTest.spiClass=org.apache.activemq.tool.spi.ActiveMQReflectionSPI
+sysTest.reportType=xml
+sysTest.destDistro=all
+sysTest.samplers=tp
+sysTest.numClients=10
+sysTest.totalDests=1
+sysTest.reportDir=./
+
+# Consumer Client Settings
+producer.deliveryMode=nonpersistent
+producer.messageSize=1024
+producer.destName=topic://TEST.FOO
+producer.sessTransacted=false
+producer.sessAckMode=autoAck
+producer.createNewMsg=false
+producer.destComposite=false
+# 5 mins send duration
+producer.sendType=time
+producer.sendDuration=300000
+# 1 million messages send
+# producer.sendType=count
+# producer.sendCount=1000000
+
+# Throughput Sampler Settings
+# 5 mins sampling duration
+# 1 min ramp up and ramp down time
+# 1 sec sampling interval
+tpSampler.duration=300000
+tpSampler.rampUpTime=60000
+tpSampler.rampDownTime=60000
+tpSampler.interval=1000
+
+# CPU Sampler Settings
+# 5 mins sampling duration
+# 1 min ramp up and ramp down time
+# 1 sec sampling interval
+# cpuSampler.duration=300000
+# cpuSampler.rampUpTime=60000
+# cpuSampler.rampDownTime=60000
+# cpuSampler.interval=1000
+
+# AMQ Connection Factory Settings
+# Use default settings
+# factory.brokerURL=tcp://localhost:61616
+# factory.useAsyncSend=false
+# factory.asyncDispatch=false
+# factory.alwaysSessionAsync=true
+# factory.useCompression=false
+# factory.optimizeAcknowledge=false
+# factory.objectMessageSerializationDefered=false
+# factory.disableTimeStampsByDefault=false
+# factory.optimizedMessageDispatch=true
+# factory.useRetroactiveConsumer=false
+# factory.copyMessageOnSend=true
+# factory.closeTimeout=15000
+
+# factory.userName=null
+# factory.clientID=null
+# factory.password=null
+
+# factory.prefetchPolicy.durableTopicPrefetch=100
+# factory.prefetchPolicy.topicPrefetch=32766
+# factory.prefetchPolicy.queueBrowserPrefetch=500
+# factory.prefetchPolicy.queuePrefetch=1000
+# factory.prefetchPolicy.inputStreamPrefetch=100
+# factory.prefetchPolicy.maximumPendingMessageLimit=0
+# factory.prefetchPolicy.optimizeDurableTopicPrefetch=1000
+
+# factory.redeliveryPolicy.initialRedeliveryDelay=1000
+# factory.redeliveryPolicy.maximumRedeliveries=5
+# factory.redeliveryPolicy.useCollisionAvoidance=false
+# factory.redeliveryPolicy.useExponentialBackOff=false
+# factory.redeliveryPolicy.collisionAvoidancePercent=15
+# factory.redeliveryPolicy.backOffMultiplier=5
Propchange: incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-topic-nonpersistent.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-topic-persistent.properties
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-topic-persistent.properties?view=diff&rev=474986&r1=474985&r2=474986
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-topic-persistent.properties (original)
+++ incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-topic-persistent.properties Tue Nov 14 13:17:31 2006
@@ -1,92 +1,92 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# Consumer System Settings
-sysTest.spiClass=org.apache.activemq.tool.spi.ActiveMQReflectionSPI
-sysTest.reportType=xml
-sysTest.destDistro=all
-sysTest.samplers=tp
-sysTest.numClients=10
-sysTest.totalDests=1
-sysTest.reportDir=./
-
-# Consumer Client Settings
-producer.deliveryMode=persistent
-producer.messageSize=1024
-producer.destName=topic://TEST.FOO
-producer.sessTransacted=false
-producer.sessAckMode=autoAck
-producer.createNewMsg=false
-producer.destComposite=false
-# 5 mins send duration
-producer.sendType=time
-producer.sendDuration=300000
-# 1 million messages send
-# producer.sendType=count
-# producer.sendCount=1000000
-
-# Throughput Sampler Settings
-# 5 mins sampling duration
-# 1 min ramp up and ramp down time
-# 1 sec sampling interval
-tpSampler.duration=300000
-tpSampler.rampUpTime=60000
-tpSampler.rampDownTime=60000
-tpSampler.interval=1000
-
-# CPU Sampler Settings
-# 5 mins sampling duration
-# 1 min ramp up and ramp down time
-# 1 sec sampling interval
-# cpuSampler.duration=300000
-# cpuSampler.rampUpTime=60000
-# cpuSampler.rampDownTime=60000
-# cpuSampler.interval=1000
-
-# AMQ Connection Factory Settings
-# Use default settings
-# factory.brokerURL=tcp://localhost:61616
-# factory.useAsyncSend=false
-# factory.asyncDispatch=false
-# factory.alwaysSessionAsync=true
-# factory.useCompression=false
-# factory.optimizeAcknowledge=false
-# factory.objectMessageSerializationDefered=false
-# factory.disableTimeStampsByDefault=false
-# factory.optimizedMessageDispatch=true
-# factory.useRetroactiveConsumer=false
-# factory.copyMessageOnSend=true
-# factory.closeTimeout=15000
-
-# factory.userName=null
-# factory.clientID=null
-# factory.password=null
-
-# factory.prefetchPolicy.durableTopicPrefetch=100
-# factory.prefetchPolicy.topicPrefetch=32766
-# factory.prefetchPolicy.queueBrowserPrefetch=500
-# factory.prefetchPolicy.queuePrefetch=1000
-# factory.prefetchPolicy.inputStreamPrefetch=100
-# factory.prefetchPolicy.maximumPendingMessageLimit=0
-# factory.prefetchPolicy.optimizeDurableTopicPrefetch=1000
-
-# factory.redeliveryPolicy.initialRedeliveryDelay=1000
-# factory.redeliveryPolicy.maximumRedeliveries=5
-# factory.redeliveryPolicy.useCollisionAvoidance=false
-# factory.redeliveryPolicy.useExponentialBackOff=false
-# factory.redeliveryPolicy.collisionAvoidancePercent=15
-# factory.redeliveryPolicy.backOffMultiplier=5
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+# Consumer System Settings
+sysTest.spiClass=org.apache.activemq.tool.spi.ActiveMQReflectionSPI
+sysTest.reportType=xml
+sysTest.destDistro=all
+sysTest.samplers=tp
+sysTest.numClients=10
+sysTest.totalDests=1
+sysTest.reportDir=./
+
+# Consumer Client Settings
+producer.deliveryMode=persistent
+producer.messageSize=1024
+producer.destName=topic://TEST.FOO
+producer.sessTransacted=false
+producer.sessAckMode=autoAck
+producer.createNewMsg=false
+producer.destComposite=false
+# 5 mins send duration
+producer.sendType=time
+producer.sendDuration=300000
+# 1 million messages send
+# producer.sendType=count
+# producer.sendCount=1000000
+
+# Throughput Sampler Settings
+# 5 mins sampling duration
+# 1 min ramp up and ramp down time
+# 1 sec sampling interval
+tpSampler.duration=300000
+tpSampler.rampUpTime=60000
+tpSampler.rampDownTime=60000
+tpSampler.interval=1000
+
+# CPU Sampler Settings
+# 5 mins sampling duration
+# 1 min ramp up and ramp down time
+# 1 sec sampling interval
+# cpuSampler.duration=300000
+# cpuSampler.rampUpTime=60000
+# cpuSampler.rampDownTime=60000
+# cpuSampler.interval=1000
+
+# AMQ Connection Factory Settings
+# Use default settings
+# factory.brokerURL=tcp://localhost:61616
+# factory.useAsyncSend=false
+# factory.asyncDispatch=false
+# factory.alwaysSessionAsync=true
+# factory.useCompression=false
+# factory.optimizeAcknowledge=false
+# factory.objectMessageSerializationDefered=false
+# factory.disableTimeStampsByDefault=false
+# factory.optimizedMessageDispatch=true
+# factory.useRetroactiveConsumer=false
+# factory.copyMessageOnSend=true
+# factory.closeTimeout=15000
+
+# factory.userName=null
+# factory.clientID=null
+# factory.password=null
+
+# factory.prefetchPolicy.durableTopicPrefetch=100
+# factory.prefetchPolicy.topicPrefetch=32766
+# factory.prefetchPolicy.queueBrowserPrefetch=500
+# factory.prefetchPolicy.queuePrefetch=1000
+# factory.prefetchPolicy.inputStreamPrefetch=100
+# factory.prefetchPolicy.maximumPendingMessageLimit=0
+# factory.prefetchPolicy.optimizeDurableTopicPrefetch=1000
+
+# factory.redeliveryPolicy.initialRedeliveryDelay=1000
+# factory.redeliveryPolicy.maximumRedeliveries=5
+# factory.redeliveryPolicy.useCollisionAvoidance=false
+# factory.redeliveryPolicy.useExponentialBackOff=false
+# factory.redeliveryPolicy.collisionAvoidancePercent=15
+# factory.redeliveryPolicy.backOffMultiplier=5
Propchange: incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-topic-persistent.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-queue-nonpersistent.properties
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-queue-nonpersistent.properties?view=diff&rev=474986&r1=474985&r2=474986
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-queue-nonpersistent.properties (original)
+++ incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-queue-nonpersistent.properties Tue Nov 14 13:17:31 2006
@@ -1,92 +1,92 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# Consumer System Settings
-sysTest.spiClass=org.apache.activemq.tool.spi.ActiveMQReflectionSPI
-sysTest.reportType=xml
-sysTest.destDistro=all
-sysTest.samplers=tp
-sysTest.numClients=10
-sysTest.totalDests=10
-sysTest.reportDir=./
-
-# Consumer Client Settings
-producer.deliveryMode=nonpersistent
-producer.messageSize=1024
-producer.destName=queue://TEST.FOO
-producer.sessTransacted=false
-producer.sessAckMode=autoAck
-producer.createNewMsg=false
-producer.destComposite=false
-# 5 mins send duration
-producer.sendType=time
-producer.sendDuration=300000
-# 1 million messages send
-# producer.sendType=count
-# producer.sendCount=1000000
-
-# Throughput Sampler Settings
-# 5 mins sampling duration
-# 1 min ramp up and ramp down time
-# 1 sec sampling interval
-tpSampler.duration=300000
-tpSampler.rampUpTime=60000
-tpSampler.rampDownTime=60000
-tpSampler.interval=1000
-
-# CPU Sampler Settings
-# 5 mins sampling duration
-# 1 min ramp up and ramp down time
-# 1 sec sampling interval
-# cpuSampler.duration=300000
-# cpuSampler.rampUpTime=60000
-# cpuSampler.rampDownTime=60000
-# cpuSampler.interval=1000
-
-# AMQ Connection Factory Settings
-# Use default settings
-# factory.brokerURL=tcp://localhost:61616
-# factory.useAsyncSend=false
-# factory.asyncDispatch=false
-# factory.alwaysSessionAsync=true
-# factory.useCompression=false
-# factory.optimizeAcknowledge=false
-# factory.objectMessageSerializationDefered=false
-# factory.disableTimeStampsByDefault=false
-# factory.optimizedMessageDispatch=true
-# factory.useRetroactiveConsumer=false
-# factory.copyMessageOnSend=true
-# factory.closeTimeout=15000
-
-# factory.userName=null
-# factory.clientID=null
-# factory.password=null
-
-# factory.prefetchPolicy.durableTopicPrefetch=100
-# factory.prefetchPolicy.topicPrefetch=32766
-# factory.prefetchPolicy.queueBrowserPrefetch=500
-# factory.prefetchPolicy.queuePrefetch=1000
-# factory.prefetchPolicy.inputStreamPrefetch=100
-# factory.prefetchPolicy.maximumPendingMessageLimit=0
-# factory.prefetchPolicy.optimizeDurableTopicPrefetch=1000
-
-# factory.redeliveryPolicy.initialRedeliveryDelay=1000
-# factory.redeliveryPolicy.maximumRedeliveries=5
-# factory.redeliveryPolicy.useCollisionAvoidance=false
-# factory.redeliveryPolicy.useExponentialBackOff=false
-# factory.redeliveryPolicy.collisionAvoidancePercent=15
-# factory.redeliveryPolicy.backOffMultiplier=5
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+# Consumer System Settings
+sysTest.spiClass=org.apache.activemq.tool.spi.ActiveMQReflectionSPI
+sysTest.reportType=xml
+sysTest.destDistro=all
+sysTest.samplers=tp
+sysTest.numClients=10
+sysTest.totalDests=10
+sysTest.reportDir=./
+
+# Consumer Client Settings
+producer.deliveryMode=nonpersistent
+producer.messageSize=1024
+producer.destName=queue://TEST.FOO
+producer.sessTransacted=false
+producer.sessAckMode=autoAck
+producer.createNewMsg=false
+producer.destComposite=false
+# 5 mins send duration
+producer.sendType=time
+producer.sendDuration=300000
+# 1 million messages send
+# producer.sendType=count
+# producer.sendCount=1000000
+
+# Throughput Sampler Settings
+# 5 mins sampling duration
+# 1 min ramp up and ramp down time
+# 1 sec sampling interval
+tpSampler.duration=300000
+tpSampler.rampUpTime=60000
+tpSampler.rampDownTime=60000
+tpSampler.interval=1000
+
+# CPU Sampler Settings
+# 5 mins sampling duration
+# 1 min ramp up and ramp down time
+# 1 sec sampling interval
+# cpuSampler.duration=300000
+# cpuSampler.rampUpTime=60000
+# cpuSampler.rampDownTime=60000
+# cpuSampler.interval=1000
+
+# AMQ Connection Factory Settings
+# Use default settings
+# factory.brokerURL=tcp://localhost:61616
+# factory.useAsyncSend=false
+# factory.asyncDispatch=false
+# factory.alwaysSessionAsync=true
+# factory.useCompression=false
+# factory.optimizeAcknowledge=false
+# factory.objectMessageSerializationDefered=false
+# factory.disableTimeStampsByDefault=false
+# factory.optimizedMessageDispatch=true
+# factory.useRetroactiveConsumer=false
+# factory.copyMessageOnSend=true
+# factory.closeTimeout=15000
+
+# factory.userName=null
+# factory.clientID=null
+# factory.password=null
+
+# factory.prefetchPolicy.durableTopicPrefetch=100
+# factory.prefetchPolicy.topicPrefetch=32766
+# factory.prefetchPolicy.queueBrowserPrefetch=500
+# factory.prefetchPolicy.queuePrefetch=1000
+# factory.prefetchPolicy.inputStreamPrefetch=100
+# factory.prefetchPolicy.maximumPendingMessageLimit=0
+# factory.prefetchPolicy.optimizeDurableTopicPrefetch=1000
+
+# factory.redeliveryPolicy.initialRedeliveryDelay=1000
+# factory.redeliveryPolicy.maximumRedeliveries=5
+# factory.redeliveryPolicy.useCollisionAvoidance=false
+# factory.redeliveryPolicy.useExponentialBackOff=false
+# factory.redeliveryPolicy.collisionAvoidancePercent=15
+# factory.redeliveryPolicy.backOffMultiplier=5
Propchange: incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-queue-nonpersistent.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-queue-persistent.properties
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-queue-persistent.properties?view=diff&rev=474986&r1=474985&r2=474986
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-queue-persistent.properties (original)
+++ incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-queue-persistent.properties Tue Nov 14 13:17:31 2006
@@ -1,92 +1,92 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# Consumer System Settings
-sysTest.spiClass=org.apache.activemq.tool.spi.ActiveMQReflectionSPI
-sysTest.reportType=xml
-sysTest.destDistro=all
-sysTest.samplers=tp
-sysTest.numClients=10
-sysTest.totalDests=10
-sysTest.reportDir=./
-
-# Consumer Client Settings
-producer.deliveryMode=persistent
-producer.messageSize=1024
-producer.destName=queue://TEST.FOO
-producer.sessTransacted=false
-producer.sessAckMode=autoAck
-producer.createNewMsg=false
-producer.destComposite=false
-# 5 mins send duration
-producer.sendType=time
-producer.sendDuration=300000
-# 1 million messages send
-# producer.sendType=count
-# producer.sendCount=1000000
-
-# Throughput Sampler Settings
-# 5 mins sampling duration
-# 1 min ramp up and ramp down time
-# 1 sec sampling interval
-tpSampler.duration=300000
-tpSampler.rampUpTime=60000
-tpSampler.rampDownTime=60000
-tpSampler.interval=1000
-
-# CPU Sampler Settings
-# 5 mins sampling duration
-# 1 min ramp up and ramp down time
-# 1 sec sampling interval
-# cpuSampler.duration=300000
-# cpuSampler.rampUpTime=60000
-# cpuSampler.rampDownTime=60000
-# cpuSampler.interval=1000
-
-# AMQ Connection Factory Settings
-# Use default settings
-# factory.brokerURL=tcp://localhost:61616
-# factory.useAsyncSend=false
-# factory.asyncDispatch=false
-# factory.alwaysSessionAsync=true
-# factory.useCompression=false
-# factory.optimizeAcknowledge=false
-# factory.objectMessageSerializationDefered=false
-# factory.disableTimeStampsByDefault=false
-# factory.optimizedMessageDispatch=true
-# factory.useRetroactiveConsumer=false
-# factory.copyMessageOnSend=true
-# factory.closeTimeout=15000
-
-# factory.userName=null
-# factory.clientID=null
-# factory.password=null
-
-# factory.prefetchPolicy.durableTopicPrefetch=100
-# factory.prefetchPolicy.topicPrefetch=32766
-# factory.prefetchPolicy.queueBrowserPrefetch=500
-# factory.prefetchPolicy.queuePrefetch=1000
-# factory.prefetchPolicy.inputStreamPrefetch=100
-# factory.prefetchPolicy.maximumPendingMessageLimit=0
-# factory.prefetchPolicy.optimizeDurableTopicPrefetch=1000
-
-# factory.redeliveryPolicy.initialRedeliveryDelay=1000
-# factory.redeliveryPolicy.maximumRedeliveries=5
-# factory.redeliveryPolicy.useCollisionAvoidance=false
-# factory.redeliveryPolicy.useExponentialBackOff=false
-# factory.redeliveryPolicy.collisionAvoidancePercent=15
-# factory.redeliveryPolicy.backOffMultiplier=5
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+# Consumer System Settings
+sysTest.spiClass=org.apache.activemq.tool.spi.ActiveMQReflectionSPI
+sysTest.reportType=xml
+sysTest.destDistro=all
+sysTest.samplers=tp
+sysTest.numClients=10
+sysTest.totalDests=10
+sysTest.reportDir=./
+
+# Consumer Client Settings
+producer.deliveryMode=persistent
+producer.messageSize=1024
+producer.destName=queue://TEST.FOO
+producer.sessTransacted=false
+producer.sessAckMode=autoAck
+producer.createNewMsg=false
+producer.destComposite=false
+# 5 mins send duration
+producer.sendType=time
+producer.sendDuration=300000
+# 1 million messages send
+# producer.sendType=count
+# producer.sendCount=1000000
+
+# Throughput Sampler Settings
+# 5 mins sampling duration
+# 1 min ramp up and ramp down time
+# 1 sec sampling interval
+tpSampler.duration=300000
+tpSampler.rampUpTime=60000
+tpSampler.rampDownTime=60000
+tpSampler.interval=1000
+
+# CPU Sampler Settings
+# 5 mins sampling duration
+# 1 min ramp up and ramp down time
+# 1 sec sampling interval
+# cpuSampler.duration=300000
+# cpuSampler.rampUpTime=60000
+# cpuSampler.rampDownTime=60000
+# cpuSampler.interval=1000
+
+# AMQ Connection Factory Settings
+# Use default settings
+# factory.brokerURL=tcp://localhost:61616
+# factory.useAsyncSend=false
+# factory.asyncDispatch=false
+# factory.alwaysSessionAsync=true
+# factory.useCompression=false
+# factory.optimizeAcknowledge=false
+# factory.objectMessageSerializationDefered=false
+# factory.disableTimeStampsByDefault=false
+# factory.optimizedMessageDispatch=true
+# factory.useRetroactiveConsumer=false
+# factory.copyMessageOnSend=true
+# factory.closeTimeout=15000
+
+# factory.userName=null
+# factory.clientID=null
+# factory.password=null
+
+# factory.prefetchPolicy.durableTopicPrefetch=100
+# factory.prefetchPolicy.topicPrefetch=32766
+# factory.prefetchPolicy.queueBrowserPrefetch=500
+# factory.prefetchPolicy.queuePrefetch=1000
+# factory.prefetchPolicy.inputStreamPrefetch=100
+# factory.prefetchPolicy.maximumPendingMessageLimit=0
+# factory.prefetchPolicy.optimizeDurableTopicPrefetch=1000
+
+# factory.redeliveryPolicy.initialRedeliveryDelay=1000
+# factory.redeliveryPolicy.maximumRedeliveries=5
+# factory.redeliveryPolicy.useCollisionAvoidance=false
+# factory.redeliveryPolicy.useExponentialBackOff=false
+# factory.redeliveryPolicy.collisionAvoidancePercent=15
+# factory.redeliveryPolicy.backOffMultiplier=5
Propchange: incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-queue-persistent.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-topic-nonpersistent.properties
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-topic-nonpersistent.properties?view=diff&rev=474986&r1=474985&r2=474986
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-topic-nonpersistent.properties (original)
+++ incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-topic-nonpersistent.properties Tue Nov 14 13:17:31 2006
@@ -1,92 +1,92 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# Consumer System Settings
-sysTest.spiClass=org.apache.activemq.tool.spi.ActiveMQReflectionSPI
-sysTest.reportType=xml
-sysTest.destDistro=all
-sysTest.samplers=tp
-sysTest.numClients=10
-sysTest.totalDests=10
-sysTest.reportDir=./
-
-# Consumer Client Settings
-producer.deliveryMode=nonpersistent
-producer.messageSize=1024
-producer.destName=topic://TEST.FOO
-producer.sessTransacted=false
-producer.sessAckMode=autoAck
-producer.createNewMsg=false
-producer.destComposite=false
-# 5 mins send duration
-producer.sendType=time
-producer.sendDuration=300000
-# 1 million messages send
-# producer.sendType=count
-# producer.sendCount=1000000
-
-# Throughput Sampler Settings
-# 5 mins sampling duration
-# 1 min ramp up and ramp down time
-# 1 sec sampling interval
-tpSampler.duration=300000
-tpSampler.rampUpTime=60000
-tpSampler.rampDownTime=60000
-tpSampler.interval=1000
-
-# CPU Sampler Settings
-# 5 mins sampling duration
-# 1 min ramp up and ramp down time
-# 1 sec sampling interval
-# cpuSampler.duration=300000
-# cpuSampler.rampUpTime=60000
-# cpuSampler.rampDownTime=60000
-# cpuSampler.interval=1000
-
-# AMQ Connection Factory Settings
-# Use default settings
-# factory.brokerURL=tcp://localhost:61616
-# factory.useAsyncSend=false
-# factory.asyncDispatch=false
-# factory.alwaysSessionAsync=true
-# factory.useCompression=false
-# factory.optimizeAcknowledge=false
-# factory.objectMessageSerializationDefered=false
-# factory.disableTimeStampsByDefault=false
-# factory.optimizedMessageDispatch=true
-# factory.useRetroactiveConsumer=false
-# factory.copyMessageOnSend=true
-# factory.closeTimeout=15000
-
-# factory.userName=null
-# factory.clientID=null
-# factory.password=null
-
-# factory.prefetchPolicy.durableTopicPrefetch=100
-# factory.prefetchPolicy.topicPrefetch=32766
-# factory.prefetchPolicy.queueBrowserPrefetch=500
-# factory.prefetchPolicy.queuePrefetch=1000
-# factory.prefetchPolicy.inputStreamPrefetch=100
-# factory.prefetchPolicy.maximumPendingMessageLimit=0
-# factory.prefetchPolicy.optimizeDurableTopicPrefetch=1000
-
-# factory.redeliveryPolicy.initialRedeliveryDelay=1000
-# factory.redeliveryPolicy.maximumRedeliveries=5
-# factory.redeliveryPolicy.useCollisionAvoidance=false
-# factory.redeliveryPolicy.useExponentialBackOff=false
-# factory.redeliveryPolicy.collisionAvoidancePercent=15
-# factory.redeliveryPolicy.backOffMultiplier=5
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+# Consumer System Settings
+sysTest.spiClass=org.apache.activemq.tool.spi.ActiveMQReflectionSPI
+sysTest.reportType=xml
+sysTest.destDistro=all
+sysTest.samplers=tp
+sysTest.numClients=10
+sysTest.totalDests=10
+sysTest.reportDir=./
+
+# Consumer Client Settings
+producer.deliveryMode=nonpersistent
+producer.messageSize=1024
+producer.destName=topic://TEST.FOO
+producer.sessTransacted=false
+producer.sessAckMode=autoAck
+producer.createNewMsg=false
+producer.destComposite=false
+# 5 mins send duration
+producer.sendType=time
+producer.sendDuration=300000
+# 1 million messages send
+# producer.sendType=count
+# producer.sendCount=1000000
+
+# Throughput Sampler Settings
+# 5 mins sampling duration
+# 1 min ramp up and ramp down time
+# 1 sec sampling interval
+tpSampler.duration=300000
+tpSampler.rampUpTime=60000
+tpSampler.rampDownTime=60000
+tpSampler.interval=1000
+
+# CPU Sampler Settings
+# 5 mins sampling duration
+# 1 min ramp up and ramp down time
+# 1 sec sampling interval
+# cpuSampler.duration=300000
+# cpuSampler.rampUpTime=60000
+# cpuSampler.rampDownTime=60000
+# cpuSampler.interval=1000
+
+# AMQ Connection Factory Settings
+# Use default settings
+# factory.brokerURL=tcp://localhost:61616
+# factory.useAsyncSend=false
+# factory.asyncDispatch=false
+# factory.alwaysSessionAsync=true
+# factory.useCompression=false
+# factory.optimizeAcknowledge=false
+# factory.objectMessageSerializationDefered=false
+# factory.disableTimeStampsByDefault=false
+# factory.optimizedMessageDispatch=true
+# factory.useRetroactiveConsumer=false
+# factory.copyMessageOnSend=true
+# factory.closeTimeout=15000
+
+# factory.userName=null
+# factory.clientID=null
+# factory.password=null
+
+# factory.prefetchPolicy.durableTopicPrefetch=100
+# factory.prefetchPolicy.topicPrefetch=32766
+# factory.prefetchPolicy.queueBrowserPrefetch=500
+# factory.prefetchPolicy.queuePrefetch=1000
+# factory.prefetchPolicy.inputStreamPrefetch=100
+# factory.prefetchPolicy.maximumPendingMessageLimit=0
+# factory.prefetchPolicy.optimizeDurableTopicPrefetch=1000
+
+# factory.redeliveryPolicy.initialRedeliveryDelay=1000
+# factory.redeliveryPolicy.maximumRedeliveries=5
+# factory.redeliveryPolicy.useCollisionAvoidance=false
+# factory.redeliveryPolicy.useExponentialBackOff=false
+# factory.redeliveryPolicy.collisionAvoidancePercent=15
+# factory.redeliveryPolicy.backOffMultiplier=5
Propchange: incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-topic-nonpersistent.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-topic-persistent.properties
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-topic-persistent.properties?view=diff&rev=474986&r1=474985&r2=474986
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-topic-persistent.properties (original)
+++ incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-topic-persistent.properties Tue Nov 14 13:17:31 2006
@@ -1,92 +1,92 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# Consumer System Settings
-sysTest.spiClass=org.apache.activemq.tool.spi.ActiveMQReflectionSPI
-sysTest.reportType=xml
-sysTest.destDistro=all
-sysTest.samplers=tp
-sysTest.numClients=10
-sysTest.totalDests=10
-sysTest.reportDir=./
-
-# Consumer Client Settings
-producer.deliveryMode=persistent
-producer.messageSize=1024
-producer.destName=topic://TEST.FOO
-producer.sessTransacted=false
-producer.sessAckMode=autoAck
-producer.createNewMsg=false
-producer.destComposite=false
-# 5 mins send duration
-producer.sendType=time
-producer.sendDuration=300000
-# 1 million messages send
-# producer.sendType=count
-# producer.sendCount=1000000
-
-# Throughput Sampler Settings
-# 5 mins sampling duration
-# 1 min ramp up and ramp down time
-# 1 sec sampling interval
-tpSampler.duration=300000
-tpSampler.rampUpTime=60000
-tpSampler.rampDownTime=60000
-tpSampler.interval=1000
-
-# CPU Sampler Settings
-# 5 mins sampling duration
-# 1 min ramp up and ramp down time
-# 1 sec sampling interval
-# cpuSampler.duration=300000
-# cpuSampler.rampUpTime=60000
-# cpuSampler.rampDownTime=60000
-# cpuSampler.interval=1000
-
-# AMQ Connection Factory Settings
-# Use default settings
-# factory.brokerURL=tcp://localhost:61616
-# factory.useAsyncSend=false
-# factory.asyncDispatch=false
-# factory.alwaysSessionAsync=true
-# factory.useCompression=false
-# factory.optimizeAcknowledge=false
-# factory.objectMessageSerializationDefered=false
-# factory.disableTimeStampsByDefault=false
-# factory.optimizedMessageDispatch=true
-# factory.useRetroactiveConsumer=false
-# factory.copyMessageOnSend=true
-# factory.closeTimeout=15000
-
-# factory.userName=null
-# factory.clientID=null
-# factory.password=null
-
-# factory.prefetchPolicy.durableTopicPrefetch=100
-# factory.prefetchPolicy.topicPrefetch=32766
-# factory.prefetchPolicy.queueBrowserPrefetch=500
-# factory.prefetchPolicy.queuePrefetch=1000
-# factory.prefetchPolicy.inputStreamPrefetch=100
-# factory.prefetchPolicy.maximumPendingMessageLimit=0
-# factory.prefetchPolicy.optimizeDurableTopicPrefetch=1000
-
-# factory.redeliveryPolicy.initialRedeliveryDelay=1000
-# factory.redeliveryPolicy.maximumRedeliveries=5
-# factory.redeliveryPolicy.useCollisionAvoidance=false
-# factory.redeliveryPolicy.useExponentialBackOff=false
-# factory.redeliveryPolicy.collisionAvoidancePercent=15
-# factory.redeliveryPolicy.backOffMultiplier=5
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+# Consumer System Settings
+sysTest.spiClass=org.apache.activemq.tool.spi.ActiveMQReflectionSPI
+sysTest.reportType=xml
+sysTest.destDistro=all
+sysTest.samplers=tp
+sysTest.numClients=10
+sysTest.totalDests=10
+sysTest.reportDir=./
+
+# Consumer Client Settings
+producer.deliveryMode=persistent
+producer.messageSize=1024
+producer.destName=topic://TEST.FOO
+producer.sessTransacted=false
+producer.sessAckMode=autoAck
+producer.createNewMsg=false
+producer.destComposite=false
+# 5 mins send duration
+producer.sendType=time
+producer.sendDuration=300000
+# 1 million messages send
+# producer.sendType=count
+# producer.sendCount=1000000
+
+# Throughput Sampler Settings
+# 5 mins sampling duration
+# 1 min ramp up and ramp down time
+# 1 sec sampling interval
+tpSampler.duration=300000
+tpSampler.rampUpTime=60000
+tpSampler.rampDownTime=60000
+tpSampler.interval=1000
+
+# CPU Sampler Settings
+# 5 mins sampling duration
+# 1 min ramp up and ramp down time
+# 1 sec sampling interval
+# cpuSampler.duration=300000
+# cpuSampler.rampUpTime=60000
+# cpuSampler.rampDownTime=60000
+# cpuSampler.interval=1000
+
+# AMQ Connection Factory Settings
+# Use default settings
+# factory.brokerURL=tcp://localhost:61616
+# factory.useAsyncSend=false
+# factory.asyncDispatch=false
+# factory.alwaysSessionAsync=true
+# factory.useCompression=false
+# factory.optimizeAcknowledge=false
+# factory.objectMessageSerializationDefered=false
+# factory.disableTimeStampsByDefault=false
+# factory.optimizedMessageDispatch=true
+# factory.useRetroactiveConsumer=false
+# factory.copyMessageOnSend=true
+# factory.closeTimeout=15000
+
+# factory.userName=null
+# factory.clientID=null
+# factory.password=null
+
+# factory.prefetchPolicy.durableTopicPrefetch=100
+# factory.prefetchPolicy.topicPrefetch=32766
+# factory.prefetchPolicy.queueBrowserPrefetch=500
+# factory.prefetchPolicy.queuePrefetch=1000
+# factory.prefetchPolicy.inputStreamPrefetch=100
+# factory.prefetchPolicy.maximumPendingMessageLimit=0
+# factory.prefetchPolicy.optimizeDurableTopicPrefetch=1000
+
+# factory.redeliveryPolicy.initialRedeliveryDelay=1000
+# factory.redeliveryPolicy.maximumRedeliveries=5
+# factory.redeliveryPolicy.useCollisionAvoidance=false
+# factory.redeliveryPolicy.useExponentialBackOff=false
+# factory.redeliveryPolicy.collisionAvoidancePercent=15
+# factory.redeliveryPolicy.backOffMultiplier=5
Propchange: incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-topic-persistent.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.1/activemq-ra/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-ra/src/main/resources/META-INF/NOTICE.txt?view=diff&rev=474986&r1=474985&r2=474986
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-ra/src/main/resources/META-INF/NOTICE.txt (original)
+++ incubator/activemq/branches/activemq-4.1/activemq-ra/src/main/resources/META-INF/NOTICE.txt Tue Nov 14 13:17:31 2006
@@ -1,12 +1,12 @@
-=========================================================================
-== NOTICE file corresponding to the section 4 d of ==
-== the Apache License, Version 2.0, ==
-== in this case for the Apache ActiveMQ distribution. ==
-=========================================================================
-
-Apache ActiveMQ
-Copyright 2005-2006 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
+=========================================================================
+== NOTICE file corresponding to the section 4 d of ==
+== the Apache License, Version 2.0, ==
+== in this case for the Apache ActiveMQ distribution. ==
+=========================================================================
+
+Apache ActiveMQ
+Copyright 2005-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Propchange: incubator/activemq/branches/activemq-4.1/activemq-ra/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/DISCLAIMER.txt
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/DISCLAIMER.txt?view=diff&rev=474986&r1=474985&r2=474986
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/DISCLAIMER.txt (original)
+++ incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/DISCLAIMER.txt Tue Nov 14 13:17:31 2006
@@ -1,7 +1,7 @@
-ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
-accepted projects until a further review indicates that the infrastructure,
-communications, and decision making process have stabilized in a manner
-consistent with other successful ASF projects. While incubation status is not
-necessarily a reflection of the completeness or stability of the code, it does
+ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
+accepted projects until a further review indicates that the infrastructure,
+communications, and decision making process have stabilized in a manner
+consistent with other successful ASF projects. While incubation status is not
+necessarily a reflection of the completeness or stability of the code, it does
indicate that the project has yet to be fully endorsed by the ASF.
Propchange: incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/DISCLAIMER.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/LICENSE.txt?view=diff&rev=474986&r1=474985&r2=474986
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/LICENSE.txt (original)
+++ incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/LICENSE.txt Tue Nov 14 13:17:31 2006
@@ -1,203 +1,203 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
-
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
+
Propchange: incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/NOTICE.txt?view=diff&rev=474986&r1=474985&r2=474986
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/NOTICE.txt (original)
+++ incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/NOTICE.txt Tue Nov 14 13:17:31 2006
@@ -1,60 +1,60 @@
-=========================================================================
-== NOTICE file corresponding to the section 4 d of ==
-== the Apache License, Version 2.0, ==
-== in this case for the Apache ActiveMQ distribution. ==
-=========================================================================
-
-Apache ActiveMQ
-Copyright 2005-2006 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-=========================================================================
-== Derby Notice ==
-=========================================================================
-
-Portions of Derby were orginally developed by
-International Business Machines Corporation and are
-licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement",
-informally known as the "Derby CLA".
-
-The portion of the functionTests under 'nist' was originally
-developed by the National Institute of Standards and Technology (NIST),
-an agency of the United States Department of Commerce, and adapted by
-International Business Machines Corporation in accordance with the NIST
-Software Acknowledgment and Redistribution document at
-http://www.itl.nist.gov/div897/ctg/sql_form.htm
-
-=========================================================================
-== Spring Notice ==
-=========================================================================
-
-This product includes software developed by
-the Apache Software Foundation (http://www.apache.org).
-
-This product also includes software developed by
-Clinton Begin (http://www.ibatis.com).
-
-The end-user documentation included with a redistribution, if any,
-must include the following acknowledgement:
-
- "This product includes software developed by the Spring Framework
- Project (http://www.springframework.org)."
-
-Alternately, this acknowledgement may appear in the software itself,
-if and wherever such third-party acknowledgements normally appear.
-
-The names "Spring" and "Spring Framework" must not be used to
-endorse or promote products derived from this software without
-prior written permission. For written permission, please contact
-rod.johnson@interface21.com or juergen.hoeller@interface21.com.
-
-
-=========================================================================
-== MX4J Notice ==
-=========================================================================
-
-This product includes software developed by the MX4J project
-(http://sourceforge.net/projects/mx4j).
+=========================================================================
+== NOTICE file corresponding to the section 4 d of ==
+== the Apache License, Version 2.0, ==
+== in this case for the Apache ActiveMQ distribution. ==
+=========================================================================
+
+Apache ActiveMQ
+Copyright 2005-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+=========================================================================
+== Derby Notice ==
+=========================================================================
+
+Portions of Derby were orginally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "Derby CLA".
+
+The portion of the functionTests under 'nist' was originally
+developed by the National Institute of Standards and Technology (NIST),
+an agency of the United States Department of Commerce, and adapted by
+International Business Machines Corporation in accordance with the NIST
+Software Acknowledgment and Redistribution document at
+http://www.itl.nist.gov/div897/ctg/sql_form.htm
+
+=========================================================================
+== Spring Notice ==
+=========================================================================
+
+This product includes software developed by
+the Apache Software Foundation (http://www.apache.org).
+
+This product also includes software developed by
+Clinton Begin (http://www.ibatis.com).
+
+The end-user documentation included with a redistribution, if any,
+must include the following acknowledgement:
+
+ "This product includes software developed by the Spring Framework
+ Project (http://www.springframework.org)."
+
+Alternately, this acknowledgement may appear in the software itself,
+if and wherever such third-party acknowledgements normally appear.
+
+The names "Spring" and "Spring Framework" must not be used to
+endorse or promote products derived from this software without
+prior written permission. For written permission, please contact
+rod.johnson@interface21.com or juergen.hoeller@interface21.com.
+
+
+=========================================================================
+== MX4J Notice ==
+=========================================================================
+
+This product includes software developed by the MX4J project
+(http://sourceforge.net/projects/mx4j).
Propchange: incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.1/activemq-soaktest/project.properties
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-soaktest/project.properties?view=diff&rev=474986&r1=474985&r2=474986
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-soaktest/project.properties (original)
+++ incubator/activemq/branches/activemq-4.1/activemq-soaktest/project.properties Tue Nov 14 13:17:31 2006
@@ -1,21 +1,21 @@
-##---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##---------------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-# Build Properties
-# -------------------------------------------------------------------
-
+##---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##---------------------------------------------------------------------------
+
+# -------------------------------------------------------------------
+# Build Properties
+# -------------------------------------------------------------------
+
Propchange: incubator/activemq/branches/activemq-4.1/activemq-soaktest/project.properties
------------------------------------------------------------------------------
svn:eol-style = native