activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r961088 - in /activemq/sandbox/activemq-apollo-actor: activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/ sandbox/activemq-amqp-generator/ sandbox/activemq-amqp-generator/specification/1.0-PR2/ sandbox/activemq-amqp-gener...
Date Wed, 07 Jul 2010 03:51:12 GMT
Author: chirino
Date: Wed Jul  7 03:51:10 2010
New Revision: 961088

URL: http://svn.apache.org/viewvc?rev=961088&view=rev
Log:
- hawtdb switched to using hawtbuf Buffer classes
- the amqp generator has moved into the hawtbuf project too.

Removed:
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/pom.xml
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/specification/1.0-PR2/amqp.dtd
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/specification/1.0-PR2/index.xml
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/specification/1.0-PR2/messaging.xml
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/specification/1.0-PR2/security.xml
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/specification/1.0-PR2/transport.xml
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/specification/1.0-PR2/types.xml
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/AmqpCommand.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/AmqpFrame.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/AmqpFramingException.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/AmqpSessionFrame.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/BitUtils.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/AmqpEncodingError.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/AmqpVersion.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/Encoded.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/Encoding.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/UnexpectedTypeException.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/BaseEncoder.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/DescribedTypeMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/Encoder.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/types/AmqpBuffer.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/types/AmqpType.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/types/IAmqpList.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/types/IAmqpMap.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpChoice.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpClass.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpDefinition.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpDescriptor.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpDoc.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpEncoding.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpException.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpField.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/Generator.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/JAXBGen.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/Main.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/TypeRegistry.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/UnknownTypeException.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/Utils.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Amqp.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/B.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Choice.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Dd.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Definition.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Descriptor.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Dl.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Doc.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Dt.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Encoding.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Exception.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Field.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/I.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Li.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/ObjectFactory.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Ol.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/P.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Picture.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Section.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Sub.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Sup.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Type.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Ul.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/jaxb/schema/Xref.java
Modified:
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/HawtDBStore.java

Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/HawtDBStore.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/HawtDBStore.java?rev=961088&r1=961087&r2=961088&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/HawtDBStore.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/HawtDBStore.java
Wed Jul  7 03:51:10 2010
@@ -81,10 +81,10 @@ public class HawtDBStore implements Stor
     private static final Log LOG = LogFactory.getLog(HawtDBStore.class);
     private static final int DATABASE_LOCKED_WAIT_DELAY = 10 * 1000;
 
-    private static final org.fusesource.hawtdb.util.buffer.Buffer BEGIN_UNIT_OF_WORK_DATA
= new org.fusesource.hawtdb.util.buffer.Buffer(new byte[] { BEGIN_UNIT_OF_WORK });
-    private static final org.fusesource.hawtdb.util.buffer.Buffer END_UNIT_OF_WORK_DATA =
new org.fusesource.hawtdb.util.buffer.Buffer(new byte[] { END_UNIT_OF_WORK });
-    private static final org.fusesource.hawtdb.util.buffer.Buffer CANCEL_UNIT_OF_WORK_DATA
= new org.fusesource.hawtdb.util.buffer.Buffer(new byte[] { CANCEL_UNIT_OF_WORK });
-    private static final org.fusesource.hawtdb.util.buffer.Buffer FLUSH_DATA = new org.fusesource.hawtdb.util.buffer.Buffer(new
byte[] { FLUSH });
+    private static final Buffer BEGIN_UNIT_OF_WORK_DATA = new Buffer(new byte[] { BEGIN_UNIT_OF_WORK
});
+    private static final Buffer END_UNIT_OF_WORK_DATA = new Buffer(new byte[] { END_UNIT_OF_WORK
});
+    private static final Buffer CANCEL_UNIT_OF_WORK_DATA = new Buffer(new byte[] { CANCEL_UNIT_OF_WORK
});
+    private static final Buffer FLUSH_DATA = new Buffer(new byte[] { FLUSH });
 
     public static final int CLOSED_STATE = 1;
     public static final int OPEN_STATE = 2;
@@ -357,7 +357,7 @@ public class HawtDBStore implements Stor
                 int uowCounter = 0;
                 while (recoveryPosition != null) {
 
-                    Buffer data = convert(journal.read(recoveryPosition));
+                    Buffer data = journal.read(recoveryPosition);
                     if (data.length == 1 && data.data[0] == BEGIN_UNIT_OF_WORK) {
                         uow = pageFile.tx();
                     } else if (data.length == 1 && data.data[0] == END_UNIT_OF_WORK)
{
@@ -407,10 +407,6 @@ public class HawtDBStore implements Stor
         }
     }
 
-    private Buffer convert(org.fusesource.hawtdb.util.buffer.Buffer buffer) {
-        return new Buffer(buffer.data, buffer.offset, buffer.length);
-    }
-
     public void incrementalRecover() throws IOException {
         indexLock.writeLock().lock();
         try {
@@ -596,7 +592,7 @@ public class HawtDBStore implements Stor
             long start = System.currentTimeMillis();
             final Location location;
             synchronized (journal) {
-                location = journal.write(convert(os.toBuffer()), onFlush);
+                location = journal.write(os.toBuffer(), onFlush);
             }
             long start2 = System.currentTimeMillis();
 
@@ -623,10 +619,6 @@ public class HawtDBStore implements Stor
 
     }
 
-    private org.fusesource.hawtdb.util.buffer.Buffer convert(Buffer buffer) {
-        return new org.fusesource.hawtdb.util.buffer.Buffer(buffer.data, buffer.offset, buffer.length);
-    }
-
     /**
      * Loads a previously stored PBMessage
      * 
@@ -635,7 +627,7 @@ public class HawtDBStore implements Stor
      * @throws IOException
      */
     private TypeCreatable load(Location location) throws IOException {
-        Buffer data = convert(journal.read(location));
+        Buffer data = journal.read(location);
         return load(location, data);
     }
 



Mime
View raw message