List:Commits« Previous MessageNext Message »
From:paul.dubois Date:November 18 2010 9:12pm
Subject:svn commit - mysqldoc@docsrva: r23841 - in trunk: . common dynamic-docs/licenses mysql-monitor-2.2 mysql-monitor-2.3 mysql-monitor-3.0
View as plain text  
Author: paul
Date: 2010-11-18 22:12:39 +0100 (Thu, 18 Nov 2010)
New Revision: 23841

Log:
 r44411@arctic:  paul | 2010-11-18 15:12:32 -0600
 Add MEM dyndocs license info, license files, rebuild dependencies


Added:
   trunk/common/license-apache-commons-beanutils.xml
   trunk/common/license-apache-commons-codec.xml
   trunk/common/license-apache-commons-exec.xml
   trunk/common/license-apache-commons-httpclient.xml
   trunk/common/license-felix.xml
   trunk/common/license-java-secure-channel.xml
   trunk/common/license-tomcat-2010.xml
Modified:
   trunk/dynamic-docs/licenses/products.xml
   trunk/mysql-monitor-2.2/Makefile.depends
   trunk/mysql-monitor-2.3/Makefile.depends
   trunk/mysql-monitor-3.0/Makefile.depends

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44409
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:65728
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44411
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:65728
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546


Added: trunk/common/license-apache-commons-beanutils.xml
===================================================================
--- trunk/common/license-apache-commons-beanutils.xml	                        (rev 0)
+++ trunk/common/license-apache-commons-beanutils.xml	2010-11-18 21:12:39 UTC (rev 23841)
Changed blocks: 1, Lines Added: 32, Lines Deleted: 0; 1097 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-beanutils">
+
+  <title>Apache Commons BeanUtils</title>
+
+  <para>
+    The following software may be included in this product:
+  </para>
+
+<programlisting>
+Apache Commons BeanUtils
+
+Component's NOTICE.txt file:
+Apache Commons BeanUtils
+Copyright 2000-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-codec.xml
===================================================================
--- trunk/common/license-apache-commons-codec.xml	                        (rev 0)
+++ trunk/common/license-apache-commons-codec.xml	2010-11-18 21:12:39 UTC (rev 23841)
Changed blocks: 1, Lines Added: 39, Lines Deleted: 0; 1392 bytes

@@ -0,0 +1,39 @@
+<?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-codec">
+
+  <title>Apache Commons Codec</title>
+
+  <para>
+    The following software may be included in this product:
+  </para>
+
+<programlisting>
+The following software may be included in this product:
+Apache Commons Codec
+Copyright 2002-2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+------
+src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains test data
+from http://aspell.net/test/batch0.tab.
+Copyright (C) 2002 Kevin Atkinson (kevina@stripped). 
+
+Verbatim copying and distribution of this entire article is permitted in 
+any medium, provided this notice is preserved. 
+------
+</programlisting>
+
+  <para>
+    This component is licensed under
+    <xref linkend="license-apache-2-0"/>.
+  </para>
+
+</section>


Added: trunk/common/license-apache-commons-exec.xml
===================================================================
--- trunk/common/license-apache-commons-exec.xml	                        (rev 0)
+++ trunk/common/license-apache-commons-exec.xml	2010-11-18 21:12:39 UTC (rev 23841)
Changed blocks: 1, Lines Added: 32, Lines Deleted: 0; 1062 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-exec">
+
+  <title>Apache Commons Exec</title>
+
+  <para>
+    The following software may be included in this product:
+  </para>
+
+<programlisting>
+Apache Commons Exec
+
+Component's NOTICE.txt file:
+Apache Commons Exec
+Copyright 2005-2009 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-httpclient.xml
===================================================================
--- trunk/common/license-apache-commons-httpclient.xml	                        (rev 0)
+++ trunk/common/license-apache-commons-httpclient.xml	2010-11-18 21:12:39 UTC (rev 23841)
Changed blocks: 1, Lines Added: 32, Lines Deleted: 0; 1104 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-httpclient">
+
+  <title>Apache Commons HttpClient</title>
+
+  <para>
+    The following software may be included in this product:
+  </para>
+
+<programlisting>
+Apache Commons HttpClient
+
+Component's NOTICE.txt file:
+Apache Jakarta HttpClient
+Copyright 1999-2007 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-felix.xml
===================================================================
--- trunk/common/license-felix.xml	                        (rev 0)
+++ trunk/common/license-felix.xml	2010-11-18 21:12:39 UTC (rev 23841)
Changed blocks: 1, Lines Added: 68, Lines Deleted: 0; 2642 bytes

@@ -0,0 +1,68 @@
+<?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-felix">
+
+  <title>Felix Framework Distribution</title>
+
+  <para>
+    The following software may be included in this product:
+  </para>
+
+<programlisting>
+Felix Framework Distribution
+
+Component's NOTICE.txt file:
+Apache Felix Main Distribution
+Copyright 2010 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Codehaus (http://www.codehaus.org)
+Licensed under the Apache License 2.0.
+
+This product includes software from http://kxml.sourceforge.net.
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
+Licensed under BSD License.
+
+   BSD license for kxml:
+
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The  above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE. 
+</programlisting>
+
+  <para>
+    This component is licensed under
+    <xref linkend="license-apache-2-0"/>.
+  </para>
+
+</section>


Added: trunk/common/license-java-secure-channel.xml
===================================================================
--- trunk/common/license-java-secure-channel.xml	                        (rev 0)
+++ trunk/common/license-java-secure-channel.xml	2010-11-18 21:12:39 UTC (rev 23841)
Changed blocks: 1, Lines Added: 51, Lines Deleted: 0; 2429 bytes

@@ -0,0 +1,51 @@
+<?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-java-secure-channel">
+
+  <title>Java Secure Channel (JSch)</title>
+
+  <para>
+    The following software may be included in this product:
+  </para>
+
+<programlisting>
+Java Secure Channel (JSch)
+
+JSch 0.0.* was released under the GNU LGPL license. Later, we have
+switched over to a BSD-style license.
+------------------------------------------------------------------
+Copyright (c) 2002,2003,2004,2005,2006,2007 Atsuhiko Yamanaka, JCraft,Inc. 
+All rights reserved. 
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met: 
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution. 
+3. The names of the authors may not be used to endorse or promote
+   products derived from this software without specific prior written
+   permission. 
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL JCRAFT, INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE 
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+</programlisting>
+
+</section>


Added: trunk/common/license-tomcat-2010.xml
===================================================================
--- trunk/common/license-tomcat-2010.xml	                        (rev 0)
+++ trunk/common/license-tomcat-2010.xml	2010-11-18 21:12:39 UTC (rev 23841)
Changed blocks: 1, Lines Added: 32, Lines Deleted: 0; 1012 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-tomcat-2010">
+
+  <title>Apache Tomcat</title>
+
+  <para>
+    The following software may be included in this product:
+  </para>
+
+<programlisting>
+Apache Tomcat
+
+Component's NOTICE.txt file:
+Apache Tomcat
+Copyright 1999-2010 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>


Modified: trunk/dynamic-docs/licenses/products.xml
===================================================================
--- trunk/dynamic-docs/licenses/products.xml	2010-11-18 20:50:37 UTC (rev 23840)
+++ trunk/dynamic-docs/licenses/products.xml	2010-11-18 21:12:39 UTC (rev 23841)
Changed blocks: 2, Lines Added: 112, Lines Deleted: 4; 5045 bytes

@@ -151,6 +151,114 @@
       <use id="license-zlib"/>
 
     </product>
+    <product id="monitor" version="2.2">
+
+      <use id="license-antlr-3"/>
+      <use id="license-apache-2-0"/>
+      <use id="license-apache-commons-beanutils"/>
+      <use id="license-apache-commons-codec"/>
+      <use id="license-apache-commons-collections"/>
+      <use id="license-apache-commons-dbcp"/>
+      <use id="license-apache-commons-digester"/>
+      <use id="license-apache-commons-exec"/>
+      <use id="license-apache-commons-fileupload"/>
+      <use id="license-apache-commons-httpclient"/>
+      <use id="license-apache-commons-io"/>
+      <use id="license-apache-commons-lang"/>
+      <use id="license-apache-commons-logging"/>
+      <use id="license-apache-commons-pool"/>
+      <use id="license-apache-commons-validator"/>
+      <use id="license-asm"/>
+      <use id="license-httpclient"/>
+      <use id="license-httpcore"/>
+      <use id="license-jdom"/>
+      <use id="license-jquery"/>
+      <use id="license-jqueryui"/>
+      <use id="license-libcurl"/>
+      <use id="license-libevent"/>
+      <use id="license-log4j"/>
+      <use id="license-lpeg"/>
+      <use id="license-luafilesystem"/>
+      <use id="license-mime4j"/>
+      <use id="license-openssl-0-9-8o"/>
+      <use id="license-spring-framework"/>
+      <use id="license-tomcat"/>
+      <use id="license-zlib"/>
+
+    </product>
+    <product id="monitor" version="2.3">
+
+      <use id="license-antlr-3"/>
+      <use id="license-apache-2-0"/>
+      <use id="license-apache-commons-beanutils"/>
+      <use id="license-apache-commons-codec"/>
+      <use id="license-apache-commons-collections"/>
+      <use id="license-apache-commons-dbcp"/>
+      <use id="license-apache-commons-digester"/>
+      <use id="license-apache-commons-exec"/>
+      <use id="license-apache-commons-fileupload"/>
+      <use id="license-apache-commons-httpclient"/>
+      <use id="license-apache-commons-io"/>
+      <use id="license-apache-commons-lang"/>
+      <use id="license-apache-commons-logging"/>
+      <use id="license-apache-commons-pool"/>
+      <use id="license-apache-commons-validator"/>
+      <use id="license-asm"/>
+      <use id="license-httpclient"/>
+      <use id="license-httpcore"/>
+      <use id="license-jdom"/>
+      <use id="license-jquery"/>
+      <use id="license-jqueryui"/>
+      <use id="license-libcurl"/>
+      <use id="license-libevent"/>
+      <use id="license-log4j"/>
+      <use id="license-lpeg"/>
+      <use id="license-luafilesystem"/>
+      <use id="license-mime4j"/>
+      <use id="license-openssl-0-9-8o"/>
+      <use id="license-spring-framework"/>
+      <use id="license-tomcat-2010"/>
+      <use id="license-zlib"/>
+
+    </product>
+    <product id="monitor" version="3.0">
+
+      <use id="license-antlr-3"/>
+      <use id="license-apache-2-0"/>
+      <use id="license-apache-commons-beanutils"/>
+      <use id="license-apache-commons-codec"/>
+      <use id="license-apache-commons-collections"/>
+      <use id="license-apache-commons-dbcp"/>
+      <use id="license-apache-commons-digester"/>
+      <use id="license-apache-commons-exec"/>
+      <use id="license-apache-commons-fileupload"/>
+      <use id="license-apache-commons-httpclient"/>
+      <use id="license-apache-commons-io"/>
+      <use id="license-apache-commons-lang"/>
+      <use id="license-apache-commons-logging"/>
+      <use id="license-apache-commons-pool"/>
+      <use id="license-apache-commons-validator"/>
+      <use id="license-asm"/>
+      <use id="license-felix"/>
+      <use id="license-httpclient"/>
+      <use id="license-httpcore"/>
+      <use id="license-java-secure-channel"/>
+      <use id="license-jdom"/>
+      <use id="license-jline"/>
+      <use id="license-jquery"/>
+      <use id="license-jqueryui"/>
+      <use id="license-libcurl"/>
+      <use id="license-libevent"/>
+      <use id="license-log4j"/>
+      <use id="license-lpeg"/>
+      <use id="license-luafilesystem"/>
+      <use id="license-mime4j"/>
+      <use id="license-openssl-0-9-8o"/>
+      <use id="license-spring-framework"/>
+      <use id="license-tomcat-2010"/>
+      <use id="license-zlib"/>
+
+    </product>
     <product id="mysql-proxy">
 
       <use id="license-lpeg"/>

@@ -191,22 +299,22 @@
 
     </product>
     <product id="cluster-manager" version="1.0">
-      
+
       <use id="license-sha1-in-c"/>
       <use id="license-libevent"/>
       <use id="license-lpeg"/>
       <use id="license-luafilesystem"/>
       <use id="license-md5"/>
-      
+
     </product>
     <product id="cluster-manager" version="1.1">
-      
+
       <use id="license-sha1-in-c"/>
       <use id="license-libevent"/>
       <use id="license-lpeg"/>
       <use id="license-luafilesystem"/>
       <use id="license-md5"/>
-      
+
     </product>
     <product id="cluster">
 


Modified: trunk/mysql-monitor-2.2/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.2/Makefile.depends	2010-11-18 20:50:37 UTC (rev 23840)
+++ trunk/mysql-monitor-2.2/Makefile.depends	2010-11-18 21:12:39 UTC (rev 23841)
Changed blocks: 4, Lines Added: 127, Lines Deleted: 1; 7543 bytes

@@ -472,7 +472,39 @@
 dynxml-local-install-unattended-remprepped.xml: $(dynxml_local_install_unattended_SOURCES) $(dynxml_local_install_unattended_IDMAPS)
 dynxml-local-install-unattended.xml: $(dynxml_local_install_unattended_IDMAPS) $(dynxml_local_install_unattended_INCLUDES)
 dynxml_local_licenses_third_party_INCLUDES = \
+	../common/all-entities.ent \
 	../common/fixedchars.ent \
+	../common/license-antlr-3.xml \
+	../common/license-apache-2-0.xml \
+	../common/license-apache-commons-beanutils.xml \
+	../common/license-apache-commons-codec.xml \
+	../common/license-apache-commons-collections.xml \
+	../common/license-apache-commons-dbcp.xml \
+	../common/license-apache-commons-digester.xml \
+	../common/license-apache-commons-exec.xml \
+	../common/license-apache-commons-fileupload.xml \
+	../common/license-apache-commons-httpclient.xml \
+	../common/license-apache-commons-io.xml \
+	../common/license-apache-commons-lang.xml \
+	../common/license-apache-commons-logging.xml \
+	../common/license-apache-commons-pool.xml \
+	../common/license-apache-commons-validator.xml \
+	../common/license-asm.xml \
+	../common/license-httpclient.xml \
+	../common/license-httpcore.xml \
+	../common/license-jdom.xml \
+	../common/license-jquery.xml \
+	../common/license-jqueryui.xml \
+	../common/license-libcurl.xml \
+	../common/license-libevent.xml \
+	../common/license-log4j.xml \
+	../common/license-lpeg.xml \
+	../common/license-luafilesystem.xml \
+	../common/license-mime4j.xml \
+	../common/license-openssl-0.9.8o.xml \
+	../common/license-spring-framework.xml \
+	../common/license-tomcat.xml \
+	../common/license-zlib.xml \
 	../common/phrases.ent \
 	../dynamic-docs/licenses/products.xml \
 	../mysql-monitor-common/urls.ent \

@@ -482,7 +514,38 @@
 	version.ent
 dynxml_local_licenses_third_party_IMAGES =
 dynxml_local_licenses_third_party_SOURCES = dynxml-local-licenses-third-party.xml $(dynxml_local_licenses_third_party_INCLUDES)
-dynxml_local_licenses_third_party_IDMAPS =
+dynxml_local_licenses_third_party_IDMAPS = \
+	../common/metadata/license-antlr-3.idmap \
+	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-beanutils.idmap \
+	../common/metadata/license-apache-commons-codec.idmap \
+	../common/metadata/license-apache-commons-collections.idmap \
+	../common/metadata/license-apache-commons-dbcp.idmap \
+	../common/metadata/license-apache-commons-digester.idmap \
+	../common/metadata/license-apache-commons-exec.idmap \
+	../common/metadata/license-apache-commons-fileupload.idmap \
+	../common/metadata/license-apache-commons-httpclient.idmap \
+	../common/metadata/license-apache-commons-io.idmap \
+	../common/metadata/license-apache-commons-lang.idmap \
+	../common/metadata/license-apache-commons-logging.idmap \
+	../common/metadata/license-apache-commons-pool.idmap \
+	../common/metadata/license-apache-commons-validator.idmap \
+	../common/metadata/license-asm.idmap \
+	../common/metadata/license-httpclient.idmap \
+	../common/metadata/license-httpcore.idmap \
+	../common/metadata/license-jdom.idmap \
+	../common/metadata/license-jquery.idmap \
+	../common/metadata/license-jqueryui.idmap \
+	../common/metadata/license-libcurl.idmap \
+	../common/metadata/license-libevent.idmap \
+	../common/metadata/license-log4j.idmap \
+	../common/metadata/license-lpeg.idmap \
+	../common/metadata/license-luafilesystem.idmap \
+	../common/metadata/license-mime4j.idmap \
+	../common/metadata/license-openssl-0.9.8o.idmap \
+	../common/metadata/license-spring-framework.idmap \
+	../common/metadata/license-tomcat.idmap \
+	../common/metadata/license-zlib.idmap
 dynxml-local-licenses-third-party.validpure: $(dynxml_local_licenses_third_party_SOURCES)
 dynxml-local-licenses-third-party.titles: $(dynxml_local_licenses_third_party_SOURCES)
 dynxml-local-licenses-third-party.useless: $(dynxml_local_licenses_third_party_SOURCES)

@@ -1139,9 +1202,41 @@
 
 monitor_INCLUDES = \
 	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
+	../common/all-entities.ent \
 	../common/fixedchars.ent \
 	../common/gpl-notice.en.xml \
 	../common/legalnotice-misc-refman.en.xml \
+	../common/license-antlr-3.xml \
+	../common/license-apache-2-0.xml \
+	../common/license-apache-commons-beanutils.xml \
+	../common/license-apache-commons-codec.xml \
+	../common/license-apache-commons-collections.xml \
+	../common/license-apache-commons-dbcp.xml \
+	../common/license-apache-commons-digester.xml \
+	../common/license-apache-commons-exec.xml \
+	../common/license-apache-commons-fileupload.xml \
+	../common/license-apache-commons-httpclient.xml \
+	../common/license-apache-commons-io.xml \
+	../common/license-apache-commons-lang.xml \
+	../common/license-apache-commons-logging.xml \
+	../common/license-apache-commons-pool.xml \
+	../common/license-apache-commons-validator.xml \
+	../common/license-asm.xml \
+	../common/license-httpclient.xml \
+	../common/license-httpcore.xml \
+	../common/license-jdom.xml \
+	../common/license-jquery.xml \
+	../common/license-jqueryui.xml \
+	../common/license-libcurl.xml \
+	../common/license-libevent.xml \
+	../common/license-log4j.xml \
+	../common/license-lpeg.xml \
+	../common/license-luafilesystem.xml \
+	../common/license-mime4j.xml \
+	../common/license-openssl-0.9.8o.xml \
+	../common/license-spring-framework.xml \
+	../common/license-tomcat.xml \
+	../common/license-zlib.xml \
 	../common/oracle-notice-ga.en.xml \
 	../common/phrases.ent \
 	../dynamic-docs/changelog/monitor-versions.xml \

@@ -1358,6 +1453,37 @@
 	images/published/warning_alert.png
 monitor_SOURCES = monitor.xml $(monitor_INCLUDES)
 monitor_IDMAPS = \
+	../common/metadata/license-antlr-3.idmap \
+	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-beanutils.idmap \
+	../common/metadata/license-apache-commons-codec.idmap \
+	../common/metadata/license-apache-commons-collections.idmap \
+	../common/metadata/license-apache-commons-dbcp.idmap \
+	../common/metadata/license-apache-commons-digester.idmap \
+	../common/metadata/license-apache-commons-exec.idmap \
+	../common/metadata/license-apache-commons-fileupload.idmap \
+	../common/metadata/license-apache-commons-httpclient.idmap \
+	../common/metadata/license-apache-commons-io.idmap \
+	../common/metadata/license-apache-commons-lang.idmap \
+	../common/metadata/license-apache-commons-logging.idmap \
+	../common/metadata/license-apache-commons-pool.idmap \
+	../common/metadata/license-apache-commons-validator.idmap \
+	../common/metadata/license-asm.idmap \
+	../common/metadata/license-httpclient.idmap \
+	../common/metadata/license-httpcore.idmap \
+	../common/metadata/license-jdom.idmap \
+	../common/metadata/license-jquery.idmap \
+	../common/metadata/license-jqueryui.idmap \
+	../common/metadata/license-libcurl.idmap \
+	../common/metadata/license-libevent.idmap \
+	../common/metadata/license-log4j.idmap \
+	../common/metadata/license-lpeg.idmap \
+	../common/metadata/license-luafilesystem.idmap \
+	../common/metadata/license-mime4j.idmap \
+	../common/metadata/license-openssl-0.9.8o.idmap \
+	../common/metadata/license-spring-framework.idmap \
+	../common/metadata/license-tomcat.idmap \
+	../common/metadata/license-zlib.idmap \
 	../mysql-monitor-common/metadata/install-upgrades-core.idmap \
 	../mysql-monitor-common/metadata/log-files-core.idmap \
 	../refman-5.1/metadata/functions-core.idmap \


Modified: trunk/mysql-monitor-2.3/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.3/Makefile.depends	2010-11-18 20:50:37 UTC (rev 23840)
+++ trunk/mysql-monitor-2.3/Makefile.depends	2010-11-18 21:12:39 UTC (rev 23841)
Changed blocks: 4, Lines Added: 127, Lines Deleted: 1; 7563 bytes

@@ -429,7 +429,39 @@
 dynxml-local-install-unattended-remprepped.xml: $(dynxml_local_install_unattended_SOURCES) $(dynxml_local_install_unattended_IDMAPS)
 dynxml-local-install-unattended.xml: $(dynxml_local_install_unattended_IDMAPS) $(dynxml_local_install_unattended_INCLUDES)
 dynxml_local_licenses_third_party_INCLUDES = \
+	../common/all-entities.ent \
 	../common/fixedchars.ent \
+	../common/license-antlr-3.xml \
+	../common/license-apache-2-0.xml \
+	../common/license-apache-commons-beanutils.xml \
+	../common/license-apache-commons-codec.xml \
+	../common/license-apache-commons-collections.xml \
+	../common/license-apache-commons-dbcp.xml \
+	../common/license-apache-commons-digester.xml \
+	../common/license-apache-commons-exec.xml \
+	../common/license-apache-commons-fileupload.xml \
+	../common/license-apache-commons-httpclient.xml \
+	../common/license-apache-commons-io.xml \
+	../common/license-apache-commons-lang.xml \
+	../common/license-apache-commons-logging.xml \
+	../common/license-apache-commons-pool.xml \
+	../common/license-apache-commons-validator.xml \
+	../common/license-asm.xml \
+	../common/license-httpclient.xml \
+	../common/license-httpcore.xml \
+	../common/license-jdom.xml \
+	../common/license-jquery.xml \
+	../common/license-jqueryui.xml \
+	../common/license-libcurl.xml \
+	../common/license-libevent.xml \
+	../common/license-log4j.xml \
+	../common/license-lpeg.xml \
+	../common/license-luafilesystem.xml \
+	../common/license-mime4j.xml \
+	../common/license-openssl-0.9.8o.xml \
+	../common/license-spring-framework.xml \
+	../common/license-tomcat-2010.xml \
+	../common/license-zlib.xml \
 	../common/phrases.ent \
 	../dynamic-docs/licenses/products.xml \
 	../mysql-monitor-common/urls.ent \

@@ -439,7 +471,38 @@
 	version.ent
 dynxml_local_licenses_third_party_IMAGES =
 dynxml_local_licenses_third_party_SOURCES = dynxml-local-licenses-third-party.xml $(dynxml_local_licenses_third_party_INCLUDES)
-dynxml_local_licenses_third_party_IDMAPS =
+dynxml_local_licenses_third_party_IDMAPS = \
+	../common/metadata/license-antlr-3.idmap \
+	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-beanutils.idmap \
+	../common/metadata/license-apache-commons-codec.idmap \
+	../common/metadata/license-apache-commons-collections.idmap \
+	../common/metadata/license-apache-commons-dbcp.idmap \
+	../common/metadata/license-apache-commons-digester.idmap \
+	../common/metadata/license-apache-commons-exec.idmap \
+	../common/metadata/license-apache-commons-fileupload.idmap \
+	../common/metadata/license-apache-commons-httpclient.idmap \
+	../common/metadata/license-apache-commons-io.idmap \
+	../common/metadata/license-apache-commons-lang.idmap \
+	../common/metadata/license-apache-commons-logging.idmap \
+	../common/metadata/license-apache-commons-pool.idmap \
+	../common/metadata/license-apache-commons-validator.idmap \
+	../common/metadata/license-asm.idmap \
+	../common/metadata/license-httpclient.idmap \
+	../common/metadata/license-httpcore.idmap \
+	../common/metadata/license-jdom.idmap \
+	../common/metadata/license-jquery.idmap \
+	../common/metadata/license-jqueryui.idmap \
+	../common/metadata/license-libcurl.idmap \
+	../common/metadata/license-libevent.idmap \
+	../common/metadata/license-log4j.idmap \
+	../common/metadata/license-lpeg.idmap \
+	../common/metadata/license-luafilesystem.idmap \
+	../common/metadata/license-mime4j.idmap \
+	../common/metadata/license-openssl-0.9.8o.idmap \
+	../common/metadata/license-spring-framework.idmap \
+	../common/metadata/license-tomcat-2010.idmap \
+	../common/metadata/license-zlib.idmap
 dynxml-local-licenses-third-party.validpure: $(dynxml_local_licenses_third_party_SOURCES)
 dynxml-local-licenses-third-party.titles: $(dynxml_local_licenses_third_party_SOURCES)
 dynxml-local-licenses-third-party.useless: $(dynxml_local_licenses_third_party_SOURCES)

@@ -1065,9 +1128,41 @@
 
 monitor_INCLUDES = \
 	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
+	../common/all-entities.ent \
 	../common/fixedchars.ent \
 	../common/gpl-notice.en.xml \
 	../common/legalnotice-misc-refman.en.xml \
+	../common/license-antlr-3.xml \
+	../common/license-apache-2-0.xml \
+	../common/license-apache-commons-beanutils.xml \
+	../common/license-apache-commons-codec.xml \
+	../common/license-apache-commons-collections.xml \
+	../common/license-apache-commons-dbcp.xml \
+	../common/license-apache-commons-digester.xml \
+	../common/license-apache-commons-exec.xml \
+	../common/license-apache-commons-fileupload.xml \
+	../common/license-apache-commons-httpclient.xml \
+	../common/license-apache-commons-io.xml \
+	../common/license-apache-commons-lang.xml \
+	../common/license-apache-commons-logging.xml \
+	../common/license-apache-commons-pool.xml \
+	../common/license-apache-commons-validator.xml \
+	../common/license-asm.xml \
+	../common/license-httpclient.xml \
+	../common/license-httpcore.xml \
+	../common/license-jdom.xml \
+	../common/license-jquery.xml \
+	../common/license-jqueryui.xml \
+	../common/license-libcurl.xml \
+	../common/license-libevent.xml \
+	../common/license-log4j.xml \
+	../common/license-lpeg.xml \
+	../common/license-luafilesystem.xml \
+	../common/license-mime4j.xml \
+	../common/license-openssl-0.9.8o.xml \
+	../common/license-spring-framework.xml \
+	../common/license-tomcat-2010.xml \
+	../common/license-zlib.xml \
 	../common/oracle-notice-ga.en.xml \
 	../common/phrases.ent \
 	../dynamic-docs/changelog/monitor-versions.xml \

@@ -1263,6 +1358,37 @@
 	images/published/warning_alert.png
 monitor_SOURCES = monitor.xml $(monitor_INCLUDES)
 monitor_IDMAPS = \
+	../common/metadata/license-antlr-3.idmap \
+	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-beanutils.idmap \
+	../common/metadata/license-apache-commons-codec.idmap \
+	../common/metadata/license-apache-commons-collections.idmap \
+	../common/metadata/license-apache-commons-dbcp.idmap \
+	../common/metadata/license-apache-commons-digester.idmap \
+	../common/metadata/license-apache-commons-exec.idmap \
+	../common/metadata/license-apache-commons-fileupload.idmap \
+	../common/metadata/license-apache-commons-httpclient.idmap \
+	../common/metadata/license-apache-commons-io.idmap \
+	../common/metadata/license-apache-commons-lang.idmap \
+	../common/metadata/license-apache-commons-logging.idmap \
+	../common/metadata/license-apache-commons-pool.idmap \
+	../common/metadata/license-apache-commons-validator.idmap \
+	../common/metadata/license-asm.idmap \
+	../common/metadata/license-httpclient.idmap \
+	../common/metadata/license-httpcore.idmap \
+	../common/metadata/license-jdom.idmap \
+	../common/metadata/license-jquery.idmap \
+	../common/metadata/license-jqueryui.idmap \
+	../common/metadata/license-libcurl.idmap \
+	../common/metadata/license-libevent.idmap \
+	../common/metadata/license-log4j.idmap \
+	../common/metadata/license-lpeg.idmap \
+	../common/metadata/license-luafilesystem.idmap \
+	../common/metadata/license-mime4j.idmap \
+	../common/metadata/license-openssl-0.9.8o.idmap \
+	../common/metadata/license-spring-framework.idmap \
+	../common/metadata/license-tomcat-2010.idmap \
+	../common/metadata/license-zlib.idmap \
 	../mysql-monitor-common/metadata/install-upgrades-core.idmap \
 	../mysql-monitor-common/metadata/log-files-core.idmap \
 	../refman-5.1/metadata/functions-core.idmap \


Modified: trunk/mysql-monitor-3.0/Makefile.depends
===================================================================
--- trunk/mysql-monitor-3.0/Makefile.depends	2010-11-18 20:50:37 UTC (rev 23840)
+++ trunk/mysql-monitor-3.0/Makefile.depends	2010-11-18 21:12:39 UTC (rev 23841)
Changed blocks: 4, Lines Added: 139, Lines Deleted: 1; 7703 bytes

@@ -1,5 +1,40 @@
 dynxml_local_licenses_third_party_INCLUDES = \
+	../common/all-entities.ent \
 	../common/fixedchars.ent \
+	../common/license-antlr-3.xml \
+	../common/license-apache-2-0.xml \
+	../common/license-apache-commons-beanutils.xml \
+	../common/license-apache-commons-codec.xml \
+	../common/license-apache-commons-collections.xml \
+	../common/license-apache-commons-dbcp.xml \
+	../common/license-apache-commons-digester.xml \
+	../common/license-apache-commons-exec.xml \
+	../common/license-apache-commons-fileupload.xml \
+	../common/license-apache-commons-httpclient.xml \
+	../common/license-apache-commons-io.xml \
+	../common/license-apache-commons-lang.xml \
+	../common/license-apache-commons-logging.xml \
+	../common/license-apache-commons-pool.xml \
+	../common/license-apache-commons-validator.xml \
+	../common/license-asm.xml \
+	../common/license-felix.xml \
+	../common/license-httpclient.xml \
+	../common/license-httpcore.xml \
+	../common/license-java-secure-channel.xml \
+	../common/license-jdom.xml \
+	../common/license-jline.xml \
+	../common/license-jquery.xml \
+	../common/license-jqueryui.xml \
+	../common/license-libcurl.xml \
+	../common/license-libevent.xml \
+	../common/license-log4j.xml \
+	../common/license-lpeg.xml \
+	../common/license-luafilesystem.xml \
+	../common/license-mime4j.xml \
+	../common/license-openssl-0.9.8o.xml \
+	../common/license-spring-framework.xml \
+	../common/license-tomcat-2010.xml \
+	../common/license-zlib.xml \
 	../common/phrases.ent \
 	../dynamic-docs/licenses/products.xml \
 	../mysql-monitor-common/urls.ent \

@@ -9,7 +44,41 @@
 	version.ent
 dynxml_local_licenses_third_party_IMAGES =
 dynxml_local_licenses_third_party_SOURCES = dynxml-local-licenses-third-party.xml $(dynxml_local_licenses_third_party_INCLUDES)
-dynxml_local_licenses_third_party_IDMAPS =
+dynxml_local_licenses_third_party_IDMAPS = \
+	../common/metadata/license-antlr-3.idmap \
+	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-beanutils.idmap \
+	../common/metadata/license-apache-commons-codec.idmap \
+	../common/metadata/license-apache-commons-collections.idmap \
+	../common/metadata/license-apache-commons-dbcp.idmap \
+	../common/metadata/license-apache-commons-digester.idmap \
+	../common/metadata/license-apache-commons-exec.idmap \
+	../common/metadata/license-apache-commons-fileupload.idmap \
+	../common/metadata/license-apache-commons-httpclient.idmap \
+	../common/metadata/license-apache-commons-io.idmap \
+	../common/metadata/license-apache-commons-lang.idmap \
+	../common/metadata/license-apache-commons-logging.idmap \
+	../common/metadata/license-apache-commons-pool.idmap \
+	../common/metadata/license-apache-commons-validator.idmap \
+	../common/metadata/license-asm.idmap \
+	../common/metadata/license-felix.idmap \
+	../common/metadata/license-httpclient.idmap \
+	../common/metadata/license-httpcore.idmap \
+	../common/metadata/license-java-secure-channel.idmap \
+	../common/metadata/license-jdom.idmap \
+	../common/metadata/license-jline.idmap \
+	../common/metadata/license-jquery.idmap \
+	../common/metadata/license-jqueryui.idmap \
+	../common/metadata/license-libcurl.idmap \
+	../common/metadata/license-libevent.idmap \
+	../common/metadata/license-log4j.idmap \
+	../common/metadata/license-lpeg.idmap \
+	../common/metadata/license-luafilesystem.idmap \
+	../common/metadata/license-mime4j.idmap \
+	../common/metadata/license-openssl-0.9.8o.idmap \
+	../common/metadata/license-spring-framework.idmap \
+	../common/metadata/license-tomcat-2010.idmap \
+	../common/metadata/license-zlib.idmap
 dynxml-local-licenses-third-party.validpure: $(dynxml_local_licenses_third_party_SOURCES)
 dynxml-local-licenses-third-party.titles: $(dynxml_local_licenses_third_party_SOURCES)
 dynxml-local-licenses-third-party.useless: $(dynxml_local_licenses_third_party_SOURCES)

@@ -83,9 +152,44 @@
 
 monitor_INCLUDES = \
 	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
+	../common/all-entities.ent \
 	../common/fixedchars.ent \
 	../common/gpl-notice.en.xml \
 	../common/legalnotice-misc-refman.en.xml \
+	../common/license-antlr-3.xml \
+	../common/license-apache-2-0.xml \
+	../common/license-apache-commons-beanutils.xml \
+	../common/license-apache-commons-codec.xml \
+	../common/license-apache-commons-collections.xml \
+	../common/license-apache-commons-dbcp.xml \
+	../common/license-apache-commons-digester.xml \
+	../common/license-apache-commons-exec.xml \
+	../common/license-apache-commons-fileupload.xml \
+	../common/license-apache-commons-httpclient.xml \
+	../common/license-apache-commons-io.xml \
+	../common/license-apache-commons-lang.xml \
+	../common/license-apache-commons-logging.xml \
+	../common/license-apache-commons-pool.xml \
+	../common/license-apache-commons-validator.xml \
+	../common/license-asm.xml \
+	../common/license-felix.xml \
+	../common/license-httpclient.xml \
+	../common/license-httpcore.xml \
+	../common/license-java-secure-channel.xml \
+	../common/license-jdom.xml \
+	../common/license-jline.xml \
+	../common/license-jquery.xml \
+	../common/license-jqueryui.xml \
+	../common/license-libcurl.xml \
+	../common/license-libevent.xml \
+	../common/license-log4j.xml \
+	../common/license-lpeg.xml \
+	../common/license-luafilesystem.xml \
+	../common/license-mime4j.xml \
+	../common/license-openssl-0.9.8o.xml \
+	../common/license-spring-framework.xml \
+	../common/license-tomcat-2010.xml \
+	../common/license-zlib.xml \
 	../common/oracle-notice-ga.en.xml \
 	../common/phrases.ent \
 	../dynamic-docs/changelog/monitor-versions.xml \

@@ -104,6 +208,40 @@
 monitor_IMAGES =
 monitor_SOURCES = monitor.xml $(monitor_INCLUDES)
 monitor_IDMAPS = \
+	../common/metadata/license-antlr-3.idmap \
+	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-beanutils.idmap \
+	../common/metadata/license-apache-commons-codec.idmap \
+	../common/metadata/license-apache-commons-collections.idmap \
+	../common/metadata/license-apache-commons-dbcp.idmap \
+	../common/metadata/license-apache-commons-digester.idmap \
+	../common/metadata/license-apache-commons-exec.idmap \
+	../common/metadata/license-apache-commons-fileupload.idmap \
+	../common/metadata/license-apache-commons-httpclient.idmap \
+	../common/metadata/license-apache-commons-io.idmap \
+	../common/metadata/license-apache-commons-lang.idmap \
+	../common/metadata/license-apache-commons-logging.idmap \
+	../common/metadata/license-apache-commons-pool.idmap \
+	../common/metadata/license-apache-commons-validator.idmap \
+	../common/metadata/license-asm.idmap \
+	../common/metadata/license-felix.idmap \
+	../common/metadata/license-httpclient.idmap \
+	../common/metadata/license-httpcore.idmap \
+	../common/metadata/license-java-secure-channel.idmap \
+	../common/metadata/license-jdom.idmap \
+	../common/metadata/license-jline.idmap \
+	../common/metadata/license-jquery.idmap \
+	../common/metadata/license-jqueryui.idmap \
+	../common/metadata/license-libcurl.idmap \
+	../common/metadata/license-libevent.idmap \
+	../common/metadata/license-log4j.idmap \
+	../common/metadata/license-lpeg.idmap \
+	../common/metadata/license-luafilesystem.idmap \
+	../common/metadata/license-mime4j.idmap \
+	../common/metadata/license-openssl-0.9.8o.idmap \
+	../common/metadata/license-spring-framework.idmap \
+	../common/metadata/license-tomcat-2010.idmap \
+	../common/metadata/license-zlib.idmap \
 	metadata/legalnotice.en.idmap \
 	metadata/licenses-third-party-core.idmap \
 	metadata/preface.idmap


Thread
svn commit - mysqldoc@docsrva: r23841 - in trunk: . common dynamic-docs/licenses mysql-monitor-2.2 mysql-monitor-2.3 mysql-monitor-3.0paul.dubois18 Nov