[rhmessaging-commits] rhmessaging commits: r3149 - in store/trunk/java/bdbstore: bin and 7 other directories.

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