You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2008/04/09 15:27:52 UTC
svn commit: r646333 - in /activemq/trunk:
activemq-web-console/src/main/webapp/META-INF/
activemq-web-demo/src/main/webapp/META-INF/ assembly/src/main/descriptors/
assembly/src/release/
Author: chirino
Date: Wed Apr 9 06:27:37 2008
New Revision: 646333
URL: http://svn.apache.org/viewvc?rev=646333&view=rev
Log:
Applied patch AMQ-1635. Thanks Trevor.
Modified:
activemq/trunk/activemq-web-console/src/main/webapp/META-INF/LICENSE
activemq/trunk/activemq-web-demo/src/main/webapp/META-INF/LICENSE
activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
activemq/trunk/assembly/src/release/LICENSE
Modified: activemq/trunk/activemq-web-console/src/main/webapp/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/META-INF/LICENSE?rev=646333&r1=646332&r2=646333&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/META-INF/LICENSE (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/META-INF/LICENSE Wed Apr 9 06:27:37 2008
@@ -588,52 +588,8 @@
=========================================================================
== Jetty is under the Apache License v 2.0 ==
=========================================================================
--- Licenses for included libraries
-=========================================================================
-== For the backport-util-concurrent library ==
-=========================================================================
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
-<html><head><title>Creative Commons Public Domain</title>
-
-<body>
-
-<p align="center"><em>Copyright-Only Dedication (based on United States law) or Public Domain Certification</em></p>
- <p>The
-person or persons who have associated work with this document (the
-"Dedicator" or "Certifier") hereby either (a) certifies that, to the
-best of his knowledge, the work of authorship identified is in the
-public domain of the country from which the work is published, or (b)
-hereby dedicates whatever copyright the dedicators holds in the work of
-authorship identified below (the "Work") to the public domain. A
-certifier, morever, dedicates any copyright interest he may have in the
-associated work, and for these purposes, is described as a "dedicator"
-below.</p>
-
- <p>A certifier has taken reasonable steps to verify
-the copyright status of this work. Certifier recognizes that his good
-faith efforts may not shield him from liability if in fact the work
-certified is not in the public domain.</p>
-
- <p>Dedicator makes
-this dedication for the benefit of the public at large and to the
-detriment of the Dedicator's heirs and successors. Dedicator intends
-this dedication to be an overt act of relinquishment in perpetuity of
-all present and future rights under copyright law, whether vested or
-contingent, in the Work. Dedicator understands that such relinquishment
-of all rights includes the relinquishment of all rights to enforce (by
-lawsuit or otherwise) those copyrights in the Work.</p>
-
- <p>Dedicator
-recognizes that, once placed in the public domain, the Work may be
-freely reproduced, distributed, transmitted, used, modified, built
-upon, or otherwise exploited by anyone for any purpose, commercial or
-non-commercial, and in any way, including by methods that have not yet
-been invented or conceived.</p>
- </div>
-</div>
-</body></html>
+-- Licenses for included libraries
=========================================================================
== For jaxb-api and jaxb-impl (CDDL) ==
Modified: activemq/trunk/activemq-web-demo/src/main/webapp/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/src/main/webapp/META-INF/LICENSE?rev=646333&r1=646332&r2=646333&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/src/main/webapp/META-INF/LICENSE (original)
+++ activemq/trunk/activemq-web-demo/src/main/webapp/META-INF/LICENSE Wed Apr 9 06:27:37 2008
@@ -202,52 +202,6 @@
limitations under the License.
=========================================================================
-== For the backport-util-concurrent library ==
-=========================================================================
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
-<html><head><title>Creative Commons Public Domain</title>
-
-<body>
-
-<p align="center"><em>Copyright-Only Dedication (based on United States law) or Public Domain Certification</em></p>
-
- <p>The
-person or persons who have associated work with this document (the
-"Dedicator" or "Certifier") hereby either (a) certifies that, to the
-best of his knowledge, the work of authorship identified is in the
-public domain of the country from which the work is published, or (b)
-hereby dedicates whatever copyright the dedicators holds in the work of
-authorship identified below (the "Work") to the public domain. A
-certifier, morever, dedicates any copyright interest he may have in the
-associated work, and for these purposes, is described as a "dedicator"
-below.</p>
-
- <p>A certifier has taken reasonable steps to verify
-the copyright status of this work. Certifier recognizes that his good
-faith efforts may not shield him from liability if in fact the work
-certified is not in the public domain.</p>
-
- <p>Dedicator makes
-this dedication for the benefit of the public at large and to the
-detriment of the Dedicator's heirs and successors. Dedicator intends
-this dedication to be an overt act of relinquishment in perpetuity of
-all present and future rights under copyright law, whether vested or
-contingent, in the Work. Dedicator understands that such relinquishment
-of all rights includes the relinquishment of all rights to enforce (by
-lawsuit or otherwise) those copyrights in the Work.</p>
-
- <p>Dedicator
-recognizes that, once placed in the public domain, the Work may be
-freely reproduced, distributed, transmitted, used, modified, built
-upon, or otherwise exploited by anyone for any purpose, commercial or
-non-commercial, and in any way, including by methods that have not yet
-been invented or conceived.</p>
- </div>
-</div>
-</body></html>
-
-=========================================================================
== jetty-util is under the Apache License v 2.0 ==
=========================================================================
=========================================================================
@@ -537,4 +491,4 @@
<li>
This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
</li>
-</ol>
\ No newline at end of file
+</ol>
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=646333&r1=646332&r2=646333&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Apr 9 06:27:37 2008
@@ -147,7 +147,6 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
- <include>backport-util-concurrent:backport-util-concurrent</include>
<include>commons-logging:commons-logging</include>
<include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
<include>${pom.groupId}:activemq-core</include>
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=646333&r1=646332&r2=646333&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Apr 9 06:27:37 2008
@@ -156,7 +156,6 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
- <include>backport-util-concurrent:backport-util-concurrent</include>
<include>commons-logging:commons-logging</include>
<include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
<include>${pom.groupId}:activemq-core</include>
Modified: activemq/trunk/assembly/src/release/LICENSE
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/LICENSE?rev=646333&r1=646332&r2=646333&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/LICENSE (original)
+++ activemq/trunk/assembly/src/release/LICENSE Wed Apr 9 06:27:37 2008
@@ -261,8 +261,6 @@
== Licenses for non-apache libraries included in this assembly ==
====================================================================
-
-backport-util-concurrent
jetty
jmdns
mx4j
@@ -270,52 +268,6 @@
tanuki wrapper
xmlpull
xstream
-
-=========================================================================
-== For the backport-util-concurrent library ==
-=========================================================================
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
-<html><head><title>Creative Commons Public Domain</title>
-
-<body>
-
-<p align="center"><em>Copyright-Only Dedication (based on United States law) or Public Domain Certification</em></p>
-
- <p>The
-person or persons who have associated work with this document (the
-"Dedicator" or "Certifier") hereby either (a) certifies that, to the
-best of his knowledge, the work of authorship identified is in the
-public domain of the country from which the work is published, or (b)
-hereby dedicates whatever copyright the dedicators holds in the work of
-authorship identified below (the "Work") to the public domain. A
-certifier, morever, dedicates any copyright interest he may have in the
-associated work, and for these purposes, is described as a "dedicator"
-below.</p>
-
- <p>A certifier has taken reasonable steps to verify
-the copyright status of this work. Certifier recognizes that his good
-faith efforts may not shield him from liability if in fact the work
-certified is not in the public domain.</p>
-
- <p>Dedicator makes
-this dedication for the benefit of the public at large and to the
-detriment of the Dedicator's heirs and successors. Dedicator intends
-this dedication to be an overt act of relinquishment in perpetuity of
-all present and future rights under copyright law, whether vested or
-contingent, in the Work. Dedicator understands that such relinquishment
-of all rights includes the relinquishment of all rights to enforce (by
-lawsuit or otherwise) those copyrights in the Work.</p>
-
- <p>Dedicator
-recognizes that, once placed in the public domain, the Work may be
-freely reproduced, distributed, transmitted, used, modified, built
-upon, or otherwise exploited by anyone for any purpose, commercial or
-non-commercial, and in any way, including by methods that have not yet
-been invented or conceived.</p>
- </div>
-</div>
-</body></html>
=========================================================================
== Jetty is licensed under the Apache License Version 2.0 ==