Author: rgemmell Date: 2010-07-20 04:34:58 -0400 (Tue, 20 Jul 2010) New Revision: 4128 Removed: store/trunk/java/bdbstore/ReadMe.txt store/trunk/java/bdbstore/default.testprofile store/trunk/java/bdbstore/dist-zip.xml store/trunk/java/bdbstore/docs/README store/trunk/java/bdbstore/etc/config.xml store/trunk/java/bdbstore/etc/jmxremote.access store/trunk/java/bdbstore/etc/passwd store/trunk/java/bdbstore/jar-with-dependencies.xml store/trunk/java/bdbstore/lib/backport-util-concurrent-2.2.jar store/trunk/java/bdbstore/lib/commons-cli-1.0.jar store/trunk/java/bdbstore/lib/commons-collections-3.2.jar store/trunk/java/bdbstore/lib/commons-configuration-1.2.jar store/trunk/java/bdbstore/lib/commons-lang-2.2.jar store/trunk/java/bdbstore/lib/geronimo-jms_1.1_spec-1.0.jar store/trunk/java/bdbstore/lib/junit-3.8.1.jar store/trunk/java/bdbstore/lib/log4j-1.2.12.jar store/trunk/java/bdbstore/lib/mina-core-1.0.1.jar store/trunk/java/bdbstore/lib/org.apache.felix.framework-1.0.0.jar store/trunk/java/bdbstore/lib/org.osgi.core-1.0.0.jar store/trunk/java/bdbstore/lib/slf4j-api-1.4.0.jar store/trunk/java/bdbstore/lib/slf4j-log4j12-1.4.0.jar store/trunk/java/bdbstore/log4j-test.xml store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.md5 store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.sha1 store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.md5 store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.sha1 store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.42/berkeleydb-je-3.2.42.jar store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.42/berkeleydb-je-3.2.42.pom store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.76/berkeleydb-je-3.2.76.jar store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.md5 store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.sha1 store/trunk/java/bdbstore/pom.xml store/trunk/java/bdbstore/test-provider.properties Modified: store/trunk/java/bdbstore/build.xml Log: Update build.xml to allow building the BDBstore as a broker-plugins module within Qpid's main Java build system. Also remove the already-defunct maven build artefacts, and the now-defunct copies of the broker libraries. Deleted: store/trunk/java/bdbstore/ReadMe.txt =================================================================== --- store/trunk/java/bdbstore/ReadMe.txt 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/ReadMe.txt 2010-07-20 08:34:58 UTC (rev 4128) @@ -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. Modified: store/trunk/java/bdbstore/build.xml =================================================================== --- store/trunk/java/bdbstore/build.xml 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/build.xml 2010-07-20 08:34:58 UTC (rev 4128) @@ -1,212 +1,43 @@ <!-- - - Simple Build file for BDBStore + - 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 name="BDBStore" default="build"> - - <property name="project.name" value="qpid-BDB-MessageStore"/> - <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.resources.dir" location="src/resources"/> - <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"/> +<project name="BDBMessageStore" default="build"> + <property name="module.depends" value="common client management/common broker perftests systests" /> + <property name="module.test.depends" value="test common/test broker/test management/common perftests systests management/tools/qpid-cli" /> - <dirname property="project.root" file="${ant.file.common}"/> + <property name="broker-plugins-bdbstore.libs" value="broker-plugins/bdbstore/lib/je-3.3.62.jar" /> + <property name="broker-plugins-bdbstore.test.libs" value="${test.libs} broker-plugins/bdbstore/lib/je-3.3.62.jar" /> - <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="qpid.work.dir" location="${project.root}/build/test-work"/> + <import file="../../module.xml" /> + <target name="postbuild" depends="copy-store-to-upgrade" /> - <property name="java.naming.factory.initial" value="org.apache.qpid.jndi.PropertiesFileInitialContextFactory"/> - - <available property="src.test.dir.exists" file="${src.test.dir}"/> - - <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 name="copy-store-to-upgrade" description="copy the upgrade tool resource folder contents into the build tree"> + <copy todir="${qpid.home}" failonerror="true"> + <fileset dir="src/test/resources/upgrade"/> + </copy> </target> - <target name="clean" description="remove build artifacts"> - <delete dir="${build.dir}"/> - <delete dir="${release.dir}"/> + <target name="copy-test-profiles" description="copy the test-profile files into the build tree"> + <copy todir="${project.root}/test-profiles" failonerror="true"> + <fileset dir="test-profiles"/> + </copy> </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}"> - <fileset dir="${build.classes}"/> - <fileset dir="${src.resources.dir}"/> - </jar> - <jar destfile="${bdbtools.jar}" basedir="${build.tools.classes}"/> - </target> - - <target name="test" depends="build-tests,prepare-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="${qpid.work.dir}"/> - <sysproperty key="BDB_WORK" value="${qpid.work.dir}/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="prepare-tests"> - <mkdir dir="${qpid.work.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/default.testprofile =================================================================== --- store/trunk/java/bdbstore/default.testprofile 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/default.testprofile 2010-07-20 08:34:58 UTC (rev 4128) @@ -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/dist-zip.xml =================================================================== --- store/trunk/java/bdbstore/dist-zip.xml 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/dist-zip.xml 2010-07-20 08:34:58 UTC (rev 4128) @@ -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/docs/README =================================================================== --- store/trunk/java/bdbstore/docs/README 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/docs/README 2010-07-20 08:34:58 UTC (rev 4128) @@ -1,3 +0,0 @@ -BDB Message Store for Apache Qpid ---------------------------------- -Documentation to be completed Deleted: store/trunk/java/bdbstore/etc/config.xml =================================================================== --- store/trunk/java/bdbstore/etc/config.xml 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/etc/config.xml 2010-07-20 08:34:58 UTC (rev 4128) @@ -1,130 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - - - 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. - - - --> -<broker> - <prefix>${QPID_HOME}</prefix> - <work>${QPID_WORK}</work> - <conf>${prefix}/etc</conf> - <connector> - <!-- Uncomment out this block and edit the keystorePath and keystorePassword - to enable SSL support - <ssl> - <enabled>true</enabled> - <sslOnly>true</sslOnly> - <keystorePath>/path/to/keystore.ks</keystorePath> - <keystorePassword>keystorepass</keystorePassword> - </ssl>--> - <qpidnio>false</qpidnio> - <protectio> - <enabled>false</enabled> - </protectio> - <transport>nio</transport> - <port>5672</port> - <sslport>8672</sslport> - <socketReceiveBuffer>32768</socketReceiveBuffer> - <socketSendBuffer>32768</socketSendBuffer> - </connector> - <management> - <enabled>true</enabled> - <jmxport>8999</jmxport> - <security-enabled>false</security-enabled> - </management> - <advanced> - <filterchain enableExecutorPool="true"/> - <enablePooledAllocator>false</enablePooledAllocator> - <enableDirectBuffers>false</enableDirectBuffers> - <framesize>65535</framesize> - <compressBufferOnQueue>false</compressBufferOnQueue> - <enableJMSXUserID>false</enableJMSXUserID> - </advanced> - - <security> - <principal-databases> - <!-- Example use of Base64 encoded MD5 hashes for authentication via CRAM-MD5-Hashed --> - <principal-database> - <name>passwordfile</name> - <class>org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase</class> - <attributes> - <attribute> - <name>passwordFile</name> - <value>${conf}/passwd</value> - </attribute> - </attributes> - </principal-database> - </principal-databases> - - <access> - <class>org.apache.qpid.server.security.access.plugins.AllowAll</class> - </access> - <jmx> - <access>${conf}/jmxremote.access</access> - <principal-database>passwordfile</principal-database> - </jmx> - </security> - - <virtualhosts> - <directory>${conf}/virtualhosts</directory> - - <virtualhost> - <name>localhost</name> - <localhost> - <store> - <class>org.apache.qpid.server.store.MemoryMessageStore</class> - </store> - - <housekeeping> - <expiredMessageCheckPeriod>20000</expiredMessageCheckPeriod> - </housekeeping> - - </localhost> - </virtualhost> - - <virtualhost> - <name>development</name> - <development> - <store> - <class>org.apache.qpid.server.store.MemoryMessageStore</class> - </store> - </development> - </virtualhost> - - <virtualhost> - <name>test</name> - <test> - <store> - <class>org.apache.qpid.server.store.MemoryMessageStore</class> - </store> - </test> - </virtualhost> - - </virtualhosts> - <heartbeat> - <delay>0</delay> - <timeoutFactor>2.0</timeoutFactor> - </heartbeat> - <queue> - <auto_register>true</auto_register> - </queue> - - <virtualhosts>${conf}/virtualhosts.xml</virtualhosts> -</broker> - - Deleted: store/trunk/java/bdbstore/etc/jmxremote.access =================================================================== --- store/trunk/java/bdbstore/etc/jmxremote.access 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/etc/jmxremote.access 2010-07-20 08:34:58 UTC (rev 4128) @@ -1,23 +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. - -#Generated by JMX Console : Last edited by user:admin -#Tue Jun 12 16:46:39 BST 2007 -admin=admin -guest=readonly -user=readwrite Deleted: store/trunk/java/bdbstore/etc/passwd =================================================================== --- store/trunk/java/bdbstore/etc/passwd 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/etc/passwd 2010-07-20 08:34:58 UTC (rev 4128) @@ -1,22 +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. -# -guest:guest -client:guest -server:guest - Deleted: store/trunk/java/bdbstore/jar-with-dependencies.xml =================================================================== --- store/trunk/java/bdbstore/jar-with-dependencies.xml 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/jar-with-dependencies.xml 2010-07-20 08:34:58 UTC (rev 4128) @@ -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/lib/backport-util-concurrent-2.2.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/lib/commons-cli-1.0.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/lib/commons-collections-3.2.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/lib/commons-configuration-1.2.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/lib/commons-lang-2.2.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/lib/geronimo-jms_1.1_spec-1.0.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/lib/junit-3.8.1.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/lib/log4j-1.2.12.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/lib/mina-core-1.0.1.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/lib/org.apache.felix.framework-1.0.0.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/lib/org.osgi.core-1.0.0.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/lib/slf4j-api-1.4.0.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/lib/slf4j-log4j12-1.4.0.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/log4j-test.xml =================================================================== --- store/trunk/java/bdbstore/log4j-test.xml 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/log4j-test.xml 2010-07-20 08:34:58 UTC (rev 4128) @@ -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/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.md5 =================================================================== --- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.md5 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.md5 2010-07-20 08:34:58 UTC (rev 4128) @@ -1 +0,0 @@ -d21746ca7c9806a202ca4b2099588605 \ No newline at end of file Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.sha1 =================================================================== --- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.sha1 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.jar.sha1 2010-07-20 08:34:58 UTC (rev 4128) @@ -1 +0,0 @@ -d345cc8c994519abbc40c1ae810fdf3e59855040 \ No newline at end of file Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom =================================================================== --- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom 2010-07-20 08:34:58 UTC (rev 4128) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><project> - <modelVersion>4.0.0</modelVersion> - <groupId>sleepycat</groupId> - <artifactId>berkeleydb-je</artifactId> - <version>3.1.0</version> - <distributionManagement> - <status>deployed</status> - </distributionManagement> -</project> \ No newline at end of file Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.md5 =================================================================== --- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.md5 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.md5 2010-07-20 08:34:58 UTC (rev 4128) @@ -1 +0,0 @@ -ddf2876fd3ba2e0813a785ffec8b697e \ No newline at end of file Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.sha1 =================================================================== --- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.sha1 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.1.0/berkeleydb-je-3.1.0.pom.sha1 2010-07-20 08:34:58 UTC (rev 4128) @@ -1 +0,0 @@ -f9c263f05c7fc0ca55202de393d55e6d8c8ec53f \ No newline at end of file Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.42/berkeleydb-je-3.2.42.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.42/berkeleydb-je-3.2.42.pom =================================================================== --- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.42/berkeleydb-je-3.2.42.pom 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.42/berkeleydb-je-3.2.42.pom 2010-07-20 08:34:58 UTC (rev 4128) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><project> - <modelVersion>4.0.0</modelVersion> - <groupId>sleepycat</groupId> - <artifactId>berkeleydb-je</artifactId> - <version>3.2.42</version> - <distributionManagement> - <status>deployed</status> - </distributionManagement> -</project> \ No newline at end of file Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.76/berkeleydb-je-3.2.76.jar =================================================================== (Binary files differ) Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml =================================================================== --- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml 2010-07-20 08:34:58 UTC (rev 4128) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><metadata> - <groupId>sleepycat</groupId> - <artifactId>berkeleydb-je</artifactId> - <version>3.1.0</version> - <versioning> - <versions> - <version>3.1.0</version> - </versions> - <lastUpdated>20070131093848</lastUpdated> - </versioning> -</metadata> \ No newline at end of file Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.md5 =================================================================== --- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.md5 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.md5 2010-07-20 08:34:58 UTC (rev 4128) @@ -1 +0,0 @@ -96bfba4c26862f955c15385d2b99eff5 \ No newline at end of file Deleted: store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.sha1 =================================================================== --- store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.sha1 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/maven-metadata.xml.sha1 2010-07-20 08:34:58 UTC (rev 4128) @@ -1 +0,0 @@ -3ddc590e7f85a5b05a3d271c29f6b370a243d27d \ No newline at end of file Deleted: store/trunk/java/bdbstore/pom.xml =================================================================== --- store/trunk/java/bdbstore/pom.xml 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/pom.xml 2010-07-20 08:34:58 UTC (rev 4128) @@ -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/test-provider.properties =================================================================== --- store/trunk/java/bdbstore/test-provider.properties 2010-07-19 15:54:02 UTC (rev 4127) +++ store/trunk/java/bdbstore/test-provider.properties 2010-07-20 08:34:58 UTC (rev 4128) @@ -1,39 +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.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5672' -connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' -connectionfactory.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5671?ssl='true'' - -connectionfactory.failover = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5673;tcp://localhost:5672'&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20'' -connectionfactory.failover.vm = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1' -connectionfactory.connection1 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5672' -connectionfactory.connection2 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5673' -connectionfactory.connection1.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' -connectionfactory.connection2.vm = 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