You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ai...@apache.org on 2008/02/13 17:28:00 UTC
svn commit: r627511 - in /incubator/qpid/branches/thegreatmerge/qpid/java:
./ common/ lib/
Author: aidan
Date: Wed Feb 13 08:27:46 2008
New Revision: 627511
URL: http://svn.apache.org/viewvc?rev=627511&view=rev
Log:
Import new dependencies and upgrade mina, fix up the build file to use the new generator correctly
Added:
incubator/qpid/branches/thegreatmerge/qpid/java/lib/junit-toolkit-0.7.1-SNAPSHOT.jar (with props)
incubator/qpid/branches/thegreatmerge/qpid/java/lib/mina-core-1.0.1.jar (with props)
incubator/qpid/branches/thegreatmerge/qpid/java/lib/mina-filter-ssl-1.0.1.jar (with props)
incubator/qpid/branches/thegreatmerge/qpid/java/lib/org.apache.felix.framework-1.0.0.jar (with props)
incubator/qpid/branches/thegreatmerge/qpid/java/lib/org.osgi.core-1.0.0.jar (with props)
Removed:
incubator/qpid/branches/thegreatmerge/qpid/java/lib/mina-core-1.0.0.jar
incubator/qpid/branches/thegreatmerge/qpid/java/lib/mina-filter-ssl-1.0.0.jar
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/build.deps
incubator/qpid/branches/thegreatmerge/qpid/java/common/build.xml
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/build.deps?rev=627511&r1=627510&r2=627511&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/build.deps (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/build.deps Wed Feb 13 08:27:46 2008
@@ -10,18 +10,23 @@
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
+junit-toolkit=lib/junit-toolkit-0.7.1-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
+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}
+
test.libs=${log4j} ${slf4j-log4j} ${junit} ${junit-toolkit}
common.libs=${slf4j-api} ${backport-util-concurrent} ${mina-core} \
@@ -29,8 +34,8 @@
${commons-configuration}
client.libs=${common.libs} ${geronimo-jms}
broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \
- ${slf4j-log4j} ${xalan}
-systests.libs=${client.libs} ${test.libs}
+ ${slf4j-log4j} ${xalan} ${felix.libs}
+systests.libs=${client.libs} ${test.libs}
perftests.libs=${systests.libs}
integrationtests.libs=${systests.libs}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/build.xml?rev=627511&r1=627510&r2=627511&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/build.xml (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/build.xml Wed Feb 13 08:27:46 2008
@@ -26,8 +26,8 @@
<property name="generated.package" value="org/apache/qpid/framing" />
<property name="generated.dir" location="${module.precompiled}/${generated.package}" />
<property name="xml.spec.dir" location="${project.root}/../specs" />
- <property name="xml.spec.deps" value="amqp.0-8.xml cluster.0-8.xml" />
- <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-8.xml ${xml.spec.dir}/cluster.0-8.xml" />
+ <property name="xml.spec.deps" value="amqp.0-8.xml amqp.0-9.xml" />
+ <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-8.xml ${xml.spec.dir}/amqp.0-9.xml" />
<property name="mllib.dir" value="${project.root}/../python" />
<property name="gentools.timestamp" location="${generated.dir}/gentools.timestamp" />
<property name="jython.timestamp" location="${generated.dir}/jython.timestamp" />
@@ -72,6 +72,8 @@
<fileset dir="${gentools.home}/lib">
<include name="**/*.jar"/>
</fileset>
+ <pathelement path="${gentools.home}/lib/velocity-1.4.jar" />
+ <pathelement path="${gentools.home}/lib/velocity-dep-1.4.jar" />
</classpath>
</java>
<touch file="${gentools.timestamp}" />
Added: incubator/qpid/branches/thegreatmerge/qpid/java/lib/junit-toolkit-0.7.1-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/lib/junit-toolkit-0.7.1-SNAPSHOT.jar?rev=627511&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/lib/junit-toolkit-0.7.1-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/lib/junit-toolkit-0.7.1-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/qpid/branches/thegreatmerge/qpid/java/lib/mina-core-1.0.1.jar
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/lib/mina-core-1.0.1.jar?rev=627511&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/lib/mina-core-1.0.1.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/lib/mina-core-1.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/qpid/branches/thegreatmerge/qpid/java/lib/mina-filter-ssl-1.0.1.jar
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/lib/mina-filter-ssl-1.0.1.jar?rev=627511&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/lib/mina-filter-ssl-1.0.1.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/lib/mina-filter-ssl-1.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/qpid/branches/thegreatmerge/qpid/java/lib/org.apache.felix.framework-1.0.0.jar
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/lib/org.apache.felix.framework-1.0.0.jar?rev=627511&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/lib/org.apache.felix.framework-1.0.0.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/lib/org.apache.felix.framework-1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/qpid/branches/thegreatmerge/qpid/java/lib/org.osgi.core-1.0.0.jar
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/lib/org.osgi.core-1.0.0.jar?rev=627511&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/lib/org.osgi.core-1.0.0.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/lib/org.osgi.core-1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream