Author: rgodfrey
Date: Fri Oct 26 10:47:35 2012
New Revision: 1402462
URL: http://svn.apache.org/viewvc?rev=1402462&view=rev
Log:
QPID-4396 : [Java AMQP 1.0] move examples into sub-module
Added:
qpid/trunk/qpid/java/amqp-1-0-client-jms/example/build.xml
- copied, changed from r1402434,
qpid/trunk/qpid/java/client/example/build.xml
qpid/trunk/qpid/java/amqp-1-0-client/example/
qpid/trunk/qpid/java/amqp-1-0-client/example/build.xml
- copied, changed from r1402434,
qpid/trunk/qpid/java/client/example/build.xml
qpid/trunk/qpid/java/amqp-1-0-client/example/src/
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Command.java
- copied unchanged from r1402434,
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Command.java
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
- copied unchanged from r1402434,
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java
- copied unchanged from r1402434,
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filereceiver.java
- copied unchanged from r1402434,
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Filereceiver.java
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java
- copied unchanged from r1402434,
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java
- copied unchanged from r1402434,
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java
- copied unchanged from r1402434,
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java
- copied unchanged from r1402434,
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java
- copied unchanged from r1402434,
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java
qpid/trunk/qpid/java/amqp-1-0-client/example/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
- copied unchanged from r1402434,
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
Removed:
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Command.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Demo.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Dump.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Filereceiver.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Filesender.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ReadBytes.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Request.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Respond.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Send.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/SendBytes.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
Modified:
qpid/trunk/qpid/java/amqp-1-0-client-jms/build.xml
qpid/trunk/qpid/java/amqp-1-0-client/build.xml
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/build.xml
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/build.xml?rev=1402462&r1=1402461&r2=1402462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/build.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/build.xml Fri Oct 26 10:47:35 2012
@@ -24,6 +24,9 @@
<property name="module.depends" value="amqp-1-0-common amqp-1-0-client"/>
<property name="module.genpom.args"
value="-Sgeronimo-jms_1.1_spec=provided"/>
+ <property name="example.src.dir"
value="${project.root}/amqp-1-0-client-jms/example/src/main/java" />
+ <property name="example.jar.file"
value="${build.lib}/qpid-amqp-1-0-client-jms-example-${project.version}.jar" />
+
<target name="release-bin-copy-readme">
<copy todir="${module.release}" overwrite="true" failonerror="true">
Copied: qpid/trunk/qpid/java/amqp-1-0-client-jms/example/build.xml (from
r1402434, qpid/trunk/qpid/java/client/example/build.xml)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/example/build.xml?p2=qpid/trunk/qpid/java/amqp-1-0-client-jms/example/build.xml&p1=qpid/trunk/qpid/java/client/example/build.xml&r1=1402434&r2=1402462&rev=1402462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/example/build.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/example/build.xml Fri Oct 26
10:47:35 2012
@@ -18,9 +18,9 @@
- under the License.
-
-->
-<project name="AMQ Client" default="build">
+<project name="AMQ 1.0 JMS Client Example" default="build">
- <property name="module.depends" value="client common"/>
+ <property name="module.depends" value="amqp-1-0-client-jms amqp-1-0-client
amqp-1-0-common"/>
<property name="module.test.depends" value=""/>
<import file="../../module.xml"/>
Modified: qpid/trunk/qpid/java/amqp-1-0-client/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client/build.xml?rev=1402462&r1=1402461&r2=1402462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client/build.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client/build.xml Fri Oct 26 10:47:35 2012
@@ -23,6 +23,9 @@
<property name="module.genpom" value="true"/>
<property name="module.depends" value="amqp-1-0-common"/>
+ <property name="example.src.dir"
value="${project.root}/amqp-1-0-client/example/src/main/java" />
+ <property name="example.jar.file"
value="${build.lib}/qpid-amqp-1-0-client-example-${project.version}.jar" />
+
<import file="../module.xml"/>
Copied: qpid/trunk/qpid/java/amqp-1-0-client/example/build.xml (from r1402434,
qpid/trunk/qpid/java/client/example/build.xml)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client/example/build.xml?p2=qpid/trunk/qpid/java/amqp-1-0-client/example/build.xml&p1=qpid/trunk/qpid/java/client/example/build.xml&r1=1402434&r2=1402462&rev=1402462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/example/build.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client/example/build.xml Fri Oct 26 10:47:35
2012
@@ -18,9 +18,9 @@
- under the License.
-
-->
-<project name="AMQ Client" default="build">
+<project name="AMQ 1.0 Client Example" default="build">
- <property name="module.depends" value="client common"/>
+ <property name="module.depends" value="amqp-1-0-client amqp-1-0-common"/>
<property name="module.test.depends" value=""/>
<import file="../../module.xml"/>
Modified: qpid/trunk/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1402462&r1=1402461&r2=1402462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Fri Oct 26 10:47:35 2012
@@ -68,7 +68,8 @@ commons-configuration.libs = ${commons-b
common.libs=${slf4j-api}
client.libs=${geronimo-jms}
amqp-1-0-common.libs=
-amqp-1-0-client.libs=${commons-cli}
+amqp-1-0-client.libs=
+amqp-1-0-client-example.libs=${commons-cli}
amqp-1-0-client-jms.libs=${geronimo-jms}
tools.libs=${commons-configuration.libs} ${log4j}
broker.libs=${commons-cli} ${commons-logging} ${log4j} ${slf4j-log4j} \
Modified: qpid/trunk/qpid/java/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1402462&r1=1402461&r2=1402462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Fri Oct 26 10:47:35 2012
@@ -32,7 +32,7 @@
</condition>
<property name="modules.core" value="common management/common
amqp-1-0-common broker client amqp-1-0-client amqp-1-0-client-jms tools"/>
- <property name="modules.examples" value="client/example
management/example"/>
+ <property name="modules.examples" value="client/example management/example
amqp-1-0-client/example amqp-1-0-client-jms/example"/>
<property name="modules.tests" value="systests perftests"/>
<property name="modules.plugin" value="${broker-plugins}
${client-plugins}"/>
<property name="modules.jca" value="jca"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
