activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r388677 [1/3] - in /incubator/activemq/trunk: ./ activecluster/ activeio/ activeio/activeio-aio/ activeio/activeio-core/ activeio/activeio-core/src/main/java/org/apache/activeio/ activeio/activeio-jxta/ activeio/activeio-oneport-jetty/ acti...
Date Fri, 24 Mar 2006 23:42:08 GMT
Author: chirino
Date: Fri Mar 24 15:41:23 2006
New Revision: 388677

URL: http://svn.apache.org/viewcvs?rev=388677&view=rev
Log:
- Switched the m2 builds to use maven-one-plugin so that the activeio jars can be used in the maven 1 build activemq is using.
- the m2 build now uses the same groupId that our m1 activemq build is using.  I know it's not the m2 way to name groups, we I'm willing to live with this until we are out of the incubator and using m2 to do builds by default.
- Ported activemq to use activeio 3.0-SNAPSHOT from activeio 2.1, since the 3.x stuff is in a new package space, it should not conflict with previous version (for example the version used in Geronimo).


Added:
    incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/Disposable.java   (with props)
    incubator/activemq/trunk/assembly/src/test/org/
    incubator/activemq/trunk/assembly/src/test/org/apache/
    incubator/activemq/trunk/assembly/src/test/org/apache/activemq/
    incubator/activemq/trunk/assembly/src/test/org/apache/activemq/usecases/
Modified:
    incubator/activemq/trunk/activecluster/pom.xml
    incubator/activemq/trunk/activecluster/project.xml
    incubator/activemq/trunk/activeio/activeio-aio/pom.xml
    incubator/activemq/trunk/activeio/activeio-core/pom.xml
    incubator/activemq/trunk/activeio/activeio-jxta/pom.xml
    incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml
    incubator/activemq/trunk/activeio/activeio-oneport-openorb/pom.xml
    incubator/activemq/trunk/activeio/pom.xml
    incubator/activemq/trunk/activemq-console/pom.xml
    incubator/activemq/trunk/activemq-console/project.xml
    incubator/activemq/trunk/activemq-core/pom.xml
    incubator/activemq/trunk/activemq-core/project.xml
    incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy
    incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaTests.groovy
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MarshallAware.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Message.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BlobJDBCAdapter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageData.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTransactionStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/CommandMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistentAdaptor.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportFactory.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportServer.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActivityMonitor.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/PacketAggregatingAsyncChannel.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Send.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
    incubator/activemq/trunk/activemq-dotnet/pom.xml
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LastPartialCommand.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LastPartialCommandMarshaller.cs
    incubator/activemq/trunk/activemq-gbean/project.xml
    incubator/activemq/trunk/activemq-jaas/pom.xml
    incubator/activemq/trunk/activemq-jaas/project.xml
    incubator/activemq/trunk/activemq-optional/pom.xml
    incubator/activemq/trunk/activemq-optional/project.xml
    incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java
    incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java
    incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java
    incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
    incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java
    incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java
    incubator/activemq/trunk/activemq-ra/pom.xml
    incubator/activemq/trunk/activemq-ra/project.xml
    incubator/activemq/trunk/activemq-soaktest/project.xml
    incubator/activemq/trunk/activemq-systest/pom.xml
    incubator/activemq/trunk/activemq-systest/project.xml
    incubator/activemq/trunk/activemq-web/pom.xml
    incubator/activemq/trunk/activemq-web/project.xml
    incubator/activemq/trunk/assembly/pom.xml
    incubator/activemq/trunk/assembly/project.xml
    incubator/activemq/trunk/assembly/src/sample-conf/jdbc-example.xml
    incubator/activemq/trunk/assembly/src/sample-conf/journal-example.xml
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java
    incubator/activemq/trunk/etc/project.properties
    incubator/activemq/trunk/jmeter/project.xml
    incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c
    incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h
    incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalTransaction.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/KeepAliveInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/LastPartialCommand.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/MessageId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/NetworkBridgeFilter.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/PartialCommand.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/SessionId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/SubscriptionInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/TransactionId.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/LastPartialCommandMarshaller.hpp
    incubator/activemq/trunk/pom.xml
    incubator/activemq/trunk/sandbox/pom.xml
    incubator/activemq/trunk/systest/jmscts/project.xml

Modified: incubator/activemq/trunk/activecluster/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activecluster/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activecluster/pom.xml (original)
+++ incubator/activemq/trunk/activecluster/pom.xml Fri Mar 24 15:41:23 2006
@@ -19,7 +19,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.activemq</groupId>
+    <groupId>incubator-activemq</groupId>
     <artifactId>activemq</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
@@ -30,7 +30,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activemq-core</artifactId>
       <version>4.0-SNAPSHOT</version>
     </dependency>

Modified: incubator/activemq/trunk/activecluster/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activecluster/project.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activecluster/project.xml (original)
+++ incubator/activemq/trunk/activecluster/project.xml Fri Mar 24 15:41:23 2006
@@ -90,9 +90,9 @@
     </dependency>
 
     <dependency>
-      <groupId>activeio</groupId>
-      <artifactId>activeio</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activeio-core</artifactId>
+      <version>${activeio_version}</version>
     </dependency>
 
     <!-- for unit test cases -->

Modified: incubator/activemq/trunk/activeio/activeio-aio/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-aio/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-aio/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-aio/pom.xml Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.activemq.activeio</groupId>
+    <groupId>incubator-activemq</groupId>
     <artifactId>activeio</artifactId>
     <version>3.0-SNAPSHOT</version>
   </parent>
@@ -29,12 +29,12 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.activemq.activeio</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activeio-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq.activeio</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activeio-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>

Modified: incubator/activemq/trunk/activeio/activeio-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-core/pom.xml Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.activemq.activeio</groupId>
+    <groupId>incubator-activemq</groupId>
     <artifactId>activeio</artifactId>
     <version>3.0-SNAPSHOT</version>
   </parent>
@@ -27,6 +27,24 @@
   <name>ActiveIO :: Core</name>
   <description>A high performance IO abstraction framework</description>
   
+  <build>
+    <plugins>
+
+      <!-- generate the attached tests jar -->
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+
   <dependencies>
     <!-- Required Dependencies -->
     <dependency>

Added: incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/Disposable.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/Disposable.java?rev=388677&view=auto
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/Disposable.java (added)
+++ incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/Disposable.java Fri Mar 24 15:41:23 2006
@@ -0,0 +1,28 @@
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activeio;
+
+
+/**
+ * @version $Revision$
+ */
+public interface Disposable {
+    
+    /**
+     */
+    void dispose();
+}

Propchange: incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/Disposable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activeio/activeio-jxta/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-jxta/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-jxta/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-jxta/pom.xml Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.activemq.activeio</groupId>
+    <groupId>incubator-activemq</groupId>
     <artifactId>activeio</artifactId>
     <version>3.0-SNAPSHOT</version>
   </parent>
@@ -30,12 +30,12 @@
   <dependencies>
     <!-- Required Dependencies -->
     <dependency>
-      <groupId>org.apache.activemq.activeio</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activeio-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq.activeio</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activeio-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>

Modified: incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.activemq.activeio</groupId>
+    <groupId>incubator-activemq</groupId>
     <artifactId>activeio</artifactId>
     <version>3.0-SNAPSHOT</version>
   </parent>
@@ -30,12 +30,12 @@
   <dependencies>
     <!-- Required Dependencies -->
     <dependency>
-      <groupId>org.apache.activemq.activeio</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activeio-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq.activeio</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activeio-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>

Modified: incubator/activemq/trunk/activeio/activeio-oneport-openorb/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-openorb/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-oneport-openorb/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-oneport-openorb/pom.xml Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.activemq.activeio</groupId>
+    <groupId>incubator-activemq</groupId>
     <artifactId>activeio</artifactId>
     <version>3.0-SNAPSHOT</version>
   </parent>
@@ -31,12 +31,12 @@
     <!-- Required Dependencies -->
 
     <dependency>
-      <groupId>org.apache.activemq.activeio</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activeio-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq.activeio</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activemq-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>

Modified: incubator/activemq/trunk/activeio/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/pom.xml (original)
+++ incubator/activemq/trunk/activeio/pom.xml Fri Mar 24 15:41:23 2006
@@ -5,11 +5,12 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.activemq</groupId>
+    <groupId>incubator-activemq</groupId>
     <artifactId>activemq</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.activemq.activeio</groupId>
+
+  <groupId>incubator-activemq</groupId>
   <artifactId>activeio</artifactId>
   <version>3.0-SNAPSHOT</version>
   <packaging>pom</packaging>

Modified: incubator/activemq/trunk/activemq-console/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-console/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-console/pom.xml (original)
+++ incubator/activemq/trunk/activemq-console/pom.xml Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.activemq</groupId>
+    <groupId>incubator-activemq</groupId>
     <artifactId>activemq</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
@@ -29,7 +29,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activemq-core</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: incubator/activemq/trunk/activemq-console/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-console/project.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-console/project.xml (original)
+++ incubator/activemq/trunk/activemq-console/project.xml Fri Mar 24 15:41:23 2006
@@ -61,11 +61,11 @@
         </dependency>
         
         <dependency>
-            <groupId>activeio</groupId>
-            <artifactId>activeio</artifactId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>activeio-core</artifactId>
             <version>${activeio_version}</version>
         </dependency>
-        
+
         <!-- used to support optional transport configuration via URI query strings -->
         <dependency>
             <groupId>commons-beanutils</groupId>

Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.activemq</groupId>
+    <groupId>incubator-activemq</groupId>
     <artifactId>activemq</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
@@ -97,7 +97,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.activemq</groupId>
+      <groupId>incubator-activemq</groupId>
       <artifactId>activemq-jaas</artifactId>
     </dependency>
 

Modified: incubator/activemq/trunk/activemq-core/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/project.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/project.xml (original)
+++ incubator/activemq/trunk/activemq-core/project.xml Fri Mar 24 15:41:23 2006
@@ -112,8 +112,8 @@
             <version>${jmdns_version}</version>
         </dependency>
         <dependency>
-            <groupId>activeio</groupId>
-            <artifactId>activeio</artifactId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>activeio-core</artifactId>
             <version>${activeio_version}</version>
         </dependency>
         <dependency>

Modified: incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy Fri Mar 24 15:41:23 2006
@@ -114,10 +114,10 @@
           case "byte[]":
               out << "ow_byte_array *$name;"; break;
               break;
-          case "org.activeio.ByteSequence":
+          case "org.apache.activeio.packet.ByteSequence":
               out << "ow_byte_array *$name;"; break;
               break;
-	      case "org.activeio.ByteSequence":
+	      case "org.apache.activeio.packet.ByteSequence":
               out << "ow_byte_array *$name;"; break;
               break;
           case "java.lang.String":
@@ -369,7 +369,7 @@
                         """;
                      }
                      break;
-                   case "org.activeio.ByteSequence":
+                   case "org.apache.activeio.packet.ByteSequence":
                      if( size ==null ) {
                         out << """
                         ow_bit_buffer_append(buffer,  object->$propname!=0 );
@@ -442,7 +442,7 @@
                           out << "SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->$propname));"; break;
                        }
                        break;
-                   case "org.activeio.ByteSequence":
+                   case "org.apache.activeio.packet.ByteSequence":
                        if( size!=null ) {
                           out << "SUCCESS_CHECK(ow_marshal2_byte_array_const_size(buffer, object->$propname, ${size.asInt()}));"; break;
                        } else {
@@ -517,7 +517,7 @@
                            out << "SUCCESS_CHECK(ow_unmarshal_byte_array(buffer, bitbuffer, &object->$propname, pool));"; break;
                        }
                        break;
-                   case "org.activeio.ByteSequence":
+                   case "org.apache.activeio.packet.ByteSequence":
                        if( size!=null ) {
                            out << "SUCCESS_CHECK(ow_unmarshal_byte_array_const_size(buffer, &object->$propname, ${size.asInt()}, pool));"; break;
                        } else {

Modified: incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaTests.groovy
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaTests.groovy?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaTests.groovy (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaTests.groovy Fri Mar 24 15:41:23 2006
@@ -173,7 +173,7 @@
     		out << """
     		{
         		byte data[] = ${generator.createByteArray(propertyName)};
-        		info.${property.setter.simpleName}(new org.activeio.ByteSequence(data,0,data.length));
+        		info.${property.setter.simpleName}(new org.apache.activeio.packet.ByteSequence(data,0,data.length));
     		}
     		""";
         break;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java Fri Mar 24 15:41:23 2006
@@ -25,7 +25,7 @@
 import javax.jms.MessageFormatException;
 import javax.jms.MessageProducer;
 
-import org.activeio.Disposable;
+import org.apache.activeio.Disposable;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ProducerId;
 import org.apache.activemq.command.ProducerInfo;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java Fri Mar 24 15:41:23 2006
@@ -25,7 +25,7 @@
 import javax.jms.InvalidDestinationException;
 import javax.jms.JMSException;
 
-import org.activeio.Disposable;
+import org.apache.activeio.Disposable;
 import org.apache.activemq.command.ActiveMQBytesMessage;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java Fri Mar 24 15:41:23 2006
@@ -16,11 +16,11 @@
  */
 package org.apache.activemq.broker;
 
-import org.activeio.FactoryFinder;
-import org.apache.activemq.util.IOExceptionSupport;
-
 import java.io.IOException;
 import java.net.URI;
+
+import org.apache.activeio.util.FactoryFinder;
+import org.apache.activemq.util.IOExceptionSupport;
 
 /**
  * A helper class to create a fully configured broker service using a URI.

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java Fri Mar 24 15:41:23 2006
@@ -34,11 +34,11 @@
 import javax.jms.MessageNotReadableException;
 import javax.jms.MessageNotWriteableException;
 
-import org.activeio.ByteArrayInputStream;
-import org.activeio.ByteArrayOutputStream;
-import org.activeio.ByteSequence;
-import org.activeio.PacketData;
-import org.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.packet.ByteSequence;
+import org.apache.activeio.packet.PacketData;
+import org.apache.activeio.util.ByteArrayInputStream;
+import org.apache.activeio.util.ByteArrayOutputStream;
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.util.JMSExceptionSupport;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java Fri Mar 24 15:41:23 2006
@@ -33,10 +33,10 @@
 import javax.jms.MessageFormatException;
 import javax.jms.MessageNotWriteableException;
 
-import org.activeio.ByteArrayInputStream;
-import org.activeio.ByteArrayOutputStream;
-import org.activeio.ByteSequence;
-import org.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.ByteSequence;
+import org.apache.activeio.util.ByteArrayInputStream;
+import org.apache.activeio.util.ByteArrayOutputStream;
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.util.JMSExceptionSupport;
 import org.apache.activemq.util.MarshallingSupport;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java Fri Mar 24 15:41:23 2006
@@ -20,16 +20,6 @@
 
 
 
-import org.activeio.ByteArrayInputStream;
-import org.activeio.ByteArrayOutputStream;
-import org.activeio.ByteSequence;
-import org.apache.activemq.ActiveMQConnection;
-import org.apache.activemq.util.ClassLoading;
-import org.apache.activemq.util.JMSExceptionSupport;
-
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -42,6 +32,16 @@
 import java.lang.reflect.Proxy;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.InflaterInputStream;
+
+import javax.jms.JMSException;
+import javax.jms.ObjectMessage;
+
+import org.apache.activeio.packet.ByteSequence;
+import org.apache.activeio.util.ByteArrayInputStream;
+import org.apache.activeio.util.ByteArrayOutputStream;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.util.ClassLoading;
+import org.apache.activemq.util.JMSExceptionSupport;
 
 /**
  * An <CODE>ObjectMessage</CODE> object is used to send a message that contains a serializable object in the Java

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java Fri Mar 24 15:41:23 2006
@@ -17,19 +17,6 @@
 
 package org.apache.activemq.command;
 
-import javax.jms.JMSException;
-import javax.jms.MessageEOFException;
-import javax.jms.MessageFormatException;
-import javax.jms.MessageNotReadableException;
-import javax.jms.MessageNotWriteableException;
-import javax.jms.StreamMessage;
-
-import org.activeio.ByteArrayInputStream;
-import org.activeio.ByteArrayOutputStream;
-import org.activeio.ByteSequence;
-import org.apache.activemq.ActiveMQConnection;
-import org.apache.activemq.util.JMSExceptionSupport;
-
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -39,6 +26,19 @@
 import java.io.OutputStream;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.InflaterInputStream;
+
+import javax.jms.JMSException;
+import javax.jms.MessageEOFException;
+import javax.jms.MessageFormatException;
+import javax.jms.MessageNotReadableException;
+import javax.jms.MessageNotWriteableException;
+import javax.jms.StreamMessage;
+
+import org.apache.activeio.packet.ByteSequence;
+import org.apache.activeio.util.ByteArrayInputStream;
+import org.apache.activeio.util.ByteArrayOutputStream;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.util.JMSExceptionSupport;
 
 /**
  * A <CODE>StreamMessage</CODE> object is used to send a stream of primitive

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java Fri Mar 24 15:41:23 2006
@@ -28,10 +28,10 @@
 import javax.jms.MessageNotWriteableException;
 import javax.jms.TextMessage;
 
-import org.activeio.ByteArrayInputStream;
-import org.activeio.ByteArrayOutputStream;
-import org.activeio.ByteSequence;
-import org.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.ByteSequence;
+import org.apache.activeio.util.ByteArrayInputStream;
+import org.apache.activeio.util.ByteArrayOutputStream;
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.util.JMSExceptionSupport;
 import org.apache.activemq.util.MarshallingSupport;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MarshallAware.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MarshallAware.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MarshallAware.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MarshallAware.java Fri Mar 24 15:41:23 2006
@@ -18,8 +18,8 @@
 
 import java.io.IOException;
 
-import org.activeio.ByteSequence;
-import org.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.ByteSequence;
 
 public interface MarshallAware {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Message.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Message.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Message.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Message.java Fri Mar 24 15:41:23 2006
@@ -23,10 +23,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.activeio.ByteArrayInputStream;
-import org.activeio.ByteArrayOutputStream;
-import org.activeio.ByteSequence;
-import org.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.ByteSequence;
+import org.apache.activeio.util.ByteArrayInputStream;
+import org.apache.activeio.util.ByteArrayOutputStream;
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.advisory.AdvisorySupport;
 import org.apache.activemq.broker.region.MessageReference;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java Fri Mar 24 15:41:23 2006
@@ -24,10 +24,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.activeio.ByteArrayInputStream;
-import org.activeio.ByteArrayOutputStream;
-import org.activeio.ByteSequence;
-import org.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.ByteSequence;
+import org.apache.activeio.util.ByteArrayInputStream;
+import org.apache.activeio.util.ByteArrayOutputStream;
 import org.apache.activemq.state.CommandVisitor;
 import org.apache.activemq.util.MarshallingSupport;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java Fri Mar 24 15:41:23 2006
@@ -26,7 +26,7 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
-import org.activeio.ByteArrayInputStream;
+import org.apache.activeio.util.ByteArrayInputStream;
 import org.apache.activemq.command.Message;
 import org.xml.sax.InputSource;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java Fri Mar 24 15:41:23 2006
@@ -21,7 +21,7 @@
 import javax.jms.JMSException;
 import javax.jms.TextMessage;
 
-import org.activeio.ByteArrayInputStream;
+import org.apache.activeio.util.ByteArrayInputStream;
 import org.apache.activemq.command.Message;
 import org.apache.xmlbeans.XmlObject;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java Fri Mar 24 15:41:23 2006
@@ -25,7 +25,7 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.activeio.ByteArrayInputStream;
+import org.apache.activeio.util.ByteArrayInputStream;
 import org.apache.activemq.command.Message;
 import org.apache.xpath.CachedXPathAPI;
 import org.w3c.dom.Document;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java Fri Mar 24 15:41:23 2006
@@ -16,25 +16,25 @@
  */
 package org.apache.activemq.openwire;
 
-import org.activeio.ByteArrayOutputStream;
-import org.activeio.ByteSequence;
-import org.activeio.Packet;
-import org.activeio.PacketData;
-import org.activeio.adapter.PacketToInputStream;
-import org.activeio.command.ClassLoading;
-import org.activeio.command.WireFormat;
-import org.activeio.packet.ByteArrayPacket;
-import org.apache.activemq.command.CommandTypes;
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.MarshallAware;
-import org.apache.activemq.command.WireFormatInfo;
-import org.apache.activemq.util.IdGenerator;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
+
+import org.apache.activeio.adapter.PacketToInputStream;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.packet.ByteSequence;
+import org.apache.activeio.packet.Packet;
+import org.apache.activeio.packet.PacketData;
+import org.apache.activeio.util.ByteArrayOutputStream;
+import org.apache.activemq.command.CommandTypes;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.MarshallAware;
+import org.apache.activemq.command.WireFormatInfo;
+import org.apache.activemq.util.ClassLoading;
+import org.apache.activemq.util.IdGenerator;
 
 /**
  * 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java Fri Mar 24 15:41:23 2006
@@ -16,8 +16,8 @@
  */
 package org.apache.activemq.openwire;
 
-import org.activeio.command.WireFormat;
-import org.activeio.command.WireFormatFactory;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormatFactory;
 import org.apache.activemq.command.WireFormatInfo;
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java Fri Mar 24 15:41:23 2006
@@ -21,12 +21,12 @@
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 
-import org.activeio.ByteSequence;
-import org.activeio.command.ClassLoading;
+import org.apache.activeio.packet.ByteSequence;
 import org.apache.activemq.command.DataStructure;
 import org.apache.activemq.openwire.BooleanStream;
 import org.apache.activemq.openwire.DataStreamMarshaller;
 import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.util.ClassLoading;
 
 abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java Fri Mar 24 15:41:23 2006
@@ -21,8 +21,8 @@
 
 import javax.sql.DataSource;
 
-import org.activeio.journal.Journal;
-import org.activeio.journal.active.JournalImpl;
+import org.apache.activeio.journal.Journal;
+import org.apache.activeio.journal.active.JournalImpl;
 import org.apache.activemq.memory.UsageManager;
 import org.apache.activemq.store.jdbc.JDBCAdapter;
 import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
 
 import java.io.IOException;
 
-import org.activeio.Service;
+import org.apache.activemq.Service;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java Fri Mar 24 15:41:23 2006
@@ -54,11 +54,11 @@
     public void removeMessage(ConnectionContext context, MessageAck ack) throws IOException {
         delegate.removeMessage(context, ack);
     }
-    public void start() throws IOException {
+    public void start() throws Exception {
         delegate.start();
     }    
-    public void stop(long timeout) throws IOException {
-        delegate.stop(timeout);
+    public void stop() throws Exception {
+        delegate.stop();
     }
     public ActiveMQDestination getDestination() {
         return delegate.getDestination();

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java Fri Mar 24 15:41:23 2006
@@ -55,11 +55,11 @@
     public void removeMessage(ConnectionContext context, MessageAck ack) throws IOException {
         delegate.removeMessage(context, ack);
     }
-    public void start() throws IOException {
+    public void start() throws Exception {
         delegate.start();
     }
-    public void stop(long timeout) throws IOException {
-        delegate.stop(timeout);
+    public void stop() throws Exception {
+        delegate.stop();
     }
     
     public SubscriptionInfo lookupSubscription(String clientId, String subscriptionName) throws IOException {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java Fri Mar 24 15:41:23 2006
@@ -19,9 +19,9 @@
 import java.io.IOException;
 import java.sql.SQLException;
 
-import org.activeio.Packet;
-import org.activeio.command.WireFormat;
-import org.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.packet.Packet;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;
@@ -170,10 +170,10 @@
         }
     }
 
-    public void start() throws IOException {
+    public void start() {
     }
 
-    public void stop(long timeout) throws IOException {
+    public void stop() {
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java Fri Mar 24 15:41:23 2006
@@ -23,8 +23,8 @@
 
 import javax.sql.DataSource;
 
-import org.activeio.FactoryFinder;
-import org.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.util.FactoryFinder;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java Fri Mar 24 15:41:23 2006
@@ -19,8 +19,8 @@
 import java.io.IOException;
 import java.sql.SQLException;
 
-import org.activeio.command.WireFormat;
-import org.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.ByteArrayPacket;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.command.Message;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BlobJDBCAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BlobJDBCAdapter.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BlobJDBCAdapter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BlobJDBCAdapter.java Fri Mar 24 15:41:23 2006
@@ -27,7 +27,7 @@
 
 import javax.jms.JMSException;
 
-import org.activeio.ByteArrayOutputStream;
+import org.apache.activeio.util.ByteArrayOutputStream;
 import org.apache.activemq.store.jdbc.TransactionContext;
 
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java Fri Mar 24 15:41:23 2006
@@ -16,14 +16,14 @@
  */
 package org.apache.activemq.store.jdbc.adapter;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.activeio.ByteArrayInputStream;
-import org.activeio.ByteArrayOutputStream;
+import org.apache.activeio.util.ByteArrayInputStream;
 
 /**
  * This JDBCAdapter inserts and extracts BLOB data using the 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java Fri Mar 24 15:41:23 2006
@@ -23,7 +23,7 @@
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 
-import org.activeio.journal.RecordLocation;
+import org.apache.activeio.journal.RecordLocation;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.JournalQueueAck;
@@ -333,12 +333,12 @@
         longTermStore.recover(listener);
     }
 
-    public void start() throws IOException {
+    public void start() throws Exception {
         longTermStore.start();
     }
 
-    public void stop(long timeout) throws IOException {
-        longTermStore.stop(timeout);
+    public void stop() throws Exception {
+        longTermStore.stop();
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java Fri Mar 24 15:41:23 2006
@@ -21,11 +21,12 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.activeio.command.WireFormat;
-import org.activeio.journal.InvalidRecordLocationException;
-import org.activeio.journal.Journal;
-import org.activeio.journal.JournalEventListener;
-import org.activeio.journal.RecordLocation;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.journal.InvalidRecordLocationException;
+import org.apache.activeio.journal.Journal;
+import org.apache.activeio.journal.JournalEventListener;
+import org.apache.activeio.journal.RecordLocation;
+import org.apache.activeio.packet.Packet;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
@@ -418,7 +419,7 @@
      */
     public DataStructure readCommand(RecordLocation location) throws IOException {
         try {
-            org.activeio.Packet data = journal.read(location);
+            Packet data = journal.read(location);
             return (DataStructure) wireFormat.unmarshal(data);
         }
         catch (InvalidRecordLocationException e) {
@@ -448,7 +449,7 @@
 
         // While we have records in the journal.
         while ((pos = journal.getNextRecordLocation(pos)) != null) {
-            org.activeio.Packet data = journal.read(pos);
+            Packet data = journal.read(pos);
             DataStructure c = (DataStructure) wireFormat.unmarshal(data);
 
             if (c instanceof Message ) {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java Fri Mar 24 15:41:23 2006
@@ -20,7 +20,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 
-import org.activeio.journal.RecordLocation;
+import org.apache.activeio.journal.RecordLocation;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.command.JournalTopicAck;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java Fri Mar 24 15:41:23 2006
@@ -23,7 +23,7 @@
 
 import javax.transaction.xa.XAException;
 
-import org.activeio.journal.RecordLocation;
+import org.apache.activeio.journal.RecordLocation;
 import org.apache.activemq.command.JournalTopicAck;
 import org.apache.activemq.command.JournalTransaction;
 import org.apache.activemq.command.Message;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageData.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageData.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageData.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageData.java Fri Mar 24 15:41:23 2006
@@ -17,7 +17,7 @@
 
 package org.apache.activemq.store.journal;
 
-import org.activeio.journal.RecordLocation;
+import org.apache.activeio.journal.RecordLocation;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageId;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java Fri Mar 24 15:41:23 2006
@@ -23,8 +23,8 @@
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 
-import org.activeio.journal.RecordLocation;
-import org.activeio.journal.active.Location;
+import org.apache.activeio.journal.RecordLocation;
+import org.apache.activeio.journal.active.Location;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.JournalQueueAck;
@@ -367,12 +367,12 @@
         });
     }
 
-    public void start() throws IOException {
+    public void start() throws Exception {
         longTermStore.start();
     }
 
-    public void stop(long timeout) throws IOException {
-        longTermStore.stop(timeout);
+    public void stop() throws Exception {
+        longTermStore.stop();
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java Fri Mar 24 15:41:23 2006
@@ -21,11 +21,12 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.activeio.command.WireFormat;
-import org.activeio.journal.InvalidRecordLocationException;
-import org.activeio.journal.Journal;
-import org.activeio.journal.JournalEventListener;
-import org.activeio.journal.RecordLocation;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.journal.InvalidRecordLocationException;
+import org.apache.activeio.journal.Journal;
+import org.apache.activeio.journal.JournalEventListener;
+import org.apache.activeio.journal.RecordLocation;
+import org.apache.activeio.packet.Packet;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
@@ -418,7 +419,7 @@
      */
     public DataStructure readCommand(RecordLocation location) throws IOException {
         try {
-            org.activeio.Packet data = journal.read(location);
+            Packet data = journal.read(location);
             return (DataStructure) wireFormat.unmarshal(data);
         }
         catch (InvalidRecordLocationException e) {
@@ -448,7 +449,7 @@
 
         // While we have records in the journal.
         while ((pos = journal.getNextRecordLocation(pos)) != null) {
-            org.activeio.Packet data = journal.read(pos);
+            Packet data = journal.read(pos);
             DataStructure c = (DataStructure) wireFormat.unmarshal(data);
 
             if (c instanceof Message ) {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java Fri Mar 24 15:41:23 2006
@@ -20,7 +20,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 
-import org.activeio.journal.RecordLocation;
+import org.apache.activeio.journal.RecordLocation;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.command.JournalTopicAck;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTransactionStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTransactionStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTransactionStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTransactionStore.java Fri Mar 24 15:41:23 2006
@@ -22,7 +22,7 @@
 
 import javax.transaction.xa.XAException;
 
-import org.activeio.journal.RecordLocation;
+import org.apache.activeio.journal.RecordLocation;
 import org.apache.activemq.command.JournalTopicAck;
 import org.apache.activemq.command.JournalTransaction;
 import org.apache.activemq.command.Message;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/CommandMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/CommandMarshaller.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/CommandMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/CommandMarshaller.java Fri Mar 24 15:41:23 2006
@@ -20,9 +20,10 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import org.activeio.Packet;
-import org.activeio.command.WireFormat;
-import org.activeio.packet.ByteArrayPacket;
+
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.packet.Packet;
 import org.apache.activemq.kaha.Marshaller;
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java Fri Mar 24 15:41:23 2006
@@ -15,6 +15,7 @@
 
 import java.io.IOException;
 import java.util.Iterator;
+
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;
@@ -74,9 +75,9 @@
         listener.finished();
     }
 
-    public void start() throws IOException{}
+    public void start() {}
 
-    public void stop(long timeout) throws IOException{}
+    public void stop() {}
 
     public void removeAllMessages(ConnectionContext context) throws IOException{
         messageContainer.clear();

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistentAdaptor.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistentAdaptor.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistentAdaptor.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistentAdaptor.java Fri Mar 24 15:41:23 2006
@@ -18,7 +18,8 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-import org.activeio.command.WireFormat;
+
+import org.apache.activeio.command.WireFormat;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
@@ -33,6 +34,7 @@
 import org.apache.activemq.store.TopicMessageStore;
 import org.apache.activemq.store.TransactionStore;
 import org.apache.activemq.store.memory.MemoryTransactionStore;
+
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 /**
  * @org.apache.xbean.XBean

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java Fri Mar 24 15:41:23 2006
@@ -86,10 +86,10 @@
         }
     }
 
-    public void start() throws IOException {
+    public void start() {
     }
 
-    public void stop(long timeout) throws IOException {
+    public void stop() {
     }
 
     public void removeAllMessages(ConnectionContext context) throws IOException {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java Fri Mar 24 15:41:23 2006
@@ -16,17 +16,17 @@
  */
 package org.apache.activemq.transport;
 
-import org.activeio.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+
+import org.apache.activeio.util.ByteArrayInputStream;
 import org.apache.activemq.command.Command;
 import org.apache.activemq.command.LastPartialCommand;
 import org.apache.activemq.command.PartialCommand;
 import org.apache.activemq.openwire.OpenWireFormat;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
 
 /**
  * Joins together of partial commands which were split into individual chunks of

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/MarshallingTransportFilter.java Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
 
 import java.io.IOException;
 
-import org.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormat;
 import org.apache.activemq.command.Command;
 
 public class MarshallingTransportFilter extends TransportFilter {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java Fri Mar 24 15:41:23 2006
@@ -16,16 +16,6 @@
  */
 package org.apache.activemq.transport;
 
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
-
-import org.activeio.FactoryFinder;
-import org.activeio.command.WireFormat;
-import org.activeio.command.WireFormatFactory;
-import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.activemq.util.IntrospectionSupport;
-import org.apache.activemq.util.URISupport;
-
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -33,6 +23,16 @@
 import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Map;
+
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormatFactory;
+import org.apache.activeio.util.FactoryFinder;
+import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.util.URISupport;
+
+import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+import edu.emory.mathcs.backport.java.util.concurrent.Executor;
 
 public abstract class TransportFactory {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java Fri Mar 24 15:41:23 2006
@@ -19,8 +19,9 @@
 import java.io.IOException;
 import java.net.SocketException;
 
-import org.activeio.command.AsyncCommandChannel;
-import org.activeio.net.SocketMetadata;
+import org.apache.activeio.command.AsyncCommandChannel;
+import org.apache.activeio.command.CommandListener;
+import org.apache.activeio.stream.sync.socket.SocketMetadata;
 import org.apache.activemq.command.Command;
 import org.apache.activemq.command.Response;
 import org.apache.activemq.command.WireFormatInfo;
@@ -50,7 +51,7 @@
 
     public ActiveIOTransport(AsyncCommandChannel commandChannel) {
         this.commandChannel = commandChannel;
-        this.commandChannel.setCommandListener(new org.activeio.command.CommandListener() {
+        this.commandChannel.setCommandListener(new CommandListener() {
             public void onCommand(Object command) {
                 if (command.getClass() == WireFormatInfo.class) {
                     WireFormatInfo info = (WireFormatInfo) command;
@@ -112,7 +113,7 @@
     }
 
     public void stop() throws Exception {
-        commandChannel.stop(stopTimeout);
+        commandChannel.stop();
         commandChannel.dispose();
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportFactory.java Fri Mar 24 15:41:23 2006
@@ -22,13 +22,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.activeio.AsyncChannel;
-import org.activeio.Channel;
-import org.activeio.ChannelFactory;
-import org.activeio.adapter.SyncToAsyncChannel;
-import org.activeio.command.AsyncChannelToAsyncCommandChannel;
-import org.activeio.command.WireFormat;
-import org.activeio.net.SocketMetadata;
+import org.apache.activeio.Channel;
+import org.apache.activeio.ChannelFactory;
+import org.apache.activeio.adapter.SyncToAsyncChannel;
+import org.apache.activeio.command.AsyncChannelToAsyncCommandChannel;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.async.AsyncChannel;
+import org.apache.activeio.stream.sync.socket.SocketMetadata;
 import org.apache.activemq.openwire.OpenWireFormat;
 import org.apache.activemq.transport.InactivityMonitor;
 import org.apache.activemq.transport.MutexTransport;
@@ -250,18 +250,18 @@
         return compositeConfigure(new ChannelFactory().openAsyncChannel(location), format, options,ex);
     }
 
-    public static Transport compositeConfigure(Channel c, org.activeio.command.WireFormat format, Map options) {
+    public static Transport compositeConfigure(Channel c, WireFormat format, Map options) {
         AsyncChannel channel = SyncToAsyncChannel.adapt(c); 
         return compositeConfigure(channel, format, options);
     }
     
-    public static Transport compositeConfigure(Channel c, org.activeio.command.WireFormat format, Map options,Executor ex) {
+    public static Transport compositeConfigure(Channel c, WireFormat format, Map options,Executor ex) {
         AsyncChannel channel = SyncToAsyncChannel.adapt(c,ex); 
         return compositeConfigure(channel, format, options);
     }
     
     
-    public static Transport compositeConfigure(AsyncChannel channel, org.activeio.command.WireFormat format, Map options) {
+    public static Transport compositeConfigure(AsyncChannel channel, WireFormat format, Map options) {
         ActivityMonitor activityMonitor = new ActivityMonitor(channel);
         channel = new PacketAggregatingAsyncChannel(activityMonitor);
         AsyncChannelToAsyncCommandChannel commandChannel = new AsyncChannelToAsyncCommandChannel(channel,format);

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportServer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportServer.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportServer.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportServer.java Fri Mar 24 15:41:23 2006
@@ -21,12 +21,12 @@
 import java.net.URI;
 import java.util.Map;
 
-import org.activeio.AcceptListener;
-import org.activeio.AsyncChannelServer;
-import org.activeio.Channel;
-import org.activeio.ChannelFactory;
-import org.activeio.command.WireFormat;
-import org.activeio.command.WireFormatFactory;
+import org.apache.activeio.AcceptListener;
+import org.apache.activeio.Channel;
+import org.apache.activeio.ChannelFactory;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormatFactory;
+import org.apache.activeio.packet.async.AsyncChannelServer;
 import org.apache.activemq.ThreadPriorities;
 import org.apache.activemq.command.BrokerInfo;
 import org.apache.activemq.openwire.OpenWireFormatFactory;
@@ -83,7 +83,7 @@
     }
 
     public void stop() throws Exception {
-        server.stop(stopTimeout);
+        server.stop();
         server.dispose();
     }
 



Mime
View raw message