summaryrefslogtreecommitdiff
path: root/java/module.xml
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2012-05-04 15:39:19 +0000
committerKim van der Riet <kpvdr@apache.org>2012-05-04 15:39:19 +0000
commit633c33f224f3196f3f9bd80bd2e418d8143fea06 (patch)
tree1391da89470593209466df68c0b40b89c14963b1 /java/module.xml
parentc73f9286ebff93a6c8dbc29cf05e258c4b55c976 (diff)
downloadqpid-python-633c33f224f3196f3f9bd80bd2e418d8143fea06.tar.gz
QPID-3858: Updated branch - merged from trunk r.1333987
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1334037 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/module.xml')
-rw-r--r--java/module.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/java/module.xml b/java/module.xml
index a3b8606525..1aea77b488 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -48,6 +48,7 @@
<property name="module.api" location="${build.api}/${module}/"/>
<property name="module.test.api" location="${build.test.api}/${module}"/>
<property name="module.test.classes" location="${module.build}/test/classes"/>
+ <property name="module.test.resources" location="${module.build}/test/resources"/>
<property name="module.results" location="${build.results}/${module}"/>
<property name="module.failed" location="${module.results}/FAILED"/>
<property name="module.src" location="src/main/java"/>
@@ -179,6 +180,7 @@
<path refid="module.class.path"/>
<pathelement path="${module.test.depends.path}"/>
<path refid="module.test.libs"/>
+ <pathelement path="${module.test.resources}"/>
</path>
<property name="javac.deprecation" value="off"/>
@@ -220,7 +222,7 @@
<jython path="${mllib.dir}">
<args>
<arg line='"${project.root}/genpom"'/>
- <arg line='-s "${project.root}/lib/poms"'/>
+ <arg line='-s "${project.root}/lib/poms${path.separator}lib/poms"'/>
<arg line='-o "${build.scratch}/qpid-${module.name}.pom"'/>
<arg line="-u ${project.url}"/>
<arg line="-g ${project.groupid}"/>
@@ -347,7 +349,7 @@
<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="messagestore.class.name" value="${messagestore.class.name}" />
+ <sysproperty key="messagestorefactory.class.name" value="${messagestorefactory.class.name}" />
<sysproperty key="test.output" value="${module.results}"/>
<sysproperty key="qpid.amqp.version" value="${qpid.amqp.version}"/>