Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 55274 invoked from network); 14 Nov 2006 21:18:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Nov 2006 21:18:22 -0000 Received: (qmail 93753 invoked by uid 500); 14 Nov 2006 21:18:32 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 93733 invoked by uid 500); 14 Nov 2006 21:18:32 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 93692 invoked by uid 99); 14 Nov 2006 21:18:32 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Nov 2006 13:18:32 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Nov 2006 13:18:15 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 349CA1A9846; Tue, 14 Nov 2006 13:17:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r474986 [1/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/... Date: Tue, 14 Nov 2006 21:17:39 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061114211744.349CA1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Tue Nov 14 13:17:31 2006 New Revision: 474986 URL: http://svn.apache.org/viewvc?view=rev&rev=474986 Log: setting svn:eol-style Modified: incubator/activemq/branches/activemq-4.1/DISCLAIMER.txt (props changed) incubator/activemq/branches/activemq-4.1/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/ConsoleCommandHandler.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-console/src/main/resources/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-console/src/test/resources/log4j.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/Disposable.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationFactory.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationFactoryImpl.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/NullMessageReference.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueMessageReference.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/PendingMessageCursor.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/VMPendingMessageCursor.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FilePendingDurableSubscriberMessageStoragePolicy.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PendingDurableSubscriberMessageStoragePolicy.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PendingQueueMessageStoragePolicy.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StorePendingDurableSubscriberMessageStoragePolicy.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/VMPendingDurableSubscriberMessageStoragePolicy.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/VMPendingQueueMessageStoragePolicy.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandHandler.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandMessageListener.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/util/MulticastTraceBrokerPlugin.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/util/UDPTraceBrokerPlugin.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/command/JournalTrace.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/IndexTypes.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/StoreEntry.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/StoreLocation.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreLockedExcpetion.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/CachedContainerListIterator.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexLinkedList.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/RangeLimitedMap.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/RangeLimitedMapKeySet.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/RangeLimitedMapKeySetIterator.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/package.html (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationPlugin.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateSecurityContext.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/state/Tracked.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/state/TransactionState.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/ConsumerMessageRef.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/ConsumerMessageRefMarshaller.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/StoreEntryMarshaller.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubAck.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubAckMarshaller.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubContainer.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/TransportDisposedIOException.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameTranslator.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/stomp/LegacyFrameTranslator.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportServer.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/ByteArrayInputStream.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/ByteArrayOutputStream.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/ByteSequence.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/ByteSequenceData.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayInputStream.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayOutputStream.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/FactoryFinder.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/wireformat/package.html (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/main/resources/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/eclipse-resources/log4j.properties (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/broker/StubBroker.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/kaha/VolumeTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/kaha/impl/CachedListContainerImplTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/RangeLimitedMapTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/VMIndexLinkedListTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/network/NetworkReconnectTest.java (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/network/SSHTunnelNetworkReconnectTest.java (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/perf/InactiveDurableTopicTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/perf/InactiveQueueTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/pool/ConnectionFailureEvictsFromPool.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/security/JaasCertificateAuthenticationBrokerTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/security/StubDoNothingCallbackHandler.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/security/StubJaasConfiguration.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/security/StubLoginModule.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/security/StubSecurityContext.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportServerTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/transport/tcp/StubSSLServerSocket.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/transport/tcp/StubSSLSession.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/transport/tcp/StubSSLSocket.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/transport/tcp/StubSSLSocketFactory.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/transport/tcp/StubSslTransport.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/transport/tcp/StubX509Certificate.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-core/src/test/resources/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateCallback.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateLoginModule.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-jaas/src/main/java/org/apache/activemq/jaas/JaasCertificateCallbackHandler.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallbackHandler.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-jaas/src/main/java/org/apache/activemq/jaas/TextFileCertificateLoginModule.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-jaas/src/main/resources/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-jaas/src/test/java/org/apache/activemq/jaas/CertificateLoginModuleTest.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-jaas/src/test/java/org/apache/activemq/jaas/StubCertificateLoginModule.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CGeneratorTask.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CHeadersGenerator.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpClassesGenerator.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpGeneratorTask.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpMarshallingGenerator.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSourcesGenerator.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppGeneratorTask.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaGeneratorTask.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaMarshallingGenerator.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/MultiSourceGenerator.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/SingleSourceGenerator.java (props changed) incubator/activemq/branches/activemq-4.1/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-optional/src/main/resources/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/readme.html (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/consumer-conf/AMQ-Cons-1-1-queue.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/consumer-conf/AMQ-Cons-1-1-topic-durable.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/consumer-conf/AMQ-Cons-1-1-topic-nondurable.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/consumer-conf/AMQ-Cons-10-1-queue.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/consumer-conf/AMQ-Cons-10-1-topic-durable.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/consumer-conf/AMQ-Cons-10-1-topic-nondurable.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/consumer-conf/AMQ-Cons-10-10-queue.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/consumer-conf/AMQ-Cons-10-10-topic-durable.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/consumer-conf/AMQ-Cons-10-10-topic-nondurable.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-1-1-queue-nonpersistent.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-1-1-queue-persistent.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-1-1-topic-nonpersistent.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-1-1-topic-persistent.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-queue-nonpersistent.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-queue-persistent.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-topic-nonpersistent.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-1-topic-persistent.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-queue-nonpersistent.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-queue-persistent.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-topic-nonpersistent.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-perftest/src/main/resources/producer-conf/AMQ-Prod-10-10-topic-persistent.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-ra/src/main/resources/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/DISCLAIMER.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/LICENSE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-soaktest/project.properties (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-tooling/maven-activemq-memtest-plugin/readme.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-tooling/maven-activemq-memtest-plugin/src/main/resources/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-tooling/maven-activemq-perf-plugin/src/main/resources/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-tooling/maven-activemq-plugin/src/main/resources/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-web-console/LICENSE.txt (props changed) incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/META-INF/DISCLAIMER.txt (props changed) incubator/activemq/branches/activemq-4.1/activemq-web-demo/src/main/webapp/META-INF/DISCLAIMER.txt (props changed) incubator/activemq/branches/activemq-4.1/activemq-web/src/main/resources/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/activemq-xmpp/src/main/resources/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/assembly/src/main/resources/META-INF/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/assembly/src/release/NOTICE.txt (contents, props changed) incubator/activemq/branches/activemq-4.1/assembly/src/release/example/ruby/README.txt (props changed) incubator/activemq/branches/activemq-4.1/assembly/src/release/example/src/CommnadLineSupport.java (props changed) incubator/activemq/branches/activemq-4.1/assembly/src/release/example/src/RequesterTool.java (props changed) incubator/activemq/branches/activemq-4.1/assembly/src/release/example/src/TopicListener.java (props changed) incubator/activemq/branches/activemq-4.1/assembly/src/release/example/src/TopicPublisher.java (props changed) Propchange: incubator/activemq/branches/activemq-4.1/DISCLAIMER.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/activemq/branches/activemq-4.1/NOTICE.txt URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/NOTICE.txt?view=diff&rev=474986&r1=474985&r2=474986 ============================================================================== --- incubator/activemq/branches/activemq-4.1/NOTICE.txt (original) +++ incubator/activemq/branches/activemq-4.1/NOTICE.txt Tue Nov 14 13:17:31 2006 @@ -1,11 +1,11 @@ - ========================================================================= - == NOTICE file corresponding to the section 4 d of == - == the Apache License, Version 2.0, == - == in this case for the Apache ActiveMQ distribution. == - ========================================================================= - - This product includes software developed by - The Apache Software Foundation (http://www.apache.org/). - - Please read the different LICENSE files present in the licenses directory of - this distribution. + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Apache ActiveMQ distribution. == + ========================================================================= + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + Please read the different LICENSE files present in the licenses directory of + this distribution. Propchange: incubator/activemq/branches/activemq-4.1/NOTICE.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/ConsoleCommandHandler.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/activemq/branches/activemq-4.1/activemq-console/src/main/resources/META-INF/NOTICE.txt URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-console/src/main/resources/META-INF/NOTICE.txt?view=diff&rev=474986&r1=474985&r2=474986 ============================================================================== --- incubator/activemq/branches/activemq-4.1/activemq-console/src/main/resources/META-INF/NOTICE.txt (original) +++ incubator/activemq/branches/activemq-4.1/activemq-console/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-console/src/main/resources/META-INF/NOTICE.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/activemq/branches/activemq-4.1/activemq-console/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-console/src/test/resources/log4j.properties?view=diff&rev=474986&r1=474985&r2=474986 ============================================================================== --- incubator/activemq/branches/activemq-4.1/activemq-console/src/test/resources/log4j.properties (original) +++ incubator/activemq/branches/activemq-4.1/activemq-console/src/test/resources/log4j.properties Tue Nov 14 13:17:31 2006 @@ -1,28 +1,28 @@ -## --------------------------------------------------------------------------- -## 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. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests.. -# -log4j.rootLogger=DEBUG, stdout - -log4j.logger.org.apache.activemq.spring=WARN - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +## --------------------------------------------------------------------------- +## 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. +## --------------------------------------------------------------------------- + +# +# The logging properties used during tests.. +# +log4j.rootLogger=DEBUG, stdout + +log4j.logger.org.apache.activemq.spring=WARN + +# CONSOLE appender not used by default +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n Propchange: incubator/activemq/branches/activemq-4.1/activemq-console/src/test/resources/log4j.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/Disposable.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationFactoryImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/NullMessageReference.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueMessageReference.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/PendingMessageCursor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/VMPendingMessageCursor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FilePendingDurableSubscriberMessageStoragePolicy.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PendingDurableSubscriberMessageStoragePolicy.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PendingQueueMessageStoragePolicy.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StorePendingDurableSubscriberMessageStoragePolicy.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/VMPendingDurableSubscriberMessageStoragePolicy.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/VMPendingQueueMessageStoragePolicy.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandHandler.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandMessageListener.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/util/MulticastTraceBrokerPlugin.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/util/UDPTraceBrokerPlugin.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/command/JournalTrace.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/IndexTypes.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/StoreEntry.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/StoreLocation.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/StoreLockedExcpetion.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/CachedContainerListIterator.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java?view=diff&rev=474986&r1=474985&r2=474986 ============================================================================== --- incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java (original) +++ incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java Tue Nov 14 13:17:31 2006 @@ -15,257 +15,257 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.kaha.impl.index; - -import java.io.IOException; +package org.apache.activemq.kaha.impl.index; + +import java.io.IOException; import org.apache.activemq.kaha.StoreEntry; -/** - * A linked list used by IndexItems - * - * @version $Revision$ - */ -public class DiskIndexLinkedList implements IndexLinkedList{ - protected IndexManager indexManager; - protected transient IndexItem root; - protected transient IndexItem last; - protected transient int size=0; - - /** - * Constructs an empty list. - */ - public DiskIndexLinkedList(IndexManager im,IndexItem header){ - this.indexManager=im; - this.root=header; - } - - public IndexItem getRoot(){ - return root; - } - - void setRoot(IndexItem e){ - this.root=e; - } - - /** - * Returns the first element in this list. - * - * @return the first element in this list. - */ - public IndexItem getFirst(){ - if(size==0) - return null; - return getNextEntry(root); - } - - /** - * Returns the last element in this list. - * - * @return the last element in this list. - */ - public IndexItem getLast(){ - if(size==0) - return null; - return last; - } - - /** - * Removes and returns the first element from this list. - * - * @return the first element from this list. - */ - public StoreEntry removeFirst(){ - if(size==0){ - return null; - } - IndexItem result=getNextEntry(root); - remove(result); - return result; - } - - /** - * Removes and returns the last element from this list. - * - * @return the last element from this list. - */ - public Object removeLast(){ - if(size==0) - return null; - StoreEntry result=last; - remove(last); - return result; - } - - /** - * Inserts the given element at the beginning of this list. - * - * @param o the element to be inserted at the beginning of this list. - */ - public void addFirst(IndexItem item){ - if(size==0){ - last=item; - } - size++; - } - - /** - * Appends the given element to the end of this list. (Identical in function to the add method; included - * only for consistency.) - * - * @param o the element to be inserted at the end of this list. - */ - public void addLast(IndexItem item){ - size++; - last=item; - } - - /** - * Returns the number of elements in this list. - * - * @return the number of elements in this list. - */ - public int size(){ - return size; - } - - /** - * is the list empty? - * - * @return true if there are no elements in the list - */ - public boolean isEmpty(){ - return size==0; - } - - /** - * Appends the specified element to the end of this list. - * - * @param o element to be appended to this list. - * @return true (as per the general contract of Collection.add). - */ +/** + * A linked list used by IndexItems + * + * @version $Revision$ + */ +public class DiskIndexLinkedList implements IndexLinkedList{ + protected IndexManager indexManager; + protected transient IndexItem root; + protected transient IndexItem last; + protected transient int size=0; + + /** + * Constructs an empty list. + */ + public DiskIndexLinkedList(IndexManager im,IndexItem header){ + this.indexManager=im; + this.root=header; + } + + public IndexItem getRoot(){ + return root; + } + + void setRoot(IndexItem e){ + this.root=e; + } + + /** + * Returns the first element in this list. + * + * @return the first element in this list. + */ + public IndexItem getFirst(){ + if(size==0) + return null; + return getNextEntry(root); + } + + /** + * Returns the last element in this list. + * + * @return the last element in this list. + */ + public IndexItem getLast(){ + if(size==0) + return null; + return last; + } + + /** + * Removes and returns the first element from this list. + * + * @return the first element from this list. + */ + public StoreEntry removeFirst(){ + if(size==0){ + return null; + } + IndexItem result=getNextEntry(root); + remove(result); + return result; + } + + /** + * Removes and returns the last element from this list. + * + * @return the last element from this list. + */ + public Object removeLast(){ + if(size==0) + return null; + StoreEntry result=last; + remove(last); + return result; + } + + /** + * Inserts the given element at the beginning of this list. + * + * @param o the element to be inserted at the beginning of this list. + */ + public void addFirst(IndexItem item){ + if(size==0){ + last=item; + } + size++; + } + + /** + * Appends the given element to the end of this list. (Identical in function to the add method; included + * only for consistency.) + * + * @param o the element to be inserted at the end of this list. + */ + public void addLast(IndexItem item){ + size++; + last=item; + } + + /** + * Returns the number of elements in this list. + * + * @return the number of elements in this list. + */ + public int size(){ + return size; + } + + /** + * is the list empty? + * + * @return true if there are no elements in the list + */ + public boolean isEmpty(){ + return size==0; + } + + /** + * Appends the specified element to the end of this list. + * + * @param o element to be appended to this list. + * @return true (as per the general contract of Collection.add). + */ public boolean add(IndexItem item){ - addLast(item); - return true; - } - - /** - * Removes all of the elements from this list. - */ - public void clear(){ - last=null; - size=0; - } - - // Positional Access Operations - /** - * Returns the element at the specified position in this list. - * - * @param index index of element to return. - * @return the element at the specified position in this list. - * - * @throws IndexOutOfBoundsException if the specified index is is out of range (index < 0 || index >= size()). - */ - public IndexItem get(int index){ - return entry(index); - } - - /** - * Inserts the specified element at the specified position in this list. Shifts the element currently at that - * position (if any) and any subsequent elements to the right (adds one to their indices). - * - * @param index index at which the specified element is to be inserted. - * @param element element to be inserted. - * - * @throws IndexOutOfBoundsException if the specified index is out of range (index < 0 || index > size()). - */ - public void add(int index,IndexItem element){ - if(index==size-1){ - last=element; - } - size++; - } - - /** - * Removes the element at the specified position in this list. Shifts any subsequent elements to the left (subtracts - * one from their indices). Returns the element that was removed from the list. - * - * @param index the index of the element to removed. - * @return the element previously at the specified position. - * - * @throws IndexOutOfBoundsException if the specified index is out of range (index < 0 || index >= size()). - */ - public Object remove(int index){ - IndexItem e=entry(index); - remove(e); - return e; - } - - /** - * Return the indexed entry. - */ - private IndexItem entry(int index){ - if(index<0||index>=size) - throw new IndexOutOfBoundsException("Index: "+index+", Size: "+size); - IndexItem e=root; - - for(int i=0;i<=index;i++) - e=getNextEntry(e); - if(e != null &&last!=null && last.equals(e)){ - last = e; - } - return e; - } - - // Search Operations - /** - * Returns the index in this list of the first occurrence of the specified element, or -1 if the List does not - * contain this element. More formally, returns the lowest index i such that - * (o==null ? get(i)==null : o.equals(get(i))), or -1 if there is no such index. - * - * @param o element to search for. - * @return the index in this list of the first occurrence of the specified element, or -1 if the list does not - * contain this element. - */ - public int indexOf(StoreEntry o){ - int index=0; - if(size>0){ - for(IndexItem e=getNextEntry(root);e!=null;e=getNextEntry(e)){ - if(o.equals(e)){ - return index; - } - index++; - } - } - return -1; - } - - /** - * Retrieve the next entry after this entry - * - * @param entry - * @return next entry - */ - public IndexItem getNextEntry(IndexItem current){ - IndexItem result=null; - if(current!=null&¤t.getNextItem()>=0){ - try{ - result=indexManager.getIndex(current.getNextItem()); - }catch(IOException e){ - throw new RuntimeException("Failed to get next index from " + indexManager + " for " + current,e); - } - } - // essential last get's updated consistently - if(result != null &&last!=null && last.equals(result)){ - result = last; - } - return result; - } - - /** - * Retrive the prev entry after this entry - * - * @param entry - * @return prev entry - */ + addLast(item); + return true; + } + + /** + * Removes all of the elements from this list. + */ + public void clear(){ + last=null; + size=0; + } + + // Positional Access Operations + /** + * Returns the element at the specified position in this list. + * + * @param index index of element to return. + * @return the element at the specified position in this list. + * + * @throws IndexOutOfBoundsException if the specified index is is out of range (index < 0 || index >= size()). + */ + public IndexItem get(int index){ + return entry(index); + } + + /** + * Inserts the specified element at the specified position in this list. Shifts the element currently at that + * position (if any) and any subsequent elements to the right (adds one to their indices). + * + * @param index index at which the specified element is to be inserted. + * @param element element to be inserted. + * + * @throws IndexOutOfBoundsException if the specified index is out of range (index < 0 || index > size()). + */ + public void add(int index,IndexItem element){ + if(index==size-1){ + last=element; + } + size++; + } + + /** + * Removes the element at the specified position in this list. Shifts any subsequent elements to the left (subtracts + * one from their indices). Returns the element that was removed from the list. + * + * @param index the index of the element to removed. + * @return the element previously at the specified position. + * + * @throws IndexOutOfBoundsException if the specified index is out of range (index < 0 || index >= size()). + */ + public Object remove(int index){ + IndexItem e=entry(index); + remove(e); + return e; + } + + /** + * Return the indexed entry. + */ + private IndexItem entry(int index){ + if(index<0||index>=size) + throw new IndexOutOfBoundsException("Index: "+index+", Size: "+size); + IndexItem e=root; + + for(int i=0;i<=index;i++) + e=getNextEntry(e); + if(e != null &&last!=null && last.equals(e)){ + last = e; + } + return e; + } + + // Search Operations + /** + * Returns the index in this list of the first occurrence of the specified element, or -1 if the List does not + * contain this element. More formally, returns the lowest index i such that + * (o==null ? get(i)==null : o.equals(get(i))), or -1 if there is no such index. + * + * @param o element to search for. + * @return the index in this list of the first occurrence of the specified element, or -1 if the list does not + * contain this element. + */ + public int indexOf(StoreEntry o){ + int index=0; + if(size>0){ + for(IndexItem e=getNextEntry(root);e!=null;e=getNextEntry(e)){ + if(o.equals(e)){ + return index; + } + index++; + } + } + return -1; + } + + /** + * Retrieve the next entry after this entry + * + * @param entry + * @return next entry + */ + public IndexItem getNextEntry(IndexItem current){ + IndexItem result=null; + if(current!=null&¤t.getNextItem()>=0){ + try{ + result=indexManager.getIndex(current.getNextItem()); + }catch(IOException e){ + throw new RuntimeException("Failed to get next index from " + indexManager + " for " + current,e); + } + } + // essential last get's updated consistently + if(result != null &&last!=null && last.equals(result)){ + result = last; + } + return result; + } + + /** + * Retrive the prev entry after this entry + * + * @param entry + * @return prev entry + */ public IndexItem getPrevEntry(IndexItem current){ IndexItem result=null; if(current!=null&¤t.getPreviousItem()>=0){ @@ -280,22 +280,22 @@ return root; } return result; - } - - public StoreEntry getEntry(StoreEntry current){ - StoreEntry result=null; - if(current != null && current.getOffset() >= 0){ - try{ - result=indexManager.getIndex(current.getOffset()); - }catch(IOException e){ - throw new RuntimeException("Failed to index",e); - } - } - //essential root get's updated consistently - if(result != null &&root!=null && root.equals(result)){ - return root; - } - return result; + } + + public StoreEntry getEntry(StoreEntry current){ + StoreEntry result=null; + if(current != null && current.getOffset() >= 0){ + try{ + result=indexManager.getIndex(current.getOffset()); + }catch(IOException e){ + throw new RuntimeException("Failed to index",e); + } + } + //essential root get's updated consistently + if(result != null &&root!=null && root.equals(result)){ + return root; + } + return result; } /** @@ -316,18 +316,18 @@ return root; } return result; - } - - public void remove(IndexItem e){ - if(e==root||e.equals(root)) - return; - if(e==last||e.equals(last)){ - if(size>1){ - last=getPrevEntry(last); - }else{ - last=null; - } - } - size--; - } -} + } + + public void remove(IndexItem e){ + if(e==root||e.equals(root)) + return; + if(e==last||e.equals(last)){ + if(size>1){ + last=getPrevEntry(last); + }else{ + last=null; + } + } + size--; + } +} Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexLinkedList.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/RangeLimitedMap.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/RangeLimitedMapKeySet.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/RangeLimitedMapKeySetIterator.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/kaha/package.html ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationPlugin.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateSecurityContext.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/state/Tracked.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/state/TransactionState.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/ConsumerMessageRef.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/ConsumerMessageRefMarshaller.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java?view=diff&rev=474986&r1=474985&r2=474986 ============================================================================== --- incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java (original) +++ incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java Tue Nov 14 13:17:31 2006 @@ -1,249 +1,249 @@ -/** - * - * 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. - */ - -package org.apache.activemq.store.kahadaptor; - -import java.io.File; -import java.io.IOException; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; -import org.apache.activemq.broker.ConnectionContext; -import org.apache.activemq.command.ActiveMQDestination; -import org.apache.activemq.command.ActiveMQQueue; -import org.apache.activemq.command.ActiveMQTopic; -import org.apache.activemq.kaha.IndexTypes; -import org.apache.activemq.kaha.ListContainer; -import org.apache.activemq.kaha.MapContainer; -import org.apache.activemq.kaha.Store; -import org.apache.activemq.kaha.StoreFactory; -import org.apache.activemq.kaha.StringMarshaller; -import org.apache.activemq.memory.UsageManager; -import org.apache.activemq.openwire.OpenWireFormat; -import org.apache.activemq.store.MessageStore; -import org.apache.activemq.store.PersistenceAdapter; -import org.apache.activemq.store.TopicMessageStore; -import org.apache.activemq.store.TransactionStore; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; - -/** - * @org.apache.xbean.XBean - * - * @version $Revision: 1.4 $ - */ -public class KahaPersistenceAdapter implements PersistenceAdapter{ - - private static final Log log=LogFactory.getLog(KahaPersistenceAdapter.class); - static final String PREPARED_TRANSACTIONS_NAME="PreparedTransactions"; - KahaTransactionStore transactionStore; - ConcurrentHashMap topics=new ConcurrentHashMap(); - ConcurrentHashMap queues=new ConcurrentHashMap(); - ConcurrentHashMap messageStores=new ConcurrentHashMap(); - private boolean useExternalMessageReferences; - private OpenWireFormat wireFormat=new OpenWireFormat(); - private long maxDataFileLength=32*1024*1024; - private String indexType=IndexTypes.DISK_INDEX; - private File dir; - private Store theStore; - - public KahaPersistenceAdapter(File dir) throws IOException{ - if(!dir.exists()){ - dir.mkdirs(); - } - this.dir=dir; - } - - public Set getDestinations(){ - Set rc=new HashSet(); - try{ - Store store=getStore(); - for(Iterator i=store.getMapContainerIds().iterator();i.hasNext();){ - Object obj=i.next(); - if(obj instanceof ActiveMQDestination){ - rc.add(obj); - } - } - }catch(IOException e){ - log.error("Failed to get destinations ",e); - } - return rc; - } - - public synchronized MessageStore createQueueMessageStore(ActiveMQQueue destination) throws IOException{ - MessageStore rc=(MessageStore)queues.get(destination); - if(rc==null){ - rc=new KahaMessageStore(getMapContainer(destination,"queue-data"),destination); - messageStores.put(destination,rc); - if(transactionStore!=null){ - rc=transactionStore.proxy(rc); - } - queues.put(destination,rc); - } - return rc; - } - - public synchronized TopicMessageStore createTopicMessageStore(ActiveMQTopic destination) throws IOException{ - TopicMessageStore rc=(TopicMessageStore)topics.get(destination); - if(rc==null){ - Store store=getStore(); - ListContainer messageContainer=getListContainer(destination,"topic-data"); - MapContainer subsContainer=getMapContainer(destination.toString()+"-Subscriptions","topic-subs"); - ListContainer ackContainer=store.getListContainer(destination.toString(),"topic-acks"); - ackContainer.setMarshaller(new TopicSubAckMarshaller()); - rc=new KahaTopicMessageStore(store,messageContainer,ackContainer,subsContainer,destination); - messageStores.put(destination,rc); - if(transactionStore!=null){ - rc=transactionStore.proxy(rc); - } - topics.put(destination,rc); - } - return rc; - } - - protected MessageStore retrieveMessageStore(Object id){ - MessageStore result=(MessageStore)messageStores.get(id); - return result; - } - - public TransactionStore createTransactionStore() throws IOException{ - if(transactionStore==null){ - Store store=getStore(); - MapContainer container=store.getMapContainer(PREPARED_TRANSACTIONS_NAME,"transactions"); - container.setKeyMarshaller(new CommandMarshaller(wireFormat)); - container.setValueMarshaller(new TransactionMarshaller(wireFormat)); - container.load(); - transactionStore=new KahaTransactionStore(this,container); - } - return transactionStore; - } - - public void beginTransaction(ConnectionContext context){ - } - - public void commitTransaction(ConnectionContext context) throws IOException{ - if(theStore!=null){ - theStore.force(); - } - } - - public void rollbackTransaction(ConnectionContext context){ - } - - public void start() throws Exception{ - } - - public void stop() throws Exception{ - if(theStore!=null){ - theStore.close(); - } - } - - public long getLastMessageBrokerSequenceId() throws IOException{ - return 0; - } - - public void deleteAllMessages() throws IOException{ - if(theStore!=null){ - theStore.delete(); - } - } - - public boolean isUseExternalMessageReferences(){ - return useExternalMessageReferences; - } - - public void setUseExternalMessageReferences(boolean useExternalMessageReferences){ - this.useExternalMessageReferences=useExternalMessageReferences; - } - - protected MapContainer getMapContainer(Object id,String containerName) throws IOException{ - Store store=getStore(); - MapContainer container=store.getMapContainer(id,containerName); - container.setKeyMarshaller(new StringMarshaller()); - if(useExternalMessageReferences){ - container.setValueMarshaller(new StringMarshaller()); - }else{ - container.setValueMarshaller(new CommandMarshaller(wireFormat)); - } - container.load(); - return container; - } - - protected ListContainer getListContainer(Object id,String containerName) throws IOException{ - Store store=getStore(); - ListContainer container=store.getListContainer(id,containerName); - if(useExternalMessageReferences){ - container.setMarshaller(new StringMarshaller()); - }else{ - container.setMarshaller(new CommandMarshaller(wireFormat)); - } - container.load(); - return container; - } - - /** - * @param usageManager - * The UsageManager that is controlling the broker's memory - * usage. - */ - public void setUsageManager(UsageManager usageManager){ - } - - /** - * @return the maxDataFileLength - */ - public long getMaxDataFileLength(){ - return maxDataFileLength; - } - - /** - * @param maxDataFileLength - * the maxDataFileLength to set - * - * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor" - */ - public void setMaxDataFileLength(long maxDataFileLength){ - this.maxDataFileLength=maxDataFileLength; - } - - /** - * @return the indexType - */ - public String getIndexType(){ - return this.indexType; - } - - /** - * @param indexType the indexTypes to set - */ - public void setIndexType(String indexType){ - this.indexType=indexType; - } - - protected synchronized Store getStore() throws IOException{ - if(theStore==null){ - String name=dir.getAbsolutePath()+File.separator+"kaha.db"; - theStore=StoreFactory.open(name,"rw"); - theStore.setMaxDataFileLength(maxDataFileLength); - theStore.setIndexType(indexType); - } - return theStore; - } -} +/** + * + * 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. + */ + +package org.apache.activemq.store.kahadaptor; + +import java.io.File; +import java.io.IOException; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.kaha.IndexTypes; +import org.apache.activemq.kaha.ListContainer; +import org.apache.activemq.kaha.MapContainer; +import org.apache.activemq.kaha.Store; +import org.apache.activemq.kaha.StoreFactory; +import org.apache.activemq.kaha.StringMarshaller; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.store.TransactionStore; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; + +/** + * @org.apache.xbean.XBean + * + * @version $Revision: 1.4 $ + */ +public class KahaPersistenceAdapter implements PersistenceAdapter{ + + private static final Log log=LogFactory.getLog(KahaPersistenceAdapter.class); + static final String PREPARED_TRANSACTIONS_NAME="PreparedTransactions"; + KahaTransactionStore transactionStore; + ConcurrentHashMap topics=new ConcurrentHashMap(); + ConcurrentHashMap queues=new ConcurrentHashMap(); + ConcurrentHashMap messageStores=new ConcurrentHashMap(); + private boolean useExternalMessageReferences; + private OpenWireFormat wireFormat=new OpenWireFormat(); + private long maxDataFileLength=32*1024*1024; + private String indexType=IndexTypes.DISK_INDEX; + private File dir; + private Store theStore; + + public KahaPersistenceAdapter(File dir) throws IOException{ + if(!dir.exists()){ + dir.mkdirs(); + } + this.dir=dir; + } + + public Set getDestinations(){ + Set rc=new HashSet(); + try{ + Store store=getStore(); + for(Iterator i=store.getMapContainerIds().iterator();i.hasNext();){ + Object obj=i.next(); + if(obj instanceof ActiveMQDestination){ + rc.add(obj); + } + } + }catch(IOException e){ + log.error("Failed to get destinations ",e); + } + return rc; + } + + public synchronized MessageStore createQueueMessageStore(ActiveMQQueue destination) throws IOException{ + MessageStore rc=(MessageStore)queues.get(destination); + if(rc==null){ + rc=new KahaMessageStore(getMapContainer(destination,"queue-data"),destination); + messageStores.put(destination,rc); + if(transactionStore!=null){ + rc=transactionStore.proxy(rc); + } + queues.put(destination,rc); + } + return rc; + } + + public synchronized TopicMessageStore createTopicMessageStore(ActiveMQTopic destination) throws IOException{ + TopicMessageStore rc=(TopicMessageStore)topics.get(destination); + if(rc==null){ + Store store=getStore(); + ListContainer messageContainer=getListContainer(destination,"topic-data"); + MapContainer subsContainer=getMapContainer(destination.toString()+"-Subscriptions","topic-subs"); + ListContainer ackContainer=store.getListContainer(destination.toString(),"topic-acks"); + ackContainer.setMarshaller(new TopicSubAckMarshaller()); + rc=new KahaTopicMessageStore(store,messageContainer,ackContainer,subsContainer,destination); + messageStores.put(destination,rc); + if(transactionStore!=null){ + rc=transactionStore.proxy(rc); + } + topics.put(destination,rc); + } + return rc; + } + + protected MessageStore retrieveMessageStore(Object id){ + MessageStore result=(MessageStore)messageStores.get(id); + return result; + } + + public TransactionStore createTransactionStore() throws IOException{ + if(transactionStore==null){ + Store store=getStore(); + MapContainer container=store.getMapContainer(PREPARED_TRANSACTIONS_NAME,"transactions"); + container.setKeyMarshaller(new CommandMarshaller(wireFormat)); + container.setValueMarshaller(new TransactionMarshaller(wireFormat)); + container.load(); + transactionStore=new KahaTransactionStore(this,container); + } + return transactionStore; + } + + public void beginTransaction(ConnectionContext context){ + } + + public void commitTransaction(ConnectionContext context) throws IOException{ + if(theStore!=null){ + theStore.force(); + } + } + + public void rollbackTransaction(ConnectionContext context){ + } + + public void start() throws Exception{ + } + + public void stop() throws Exception{ + if(theStore!=null){ + theStore.close(); + } + } + + public long getLastMessageBrokerSequenceId() throws IOException{ + return 0; + } + + public void deleteAllMessages() throws IOException{ + if(theStore!=null){ + theStore.delete(); + } + } + + public boolean isUseExternalMessageReferences(){ + return useExternalMessageReferences; + } + + public void setUseExternalMessageReferences(boolean useExternalMessageReferences){ + this.useExternalMessageReferences=useExternalMessageReferences; + } + + protected MapContainer getMapContainer(Object id,String containerName) throws IOException{ + Store store=getStore(); + MapContainer container=store.getMapContainer(id,containerName); + container.setKeyMarshaller(new StringMarshaller()); + if(useExternalMessageReferences){ + container.setValueMarshaller(new StringMarshaller()); + }else{ + container.setValueMarshaller(new CommandMarshaller(wireFormat)); + } + container.load(); + return container; + } + + protected ListContainer getListContainer(Object id,String containerName) throws IOException{ + Store store=getStore(); + ListContainer container=store.getListContainer(id,containerName); + if(useExternalMessageReferences){ + container.setMarshaller(new StringMarshaller()); + }else{ + container.setMarshaller(new CommandMarshaller(wireFormat)); + } + container.load(); + return container; + } + + /** + * @param usageManager + * The UsageManager that is controlling the broker's memory + * usage. + */ + public void setUsageManager(UsageManager usageManager){ + } + + /** + * @return the maxDataFileLength + */ + public long getMaxDataFileLength(){ + return maxDataFileLength; + } + + /** + * @param maxDataFileLength + * the maxDataFileLength to set + * + * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor" + */ + public void setMaxDataFileLength(long maxDataFileLength){ + this.maxDataFileLength=maxDataFileLength; + } + + /** + * @return the indexType + */ + public String getIndexType(){ + return this.indexType; + } + + /** + * @param indexType the indexTypes to set + */ + public void setIndexType(String indexType){ + this.indexType=indexType; + } + + protected synchronized Store getStore() throws IOException{ + if(theStore==null){ + String name=dir.getAbsolutePath()+File.separator+"kaha.db"; + theStore=StoreFactory.open(name,"rw"); + theStore.setMaxDataFileLength(maxDataFileLength); + theStore.setIndexType(indexType); + } + return theStore; + } +} Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/StoreEntryMarshaller.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubAck.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubAckMarshaller.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubContainer.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/TransportDisposedIOException.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameTranslator.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/stomp/LegacyFrameTranslator.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportServer.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/ByteArrayInputStream.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/ByteArrayOutputStream.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/ByteSequence.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/ByteSequenceData.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayInputStream.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayOutputStream.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/FactoryFinder.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/wireformat/package.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/resources/META-INF/NOTICE.txt URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-core/src/main/resources/META-INF/NOTICE.txt?view=diff&rev=474986&r1=474985&r2=474986 ============================================================================== --- incubator/activemq/branches/activemq-4.1/activemq-core/src/main/resources/META-INF/NOTICE.txt (original) +++ incubator/activemq/branches/activemq-4.1/activemq-core/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-core/src/main/resources/META-INF/NOTICE.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/activemq/branches/activemq-4.1/activemq-core/src/test/eclipse-resources/log4j.properties ------------------------------------------------------------------------------ svn:eol-style = native