20 files changed, 348 insertions, 92 deletions
diff --git a/ChangeLog b/ChangeLog
index e89d3a10c2..f743566a2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-13  Michael Hutchinson <mhutchinson@novell.com>
+
+	* contrib/*: Rework build code so that Mono.Addins, Mono.Cecil 
+	  and log4net libraries are included via svn:externals and built 
+	  from source.
+	
+	* configure.in: Updated.
+
 2007-09-10  Lluis Sanchez Gual <lluis@novell.com> 
 
 	
diff --git a/configure.in b/configure.in
index b68d94c03b..967d21d4d1 100644
--- a/configure.in
+++ b/configure.in
@@ -452,6 +452,9 @@ build/data/resources/css/Makefile
 build/data/resources/Makefile
 build/Makefile
 contrib/Makefile
+contrib/Mono.Addins/Makefile
+contrib/log4net/Makefile
+contrib/Mono.Cecil/Makefile
 Core/Makefile
 Core/src/NRefactory/Makefile
 Core/src/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 23e3fbc8bf..0805d8d4c7 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,15 +1,4 @@
-
-BINDIR=$(top_builddir)/build/bin
-LOG4NET_DLL=log4net.dll
-LOG4NET = $(BINDIR)/$(LOG4NET_DLL)
-CECIL_DLL=Mono.Cecil.dll
-CECIL = $(BINDIR)/$(CECIL_DLL)
-MONO_ADDINS_DLL=Mono.Addins.dll
-MONO_ADDINS = $(BINDIR)/$(MONO_ADDINS_DLL)
-MONO_ADDINS_SETUP_DLL=Mono.Addins.Setup.dll
-MONO_ADDINS_SETUP = $(BINDIR)/$(MONO_ADDINS_SETUP_DLL)
-MONO_ADDINS_GUI_DLL=Mono.Addins.Gui.dll
-MONO_ADDINS_GUI = $(BINDIR)/$(MONO_ADDINS_GUI_DLL)
+SUBDIRS = Mono.Addins Mono.Cecil log4net
 
 # We need to copy Firebird to the same directory as where
 # mono.data.sql builds. otherwise, mono.data.sql cant find the
@@ -18,36 +7,14 @@ FIREBIRDDIR=$(top_builddir)/build/AddIns/MonoQuery
 FIREBIRD_DLL=FirebirdSql.Data.Firebird.dll
 FIREBIRD = $(FIREBIRDDIR)/$(FIREBIRD_DLL)
 
-all: $(LOG4NET) $(CECIL) $(FIREBIRD) $(MONO_ADDINS) $(MONO_ADDINS_SETUP) $(MONO_ADDINS_GUI)
-
-$(LOG4NET): $(srcdir)/$(LOG4NET_DLL)
-	mkdir -p $(BINDIR)
-	cp $(srcdir)/$(LOG4NET_DLL) $(LOG4NET)
-
-$(CECIL): $(srcdir)/$(CECIL_DLL)
-	mkdir -p $(BINDIR)
-	cp $(srcdir)/$(CECIL_DLL) $(CECIL)
-
-$(MONO_ADDINS): $(srcdir)/$(MONO_ADDINS_DLL) $(srcdir)/$(MONO_ADDINS_DLL).config
-	mkdir -p $(BINDIR)
-	cp $(srcdir)/$(MONO_ADDINS_DLL) $(MONO_ADDINS)
-	cp $(srcdir)/$(MONO_ADDINS_DLL).config $(MONO_ADDINS).config
-
-$(MONO_ADDINS_GUI): $(srcdir)/$(MONO_ADDINS_GUI_DLL)
-	mkdir -p $(BINDIR)
-	cp $(srcdir)/$(MONO_ADDINS_GUI_DLL) $(MONO_ADDINS_GUI)
-
-$(MONO_ADDINS_SETUP): $(srcdir)/$(MONO_ADDINS_SETUP_DLL)
-	mkdir -p $(BINDIR)
-	cp $(srcdir)/$(MONO_ADDINS_SETUP_DLL) $(MONO_ADDINS_SETUP)
+all: $(FIREBIRD)
 
 $(FIREBIRD): $(srcdir)/$(FIREBIRD_DLL)
 	mkdir -p $(FIREBIRDDIR)
 	cp $(srcdir)/$(FIREBIRD_DLL) $(FIREBIRD)
 
 assemblydir = $(MD_ASSEMBLY_DIR)
-assembly_DATA = $(LOG4NET) $(CECIL) $(FIREBIRD) $(MONO_ADDINS) $(MONO_ADDINS).config $(MONO_ADDINS_SETUP) $(MONO_ADDINS_GUI)
-
-CLEANFILES = $(LOG4NET) $(CECIL) $(FIREBIRD) $(MONO_ADDINS) $(MONO_ADDINS).config
-EXTRA_DIST = $(LOG4NET_DLL) $(CECIL_DLL) $(FIREBIRD_DLL) $(MONO_ADDINS_DLL) $(MONO_ADDINS_DLL).config $(MONO_ADDINS_SETUP_DLL) $(MONO_ADDINS_GUI_DLL)
+assembly_DATA = $(FIREBIRD)
 
+CLEANFILES = $(FIREBIRD)
+EXTRA_DIST = $(FIREBIRD_DLL) FirebirdSql.Data.Firebird.license.txt
diff --git a/contrib/Mono.Addins.Gui.dll b/contrib/Mono.Addins.Gui.dll
deleted file mode 100755
index 3731c26cab..0000000000
--- a/contrib/Mono.Addins.Gui.dll
+++ /dev/null
diff --git a/contrib/Mono.Addins.Setup.dll b/contrib/Mono.Addins.Setup.dll
deleted file mode 100755
index a58b2f1187..0000000000
--- a/contrib/Mono.Addins.Setup.dll
+++ /dev/null
diff --git a/contrib/Mono.Addins.dll b/contrib/Mono.Addins.dll
deleted file mode 100755
index 8080b4079f..0000000000
--- a/contrib/Mono.Addins.dll
+++ /dev/null
diff --git a/contrib/Mono.Addins.dll.config b/contrib/Mono.Addins.dll.config
deleted file mode 100644
index 39e8a66b28..0000000000
--- a/contrib/Mono.Addins.dll.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <startup>
-    <supportedRuntime version="v2.0.50727" /> 
-  </startup>
-</configuration>
diff --git a/contrib/Mono.Addins/Makefile.am b/contrib/Mono.Addins/Makefile.am
new file mode 100644
index 0000000000..8818c257bb
--- /dev/null
+++ b/contrib/Mono.Addins/Makefile.am
@@ -0,0 +1,78 @@
+BINDIR=$(top_builddir)/build/bin
+
+all: $(MONO_ADDINS) $(MONO_ADDINS_SETUP) $(MONO_ADDINS_GUI) 
+
+### Common settings ###
+KEY_FILE = $(srcdir)/src/mono-addins.snk
+MCS = mcs
+
+
+### Mono.Addins ###
+
+MONO_ADDINS_DIR = $(srcdir)/src/Mono.Addins
+MONO_ADDINS_DLL = Mono.Addins.dll
+MONO_ADDINS = $(BINDIR)/$(MONO_ADDINS_DLL)
+MONO_ADDINS_MAKEFILE = $(srcdir)/src/Mono.Addins/Makefile.am
+
+MONO_ADDINS_FLAGS = -keyfile:$(KEY_FILE) -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG "-main:Mono.Addins.Database.SetupProcess" -target:exe
+
+MONO_ADDINS_FILES := $(addprefix $(MONO_ADDINS_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/files.sed $(MONO_ADDINS_MAKEFILE)))
+MONO_ADDINS_RESOURCES := $(addprefix $(MONO_ADDINS_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/resources.sed $(MONO_ADDINS_MAKEFILE)))
+MONO_ADDINS_REFERENCES := $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/references.sed $(MONO_ADDINS_MAKEFILE))
+MONO_ADDINS_DATA_FILES := $(addprefix $(MONO_ADDINS_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/data_files.sed $(MONO_ADDINS_MAKEFILE)))
+MONO_ADDINS_DIST := $(MONO_ADDINS_FILES)  $(MONO_ADDINS_RESOURCES) $(MONO_ADDINS_DATA_FILES) $(MONO_ADDINS_MAKEFILE) $(MONO_ADDINS_DIR)/$(MONO_ADDINS_DLL).config
+
+$(MONO_ADDINS): $(MONO_ADDINS_FILES) $(MONO_ADDINS_RESOURCES) $(MONO_ADDINS_DATA_FILES) $(MONO_ADDINS).config 
+	mkdir -p $(BINDIR)
+	$(MCS) $(MONO_ADDINS_FLAGS) -out:$@ $(MONO_ADDINS_FILES) $(MONO_ADDINS_REFERENCES) $(MONO_ADDINS_RESOURCES:%=-resource:%)
+
+$(MONO_ADDINS).config:
+	mkdir -p $(BINDIR)
+	cp $(MONO_ADDINS_DIR)/$(MONO_ADDINS_DLL).config $(MONO_ADDINS).config
+
+
+### Mono.Addins.Setup ###
+
+MONO_ADDINS_SETUP_DIR = $(srcdir)/src/Mono.Addins.Setup
+MONO_ADDINS_SETUP_DLL = Mono.Addins.Setup.dll
+MONO_ADDINS_SETUP = $(BINDIR)/$(MONO_ADDINS_SETUP_DLL)
+MONO_ADDINS_SETUP_MAKEFILE = $(srcdir)/src/Mono.Addins.Setup/Makefile.am
+
+MONO_ADDINS_SETUP_FLAGS = -keyfile:$(KEY_FILE) -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG -target:library
+
+MONO_ADDINS_SETUP_FILES := $(addprefix $(MONO_ADDINS_SETUP_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/files.sed $(MONO_ADDINS_SETUP_MAKEFILE)))
+MONO_ADDINS_SETUP_RESOURCES := $(addprefix $(MONO_ADDINS_SETUP_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/resources.sed $(MONO_ADDINS_SETUP_MAKEFILE)))
+MONO_ADDINS_SETUP_REFERENCES := $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/references.sed $(MONO_ADDINS_SETUP_MAKEFILE))
+MONO_ADDINS_SETUP_DATA_FILES := $(addprefix $(MONO_ADDINS_SETUP_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/data_files.sed $(MONO_ADDINS_SETUP_MAKEFILE)))
+MONO_ADDINS_SETUP_DIST := $(MONO_ADDINS_SETUP_FILES)  $(MONO_ADDINS_SETUP_RESOURCES) $(MONO_ADDINS_SETUP_DATA_FILES) $(MONO_ADDINS_SETUP_MAKEFILE)
+
+$(MONO_ADDINS_SETUP): $(MONO_ADDINS_SETUP_FILES) $(MONO_ADDINS_SETUP_RESOURCES) $(MONO_ADDINS_SETUP_DATA_FILES) $(MONO_ADDINS)
+	mkdir -p $(BINDIR)
+	$(MCS) $(MONO_ADDINS_SETUP_FLAGS) -out:$@ $(MONO_ADDINS_SETUP_FILES) $(MONO_ADDINS_SETUP_REFERENCES) $(MONO_ADDINS_SETUP_RESOURCES:%=-resource:%) -r:$(MONO_ADDINS)
+
+
+### Mono.Addins.Gui ###
+
+MONO_ADDINS_GUI_DIR = $(srcdir)/src/Mono.Addins.Gui
+MONO_ADDINS_GUI_DLL = Mono.Addins.Gui.dll
+MONO_ADDINS_GUI = $(BINDIR)/$(MONO_ADDINS_GUI_DLL)
+MONO_ADDINS_GUI_MAKEFILE = $(srcdir)/src/Mono.Addins.Gui/Makefile.am
+
+MONO_ADDINS_GUI_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG -target:library
+
+MONO_ADDINS_GUI_FILES := $(addprefix $(MONO_ADDINS_GUI_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/files.sed $(MONO_ADDINS_GUI_MAKEFILE)))
+MONO_ADDINS_GUI_RESOURCES := $(addprefix $(MONO_ADDINS_GUI_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/resources.sed $(MONO_ADDINS_GUI_MAKEFILE)))
+MONO_ADDINS_GUI_REFERENCES := $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/references.sed $(MONO_ADDINS_GUI_MAKEFILE))
+MONO_ADDINS_GUI_DATA_FILES := $(addprefix $(MONO_ADDINS_GUI_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/data_files.sed $(MONO_ADDINS_GUI_MAKEFILE)))
+MONO_ADDINS_GUI_DIST := $(MONO_ADDINS_GUI_FILES)  $(MONO_ADDINS_GUI_RESOURCES) $(MONO_ADDINS_GUI_DATA_FILES) $(MONO_ADDINS_GUI_MAKEFILE)
+
+$(MONO_ADDINS_GUI): $(MONO_ADDINS_GUI_FILES) $(MONO_ADDINS_GUI_RESOURCES) $(MONO_ADDINS_GUI_DATA_FILES) $(MONO_ADDINS) $(MONO_ADDINS_SETUP)
+	mkdir -p $(BINDIR)
+	$(MCS) $(MONO_ADDINS_GUI_FLAGS) -out:$@ $(MONO_ADDINS_GUI_FILES) $(MONO_ADDINS_GUI_REFERENCES) $(MONO_ADDINS_GUI_RESOURCES:%=-resource:%) -r:$(MONO_ADDINS) -r:$(MONO_ADDINS_SETUP)
+
+assemblydir = $(MD_ASSEMBLY_DIR)
+assembly_DATA = $(MONO_ADDINS) $(MONO_ADDINS_SETUP) $(MONO_ADDINS_GUI) $(MONO_ADDINS).config
+
+CLEANFILES = $(assembly_DATA)
+EXTRA_DIST = $(MONO_ADDINS_DIST) $(MONO_ADDINS_SETUP_DIST) $(MONO_ADDINS_GUI_DIST) $(KEY_FILE) singlelinevars.sed resources.sed files.sed data_files.sed references.sed 
+
diff --git a/contrib/Mono.Addins/data_files.sed b/contrib/Mono.Addins/data_files.sed
new file mode 100644
index 0000000000..abddeb061a
--- /dev/null
+++ b/contrib/Mono.Addins/data_files.sed
@@ -0,0 +1,2 @@
+/^DATA_FILES/!d
+s/DATA_FILES = //
diff --git a/contrib/Mono.Addins/files.sed b/contrib/Mono.Addins/files.sed
new file mode 100644
index 0000000000..d1ab86ae6d
--- /dev/null
+++ b/contrib/Mono.Addins/files.sed
@@ -0,0 +1,2 @@
+/^FILES/!d
+s/FILES = //
diff --git a/contrib/Mono.Addins/references.sed b/contrib/Mono.Addins/references.sed
new file mode 100644
index 0000000000..437724d0a1
--- /dev/null
+++ b/contrib/Mono.Addins/references.sed
@@ -0,0 +1,2 @@
+/^REFERENCES/!d
+s/REFERENCES = //
diff --git a/contrib/Mono.Addins/resources.sed b/contrib/Mono.Addins/resources.sed
new file mode 100644
index 0000000000..8d0e2ab90d
--- /dev/null
+++ b/contrib/Mono.Addins/resources.sed
@@ -0,0 +1,2 @@
+/^RESOURCES/!d
+s/RESOURCES = //
diff --git a/contrib/Mono.Addins/singlelinevars.sed b/contrib/Mono.Addins/singlelinevars.sed
new file mode 100644
index 0000000000..f4c4575017
--- /dev/null
+++ b/contrib/Mono.Addins/singlelinevars.sed
@@ -0,0 +1,2 @@
+:a
+/\\$/N; s/\\\n//; ta
diff --git a/contrib/Mono.Cecil.dll b/contrib/Mono.Cecil.dll
deleted file mode 100755
index f304f3d165..0000000000
--- a/contrib/Mono.Cecil.dll
+++ /dev/null
diff --git a/contrib/Mono.Cecil/Makefile.am b/contrib/Mono.Cecil/Makefile.am
new file mode 100644
index 0000000000..4ff7492724
--- /dev/null
+++ b/contrib/Mono.Cecil/Makefile.am
@@ -0,0 +1,19 @@
+BINDIR=$(top_builddir)/build/bin
+
+all: $(CECIL)
+
+CECIL_DLL=Mono.Cecil.dll
+CECIL = $(BINDIR)/$(CECIL_DLL)
+CECIL_DIR=$(srcdir)/src
+CECIL_CSFILES=$(addprefix $(CECIL_DIR)/, $(shell sed -f $(srcdir)/stripnewline.sed  $(CECIL_DIR)/Mono.Cecil.dll.sources))
+CECIL_DIST= $(CECIL_CSFILES)
+
+$(CECIL): $(CECIL_CSFILES)
+	mkdir -p $(BINDIR)
+	mcs $(CECIL_CSFILES) /target:library /out:$(CECIL)
+
+assemblydir = $(MD_ASSEMBLY_DIR)
+assembly_DATA = $(CECIL)
+
+CLEANFILES =  $(CECIL)
+EXTRA_DIST = $(CECIL_DIST) $(CECIL_DIR)/Mono.Cecil.dll.sources stripnewline.sed
diff --git a/contrib/Mono.Cecil/stripnewline.sed b/contrib/Mono.Cecil/stripnewline.sed
new file mode 100644
index 0000000000..abf2ee8855
--- /dev/null
+++ b/contrib/Mono.Cecil/stripnewline.sed
@@ -0,0 +1,2 @@
+:a
+/\\$$/N; s/\n/ /; ta
diff --git a/contrib/log4net.dll b/contrib/log4net.dll
deleted file mode 100755
index 2a5bf3e6ea..0000000000
--- a/contrib/log4net.dll
+++ /dev/null
diff --git a/contrib/log4net.license.txt b/contrib/log4net.license.txt
deleted file mode 100644
index 030564fc13..0000000000
--- a/contrib/log4net.license.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * ============================================================================
- *                   The Apache Software License, Version 1.1
- * ============================================================================
- * 
- *    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, 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 end-user documentation included with the redistribution, if any, must
- *    include  the following  acknowledgment:  "This product includes  software
- *    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
- *    Alternately, this  acknowledgment may  appear in the software itself,  if
- *    and wherever such third-party acknowledgments normally appear.
- * 
- * 4. The names "log4j" and  "Apache Software Foundation"  must not be used to
- *    endorse  or promote  products derived  from this  software without  prior
- *    written permission. For written permission, please contact
- *    apache@apache.org.
- * 
- * 5. Products  derived from this software may not  be called "Apache", nor may
- *    "Apache" appear  in their name,  without prior written permission  of the
- *    Apache Software Foundation.
- * 
- * 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  THE
- * APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- * DING, 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.
- * 
- * This software  consists of voluntary contributions made  by many individuals
- * on  behalf of the Apache Software  Foundation.  For more  information on the 
- * Apache Software Foundation, please see <http://www.apache.org/>.
- *
- */
diff --git a/contrib/log4net/Makefile.am b/contrib/log4net/Makefile.am
new file mode 100644
index 0000000000..ac83616186
--- /dev/null
+++ b/contrib/log4net/Makefile.am
@@ -0,0 +1,21 @@
+BINDIR=$(top_builddir)/build/bin
+
+all: $(LOG4NET)
+
+LOG4NET_DLL=log4net.dll
+LOG4NET = $(BINDIR)/$(LOG4NET_DLL)
+LOG4NET_DIR=$(srcdir)/src
+LOG4NET_CSFILES=$(LOG4NET_DIR)/*.cs $(LOG4NET_DIR)/*/*.cs $(LOG4NET_DIR)/*/*/*.cs
+LOG4NET_DIST= $(LOG4NET_CSFILES)
+LOG4NET_REFS=/r:System /r:System.Data /r:System.Web
+
+$(LOG4NET): $(LOG4NET_CSFILES)
+	mkdir -p $(BINDIR)
+	mcs /target:library /out:$(LOG4NET) $(LOG4NET_REFS) $(LOG4NET_CSFILES)
+
+assemblydir = $(MD_ASSEMBLY_DIR)
+assembly_DATA = $(LOG4NET)
+
+CLEANFILES =  $(assembly_DATA)
+EXTRA_DIST = $(LOG4NET_DIST) log4net.license.txt
+
diff --git a/contrib/log4net/log4net.license.txt b/contrib/log4net/log4net.license.txt
new file mode 100644
index 0000000000..57bc88a15a
--- /dev/null
+++ b/contrib/log4net/log4net.license.txt
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+