Author: mcbrown
Date: 2010-09-10 11:24:35 +0200 (Fri, 10 Sep 2010)
New Revision: 22668
Log:
Licenses (Docs Bug #55573 and #56707)
Added:
trunk/common/license-apache-commons-collections.xml
trunk/common/license-apache-commons-dbcp.xml
Modified:
trunk/dynamic-docs/licenses/products.xml
trunk/mysql-monitor-2.0/Makefile.depends
trunk/mysql-monitor-2.1/Makefile.depends
Added: trunk/common/license-apache-commons-collections.xml
===================================================================
--- trunk/common/license-apache-commons-collections.xml (rev 0)
+++ trunk/common/license-apache-commons-collections.xml 2010-09-10 09:24:35 UTC (rev 22668)
Changed blocks: 1, Lines Added: 32, Lines Deleted: 0; 1111 bytes
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+ <!ENTITY % all.entities SYSTEM "all-entities.ent">
+ %all.entities;
+]>
+<section id="license-apache-commons-collections">
+
+ <title>Apache Commons Collections</title>
+
+ <para>
+ The following software may be included in this product:
+ </para>
+
+<programlisting>
+Apache Commons Collections
+
+Component's NOTICE.txt file:
+Apache Commons Collections
+Copyright 2001-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+</programlisting>
+
+ <para>
+ This component is licensed under
+ <xref linkend="license-apache-2-0"/>.
+ </para>
+
+</section>
Added: trunk/common/license-apache-commons-dbcp.xml
===================================================================
--- trunk/common/license-apache-commons-dbcp.xml (rev 0)
+++ trunk/common/license-apache-commons-dbcp.xml 2010-09-10 09:24:35 UTC (rev 22668)
Changed blocks: 1, Lines Added: 29, Lines Deleted: 0; 990 bytes
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+ <!ENTITY % all.entities SYSTEM "all-entities.ent">
+ %all.entities;
+]>
+<section id="license-apache-commons-dbcp">
+
+ <title>Apache Commons DBCP</title>
+
+ <para>
+ The following software may be included in this product:
+ </para>
+
+<programlisting>
+Apache Commons DBCP
+
+Component's NOTICE.txt file:
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+</programlisting>
+
+ <para>
+ This component is licensed under
+ <xref linkend="license-apache-2-0"/>.
+ </para>
+
+</section>
Modified: trunk/dynamic-docs/licenses/products.xml
===================================================================
--- trunk/dynamic-docs/licenses/products.xml 2010-09-10 09:04:21 UTC (rev 22667)
+++ trunk/dynamic-docs/licenses/products.xml 2010-09-10 09:24:35 UTC (rev 22668)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 0; 966 bytes
@@ -92,7 +92,9 @@
<product id="monitor" version="2.0">
<use id="license-apache-2-0"/>
+ <use id="license-apache-commons-collections"/>
<use id="license-apache-commons-fileupload"/>
+ <use id="license-apache-commons-dbcp"/>
<use id="license-jdom"/>
<use id="license-jquery"/>
<use id="license-jqueryui"/>
@@ -110,7 +112,9 @@
<product id="monitor" version="2.1">
<use id="license-apache-2-0"/>
+ <use id="license-apache-commons-collections"/>
<use id="license-apache-commons-fileupload"/>
+ <use id="license-apache-commons-dbcp"/>
<use id="license-asm"/>
<use id="license-jdom"/>
<use id="license-jquery"/>
Modified: trunk/mysql-monitor-2.0/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.0/Makefile.depends 2010-09-10 09:04:21 UTC (rev 22667)
+++ trunk/mysql-monitor-2.0/Makefile.depends 2010-09-10 09:24:35 UTC (rev 22668)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 0; 1792 bytes
@@ -501,6 +501,8 @@
../common/all-entities.ent \
../common/fixedchars.ent \
../common/license-apache-2-0.xml \
+ ../common/license-apache-commons-collections.xml \
+ ../common/license-apache-commons-dbcp.xml \
../common/license-apache-commons-fileupload.xml \
../common/license-jdom.xml \
../common/license-jquery.xml \
@@ -524,6 +526,8 @@
dynxml_local_preface_SOURCES = dynxml-local-preface.xml $(dynxml_local_preface_INCLUDES)
dynxml_local_preface_IDMAPS = \
../common/metadata/license-apache-2-0.idmap \
+ ../common/metadata/license-apache-commons-collections.idmap \
+ ../common/metadata/license-apache-commons-dbcp.idmap \
../common/metadata/license-apache-commons-fileupload.idmap \
../common/metadata/license-jdom.idmap \
../common/metadata/license-jquery.idmap \
@@ -642,6 +646,8 @@
../common/gpl-notice.en.xml \
../common/legalnotice-misc-refman.en.xml \
../common/license-apache-2-0.xml \
+ ../common/license-apache-commons-collections.xml \
+ ../common/license-apache-commons-dbcp.xml \
../common/license-apache-commons-fileupload.xml \
../common/license-jdom.xml \
../common/license-jquery.xml \
@@ -829,6 +835,8 @@
monitor_SOURCES = monitor.xml $(monitor_INCLUDES)
monitor_IDMAPS = \
../common/metadata/license-apache-2-0.idmap \
+ ../common/metadata/license-apache-commons-collections.idmap \
+ ../common/metadata/license-apache-commons-dbcp.idmap \
../common/metadata/license-apache-commons-fileupload.idmap \
../common/metadata/license-jdom.idmap \
../common/metadata/license-jquery.idmap \
Modified: trunk/mysql-monitor-2.1/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.1/Makefile.depends 2010-09-10 09:04:21 UTC (rev 22667)
+++ trunk/mysql-monitor-2.1/Makefile.depends 2010-09-10 09:24:35 UTC (rev 22668)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 0; 1780 bytes
@@ -511,6 +511,8 @@
../common/all-entities.ent \
../common/fixedchars.ent \
../common/license-apache-2-0.xml \
+ ../common/license-apache-commons-collections.xml \
+ ../common/license-apache-commons-dbcp.xml \
../common/license-apache-commons-fileupload.xml \
../common/license-asm.xml \
../common/license-jdom.xml \
@@ -536,6 +538,8 @@
dynxml_local_preface_SOURCES = dynxml-local-preface.xml $(dynxml_local_preface_INCLUDES)
dynxml_local_preface_IDMAPS = \
../common/metadata/license-apache-2-0.idmap \
+ ../common/metadata/license-apache-commons-collections.idmap \
+ ../common/metadata/license-apache-commons-dbcp.idmap \
../common/metadata/license-apache-commons-fileupload.idmap \
../common/metadata/license-asm.idmap \
../common/metadata/license-jdom.idmap \
@@ -635,6 +639,8 @@
../common/gpl-notice.en.xml \
../common/legalnotice-misc-refman.en.xml \
../common/license-apache-2-0.xml \
+ ../common/license-apache-commons-collections.xml \
+ ../common/license-apache-commons-dbcp.xml \
../common/license-apache-commons-fileupload.xml \
../common/license-asm.xml \
../common/license-jdom.xml \
@@ -836,6 +842,8 @@
monitor_SOURCES = monitor.xml $(monitor_INCLUDES)
monitor_IDMAPS = \
../common/metadata/license-apache-2-0.idmap \
+ ../common/metadata/license-apache-commons-collections.idmap \
+ ../common/metadata/license-apache-commons-dbcp.idmap \
../common/metadata/license-apache-commons-fileupload.idmap \
../common/metadata/license-asm.idmap \
../common/metadata/license-jdom.idmap \
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r22668 - in trunk: common dynamic-docs/licenses mysql-monitor-2.0 mysql-monitor-2.1 | mc.brown | 10 Sep |
