rhmessaging commits: r3157 - mgmt/trunk/wooly/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2009-03-17 13:55:17 -0400 (Tue, 17 Mar 2009)
New Revision: 3157
Modified:
mgmt/trunk/wooly/python/wooly/server.py
Log:
Always display a python trace in the event of an app error
Modified: mgmt/trunk/wooly/python/wooly/server.py
===================================================================
--- mgmt/trunk/wooly/python/wooly/server.py 2009-03-17 14:18:28 UTC (rev 3156)
+++ mgmt/trunk/wooly/python/wooly/server.py 2009-03-17 17:55:17 UTC (rev 3157)
@@ -159,15 +159,15 @@
respond("500 Error", session.response_headers)
+ writer = Writer()
+ writer.write("APPLICATION ERROR\n")
+ writer.write("\n----- python trace -----\n")
+ print_exc(None, writer)
+
if session.debug:
- writer = Writer()
- writer.write("APPLICATION ERROR\n")
- writer.write("\n----- python trace -----\n")
- print_exc(None, writer)
writer.write("\n----- process trace -----\n")
session.debug.print_process_calls(writer)
writer.write("\n----- render trace -----\n")
session.debug.print_render_calls(writer)
- return writer.to_string()
- else:
- return "APPLICATION ERROR\n"
+
+ return writer.to_string()
17 years, 1 month
rhmessaging commits: r3156 - store/branches/java.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-03-17 10:18:28 -0400 (Tue, 17 Mar 2009)
New Revision: 3156
Added:
store/branches/java/0.5-release/
Log:
Branch to reflect Apache Qpid 0.5 release branch.
Copied: store/branches/java/0.5-release (from rev 3155, store/trunk/java)
17 years, 1 month
rhmessaging commits: r3155 - in store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb: tuples and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-03-13 08:22:07 -0400 (Fri, 13 Mar 2009)
New Revision: 3155
Modified:
store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ExchangeTB.java
store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_1.java
Log:
QPID-1730 : Update to make the recovery of queues and exchanges perform a look up in the broker to see if the object already exists rather than make a new one. This does mean that any dynamic changes will be lost, but I'm not sure they are persisted anyway.
Modified: store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
===================================================================
--- store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-03-12 15:04:25 UTC (rev 3154)
+++ store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-03-13 12:22:07 UTC (rev 3155)
@@ -41,6 +41,7 @@
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.framing.abstraction.ContentChunk;
+import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.AMQQueueFactory;
@@ -57,7 +58,6 @@
import org.apache.qpid.server.txn.NonTransactionalContext;
import org.apache.qpid.server.txn.TransactionalContext;
import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import java.io.File;
import java.util.ArrayList;
@@ -480,7 +480,7 @@
/**
* Removes the specified message from the store in the given transactional store context.
* Internal method that is package scoped to allow testing.
- *
+ *
* @param context The transactional context to remove the message in.
* @param messageId Identifies the message to remove.
*
@@ -649,7 +649,7 @@
private void recoverExchange(Exchange exchange) throws AMQException, DatabaseException
{
- _log.info("Recovering durable exchange " + exchange.getName() + " of type " + exchange.getType() + "...");
+ _log.info("Recovering bindings for durable exchange:" + exchange);
QueueRegistry queueRegistry = _virtualHost.getQueueRegistry();
@@ -732,10 +732,7 @@
{
Exchange exchange = (Exchange) binding.entryToObject(value);
- _virtualHost.getExchangeRegistry().registerExchange(exchange);
-
exchanges.add(exchange);
- _log.info("Registering exchange " + exchange.getName());
}
return exchanges;
@@ -834,10 +831,18 @@
*/
public void createQueue(AMQQueue queue, FieldTable arguments) throws AMQException
{
- _log.debug("public void createQueue(AMQQueue queue(" + queue.getName() + ") = " + queue + "): called");
if (_state != State.RECOVERING)
{
+
+ // Check that we don't already have this queue in our map.
+ if (_queueNameToIdMap.containsKey(queue.getName()))
+ {
+ return;
+ }
+
+ _log.debug("BDBMessageStore.createQueue(AMQQueue queue(" + queue + "," + arguments + "): called");
+
long queueId = _queueId.getAndIncrement();
_queueNameToIdMap.put(queue.getName(), queueId);
@@ -1057,7 +1062,7 @@
{
commit(tx);
context.setPayload(null);
- }
+ }
}
catch (DatabaseException e)
{
@@ -1494,13 +1499,8 @@
while (cursor.getNext(key, value, LockMode.RMW) == OperationStatus.SUCCESS)
{
AMQQueue queue = (AMQQueue) binding.entryToObject(value);
- if (queue != null)
- {
- _virtualHost.getQueueRegistry().registerQueue(queue);
- queues.put(queue.getName(), queue);
- _log.info("Recovering queue " + queue.getName() + " with owner:"
- + ((queue.getOwner() == null) ? " <<null>> " : (" \"" + queue.getOwner() + "\" ")));
- }
+
+ queues.put(queue.getName(), queue);
}
return queues;
@@ -1619,7 +1619,6 @@
}
}
-
private void deliverMessages(final StoreContext context, Map<AMQShortString, AMQQueue> queues)
throws DatabaseException, AMQException
{
Modified: store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ExchangeTB.java
===================================================================
--- store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ExchangeTB.java 2009-03-12 15:04:25 UTC (rev 3154)
+++ store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ExchangeTB.java 2009-03-13 12:22:07 UTC (rev 3155)
@@ -1,21 +1,18 @@
package org.apache.qpid.server.store.berkeleydb;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.AMQException;
-
import com.sleepycat.bind.tuple.TupleBinding;
import com.sleepycat.bind.tuple.TupleInput;
import com.sleepycat.bind.tuple.TupleOutput;
import org.apache.log4j.Logger;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.virtualhost.VirtualHost;
public class ExchangeTB extends TupleBinding
{
private static final Logger _log = Logger.getLogger(ExchangeTB.class);
-
-
private final VirtualHost _virtualHost;
public ExchangeTB(VirtualHost virtualHost)
@@ -29,12 +26,28 @@
AMQShortString name = AMQShortStringEncoding.readShortString(tupleInput);
AMQShortString typeName = AMQShortStringEncoding.readShortString(tupleInput);
-
boolean autoDelete = tupleInput.readBoolean();
try
{
- return _virtualHost.getExchangeFactory().createExchange(name, typeName, true, autoDelete, 0);
+ Exchange exchange;
+ Exchange existing = _virtualHost.getExchangeRegistry().getExchange(name);
+
+ if (existing != null)
+ {
+ _log.info("Exchange :" + existing + ": already exists in configured broker.");
+ exchange = existing;
+ }
+ else
+ {
+ exchange = _virtualHost.getExchangeFactory().createExchange(name, typeName, true, autoDelete, 0);
+
+ _virtualHost.getExchangeRegistry().registerExchange(exchange);
+
+ _log.info("Registering new durable exchange from BDB:" + exchange);
+ }
+
+ return exchange;
}
catch (AMQException e)
{
@@ -47,10 +60,9 @@
{
Exchange exchange = (Exchange) object;
+ AMQShortStringEncoding.writeShortString(exchange.getName(), tupleOutput);
+ AMQShortStringEncoding.writeShortString(exchange.getType(), tupleOutput);
- AMQShortStringEncoding.writeShortString(exchange.getName(),tupleOutput);
- AMQShortStringEncoding.writeShortString(exchange.getType(),tupleOutput);
-
tupleOutput.writeBoolean(exchange.isAutoDelete());
}
Modified: store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_1.java
===================================================================
--- store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_1.java 2009-03-12 15:04:25 UTC (rev 3154)
+++ store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/QueueTuple_1.java 2009-03-13 12:22:07 UTC (rev 3155)
@@ -20,14 +20,14 @@
import com.sleepycat.bind.tuple.TupleBinding;
import com.sleepycat.bind.tuple.TupleInput;
import com.sleepycat.bind.tuple.TupleOutput;
+import org.apache.log4j.Logger;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.AMQQueueFactory;
+import org.apache.qpid.server.store.berkeleydb.AMQShortStringEncoding;
import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.store.berkeleydb.AMQShortStringEncoding;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.log4j.Logger;
public class QueueTuple_1 extends TupleBinding implements QueueTuple
{
@@ -76,7 +76,26 @@
{
try
{
- return AMQQueueFactory.createAMQQueueImpl(name, true, owner, false, _virtualHost, arguments);
+
+ AMQQueue queue;
+ AMQQueue existing = _virtualHost.getQueueRegistry().getQueue(name);
+
+ if (existing != null)
+ {
+ _logger.info("Queue :" + existing + ": already exists in configured broker.");
+
+ queue = existing;
+ }
+ else
+ {
+ // Retrieve the existing Queue object
+ queue = AMQQueueFactory.createAMQQueueImpl(name, true, owner, false, _virtualHost, arguments);
+ _virtualHost.getQueueRegistry().registerQueue(queue);
+ _logger.info("Recovering queue " + queue.getName() + " with owner:"
+ + ((queue.getOwner() == null) ? " <<null>> " : (" \"" + queue.getOwner() + "\" ")));
+ }
+
+ return queue;
}
catch (AMQException e)
{
17 years, 1 month
rhmessaging commits: r3154 - mgmt/trunk/wooly/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-03-12 11:04:25 -0400 (Thu, 12 Mar 2009)
New Revision: 3154
Modified:
mgmt/trunk/wooly/python/wooly/pages.py
Log:
Minor fix for returning correct content type for .js files
Modified: mgmt/trunk/wooly/python/wooly/pages.py
===================================================================
--- mgmt/trunk/wooly/python/wooly/pages.py 2009-03-11 20:13:02 UTC (rev 3153)
+++ mgmt/trunk/wooly/python/wooly/pages.py 2009-03-12 15:04:25 UTC (rev 3154)
@@ -94,6 +94,8 @@
type = "text/html"
elif name.endswith(".css"):
type = "text/css"
+ elif name.endswith(".js"):
+ type = "text/javascript"
else:
type = "text/plain"
17 years, 1 month
rhmessaging commits: r3153 - in store/trunk/cpp: tests/jrnl/jtt and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2009-03-11 16:13:02 -0400 (Wed, 11 Mar 2009)
New Revision: 3153
Modified:
store/trunk/cpp/configure.ac
store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py
Log:
Updated version to 0.5 to match qpid verion; minor updates to journal analysis tool
Modified: store/trunk/cpp/configure.ac
===================================================================
--- store/trunk/cpp/configure.ac 2009-03-11 17:24:42 UTC (rev 3152)
+++ store/trunk/cpp/configure.ac 2009-03-11 20:13:02 UTC (rev 3153)
@@ -21,7 +21,7 @@
dnl
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([rhm], [0.4], [rhemrg-users-list(a)redhat.com])
+AC_INIT([rhm], [0.5], [rhemrg-users-list(a)redhat.com])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([dist-bzip2])
Modified: store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py 2009-03-11 17:24:42 UTC (rev 3152)
+++ store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py 2009-03-11 20:13:02 UTC (rev 3153)
@@ -56,7 +56,7 @@
def load(f, klass):
args = load_args(f, klass)
- subclass = klass.descriminate(args)
+ subclass = klass.discriminate(args)
result = subclass(*args)
if subclass != klass:
result.init(f, *load_args(f, subclass))
@@ -183,9 +183,9 @@
format = '=4sBBHQ'
- def descriminate(args):
+ def discriminate(args):
return CLASSES.get(args[1][-1], Hdr)
- descriminate = staticmethod(descriminate)
+ discriminate = staticmethod(discriminate)
def __init__(self, foffs, magic, ver, end, flags, rid):
self.foffs = foffs
@@ -247,7 +247,7 @@
def timestamp_str(self):
ts = gmtime(self.time_sec)
- fstr = '%%a %%b %%d %%H:%%M:%%S.%d %%Y' % (self.time_ns)
+ fstr = '%%a %%b %%d %%H:%%M:%%S.%09d %%Y' % (self.time_ns)
return strftime(fstr, ts)
17 years, 1 month
rhmessaging commits: r3152 - store/trunk/java/bdbstore.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-03-11 13:24:42 -0400 (Wed, 11 Mar 2009)
New Revision: 3152
Modified:
store/trunk/java/bdbstore/build.xml
Log:
Updated project version to be 0.5 to match Apache Qpid release
Modified: store/trunk/java/bdbstore/build.xml
===================================================================
--- store/trunk/java/bdbstore/build.xml 2009-03-11 16:33:40 UTC (rev 3151)
+++ store/trunk/java/bdbstore/build.xml 2009-03-11 17:24:42 UTC (rev 3152)
@@ -4,7 +4,7 @@
<project name="BDBStore" default="build">
<property name="project.name" value="qpid-BDB-MessageStore"/>
- <property name="project.version" value="M3"/>
+ <property name="project.version" value="0.5"/>
<property name="src.tools.dir" location="src/tools/java"/>
<property name="src.main.dir" location="src/main/java"/>
<property name="src.test.dir" location="src/test/java"/>
17 years, 1 month
rhmessaging commits: r3151 - store/trunk/java.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-03-11 12:33:40 -0400 (Wed, 11 Mar 2009)
New Revision: 3151
Added:
store/trunk/java/bdbstore/
Log:
Added BDBStore from broker-queue-refactoring r3134
Copied: store/trunk/java/bdbstore (from rev 3143, store/branches/java/broker-queue-refactor/java/bdbstore)
17 years, 1 month
rhmessaging commits: r3150 - store/trunk/java.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-03-11 12:31:57 -0400 (Wed, 11 Mar 2009)
New Revision: 3150
Removed:
store/trunk/java/bdbstore/
Log:
Remove Old BDBStore from trunk
17 years, 1 month
rhmessaging commits: r3149 - in store/trunk/java/bdbstore: bin and 7 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: ritchiem
Date: 2009-03-11 08:29:35 -0400 (Wed, 11 Mar 2009)
New Revision: 3149
Added:
store/trunk/java/bdbstore/ReadMe.txt
store/trunk/java/bdbstore/bin/
store/trunk/java/bdbstore/build.xml
store/trunk/java/bdbstore/default.testprofile
store/trunk/java/bdbstore/dist-zip.xml
store/trunk/java/bdbstore/docs/
store/trunk/java/bdbstore/etc/
store/trunk/java/bdbstore/jar-with-dependencies.xml
store/trunk/java/bdbstore/lib/
store/trunk/java/bdbstore/log4j-test.xml
store/trunk/java/bdbstore/mvn-repo/
store/trunk/java/bdbstore/pom.xml
store/trunk/java/bdbstore/resources/
store/trunk/java/bdbstore/src/
store/trunk/java/bdbstore/test-provider.properties
Removed:
store/trunk/java/bdbstore/java/bdbstore/ReadMe.txt
store/trunk/java/bdbstore/java/bdbstore/bin/
store/trunk/java/bdbstore/java/bdbstore/build.xml
store/trunk/java/bdbstore/java/bdbstore/default.testprofile
store/trunk/java/bdbstore/java/bdbstore/dist-zip.xml
store/trunk/java/bdbstore/java/bdbstore/docs/
store/trunk/java/bdbstore/java/bdbstore/etc/
store/trunk/java/bdbstore/java/bdbstore/jar-with-dependencies.xml
store/trunk/java/bdbstore/java/bdbstore/lib/
store/trunk/java/bdbstore/java/bdbstore/log4j-test.xml
store/trunk/java/bdbstore/java/bdbstore/mvn-repo/
store/trunk/java/bdbstore/java/bdbstore/pom.xml
store/trunk/java/bdbstore/java/bdbstore/resources/
store/trunk/java/bdbstore/java/bdbstore/src/
store/trunk/java/bdbstore/java/bdbstore/test-provider.properties
Log:
Removed extra path
Copied: store/trunk/java/bdbstore/ReadMe.txt (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/ReadMe.txt)
===================================================================
--- store/trunk/java/bdbstore/ReadMe.txt (rev 0)
+++ store/trunk/java/bdbstore/ReadMe.txt 2009-03-11 12:29:35 UTC (rev 3149)
@@ -0,0 +1,14 @@
+Building with Maven
+-------------------
+The BerkeleyDB jar will automatically be installed in to your local repository with maven from the
+local mvn-repo. This will occur whe you first try and compile the BDB module.
+
+
+Using with Qpid
+---------------
+You will need to update the broker config.xml to configure the broker to use the BDB store.
+Full class is org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+
+In the broker directory a new persistent-distribution directory is available.
+Running "mvn assembly:directory" will create a directory in target that includes all the BDB code and can be run
+as normal with the qpid-server scripts located in the bin directory.
Property changes on: store/trunk/java/bdbstore/ReadMe.txt
___________________________________________________________________
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Copied: store/trunk/java/bdbstore/bin (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/bin)
Property changes on: store/trunk/java/bdbstore/bin
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: store/trunk/java/bdbstore/build.xml (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/build.xml)
===================================================================
--- store/trunk/java/bdbstore/build.xml (rev 0)
+++ store/trunk/java/bdbstore/build.xml 2009-03-11 12:29:35 UTC (rev 3149)
@@ -0,0 +1,204 @@
+<!--
+ - Simple Build file for BDBStore
+ -->
+<project name="BDBStore" default="build">
+
+ <property name="project.name" value="qpid-BDB-MessageStore"/>
+ <property name="project.version" value="M3"/>
+ <property name="src.tools.dir" location="src/tools/java"/>
+ <property name="src.main.dir" location="src/main/java"/>
+ <property name="src.test.dir" location="src/test/java"/>
+ <property name="build.dir" location="build"/>
+ <property name="lib.dir" location="lib"/>
+ <property name="bin.dir" location="bin"/>
+ <property name="release.dir" location="release"/>
+ <property name="resources.dir" location="resources"/>
+ <property name="docs.dir" location="docs"/>
+ <property name="java.target" value="1.5"/>
+ <property name="java.source" value="1.5"/>
+
+ <property name="build.classes" location="build/classes"/>
+ <property name="build.test.classes" location="build/test/classes"/>
+ <property name="build.tools.classes" location="build/tools/classes"/>
+ <property name="build.results" location="build/results"/>
+ <property name="project.namever" value="${project.name}-${project.version}"/>
+ <property name="bdbstore.jar" location="${build.dir}/qpid-bdbstore-${project.version}.jar"/>
+ <property name="bdbtools.jar" location="${build.dir}/qpid-bdbtools-${project.version}.jar"/>
+ <property name="release.zip" location="${release.dir}/${project.namever}.zip"/>
+ <property name="release.tar" location="${release.dir}/${project.namever}.tar"/>
+ <property name="release.tgz" location="${release.dir}/${project.namever}.tgz"/>
+ <property name="release.bz2" location="${release.dir}/${project.namever}.bz2"/>
+
+
+ <property name="java.naming.factory.initial" value="org.apache.qpid.jndi.PropertiesFileInitialContextFactory"/>
+
+ <available property="src.test.dir.exists" file="${src.test.dir}"/>
+
+ <dirname property="project.root" file="${ant.file.common}"/>
+
+ <property file="${project.root}/default.testprofile"/>
+
+ <path id="class.path">
+ <fileset dir="lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="tools.class.path">
+ <path refid="class.path"/>
+ <pathelement path="${build.classes}"/>
+ <pathelement path="${build.tools.classes}"/>
+ </path>
+
+
+ <path id="test.class.path">
+ <path refid="class.path"/>
+ <pathelement path="${build.classes}"/>
+ <pathelement path="${build.tools.classes}"/>
+ <pathelement path="${build.test.classes}"/>
+ </path>
+
+ <target name="init">
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.test.classes}"/>
+ <mkdir dir="${build.tools.classes}"/>
+ <mkdir dir="${build.results}"/>
+ </target>
+
+ <target name="clean" description="remove build artifacts">
+ <delete dir="${build.dir}"/>
+ <delete dir="${release.dir}"/>
+ </target>
+
+ <target name="build" depends="init,build-main,build-tools,build-tests"/>
+
+ <target name="build-main" depends="init">
+ <javac srcdir="${src.main.dir}"
+ destdir="${build.classes}"
+ target="${java.target}"
+ classpathref="test.class.path" debug="on"/>
+ </target>
+
+ <target name="build-tests" depends="init,build-main">
+ <javac srcdir="${src.test.dir}"
+ destdir="${build.test.classes}"
+ classpathref="test.class.path" debug="on"/>
+ </target>
+
+ <target name="build-tools" depends="init,build-main">
+ <javac srcdir="${src.tools.dir}"
+ destdir="${build.tools.classes}"
+ classpathref="tools.class.path" debug="on"/>
+ <copy todir="${build.tools.classes}" >
+ <fileset dir="${src.tools.dir}">
+ <exclude name="**/*.java"/>
+ <exclude name="**/package.html"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="jar" depends="build">
+ <jar destfile="${bdbstore.jar}" basedir="${build.classes}"/>
+ <jar destfile="${bdbtools.jar}" basedir="${build.tools.classes}"/>
+ </target>
+
+ <target name="test" depends="build-tests" if="src.test.dir.exists"
+ unless="${dontruntest}" description="execute unit tests">
+
+ <delete file="${module.failed}"/>
+
+ <junit fork="${test.fork}" maxmemory="${test.mem}" reloading="no"
+ haltonfailure="${haltonfailure}" haltonerror="${haltonerror}"
+ failureproperty="test.failures" printsummary="on" timeout="600000" >
+
+ <sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/>
+ <sysproperty key="root.logging.level" value="${root.logging.level}"/>
+ <sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
+ <sysproperty key="java.naming.factory.initial" value="${java.naming.factory.initial}"/>
+ <sysproperty key="java.naming.provider.url" value="${java.naming.provider.url}"/>
+ <sysproperty key="broker" value="${broker}"/>
+ <sysproperty key="broker.clean" value="${broker.clean}"/>
+ <sysproperty key="broker.version" value="${broker.version}"/>
+ <sysproperty key="broker.ready" value="${broker.ready}" />
+ <sysproperty key="test.excludes" value="${test.excludes}"/>
+ <sysproperty key="test.excludesfile" value="${test.excludesfile}"/>
+ <sysproperty key="max_prefetch" value ="${max_prefetch}"/>
+ <sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/>
+ <sysproperty key="QPID_HOME" value="${project.root}"/>
+ <sysproperty key="QPID_WORK" value="${project.root}/build/test-work"/>
+ <sysproperty key="BDB_WORK" value="${project.root}/build/test-work/bdbstore"/>
+ <sysproperty key="BDB_HOME" value="${project.root}"/>
+ <sysproperty key="test.excludes" value="false"/>
+
+
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+
+ <classpath refid="test.class.path"/>
+
+ <batchtest fork="${test.fork}" todir="${build.results}">
+ <fileset dir="${src.test.dir}" excludes="${module.test.excludes}">
+ <include name="**/${test}.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+
+ <!--antcall target="touch-failed"/-->
+
+ <condition property="failed">
+ <and>
+ <isfalse value="${test.failures.ignore}"/>
+ <available file="${module.failed}"/>
+ </and>
+ </condition>
+
+ <fail if="failed" message="TEST SUITE FAILED"/>
+
+ </target>
+
+ <target name="prepare" depends="jar">
+ <mkdir dir="${release.dir}"/>
+ </target>
+
+ <target name="zip" depends="build,prepare" description="build release archive">
+ <zip destfile="${release.zip}">
+ <zipfileset dir="${bin.dir}" prefix="${project.namever}/bin" filemode="755">
+ <include name="*"/>
+ <exclude name="*.txt"/>
+ </zipfileset>
+
+ <zipfileset dir="${bin.dir}" prefix="${project.namever}/bin" filemode="644">
+ <include name="*.txt"/>
+ </zipfileset>
+
+ <zipfileset dir="${build.dir}" prefix="${project.namever}/lib" filemode="644">
+ <include name="*.jar"/>
+ </zipfileset>
+
+ <zipfileset dir="${lib.dir}" prefix="${project.namever}/lib" filemode="644">
+ <include name="je*.jar"/>
+ <include name="commons-cli*.jar"/>
+ </zipfileset>
+
+ <zipfileset dir="${resources.dir}" prefix="${project.namever}" filemode="644"/>
+ <zipfileset dir="${docs.dir}" prefix="${project.namever}/docs" filemode="644"/>
+ </zip>
+ </target>
+
+ <target name="tar" depends="zip" description="build release archive">
+ <tar destfile="${release.tar}" longfile="gnu" >
+ <zipfileset src="${release.zip}"/>
+ </tar>
+ </target>
+
+ <target name="tgz" depends="tar" description="build release archive">
+ <gzip src="${release.tar}" destfile="${release.tgz}"/>
+ </target>
+
+ <target name="bzip2" depends="tar" description="build release archive">
+ <bzip2 src="${release.tar}" destfile="${release.bz2}"/>
+ </target>
+
+ <target name="release" depends="zip,tgz" description="build all release archives except .bz2"/>
+
+</project>
Property changes on: store/trunk/java/bdbstore/build.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Copied: store/trunk/java/bdbstore/default.testprofile (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/default.testprofile)
===================================================================
--- store/trunk/java/bdbstore/default.testprofile (rev 0)
+++ store/trunk/java/bdbstore/default.testprofile 2009-03-11 12:29:35 UTC (rev 3149)
@@ -0,0 +1,23 @@
+broker.version=0-8
+broker=vm
+broker.clean=${project.root}/clean-dir ${build.data}
+broker.ready=Listening on TCP port
+
+java.naming.provider.url=${project.root}/test-provider.properties
+max_prefetch=1000
+
+log=debug
+amqj.logging.level=${log}
+amqj.protocol.logging.level=${log}
+root.logging.level=${log}
+log4j.configuration=file:///${project.root}/log4j-test.xml
+log4j.debug=false
+
+test.excludes=true
+test.excludesfile=${project.root}/08ExcludeList
+test.fork=no
+test.mem=512M
+test=*Test
+haltonfailure=no
+haltonerror=no
+exclude.modules=none
Property changes on: store/trunk/java/bdbstore/default.testprofile
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: store/trunk/java/bdbstore/dist-zip.xml (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/dist-zip.xml)
===================================================================
--- store/trunk/java/bdbstore/dist-zip.xml (rev 0)
+++ store/trunk/java/bdbstore/dist-zip.xml 2009-03-11 12:29:35 UTC (rev 3149)
@@ -0,0 +1,25 @@
+<!-- This is an assembly descriptor that produces a zip containing the backup utility and the all dependencies jar. -->
+<assembly>
+ <id>bdbtests</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>bdb_backup</outputDirectory>
+ <includes>
+ <include>qpid-bdbstore-${qpid.version}-all-test-deps.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>etc/scripts</directory>
+ <outputDirectory>bdb_backup</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Property changes on: store/trunk/java/bdbstore/dist-zip.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Copied: store/trunk/java/bdbstore/docs (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/docs)
Property changes on: store/trunk/java/bdbstore/docs
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: store/trunk/java/bdbstore/etc (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/etc)
Property changes on: store/trunk/java/bdbstore/etc
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: store/trunk/java/bdbstore/jar-with-dependencies.xml (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/jar-with-dependencies.xml)
===================================================================
--- store/trunk/java/bdbstore/jar-with-dependencies.xml (rev 0)
+++ store/trunk/java/bdbstore/jar-with-dependencies.xml 2009-03-11 12:29:35 UTC (rev 3149)
@@ -0,0 +1,56 @@
+<!--
+ This is an assembly descriptor that produces a jar file that contains all the
+ runtime dependencies, fully expanded into a single jar.
+-->
+<assembly>
+ <id>all-test-deps</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory></outputDirectory>
+ <outputFileNameMapping></outputFileNameMapping>
+ <unpack>true</unpack>
+ <scope>test</scope>
+ <excludes>
+ <!-- Exclude everything not needed by the backup utility. -->
+ <!--
+ <exclude>org.apache.mina:mina-java5</exclude>
+ <exclude>org.apache.mina:mina-filter-ssl</exclude>
+ <exclude>relaxngDatatype:relaxngDatatype</exclude>
+ <exclude>isorelax:isorelax</exclude>
+ <exclude>org.apache.mina:mina-core</exclude>
+ <exclude>commons-lang:commons-lang</exclude>
+ <exclude>commons-collections:commons-collections</exclude>
+ <exclude>commons-digester:commons-digester</exclude>
+ <exclude>commons-cli:commons-cli</exclude>
+ <exclude>msv:msv</exclude>
+ <exclude>org.apache.qpid:qpid-broker</exclude>
+ <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
+ <exclude>commons-logging:commons-logging</exclude>
+ <exlcude>commons-codec:commons-codec</exlcude>
+ <exclude>xerces:xercesImpl</exclude>
+ <exclude>javax.servlet:servlet-api</exclude>
+ <exclude>xalan:xalan</exclude>
+ <exclude>commons-configuration:commons-configuration</exclude>
+ <exclude>jaxen:jaxen</exclude>
+ <exclude>slf4j:slf4j-simple</exclude>
+ <exclude>commons-beanutils:commons-beanutils</exclude>
+ <exclude>xml-apis:xml-apis</exclude>
+ <exclude>commons-beanutils:commons-beanutils-core</exclude>
+ <exclude>commons-logging:commons-logging-api</exclude>
+ <exclude>dom4j:dom4j</exclude>
+ <exclude>saxpath:saxpath</exclude>
+ -->
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Property changes on: store/trunk/java/bdbstore/jar-with-dependencies.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Deleted: store/trunk/java/bdbstore/java/bdbstore/ReadMe.txt
===================================================================
--- store/trunk/java/bdbstore/java/bdbstore/ReadMe.txt 2009-03-11 12:24:21 UTC (rev 3148)
+++ store/trunk/java/bdbstore/java/bdbstore/ReadMe.txt 2009-03-11 12:29:35 UTC (rev 3149)
@@ -1,14 +0,0 @@
-Building with Maven
--------------------
-The BerkeleyDB jar will automatically be installed in to your local repository with maven from the
-local mvn-repo. This will occur whe you first try and compile the BDB module.
-
-
-Using with Qpid
----------------
-You will need to update the broker config.xml to configure the broker to use the BDB store.
-Full class is org.apache.qpid.server.store.berkeleydb.BDBMessageStore
-
-In the broker directory a new persistent-distribution directory is available.
-Running "mvn assembly:directory" will create a directory in target that includes all the BDB code and can be run
-as normal with the qpid-server scripts located in the bin directory.
Deleted: store/trunk/java/bdbstore/java/bdbstore/build.xml
===================================================================
--- store/trunk/java/bdbstore/java/bdbstore/build.xml 2009-03-11 12:24:21 UTC (rev 3148)
+++ store/trunk/java/bdbstore/java/bdbstore/build.xml 2009-03-11 12:29:35 UTC (rev 3149)
@@ -1,204 +0,0 @@
-<!--
- - Simple Build file for BDBStore
- -->
-<project name="BDBStore" default="build">
-
- <property name="project.name" value="qpid-BDB-MessageStore"/>
- <property name="project.version" value="M3"/>
- <property name="src.tools.dir" location="src/tools/java"/>
- <property name="src.main.dir" location="src/main/java"/>
- <property name="src.test.dir" location="src/test/java"/>
- <property name="build.dir" location="build"/>
- <property name="lib.dir" location="lib"/>
- <property name="bin.dir" location="bin"/>
- <property name="release.dir" location="release"/>
- <property name="resources.dir" location="resources"/>
- <property name="docs.dir" location="docs"/>
- <property name="java.target" value="1.5"/>
- <property name="java.source" value="1.5"/>
-
- <property name="build.classes" location="build/classes"/>
- <property name="build.test.classes" location="build/test/classes"/>
- <property name="build.tools.classes" location="build/tools/classes"/>
- <property name="build.results" location="build/results"/>
- <property name="project.namever" value="${project.name}-${project.version}"/>
- <property name="bdbstore.jar" location="${build.dir}/qpid-bdbstore-${project.version}.jar"/>
- <property name="bdbtools.jar" location="${build.dir}/qpid-bdbtools-${project.version}.jar"/>
- <property name="release.zip" location="${release.dir}/${project.namever}.zip"/>
- <property name="release.tar" location="${release.dir}/${project.namever}.tar"/>
- <property name="release.tgz" location="${release.dir}/${project.namever}.tgz"/>
- <property name="release.bz2" location="${release.dir}/${project.namever}.bz2"/>
-
-
- <property name="java.naming.factory.initial" value="org.apache.qpid.jndi.PropertiesFileInitialContextFactory"/>
-
- <available property="src.test.dir.exists" file="${src.test.dir}"/>
-
- <dirname property="project.root" file="${ant.file.common}"/>
-
- <property file="${project.root}/default.testprofile"/>
-
- <path id="class.path">
- <fileset dir="lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <path id="tools.class.path">
- <path refid="class.path"/>
- <pathelement path="${build.classes}"/>
- <pathelement path="${build.tools.classes}"/>
- </path>
-
-
- <path id="test.class.path">
- <path refid="class.path"/>
- <pathelement path="${build.classes}"/>
- <pathelement path="${build.tools.classes}"/>
- <pathelement path="${build.test.classes}"/>
- </path>
-
- <target name="init">
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${build.test.classes}"/>
- <mkdir dir="${build.tools.classes}"/>
- <mkdir dir="${build.results}"/>
- </target>
-
- <target name="clean" description="remove build artifacts">
- <delete dir="${build.dir}"/>
- <delete dir="${release.dir}"/>
- </target>
-
- <target name="build" depends="init,build-main,build-tools,build-tests"/>
-
- <target name="build-main" depends="init">
- <javac srcdir="${src.main.dir}"
- destdir="${build.classes}"
- target="${java.target}"
- classpathref="test.class.path" debug="on"/>
- </target>
-
- <target name="build-tests" depends="init,build-main">
- <javac srcdir="${src.test.dir}"
- destdir="${build.test.classes}"
- classpathref="test.class.path" debug="on"/>
- </target>
-
- <target name="build-tools" depends="init,build-main">
- <javac srcdir="${src.tools.dir}"
- destdir="${build.tools.classes}"
- classpathref="tools.class.path" debug="on"/>
- <copy todir="${build.tools.classes}" >
- <fileset dir="${src.tools.dir}">
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </copy>
- </target>
-
- <target name="jar" depends="build">
- <jar destfile="${bdbstore.jar}" basedir="${build.classes}"/>
- <jar destfile="${bdbtools.jar}" basedir="${build.tools.classes}"/>
- </target>
-
- <target name="test" depends="build-tests" if="src.test.dir.exists"
- unless="${dontruntest}" description="execute unit tests">
-
- <delete file="${module.failed}"/>
-
- <junit fork="${test.fork}" maxmemory="${test.mem}" reloading="no"
- haltonfailure="${haltonfailure}" haltonerror="${haltonerror}"
- failureproperty="test.failures" printsummary="on" timeout="600000" >
-
- <sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/>
- <sysproperty key="root.logging.level" value="${root.logging.level}"/>
- <sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
- <sysproperty key="java.naming.factory.initial" value="${java.naming.factory.initial}"/>
- <sysproperty key="java.naming.provider.url" value="${java.naming.provider.url}"/>
- <sysproperty key="broker" value="${broker}"/>
- <sysproperty key="broker.clean" value="${broker.clean}"/>
- <sysproperty key="broker.version" value="${broker.version}"/>
- <sysproperty key="broker.ready" value="${broker.ready}" />
- <sysproperty key="test.excludes" value="${test.excludes}"/>
- <sysproperty key="test.excludesfile" value="${test.excludesfile}"/>
- <sysproperty key="max_prefetch" value ="${max_prefetch}"/>
- <sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/>
- <sysproperty key="QPID_HOME" value="${project.root}"/>
- <sysproperty key="QPID_WORK" value="${project.root}/build/test-work"/>
- <sysproperty key="BDB_WORK" value="${project.root}/build/test-work/bdbstore"/>
- <sysproperty key="BDB_HOME" value="${project.root}"/>
- <sysproperty key="test.excludes" value="false"/>
-
-
- <formatter type="plain"/>
- <formatter type="xml"/>
-
- <classpath refid="test.class.path"/>
-
- <batchtest fork="${test.fork}" todir="${build.results}">
- <fileset dir="${src.test.dir}" excludes="${module.test.excludes}">
- <include name="**/${test}.java"/>
- </fileset>
- </batchtest>
- </junit>
-
- <!--antcall target="touch-failed"/-->
-
- <condition property="failed">
- <and>
- <isfalse value="${test.failures.ignore}"/>
- <available file="${module.failed}"/>
- </and>
- </condition>
-
- <fail if="failed" message="TEST SUITE FAILED"/>
-
- </target>
-
- <target name="prepare" depends="jar">
- <mkdir dir="${release.dir}"/>
- </target>
-
- <target name="zip" depends="build,prepare" description="build release archive">
- <zip destfile="${release.zip}">
- <zipfileset dir="${bin.dir}" prefix="${project.namever}/bin" filemode="755">
- <include name="*"/>
- <exclude name="*.txt"/>
- </zipfileset>
-
- <zipfileset dir="${bin.dir}" prefix="${project.namever}/bin" filemode="644">
- <include name="*.txt"/>
- </zipfileset>
-
- <zipfileset dir="${build.dir}" prefix="${project.namever}/lib" filemode="644">
- <include name="*.jar"/>
- </zipfileset>
-
- <zipfileset dir="${lib.dir}" prefix="${project.namever}/lib" filemode="644">
- <include name="je*.jar"/>
- <include name="commons-cli*.jar"/>
- </zipfileset>
-
- <zipfileset dir="${resources.dir}" prefix="${project.namever}" filemode="644"/>
- <zipfileset dir="${docs.dir}" prefix="${project.namever}/docs" filemode="644"/>
- </zip>
- </target>
-
- <target name="tar" depends="zip" description="build release archive">
- <tar destfile="${release.tar}" longfile="gnu" >
- <zipfileset src="${release.zip}"/>
- </tar>
- </target>
-
- <target name="tgz" depends="tar" description="build release archive">
- <gzip src="${release.tar}" destfile="${release.tgz}"/>
- </target>
-
- <target name="bzip2" depends="tar" description="build release archive">
- <bzip2 src="${release.tar}" destfile="${release.bz2}"/>
- </target>
-
- <target name="release" depends="zip,tgz" description="build all release archives except .bz2"/>
-
-</project>
Deleted: store/trunk/java/bdbstore/java/bdbstore/default.testprofile
===================================================================
--- store/trunk/java/bdbstore/java/bdbstore/default.testprofile 2009-03-11 12:24:21 UTC (rev 3148)
+++ store/trunk/java/bdbstore/java/bdbstore/default.testprofile 2009-03-11 12:29:35 UTC (rev 3149)
@@ -1,23 +0,0 @@
-broker.version=0-8
-broker=vm
-broker.clean=${project.root}/clean-dir ${build.data}
-broker.ready=Listening on TCP port
-
-java.naming.provider.url=${project.root}/test-provider.properties
-max_prefetch=1000
-
-log=debug
-amqj.logging.level=${log}
-amqj.protocol.logging.level=${log}
-root.logging.level=${log}
-log4j.configuration=file:///${project.root}/log4j-test.xml
-log4j.debug=false
-
-test.excludes=true
-test.excludesfile=${project.root}/08ExcludeList
-test.fork=no
-test.mem=512M
-test=*Test
-haltonfailure=no
-haltonerror=no
-exclude.modules=none
Deleted: store/trunk/java/bdbstore/java/bdbstore/dist-zip.xml
===================================================================
--- store/trunk/java/bdbstore/java/bdbstore/dist-zip.xml 2009-03-11 12:24:21 UTC (rev 3148)
+++ store/trunk/java/bdbstore/java/bdbstore/dist-zip.xml 2009-03-11 12:29:35 UTC (rev 3149)
@@ -1,25 +0,0 @@
-<!-- This is an assembly descriptor that produces a zip containing the backup utility and the all dependencies jar. -->
-<assembly>
- <id>bdbtests</id>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>bdb_backup</outputDirectory>
- <includes>
- <include>qpid-bdbstore-${qpid.version}-all-test-deps.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>etc/scripts</directory>
- <outputDirectory>bdb_backup</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
Deleted: store/trunk/java/bdbstore/java/bdbstore/jar-with-dependencies.xml
===================================================================
--- store/trunk/java/bdbstore/java/bdbstore/jar-with-dependencies.xml 2009-03-11 12:24:21 UTC (rev 3148)
+++ store/trunk/java/bdbstore/java/bdbstore/jar-with-dependencies.xml 2009-03-11 12:29:35 UTC (rev 3149)
@@ -1,56 +0,0 @@
-<!--
- This is an assembly descriptor that produces a jar file that contains all the
- runtime dependencies, fully expanded into a single jar.
--->
-<assembly>
- <id>all-test-deps</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory></outputDirectory>
- <outputFileNameMapping></outputFileNameMapping>
- <unpack>true</unpack>
- <scope>test</scope>
- <excludes>
- <!-- Exclude everything not needed by the backup utility. -->
- <!--
- <exclude>org.apache.mina:mina-java5</exclude>
- <exclude>org.apache.mina:mina-filter-ssl</exclude>
- <exclude>relaxngDatatype:relaxngDatatype</exclude>
- <exclude>isorelax:isorelax</exclude>
- <exclude>org.apache.mina:mina-core</exclude>
- <exclude>commons-lang:commons-lang</exclude>
- <exclude>commons-collections:commons-collections</exclude>
- <exclude>commons-digester:commons-digester</exclude>
- <exclude>commons-cli:commons-cli</exclude>
- <exclude>msv:msv</exclude>
- <exclude>org.apache.qpid:qpid-broker</exclude>
- <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
- <exclude>commons-logging:commons-logging</exclude>
- <exlcude>commons-codec:commons-codec</exlcude>
- <exclude>xerces:xercesImpl</exclude>
- <exclude>javax.servlet:servlet-api</exclude>
- <exclude>xalan:xalan</exclude>
- <exclude>commons-configuration:commons-configuration</exclude>
- <exclude>jaxen:jaxen</exclude>
- <exclude>slf4j:slf4j-simple</exclude>
- <exclude>commons-beanutils:commons-beanutils</exclude>
- <exclude>xml-apis:xml-apis</exclude>
- <exclude>commons-beanutils:commons-beanutils-core</exclude>
- <exclude>commons-logging:commons-logging-api</exclude>
- <exclude>dom4j:dom4j</exclude>
- <exclude>saxpath:saxpath</exclude>
- -->
- </excludes>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
Deleted: store/trunk/java/bdbstore/java/bdbstore/log4j-test.xml
===================================================================
--- store/trunk/java/bdbstore/java/bdbstore/log4j-test.xml 2009-03-11 12:24:21 UTC (rev 3148)
+++ store/trunk/java/bdbstore/java/bdbstore/log4j-test.xml 2009-03-11 12:29:35 UTC (rev 3149)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j configuration for unit tests -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t %d %p [%c{4}] %m%n"/>
- </layout>
- </appender>
-
- <logger name="org.apache.qpid">
- <level value="${amqj.logging.level}"/>
- </logger>
-
- <logger name="qpid.protocol">
- <level value="${amqj.protocol.logging.level}"/>
- </logger>
-
- <logger name="org.apache.qpid.test">
- <level value="ALL"/>
- </logger>
-
- <root>
- <level value="${root.logging.level}"/>
- <appender-ref ref="console" />
- </root>
-</log4j:configuration>
Deleted: store/trunk/java/bdbstore/java/bdbstore/pom.xml
===================================================================
--- store/trunk/java/bdbstore/java/bdbstore/pom.xml 2009-03-11 12:24:21 UTC (rev 3148)
+++ store/trunk/java/bdbstore/java/bdbstore/pom.xml 2009-03-11 12:29:35 UTC (rev 3149)
@@ -1,110 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.etp.qpid</groupId>
- <artifactId>qpid-bdbstore</artifactId>
- <packaging>jar</packaging>
- <version>1.0-incubating-M2.1-SNAPSHOT</version>
- <name>Qpid BDB Store</name>
- <url>http://cwiki.apache.org/confluence/display/qpid</url>
-
- <parent>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid</artifactId>
- <version>1.0-incubating-M2.1-SNAPSHOT</version>
- </parent>
-
- <!-- Local repository for the BerkeleyDB-je so we don't have to use the installer script -->
- <repositories>
- <repository>
- <id>berkeley-je.local</id>
- <name>Local BerkeleyDB JE Repository</name>
- <url>file://${basedir}/mvn-repo</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-broker</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-perftests</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-systests</artifactId>
- </dependency>
- <dependency>
- <groupId>sleepycat</groupId>
- <artifactId>berkeleydb-je</artifactId>
- <version>3.2.76</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <!-- Produce an all dependencies jar, to be used for running the hot backup utility as a standalone tool. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
- <configuration>
- <descriptors>
- <descriptor>jar-with-dependencies.xml</descriptor>
- <descriptor>dist-zip.xml</descriptor>
- </descriptors>
- <outputDirectory>target</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
- </plugin>
- </plugins>
-
- <resources>
- <!-- Ensure that the customized log4j for the backup tool is included. -->
- <resource>
- <targetPath>/</targetPath>
- <filtering>false</filtering>
- <directory>src/resources</directory>
- <includes>
- <include>backup-log4j.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
-
-</project>
Deleted: store/trunk/java/bdbstore/java/bdbstore/test-provider.properties
===================================================================
--- store/trunk/java/bdbstore/java/bdbstore/test-provider.properties 2009-03-11 12:24:21 UTC (rev 3148)
+++ store/trunk/java/bdbstore/java/bdbstore/test-provider.properties 2009-03-11 12:29:35 UTC (rev 3149)
@@ -1,34 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-
-connectionfactory.vm = amqp://username:password@clientid/test?brokerlist='vm://:1'
-
-connectionfactory.vmfailover = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1'
-connectionfactory.connection1 = amqp://username:password@clientid/test?brokerlist='vm://:1'
-connectionfactory.connection2 = amqp://username:password@clientid/test?brokerlist='vm://:2'
-
-
-#queue.MyQueue = example.MyQueue
-queue.queue = example.queue
-#queue.xaQueue = xaQueue
-
-#topic.xaTopic = xaTopic
-#topic.durableSubscriberTopic = durableSubscriberTopic
Copied: store/trunk/java/bdbstore/lib (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/lib)
Property changes on: store/trunk/java/bdbstore/lib
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: store/trunk/java/bdbstore/log4j-test.xml (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/log4j-test.xml)
===================================================================
--- store/trunk/java/bdbstore/log4j-test.xml (rev 0)
+++ store/trunk/java/bdbstore/log4j-test.xml 2009-03-11 12:29:35 UTC (rev 3149)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j configuration for unit tests -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%t %d %p [%c{4}] %m%n"/>
+ </layout>
+ </appender>
+
+ <logger name="org.apache.qpid">
+ <level value="${amqj.logging.level}"/>
+ </logger>
+
+ <logger name="qpid.protocol">
+ <level value="${amqj.protocol.logging.level}"/>
+ </logger>
+
+ <logger name="org.apache.qpid.test">
+ <level value="ALL"/>
+ </logger>
+
+ <root>
+ <level value="${root.logging.level}"/>
+ <appender-ref ref="console" />
+ </root>
+</log4j:configuration>
Property changes on: store/trunk/java/bdbstore/log4j-test.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: store/trunk/java/bdbstore/mvn-repo (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/mvn-repo)
Property changes on: store/trunk/java/bdbstore/mvn-repo
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: store/trunk/java/bdbstore/pom.xml (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/pom.xml)
===================================================================
--- store/trunk/java/bdbstore/pom.xml (rev 0)
+++ store/trunk/java/bdbstore/pom.xml 2009-03-11 12:29:35 UTC (rev 3149)
@@ -0,0 +1,110 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.etp.qpid</groupId>
+ <artifactId>qpid-bdbstore</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-incubating-M2.1-SNAPSHOT</version>
+ <name>Qpid BDB Store</name>
+ <url>http://cwiki.apache.org/confluence/display/qpid</url>
+
+ <parent>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid</artifactId>
+ <version>1.0-incubating-M2.1-SNAPSHOT</version>
+ </parent>
+
+ <!-- Local repository for the BerkeleyDB-je so we don't have to use the installer script -->
+ <repositories>
+ <repository>
+ <id>berkeley-je.local</id>
+ <name>Local BerkeleyDB JE Repository</name>
+ <url>file://${basedir}/mvn-repo</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-broker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-perftests</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-systests</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>sleepycat</groupId>
+ <artifactId>berkeleydb-je</artifactId>
+ <version>3.2.76</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- Produce an all dependencies jar, to be used for running the hot backup utility as a standalone tool. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <configuration>
+ <descriptors>
+ <descriptor>jar-with-dependencies.xml</descriptor>
+ <descriptor>dist-zip.xml</descriptor>
+ </descriptors>
+ <outputDirectory>target</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <!-- Ensure that the customized log4j for the backup tool is included. -->
+ <resource>
+ <targetPath>/</targetPath>
+ <filtering>false</filtering>
+ <directory>src/resources</directory>
+ <includes>
+ <include>backup-log4j.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Property changes on: store/trunk/java/bdbstore/pom.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Copied: store/trunk/java/bdbstore/resources (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/resources)
Property changes on: store/trunk/java/bdbstore/resources
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: store/trunk/java/bdbstore/src (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/src)
Property changes on: store/trunk/java/bdbstore/src
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: store/trunk/java/bdbstore/test-provider.properties (from rev 3148, store/trunk/java/bdbstore/java/bdbstore/test-provider.properties)
===================================================================
--- store/trunk/java/bdbstore/test-provider.properties (rev 0)
+++ store/trunk/java/bdbstore/test-provider.properties 2009-03-11 12:29:35 UTC (rev 3149)
@@ -0,0 +1,34 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
+connectionfactory.vm = amqp://username:password@clientid/test?brokerlist='vm://:1'
+
+connectionfactory.vmfailover = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1'
+connectionfactory.connection1 = amqp://username:password@clientid/test?brokerlist='vm://:1'
+connectionfactory.connection2 = amqp://username:password@clientid/test?brokerlist='vm://:2'
+
+
+#queue.MyQueue = example.MyQueue
+queue.queue = example.queue
+#queue.xaQueue = xaQueue
+
+#topic.xaTopic = xaTopic
+#topic.durableSubscriberTopic = durableSubscriberTopic
Property changes on: store/trunk/java/bdbstore/test-provider.properties
___________________________________________________________________
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
17 years, 1 month