activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r645991 [1/2] - in /activemq/trunk: ./ activemq-console/src/main/resources/META-INF/ activemq-core/ activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/ activemq-core/src/main/resources/META-INF/ activemq-jaas/src...
Date Tue, 08 Apr 2008 16:28:15 GMT
Author: chirino
Date: Tue Apr  8 09:28:08 2008
New Revision: 645991

URL: http://svn.apache.org/viewvc?rev=645991&view=rev
Log:
Merged in the rest of djencks's release changes from the 4.1 branch

Added:
    activemq/trunk/LICENSE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/LICENSE
    activemq/trunk/NOTICE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/NOTICE
    activemq/trunk/activemq-jmdns_1.0/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/
    activemq/trunk/activemq-jmdns_1.0/pom.xml
      - copied, changed from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/pom.xml
    activemq/trunk/activemq-jmdns_1.0/src/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/
    activemq/trunk/activemq-jmdns_1.0/src/main/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/
    activemq/trunk/activemq-jmdns_1.0/src/main/java/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSCache.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSCache.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSConstants.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSConstants.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSEntry.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSEntry.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSIncoming.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSIncoming.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSListener.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSListener.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSOutgoing.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSOutgoing.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSQuestion.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSQuestion.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSRecord.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSRecord.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSState.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSState.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/HostInfo.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/HostInfo.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/JmDNS.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/JmDNS.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceEvent.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceEvent.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceInfo.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceInfo.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceListener.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceListener.java
    activemq/trunk/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceTypeListener.java
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceTypeListener.java
    activemq/trunk/activemq-jmdns_1.0/src/main/resources/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/resources/
    activemq/trunk/activemq-jmdns_1.0/src/main/resources/META-INF/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/resources/META-INF/
    activemq/trunk/activemq-jmdns_1.0/src/main/resources/META-INF/NOTICE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/resources/META-INF/NOTICE
    activemq/trunk/activemq-jmdns_1.0/src/main/resources/META-INF/README.txt
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/src/main/resources/META-INF/README.txt
    activemq/trunk/activemq-rar/src/main/rar/META-INF/LICENSE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/LICENSE
    activemq/trunk/activemq-rar/src/main/rar/META-INF/NOTICE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-rar/src/main/rar/META-INF/NOTICE
    activemq/trunk/activemq-web-console/src/main/webapp/META-INF/LICENSE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/META-INF/LICENSE
    activemq/trunk/activemq-web-console/src/main/webapp/META-INF/NOTICE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/META-INF/NOTICE
    activemq/trunk/activemq-web-demo/src/main/webapp/META-INF/LICENSE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-web-demo/src/main/webapp/META-INF/LICENSE
    activemq/trunk/activemq-web-demo/src/main/webapp/META-INF/NOTICE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-web-demo/src/main/webapp/META-INF/NOTICE
    activemq/trunk/activemq-web/src/main/appended-resources/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-web/src/main/appended-resources/
    activemq/trunk/activemq-web/src/main/appended-resources/META-INF/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-web/src/main/appended-resources/META-INF/
    activemq/trunk/activemq-web/src/main/appended-resources/META-INF/LICENSE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-web/src/main/appended-resources/META-INF/LICENSE
    activemq/trunk/activemq-web/src/main/appended-resources/META-INF/NOTICE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-web/src/main/appended-resources/META-INF/NOTICE
    activemq/trunk/activemq-xmpp/src/main/appended-resources/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-xmpp/src/main/appended-resources/
    activemq/trunk/activemq-xmpp/src/main/appended-resources/META-INF/
      - copied from r645632, activemq/branches/activemq-4.1/activemq-xmpp/src/main/appended-resources/META-INF/
    activemq/trunk/activemq-xmpp/src/main/appended-resources/META-INF/LICENSE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-xmpp/src/main/appended-resources/META-INF/LICENSE
    activemq/trunk/activemq-xmpp/src/main/appended-resources/META-INF/NOTICE
      - copied unchanged from r645632, activemq/branches/activemq-4.1/activemq-xmpp/src/main/appended-resources/META-INF/NOTICE
Removed:
    activemq/trunk/LICENSE.txt
    activemq/trunk/NOTICE.txt
    activemq/trunk/activemq-console/src/main/resources/META-INF/LICENSE.txt
    activemq/trunk/activemq-console/src/main/resources/META-INF/NOTICE.txt
    activemq/trunk/activemq-core/src/main/resources/META-INF/LICENSE.txt
    activemq/trunk/activemq-core/src/main/resources/META-INF/NOTICE.txt
    activemq/trunk/activemq-jaas/src/main/resources/
    activemq/trunk/activemq-openwire-generator/src/main/resources/
    activemq/trunk/activemq-optional/src/main/resources/META-INF/LICENSE.txt
    activemq/trunk/activemq-optional/src/main/resources/META-INF/NOTICE.txt
    activemq/trunk/activemq-perftest/src/main/resources/META-INF/
    activemq/trunk/activemq-ra/src/main/resources/
    activemq/trunk/activemq-rar/src/main/rar/META-INF/LICENSE.txt
    activemq/trunk/activemq-rar/src/main/rar/META-INF/NOTICE.txt
    activemq/trunk/activemq-soaktest/src/main/
    activemq/trunk/activemq-systest/src/main/resources/META-INF/
    activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/resources/
    activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/resources/
    activemq/trunk/activemq-tooling/maven-activemq-plugin/src/main/resources/
    activemq/trunk/activemq-web-console/LICENSE.txt
    activemq/trunk/activemq-web-console/src/main/webapp/META-INF/LICENSE.txt
    activemq/trunk/activemq-web-console/src/main/webapp/META-INF/NOTICE.txt
    activemq/trunk/activemq-web-demo/src/main/webapp/META-INF/LICENSE.txt
    activemq/trunk/activemq-web-demo/src/main/webapp/META-INF/NOTICE.txt
    activemq/trunk/activemq-web/src/main/resources/META-INF/LICENSE.txt
    activemq/trunk/activemq-web/src/main/resources/META-INF/NOTICE.txt
    activemq/trunk/activemq-xmpp/src/main/resources/META-INF/LICENSE.txt
    activemq/trunk/activemq-xmpp/src/main/resources/META-INF/NOTICE.txt
    activemq/trunk/assembly/src/main/resources/
Modified:
    activemq/trunk/KEYS
    activemq/trunk/activemq-core/pom.xml
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java
    activemq/trunk/activemq-openwire-generator/pom.xml
    activemq/trunk/activemq-ra/pom.xml
    activemq/trunk/activemq-rar/pom.xml
    activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
    activemq/trunk/activemq-tooling/maven-activemq-plugin/pom.xml
    activemq/trunk/activemq-web-console/pom.xml
    activemq/trunk/activemq-xmpp/pom.xml
    activemq/trunk/assembly/pom.xml
    activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
    activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
    activemq/trunk/assembly/src/release/LICENSE.txt
    activemq/trunk/assembly/src/release/NOTICE.txt
    activemq/trunk/pom.xml

Modified: activemq/trunk/KEYS
URL: http://svn.apache.org/viewvc/activemq/trunk/KEYS?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/KEYS (original)
+++ activemq/trunk/KEYS Tue Apr  8 09:28:08 2008
@@ -28,3 +28,113 @@
 zL5kZCj7c8MN8YZDAKDR9LTb6woveul50+uGtUl2fIH1uA==
 =RBPl
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub   1024D/56F3E01B 2007-08-01
+      Key fingerprint = A48F ADE5 4FA5 6B93 FE66  EC17 A05E BEE6 56F3 E01B
+uid                  David Jencks (geronimo) <david_jencks@yahoo.com>
+sig 3        56F3E01B 2007-08-01  David Jencks (geronimo) <david_jencks@yahoo.com>
+sub   2048g/4E525FE0 2007-08-01
+sig          56F3E01B 2007-08-01  David Jencks (geronimo) <david_jencks@yahoo.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.7 (Darwin)
+
+mQGiBEawPygRBADKQe8iEQdS45n4jbSopR4XfDOLEVcxHHZBHrdj357vAZvSdgYI
+U738HNAX5INMHub1+pv/B2DpUkfmnnfRENGBeSYWtl6XsKZYRjodR2muI33daUYj
+lRqvxrY0ZSgmSbKlcQHAP8jMAtmPi+EG8tDcufLXSELtoLT6KTMJ183vgwCgxXgM
+xUYSo5JTdoKl426Ix9MzMjcEAKBlHorZ39y8kt+YtCaqoJdmTAqXb1YF/lSX08++
+knpPmxyjFaCZZGXaFLhRN9ru5+pTvebwjERm+/m+bObXWtWhovS3NOquykpKNJr8
+gDvo/B8ony4IlDwozDlsaa+yNx7TpkoAZ43wVh15L6Jn2j+LD4C91yFUC9EB4E5Z
+gQMuBACMD+Pf6TsT26ObkKG8aaNvk9nmPCbIhVSERWB8A/4+yloJEeskbU2HPOZL
+/74Ap5c9KWxMgajDqK/OJ7AS3ioM3emk7nAiWQ4GJfjA9eQq5DwK7zmDIBXH90wR
+sFW6YXXoJe0YdFnp0iUUg+77K+Jndmew0S0orfjUI+PPIYl4GbQwRGF2aWQgSmVu
+Y2tzIChnZXJvbmltbykgPGRhdmlkX2plbmNrc0B5YWhvby5jb20+iGAEExECACAF
+AkawPygCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCgXr7mVvPgG3GRAJ9R
+HPXrbn4pG4/1T0L0x6OaKMOlAgCfXVpywuj+t4AmBBUMtDYLCX5nFxi5Ag0ERrA/
+KBAIAJjFzBHoHeZxj22hxzdwVS0uI3GGizrANwL6HAf+EaVLvwOFmNiUjeg757z3
+XsM/mLVABc6TueB4PPjVJTYlSrBvgsAbIYtcC0BPyZ0hDRDJPj5sj2kgq8mxZjWY
+D8ZrEzxqVmQ94uL5uHfsVdMPubtaJvDRHMr8vagETlNgMQsUvHtILEwRQagOwtUi
+Un/PnItw99DJTVADvS/N+1Yk0Wxf+/BCuafECgSl3w1/vsA23yLAAEdBLhERpWql
+BRteCug1vkA8BQtstdW0GwXZ6k0jXTkG27sCtImQklvWWFYFQtRSWutLdvQRdjkj
+jJucEgEh1nxmj6tbGkwizmd1+9MAAwYH/iQ8GcbnFJc5KdLBd1BkmGglcFeGDHC7
+0BDZdpXuCKQqSe9IG/i2DMdg6b2T+dsyejdBVzAe7mmVp2yXwZ21e2+YllfrD2kO
+0YgCkAEf+WMN2ABv+VHSN+XfUjiNHvWDXUvbq4Ul5xlQ3Nj8d5NdiXEabd6QuVD7
+DduGMZPmreosqdjLODRuifRdC5RXyGzoM4CghibNIHtDqDAsFxaOgON8nP7yooo8
+D3AnYprsWRTKV88YlULxpnPXwNZuMnsIiwstZinLdCUs9laZx+UC/FaD3CMV720x
+ZDfHJ2hMS+MqGU8A7Cpu4qXEDfB4Py9D1DJe/v3mML/TX94gklTw2ZGISQQYEQIA
+CQUCRrA/KAIbDAAKCRCgXr7mVvPgGxy3AKCwWsjL+86/X9NhVkCATFmxRR97EQCe
+N7cG7JasIe/XD/3vwMpY6s1HQ9+ZAaIERGuO4BEEAKof0LWrTOJcizRIQPWm/HaF
+OEIkuk8AuLoC4O2bPO7x1cxPdeUKNvy9gGvsmxJUBFic3dTUhJAB3QW5FFUzXjLc
+GIjTV0fnsQBHJNdFUTEE8r+EBlvsgOYxDsuMYgeRNlLji6Th3H5dGd02+ze7vq6P
+E2VZNUvs/h2ZqHmKM6lrAKDX9aZpCuE/DUUep5c6DKSGtdimlQQAjNl/K60zbL8V
+cnq2hznzfdCrgItzocwGoxGs/6l8kI9POUqChDRAtXjhgPWfpkLz6nYf7hd3GUgh
+TmlZ7y0ivzMXraa6rmmFgBL7yRGiqSoCtOGSnsKyR76JkrTCcWHSXrmYTxDJ2Lou
+wtGEDqbPcnK+LYQoO/LzLwV3HGKJFNwEAKXFRwmd74QIazMNtgZVppJWSQepK+ay
+l01AF9Gs9dk/ZSdq8fxWmPFpnifNTUarW2HxmCft15fFuuQaVhJPbDiNuXtbNUfo
+5gS912pg8slG/633eDa7lRJ8IpCBFDQUMbKC6PQYGt8SOzWKoUFuHlI9WaGTsjwE
+zXqPEeNea5BYtDZEYXZpZCBNLiBKb2huc29uIChEYXZlIEpvaG5zb24pIDxzbm9v
+cGRhdmVAYXBhY2hlLm9yZz6IXgQTEQIAHgUCRGuO4AIbAwYLCQgHAwIDFQIDAxYC
+AQIeAQIXgAAKCRDS475zRW3+qT4cAJ4szy1AZSHZiuj2cIzGpCNkF56TqACfWtoI
+PBSi4LwRhekMmM+EtKE8IJi5Ag0ERGuPARAIANRyV+xiYHZ4U0Emquc0Q8EXaAKs
+YJ9ZxRjUr7XRyLYFfSSPzPJSEZeCMLk88+FvjBEVffkHSZHSCiQnd6JZ22N41SfL
+tj5f1B1NBE2+4oB81K2sqMzMX/RD6DdgL2Qff6Tp1Y2+zlZzjl+RJRSFuADyOX1X
+e+f6Ika/fR+gpiYqwWwIQKH82omD1kGdZZhwP7/eELOpN525NJlVeGTOUQbhVS87
+EG+U1o+cCk4RfoupNQw9HeLXvS50MmMldMLEParcJofJ7g/2YKxKfg3qyTbc9HsR
+kwaktxah/3D6nKy1RNZyK5Kjn7Ql+F+8j+M503ZFCVgotUa/0oRgteR2IlMAAwYI
+AJZCNAAoylWbJPaDd9CxRY13GDv/a/p3kgf1pTrkqtBFnMhnrExvb/aEwxFYa+be
+VXZiU+tPknNYTn14xG2CXw7CWy/Ua5P0Y/SgioBmyciPVcsx/9WzPpeHrDLRrcB/
+4lbp7yR9nIvP9EZ9EZcwvhD2jwPxtqnPkpbM7mpyVdz4ghkYyw3TuA0NsUcTE8YA
+foYvDMISbtU6Cjh/njEdNH3MxA0NAQXC8bGCzGehiEOD9iXQoJ1rjdAUPNOP8nry
+YLjqXHMMNcv7tLMPaJHd3UDRpUzrKtyeNQ47ywDwfNL6w1jLv+vZbaTZPIRs9WrW
+vNUfgJUVh+OmVCGgfIL9noOISQQYEQIACQUCRGuPAQIbDAAKCRDS475zRW3+qYLc
+AJ9cedvS6uxGo16+cqYaN9V4lhRn1ACeMjIZjW/rhCjwaKL9PITjPSt2k2GZAaIE
+Q55JXxEEAMvNaI5I+tdfXeKsJdPjaXpwWPhyorbUrTbJlYZAp+sUu06uuvtfM3/c
+rRqYUpPgK6sEPHffKTZA+Vku7+F7U/vJoQJEvrtR6jK5zkom25n9PopoiefFhXM3
+Rp0dy6GzDY15RccGBZM6YSVgkshizGbYvknzp2MB/M46VKOGim1rAKD8FiC1vZaI
+WfoWYu7kBzbS575OdwP/Z0nTDgLl0iTrRZK+qAzRO5o3a7eW+8RYoLD3gv0/5WcN
+IfrvYd4UuMOcRzRJv3mRSEXWEIATMRJfPyDxoHO8CYclem5fX3CmJsI5zA4WiTt4
+Cig45Uoy44CDl3dCsZyEQQVqBnhU58uAdm+yIkto6BVFJid5UXUgjvFFONKvpAUD
+/1Yv8HauQLLd3yycusPm5ryTlubEAgdVn3N1tMVt3bhOxtvA65KOgmB/teKHs08+
+xlJxDgIVFK+15ABJ1UiWIe/Yl38USFVRL9OGrWmqqgG7pgZFQr4EvMmpavK9ivsL
+GneKBVWu7kvCI9zJP5WtRRbJTRXtdIEnaRQXXhG1bMz3tCREYXZpZCBKb2huc29u
+IDxzbm9vcGRhdmVAYXBhY2hlLm9yZz6IRQQQEQIABgUCRYWJ+QAKCRATLknU5B7c
+fmAHAJiCBzQ/q1vgg2gPwC2e+zI24wemAJ9HBRpfjI4eIIlyaz7tUCN4aO/804hG
+BBARAgAGBQJEe8ToAAoJEAEFZrzkE2OSCKkAn0GIpUl/zmjn6l1f9p5qNOXzG0wQ
+AJ4nQco6HKNaEn/g0kl3fQvNhWQpRIhGBBARAgAGBQJFLyxiAAoJEFuWgBDgT5qJ
+8LwAn3EBUDHcxfXNL0OXuY8hTntwZ+y+AJ9/Klov0NSFpbtbKhoZahoUmz705ohG
+BBARAgAGBQJFMJiLAAoJEA3wdF2rgh+8JioAmwW7sg/VB45nI0CJK0WCVBzcqJ2B
+AJ9nt04X9kH49HkwTVFTWhR2odn3TYhGBBARAgAGBQJFNCP6AAoJEF5FJs6Zkq38
+bUAAoIprJiO1GTFLq+EoClM/KAn28jWzAKDhTNUkiQmS7E7azLWFNP/O1tKvSohG
+BBARAgAGBQJFNDBAAAoJEJksQ/1feJipsnQAni8HC3R8n1Y9D02c98ck7lk1MKmi
+AJ4uWT/LCSwq0noWLWdZD8TEZRs8c4hGBBARAgAGBQJFNPrmAAoJEKvI7jm7VQdG
+44kAnRpcqEI8zUHTYDHUTlAqG6uduJikAJ9IKY2pcr1FSGfpauCsU+t60eh26ohG
+BBARAgAGBQJFNk9JAAoJEIs6YB8IyXXlfUYAoKTSEl6R7Ha2cOojX6mHXL/koznf
+AJ9yvgWwHm5gwT0MvvV06oED6yO+WohGBBARAgAGBQJFPYQAAAoJEMkduNqbz84v
+dSUAnR4auNDXzNGpxblGdbL0eA7zu6OFAKDzt8q4QBYs6gZZgWyi2q6sDNxfx4hG
+BBARAgAGBQJFPrULAAoJEGvijq6/0DB8EpkAnith6mCJPuiTbDD80VDXzV6FMW8u
+AJ9XWz0caY7KPOJnxQNMtLsi5QEilohGBBARAgAGBQJFQIT2AAoJEJd7/dDYcuJw
+6ZcAoLK6IWR2Fx7ZiXMvv6yk9Knuu40HAKCBN/fkJD+IZJQ1S8sGqDKiFfR7dIhG
+BBARAgAGBQJFQqiiAAoJEBJBvIcsXk7Ac/YAn28oplMOif3sCioeYTTYKtT/+Y3W
+AJwIVqixX+cXLntknf69mTVXzstc7YhGBBARAgAGBQJFRtwWAAoJEPx3dBEynYDS
+cskAn0Ri7cS1WXxZ+5GYerBMe5RQrWYbAJ94EAnW/ycxEyJzHmEiMKzPTIAMhIhG
+BBARAgAGBQJFgnGgAAoJEEriyIdmXgdgeVkAoJiNYq0f/th5vBNjfoRLPOi65QK+
+AJ4mU4zkcMwLLeAx/YVTrRERUbDi1oheBBMRAgAeBQJDnklfAhsDBgsJCAcDAgMV
+AgMDFgIBAh4BAheAAAoJEP2e2fEXqlsly8kAmwSJ+1IUOo67g5V8g7ijyF05pIP9
+AJ9iUF3BBlY+i0+T+KxsyMMT86bxpIheBBMRAgAeBQJDnklfAhsDBgsJCAcDAgMV
+AgMDFgIBAh4BAheAAAoJEP2e2fEXqlsly8kAoPF9yjw8EYKnOhdl5Q9yedcrIvMh
+AKD3VaxwH2fBy9ecR5JDnzWu9AM2zrkCDQRDnknHEAgA6sRNVHsmMPA72smxPYxp
+whOwYEgjT5IwRS+RdTE/fpBwVAUs50ww4b754mKsBjGl8zwHSAnjXIsfDC7YHEOJ
+Mgc4Dv9w3tpNNdi1TBPvEQfK0D7+8RbEtp1ssI3IM3EAjGt1fZ/EFO2IziIG3k+1
+5JWU8tSlmUrzgWemJ+ogTR1eRDndsI2pHT2yf4KbTCtB/xh12HVTVOCi3M5Lx3cp
+gF+0WMV3wgzIEi59xmosJSCwC8bkETMSqtikEPt2hwk+cWYIQZ9/u9JB2Xrvqs+7
+vDDZT9DrGUDtJNkAZ+fjU+V7jeVIfowsfVo6nQAVxrKcQ4PapplKWpqG9bFl8q4I
+zwADBQf/X5Bkepht9M3dfaGSs7RwbwJrVeOjmuoLJr59wsQu3yLzCPyBYETQzBFd
+FRKs4tQiv8NKeE8bLfBZNa23+RdS0HtNUT/sbiMDUOH/CeMVTptmYlFQDWicvBh9
+fgswD4bE3prafIJmYcM2j0E0r17FCDjVojmllQslEz2FdS/UKHQOFynwr8wapH4B
+LJfKuxQek3vdCbmsBseKsTpn9rKJ0VbAmzGQtazstt0w1ag8I33Z63bMAwLf4+KI
+FXGtW0yf0uk3V2WNKo9SMhR6Qi0XC8CFSxtMIWMf4hscvzQpp4FNtRwS7A2Z69BL
+ZFcn94uoUEO2GAbXiedjxRckC6O1YohJBBgRAgAJBQJDnknHAhsMAAoJEP2e2fEX
+qlslx8MAoKM+DrO1U9eaph/nvzTxkUPjwOEfAKDWM5WWzi6UoysRPcQ7rlJCW58n
+qQ==
+=lxT7
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file

Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Tue Apr  8 09:28:08 2008
@@ -36,7 +36,6 @@
   <properties>
     <activemq.osgi.import.pkg>
       com.thoughtworks.xstream*;resolution:=optional,
-      javax.jmdns*;resolution:=optional,
       org.apache.activeio*;resolution:=optional,
       org.apache.camel*;resolution:=optional,
       org.apache.commons.pool*;resolution:=optional,
@@ -139,11 +138,6 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>activemq</groupId>
-      <artifactId>jmdns</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
       <optional>true</optional>
@@ -216,6 +210,11 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
+    </dependency>    
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-jmdns_1.0</artifactId>
+      <optional>true</optional>
     </dependency>
 
     <!-- Camel UI testing -->

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java
Tue Apr  8 09:28:08 2008
@@ -21,8 +21,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.jmdns.JmDNS;
+import org.apache.activemq.jmdns.JmDNS;
 
 public final class JmDNSFactory {
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java
Tue Apr  8 09:28:08 2008
@@ -24,10 +24,10 @@
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.jmdns.JmDNS;
-import javax.jmdns.ServiceEvent;
-import javax.jmdns.ServiceInfo;
-import javax.jmdns.ServiceListener;
+import org.apache.activemq.jmdns.JmDNS;
+import org.apache.activemq.jmdns.ServiceEvent;
+import org.apache.activemq.jmdns.ServiceInfo;
+import org.apache.activemq.jmdns.ServiceListener;
 
 import org.apache.activemq.command.DiscoveryEvent;
 import org.apache.activemq.transport.discovery.DiscoveryAgent;

Copied: activemq/trunk/activemq-jmdns_1.0/pom.xml (from r645632, activemq/branches/activemq-4.1/activemq-jmdns_1.0/pom.xml)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jmdns_1.0/pom.xml?p2=activemq/trunk/activemq-jmdns_1.0/pom.xml&p1=activemq/branches/activemq-4.1/activemq-jmdns_1.0/pom.xml&r1=645632&r2=645991&rev=645991&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/activemq-jmdns_1.0/pom.xml (original)
+++ activemq/trunk/activemq-jmdns_1.0/pom.xml Tue Apr  8 09:28:08 2008
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>activemq-parent</artifactId>
     <groupId>org.apache.activemq</groupId>
-    <version>4.1-SNAPSHOT</version>
+    <version>5.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>activemq-jmdns_1.0</artifactId>
-  <name>activemq-jmdns_1.0</name>
+  <name>ActiveMQ :: jmdns 1.0</name>
 
   <description>
     The activemq-jmdns_1.0 source is derived from http://repo1.maven.org/maven2/jmdns/jmdns/1.0/jmdns-1.0-sources.jar

Modified: activemq/trunk/activemq-openwire-generator/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-openwire-generator/pom.xml?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/activemq-openwire-generator/pom.xml (original)
+++ activemq/trunk/activemq-openwire-generator/pom.xml Tue Apr  8 09:28:08 2008
@@ -83,4 +83,15 @@
     </profile>
   </profiles>
  
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

Modified: activemq/trunk/activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/pom.xml?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/pom.xml (original)
+++ activemq/trunk/activemq-ra/pom.xml Tue Apr  8 09:28:08 2008
@@ -48,10 +48,12 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>
     </dependency>
+<!--
     <dependency>
-      <groupId>activemq</groupId>
-      <artifactId>jmdns</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-jmdns_1.0</artifactId>
     </dependency>
+-->
     <dependency>
       <groupId>jmock</groupId>
       <artifactId>jmock</artifactId>

Modified: activemq/trunk/activemq-rar/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-rar/pom.xml?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/activemq-rar/pom.xml (original)
+++ activemq/trunk/activemq-rar/pom.xml Tue Apr  8 09:28:08 2008
@@ -135,8 +135,8 @@
            <artifactId>regexp</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>activemq</groupId>
-           <artifactId>jmdns</artifactId>
+           <groupId>org.apache.activemq</groupId>
+           <artifactId>activemq-jmdns_1.0</artifactId>
         </exclusion>
         <exclusion>
            <groupId>xalan</groupId>
@@ -215,5 +215,15 @@
       <artifactId>log4j</artifactId>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   
 </project>

Modified: activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/pom.xml?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/pom.xml (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/pom.xml Tue Apr  8 09:28:08
2008
@@ -16,53 +16,64 @@
     limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.activemq.tooling</groupId>
-        <artifactId>activemq-tooling</artifactId>
-        <version>5.1-SNAPSHOT</version>
-	</parent>
-    
-	<artifactId>maven-activemq-memtest-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>ActiveMQ :: Memory Usage Test Plugin</name>
+  <parent>
+    <groupId>org.apache.activemq.tooling</groupId>
+    <artifactId>activemq-tooling</artifactId>
+    <version>5.1-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>maven-activemq-memtest-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <name>ActiveMQ :: Memory Usage Test Plugin</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-console</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activeio-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbynet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-console</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activeio-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbynet</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-        </dependency>
-    </dependencies>
 </project>

Modified: activemq/trunk/activemq-tooling/maven-activemq-plugin/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-plugin/pom.xml?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-plugin/pom.xml (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-plugin/pom.xml Tue Apr  8 09:28:08 2008
@@ -15,7 +15,7 @@
     limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -23,34 +23,56 @@
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
     <version>5.1-SNAPSHOT</version>
-	</parent>
-    
-	<artifactId>maven-activemq-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>ActiveMQ :: StartUp Plugin</name>
+  </parent>
 
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-plugin-api</artifactId>
-        <version>2.0.5</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-project</artifactId>
-        <version>2.0.5</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-core</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-spring</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.derby</groupId>
-        <artifactId>derby</artifactId>
-      </dependency>
-    </dependencies>
+  <artifactId>maven-activemq-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <name>ActiveMQ :: StartUp Plugin</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-console</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activeio-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbynet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
 </project>

Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Tue Apr  8 09:28:08 2008
@@ -194,9 +194,10 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jcl</artifactId>
-      <!--
-        <scope>optional</scope>
-      -->
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
     </dependency>
 
 

Modified: activemq/trunk/activemq-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/pom.xml?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/pom.xml (original)
+++ activemq/trunk/activemq-xmpp/pom.xml Tue Apr  8 09:28:08 2008
@@ -84,6 +84,7 @@
       <artifactId>activeio-core</artifactId>
     </dependency>
 
+<!--
     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax</artifactId>
@@ -96,6 +97,7 @@
         </exclusion>
       </exclusions>
     </dependency>
+-->
 
 
     <dependency>
@@ -104,23 +106,31 @@
       <version>2.0.2</version>
       <exclusions>
         <exclusion>
-          <groupId>javax.xml</groupId>
-          <artifactId>jsr173</artifactId>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jsr173_api</artifactId>
         </exclusion>
         <exclusion>
           <groupId>javax.jws</groupId>
           <artifactId>jsr181-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>javax.xml</groupId>
+      <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
       <version>2.0</version>
       <exclusions>
         <exclusion>
-          <groupId>javax.xml</groupId>
-          <artifactId>jsr173</artifactId>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jsr173_api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -129,14 +139,33 @@
       <groupId>org.codehaus.woodstox</groupId>
       <!--<groupId>woodstox</groupId>-->
       <artifactId>wstx-asl</artifactId>
+
       <version>3.0.1</version>
       <!--<version>3.1-rc1</version>-->
+      <exclusions>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-activation_1.1_spec</artifactId>
+      <version>1.0.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+      <version>1.0.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>
-      <version>2.0</version>
+      <!--<version>2.0</version>-->
     </dependency>
 
     <dependency>
@@ -170,6 +199,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
         <inherited>true</inherited>
         <configuration>
           <source>1.5</source>

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Tue Apr  8 09:28:08 2008
@@ -147,8 +147,8 @@
       <artifactId>jaxp-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>activemq</groupId>
-      <artifactId>jmdns</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-jmdns_1.0</artifactId>
     </dependency>
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
@@ -293,6 +293,22 @@
   <build>
     
     <plugins>
+      <plugin>
+        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+        <artifactId>tools-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>verify-legal-files</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>verify-legal-files</goal>
+            </goals>
+            <configuration>
+              <strict>false</strict>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>

Modified: activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Tue Apr  8 09:28:08 2008
@@ -182,6 +182,7 @@
         <include>${pom.groupId}:activemq-xmpp</include>
         <include>${pom.groupId}:activecluster</include>
         <include>${pom.groupId}:activeio-core</include>
+        <include>${pom.groupId}:activemq-jmdns_1.0</include>
         <include>commons-beanutils:commons-beanutils</include>
         <include>commons-collections:commons-collections</include>
         <include>commons-httpclient:commons-httpclient</include>
@@ -197,7 +198,6 @@
         <include>org.springframework:spring</include>
         <include>xstream:xstream</include>
         <include>xmlpull:xmlpull</include>
-        <include>activemq:jmdns</include>
       </includes>
     </dependencySet>
     <dependencySet>

Modified: activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=645991&r1=645990&r2=645991&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Tue Apr  8 09:28:08 2008
@@ -191,6 +191,7 @@
         <include>${pom.groupId}:activemq-xmpp</include>
         <include>${pom.groupId}:activecluster</include>
         <include>${pom.groupId}:activeio-core</include>
+        <include>${pom.groupId}:activemq-jmdns_1.0</include>
         <include>commons-beanutils:commons-beanutils</include>
         <include>commons-collections:commons-collections</include>
         <include>commons-httpclient:commons-httpclient</include>
@@ -209,7 +210,6 @@
         <include>org.springframework:spring</include>
         <include>xstream:xstream</include>
         <include>xmlpull:xmlpull</include>
-        <include>activemq:jmdns</include>
       </includes>
     </dependencySet>
     <dependencySet>



Mime
View raw message