You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2006/12/05 08:02:18 UTC

svn commit: r482529 - in /db/derby/code/trunk/plugins/eclipse: ./ org.apache.derby.plugin.doc/ org.apache.derby.ui/

Author: fuzzylogic
Date: Mon Dec  4 23:02:16 2006
New Revision: 482529

URL: http://svn.apache.org/viewvc?view=rev&rev=482529
Log:
DERBY-1529: Add LICENSE and NOTICE files to the Eclipse plugins, update build
instructions

Committed for Rajesh Kartha <ka...@gmail.com>

Added:
    db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/LICENSE
    db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/NOTICE
    db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/LICENSE
    db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/NOTICE
Modified:
    db/derby/code/trunk/plugins/eclipse/Readme.txt
    db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/build.properties
    db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/build.properties

Modified: db/derby/code/trunk/plugins/eclipse/Readme.txt
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/plugins/eclipse/Readme.txt?view=diff&rev=482529&r1=482528&r2=482529
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/Readme.txt (original)
+++ db/derby/code/trunk/plugins/eclipse/Readme.txt Mon Dec  4 23:02:16 2006
@@ -49,12 +49,12 @@
   
 2) Install Eclipse 3.x and the JDK needed
 
-3) Install the Apache Derby 10.1.0 Eclipse Core plug-in from:
+3) Install the Apache Derby 10.x Eclipse Core plug-in from:
    http://db.apache.org/derby/derby_downloads.html
 
    It is available as a zip file:
 
-   for example; derby_core_plugin_10.1.0.178324.zip
+   for example; derby_core_plugin_10.1.3.zip
 
    Unzip this file into the directory where the eclipse executable is located.
    For instance, if Eclipse is installed in C:\eclipse, unzip the Derby
@@ -75,7 +75,8 @@
 6) Switch to the Plug-in perspective
    Window -> Open Perspective -> Other -> Select Plug-in Development
 
-7) To invoke and test the Apache Derby UI Plug-in in this development environment
+7) To invoke and test the Apache Derby UI Plug-in in this development 
+   environment
    
    Run ->Run As -> Eclipse Application (Eclipse 3.1)
    OR
@@ -96,40 +97,79 @@
 In order to install the plug-ins easily in another Eclipse environment creating
 a zip file is useful.
 
-To create a zip file for the UI plug-in:
+To create a zip file for the UI plug-in only:
 
-1) From within the Plug-in Development perspective, right-click the org.apache.derby.ui
-   project.  Select Export --> Deployable plug-ins and fragments, then the Next button.
-
-2) In the Export Plug-ins and Fragments window select the org.apache.derby.ui project
-   listed in the Available Plug-ins and Fragments text area.  For the Export Options
-   section select Deploy as: a single ZIP file.  Click the Build Options button.
-   Check any options desired from the Build Options Preferences window and then
-   click OK.
-
-3) Browse to a Destination where you would like to put the zip file and name it
-   org.apache.derby.ui_1.0.0.zip to represent the name and version of the plug-in.
+1) From within the Plug-in Development perspective, right-click the 
+   org.apache.derby.ui project.  Select Export --> Deployable plug-ins and 
+   fragments, then the Next button.
+
+2) In the Deployable plug-ins and fragments window select the 
+   org.apache.derby.ui project listed in the Available Plug-ins and Fragments 
+   text area. Depending on the Eclipse version used:
+
+   Eclipse 3.1:
+   In the Export Destination, select the Archive File option
+
+   Eclipse 3.0:
+   For the Export Options section select Deploy as: a single ZIP file.  Click 
+   the Build Options button.  Check any options desired from the Build Options 
+   Preferences window and then click OK.
+
+3) Browse to a Destination where you would like to put the zip file and provide 
+   a file name for example: derby_ui_plugin_1.1.0.zip, to represent the name and
+   version of the plug-in.
 
 4) Finally, click Finish.
 
 5) To install in another Eclipse installation unzip this file in the base
    directory of the Eclipse installation.
 
-To create a zip file for the Doc plug-in:
+To create a zip file for the Doc plug-in only:
 
 1) From within the Plug-in Development perspective, right-click the
-   org.apache.derby.plugin.doc project.  Select Export --> Zip file.
+   org.apache.derby.plugin.doc project.  Select Export --> Deployable plug-ins 
+   and fragments, then the Next button.
+
+2) In the Deployable plug-ins and fragments window select the 
+   org.apache.derby.plugin.doc project listed in the left frame.  In the right 
+   frame uncheck the .project and build.properties files. Depending on the 
+   Eclipse version used:
+
+   Eclipse 3.1:
+   In the Export Destination, select the Archive File option
 
-2) In the Export Zip file window select the org.apache.derby.plugin.doc project
-   listed in the left frame.  In the right frame uncheck the .project and
-   build.properties files.
-
-3) Browse to a Destination where you would like to put the zip file and name it
-   org.apache.derby.plugin.doc_1.0.0.zip to represent the name and version of 
-   the plug-in.
+   Eclipse 3.0:
+   For the Export Options section select Deploy as: a single ZIP file.  Click 
+   the Build Options button.  Check any options desired from the Build Options 
+   Preferences window and then click OK.
+
+
+3) Browse to a Destination where you would like to put the zip file and provide    a file name, for example: derby_doc_plugin_1.1.0.zip, to represent the name 
+   and version of the plug-in.
 
 4) Finally, click Finish.
 
 5) Note that the documentation zip files' base directory is
    org.apache.derby.plugin.doc and therefore must be unzipped in the plug-ins
    directory.
+
+To create a single zip file for both UI and Doc plug-ins:
+
+1) From within the Plug-in Development perspective, right-click the
+   org.apache.derby.plugin.doc and the org.apache.derby.ui projects.  Select 
+   Export --> Deployable plug-ins and fragments, then the Next button.
+
+2) In the Deployable plug-ins and fragments window select the 
+   org.apache.derby.plugin.doc project listed in the left frame.  In the right 
+   frame uncheck the .project and build.properties files. Depending on the 
+   Eclipse version used:
+
+   Eclipse 3.1:
+   In the Export Destination, select the Archive File option
+
+3) Browse to a Destination where you would like to put the zip file and provide    a file name, for example: derby_ui_plugin_1.1.0.zip,  to represent the name 
+   and version of the plug-in.
+
+4) Finally, click Finish.
+
+

Added: db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/LICENSE
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/LICENSE?view=auto&rev=482529
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/LICENSE (added)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/LICENSE Mon Dec  4 23:02:16 2006
@@ -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.

Added: db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/NOTICE
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/NOTICE?view=auto&rev=482529
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/NOTICE (added)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/NOTICE Mon Dec  4 23:02:16 2006
@@ -0,0 +1,31 @@
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for the Apache Derby distribution.       ==
+=========================================================================
+
+Apache Derby
+Copyright 2004-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of Derby were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "Derby CLA".
+The following copyright notice(s) were affixed to portions of the code
+with which this file is now or was at one time distributed
+and are placed here unaltered.
+
+(C) Copyright 1997,2004 International Business Machines Corporation.  All rights reserved.
+
+(C) Copyright IBM Corp. 2003. 
+
+The portion of the functionTests under 'nist' was originally 
+developed by the National Institute of Standards and Technology (NIST), 
+an agency of the United States Department of Commerce, and adapted by
+International Business Machines Corporation in accordance with the NIST
+Software Acknowledgment and Redistribution document at
+http://www.itl.nist.gov/div897/ctg/sql_form.htm
+

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/build.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/build.properties?view=diff&rev=482529&r1=482528&r2=482529
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/build.properties (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.plugin.doc/build.properties Mon Dec  4 23:02:16 2006
@@ -1,3 +1,5 @@
 bin.includes = topics/,\
                plugin.xml,\
-               toc.xml
+               toc.xml,\
+               LICENSE,\
+               NOTICE

Added: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/LICENSE
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/LICENSE?view=auto&rev=482529
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/LICENSE (added)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/LICENSE Mon Dec  4 23:02:16 2006
@@ -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.

Added: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/NOTICE
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/NOTICE?view=auto&rev=482529
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/NOTICE (added)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/NOTICE Mon Dec  4 23:02:16 2006
@@ -0,0 +1,31 @@
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for the Apache Derby distribution.       ==
+=========================================================================
+
+Apache Derby
+Copyright 2004-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of Derby were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "Derby CLA".
+The following copyright notice(s) were affixed to portions of the code
+with which this file is now or was at one time distributed
+and are placed here unaltered.
+
+(C) Copyright 1997,2004 International Business Machines Corporation.  All rights reserved.
+
+(C) Copyright IBM Corp. 2003. 
+
+The portion of the functionTests under 'nist' was originally 
+developed by the National Institute of Standards and Technology (NIST), 
+an agency of the United States Department of Commerce, and adapted by
+International Business Machines Corporation in accordance with the NIST
+Software Acknowledgment and Redistribution document at
+http://www.itl.nist.gov/div897/ctg/sql_form.htm
+

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/build.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/build.properties?view=diff&rev=482529&r1=482528&r2=482529
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/build.properties (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/build.properties Mon Dec  4 23:02:16 2006
@@ -1,7 +1,9 @@
 bin.includes = icons/,\
                ui.jar,\
                install_plugin.html,\
-               plugin.xml
+               plugin.xml,\
+               LICENSE,\
+               NOTICE
 jars.compile.order = ui.jar
 source.ui.jar = src/
 output.ui.jar = bin/