Author: aidan
Date: Wed Apr 23 17:32:22 2008
New Revision: 651124
URL: http://svn.apache.org/viewvc?rev=651124&view=rev
Log:
QPID-832 sync build stuff from thegreatmerge
Added:
incubator/qpid/trunk/qpid/java/broker/build.xml
incubator/qpid/trunk/qpid/java/lib/mina-core-1.0.1.jar (with props)
incubator/qpid/trunk/qpid/java/lib/mina-filter-ssl-1.0.1.jar (with props)
incubator/qpid/trunk/qpid/java/lib/org.apache.felix.framework-1.0.0.jar
(with props)
incubator/qpid/trunk/qpid/java/lib/org.osgi.core-1.0.0.jar (with props)
Removed:
incubator/qpid/trunk/qpid/java/lib/junit-toolkit-0.6-SNAPSHOT.jar
incubator/qpid/trunk/qpid/java/lib/mina-core-1.0.0.jar
incubator/qpid/trunk/qpid/java/lib/mina-filter-ssl-1.0.0.jar
Modified:
incubator/qpid/trunk/qpid/java/build.deps
incubator/qpid/trunk/qpid/java/build.xml
Added: incubator/qpid/trunk/qpid/java/broker/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/build.xml?rev=651124&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/build.xml (added)
+++ incubator/qpid/trunk/qpid/java/broker/build.xml Wed Apr 23 17:32:22 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}"/>
+ <javacc target="src/main/grammar/SelectorParser.jj"
+ outputdirectory="${output.dir}"
+ javacchome="${project.root}/lib"/>
+ </target>
+
+</project>
Modified: incubator/qpid/trunk/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.deps?rev=651124&r1=651123&r2=651124&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.deps (original)
+++ incubator/qpid/trunk/qpid/java/build.deps Wed Apr 23 17:32:22 2008
@@ -10,26 +10,31 @@
geronimo-jms=lib/geronimo-jms_1.1_spec-1.0.jar
junit=lib/junit-3.8.1.jar
-junit-toolkit=lib/junit-toolkit-0.6-SNAPSHOT.jar
log4j=lib/log4j-1.2.12.jar
-mina-core=lib/mina-core-1.0.0.jar
-mina-filter-ssl=lib/mina-filter-ssl-1.0.0.jar
+mina-core=lib/mina-core-1.0.1.jar
+mina-filter-ssl=lib/mina-filter-ssl-1.0.1.jar
slf4j-api=lib/slf4j-api-1.4.0.jar
slf4j-log4j=lib/slf4j-log4j12-1.4.0.jar
xalan=lib/xalan-2.7.0.jar
-test.libs=${log4j} ${slf4j-log4j} ${junit} ${junit-toolkit}
+osgi-core=lib/org.osgi.core-1.0.0.jar
+felix-framework=lib/org.apache.felix.framework-1.0.0.jar
+
+felix.libs=${osgi-core} ${felix-framework}
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}
+ ${slf4j-log4j} ${xalan} ${felix.libs}
+
+junit-toolkit.libs=${log4j} ${junit}
+test.libs=${slf4j-log4j} ${junit-toolkit.libs}
systests.libs=${client.libs} ${test.libs}
perftests.libs=${systests.libs}
integrationtests.libs=${systests.libs}
Modified: incubator/qpid/trunk/qpid/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.xml?rev=651124&r1=651123&r2=651124&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/build.xml Wed Apr 23 17:32:22 2008
@@ -22,7 +22,7 @@
<import file="common.xml"/>
- <property name="modules.core" value="common broker client"/>
+ <property name="modules.core" value="junit-toolkit common broker
client"/>
<property name="modules.examples" value="client/example"/>
<property name="modules.tests" value="systests perftests
integrationtests"/>
<property name="modules.management" value="management/eclipse-plugin"/>
Added: incubator/qpid/trunk/qpid/java/lib/mina-core-1.0.1.jar
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/mina-core-1.0.1.jar?rev=651124&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/trunk/qpid/java/lib/mina-core-1.0.1.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/qpid/trunk/qpid/java/lib/mina-core-1.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/qpid/trunk/qpid/java/lib/mina-filter-ssl-1.0.1.jar
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/mina-filter-ssl-1.0.1.jar?rev=651124&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/trunk/qpid/java/lib/mina-filter-ssl-1.0.1.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/qpid/trunk/qpid/java/lib/mina-filter-ssl-1.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/qpid/trunk/qpid/java/lib/org.apache.felix.framework-1.0.0.jar
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/org.apache.felix.framework-1.0.0.jar?rev=651124&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/qpid/trunk/qpid/java/lib/org.apache.felix.framework-1.0.0.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/qpid/trunk/qpid/java/lib/org.apache.felix.framework-1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/qpid/trunk/qpid/java/lib/org.osgi.core-1.0.0.jar
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/org.osgi.core-1.0.0.jar?rev=651124&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/trunk/qpid/java/lib/org.osgi.core-1.0.0.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/qpid/trunk/qpid/java/lib/org.osgi.core-1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
