Author: rhs
Date: Mon Apr 21 19:25:09 2008
New Revision: 650359
URL: http://svn.apache.org/viewvc?rev=650359&view=rev
Log:
QPID-832: fixed ant build system
Added:
incubator/qpid/branches/thegreatmerge/qpid/java/broker/build.xml (with
props)
incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/build.xml
(with props)
Removed:
incubator/qpid/branches/thegreatmerge/qpid/java/lib/junit-toolkit-0.6-SNAPSHOT.jar
incubator/qpid/branches/thegreatmerge/qpid/java/lib/junit-toolkit-0.7.1-SNAPSHOT.jar
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/build.deps
incubator/qpid/branches/thegreatmerge/qpid/java/build.xml
incubator/qpid/branches/thegreatmerge/qpid/java/client/build.xml
incubator/qpid/branches/thegreatmerge/qpid/java/integrationtests/build.xml
incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java
incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
incubator/qpid/branches/thegreatmerge/qpid/java/perftests/build.xml
incubator/qpid/branches/thegreatmerge/qpid/java/systests/build.xml
Added: incubator/qpid/branches/thegreatmerge/qpid/java/broker/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/broker/build.xml?rev=650359&view=auto
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/broker/build.xml (added)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/broker/build.xml Mon Apr 21
19:25:09 2008
@@ -0,0 +1,38 @@
+<!--
+ -
+ - 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="AMQ Broker" default="build">
+
+ <property name="module.depends" value="common"/>
+ <property name="module.main" value="org.apache.qpid.server.Main"/>
+ <property name="module.vm.version" value="1.5"/>
+
+ <import file="../module.xml"/>
+
+ <property name="output.dir"
value="${module.precompiled}/org/apache/qpid/server/filter/jms/selector"/>
+
+ <target name="precompile">
+ <mkdir dir="${output.dir}"/>
+ <exec executable="javacc">
+ <arg line="-OUTPUT_DIRECTORY=${output.dir}
src/main/grammar/SelectorParser.jj"/>
+ </exec>
+ </target>
+
+</project>
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/broker/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/build.deps?rev=650359&r1=650358&r2=650359&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/build.deps (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/build.deps Mon Apr 21
19:25:09 2008
@@ -10,7 +10,6 @@
geronimo-jms=lib/geronimo-jms_1.1_spec-1.0.jar
junit=lib/junit-3.8.1.jar
-junit-toolkit=lib/junit-toolkit-0.7.1-SNAPSHOT.jar
log4j=lib/log4j-1.2.12.jar
@@ -27,15 +26,16 @@
felix.libs=${osgi-core} ${felix-framework}
-test.libs=${log4j} ${slf4j-log4j} ${junit} ${junit-toolkit}
-
common.libs=${slf4j-api} ${backport-util-concurrent} ${mina-core} \
${mina-filter-ssl} ${commons-codec} ${commons-lang} ${commons-collections}
\
${commons-configuration}
client.libs=${common.libs} ${geronimo-jms}
broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \
${slf4j-log4j} ${xalan} ${felix.libs}
-systests.libs=${client.libs} ${test.libs}
+
+junit-toolkit.libs=${log4j}
+test.libs=${slf4j-log4j} ${junit} ${junit-toolkit.libs}
+systests.libs=${client.libs} ${test.libs}
perftests.libs=${systests.libs}
integrationtests.libs=${systests.libs}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/build.xml?rev=650359&r1=650358&r2=650359&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/build.xml (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/build.xml Mon Apr 21
19:25:09 2008
@@ -24,7 +24,7 @@
<property name="modules.core" value="common broker client"/>
<property name="modules.examples" value="client/example"/>
- <property name="modules.tests" value="systests perftests
integrationtests"/>
+ <property name="modules.tests" value="junit-toolkit systests perftests
integrationtests"/>
<property name="modules.management" value="management/eclipse-plugin"/>
<property name="modules" value="${modules.core}
${modules.examples} ${modules.tests} ${modules.management}"/>
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/client/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/client/build.xml?rev=650359&r1=650358&r2=650359&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/client/build.xml (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/client/build.xml Mon Apr 21
19:25:09 2008
@@ -21,7 +21,7 @@
<project name="AMQ Client" default="build">
<property name="module.depends" value="common"/>
- <property name="module.test.depends" value="broker"/>
+ <property name="module.test.depends" value="broker junit-toolkit"/>
<import file="../module.xml"/>
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/integrationtests/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/integrationtests/build.xml?rev=650359&r1=650358&r2=650359&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/integrationtests/build.xml
(original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/integrationtests/build.xml
Mon Apr 21 19:25:09 2008
@@ -20,7 +20,7 @@
-->
<project name="Integration Tests" default="build">
- <property name="module.depends" value="systests client common"/>
+ <property name="module.depends" value="systests client common
junit-toolkit"/>
<property name="module.dist" value="false"/>
<import file="../module.xml"/>
Added: incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/build.xml?rev=650359&view=auto
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/build.xml
(added)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/build.xml Mon
Apr 21 19:25:09 2008
@@ -0,0 +1,27 @@
+<!--
+ -
+ - 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="Junit Toolkit" default="build">
+
+ <property name="module.src" value="src/main"/>
+
+ <import file="../module.xml"/>
+
+</project>
Propchange:
incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java?rev=650359&r1=650358&r2=650359&view=diff
==============================================================================
---
incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java
(original)
+++
incubator/qpid/branches/thegreatmerge/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java
Mon Apr 21 19:25:09 2008
@@ -86,7 +86,7 @@
*
* @throws Exception Any exceptions falling through the tests are wrapped
in Exception and rethrown.
*/
- protected TestResult start(String[] args) throws Exception
+ public TestResult start(String[] args) throws Exception
{
String testCase = "";
boolean wait = false;
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java?rev=650359&r1=650358&r2=650359&view=diff
==============================================================================
---
incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
(original)
+++
incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
Mon Apr 21 19:25:09 2008
@@ -83,7 +83,7 @@
// If this test fails due to changes in the broker code,
// then the constants in the Constants.java shoule be updated
accordingly
DestNameExchange exchange = new DestNameExchange();
- exchange.initialise(_virtualHost,
ExchangeDefaults.DIRECT_EXCHANGE_NAME, false, true);
+ exchange.initialise(_virtualHost,
ExchangeDefaults.DIRECT_EXCHANGE_NAME, false, 0, true);
AMQManagedObject mbean = (AMQManagedObject)exchange.getManagedObject();
MBeanInfo mbeanInfo = mbean.getMBeanInfo();
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/perftests/build.xml?rev=650359&r1=650358&r2=650359&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/perftests/build.xml
(original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/perftests/build.xml Mon Apr
21 19:25:09 2008
@@ -20,7 +20,7 @@
-->
<project name="Performance Tests" default="build">
- <property name="module.depends" value="systests client broker common"/>
+ <property name="module.depends" value="systests client broker common
junit-toolkit"/>
<property name="module.dist" value="false"/>
<import file="../module.xml"/>
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/systests/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/systests/build.xml?rev=650359&r1=650358&r2=650359&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/systests/build.xml
(original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/systests/build.xml Mon Apr
21 19:25:09 2008
@@ -19,7 +19,7 @@
-
-->
<project name="System Tests" default="build">
- <property name="module.depends" value="client broker common"/>
+ <property name="module.depends" value="client broker common
junit-toolkit"/>
<property name="module.dist" value="false"/>
<import file="../module.xml"/>
