From 41d29f059f8fef4ef2ef9ec77d482960b94ca091 Mon Sep 17 00:00:00 2001 From: Ted Williams Date: Wed, 30 May 2007 02:06:46 +0000 Subject: [PATCH] fixes for 189542 --- .../build.properties | 4 +- .../feature.properties | 126 ++++++++++++++++++ .../feature.xml | 104 +-------------- .../license.html | 79 +++++++++++ .../about.html | 24 ++++ .../build.properties | 3 +- 6 files changed, 238 insertions(+), 102 deletions(-) create mode 100644 features/org.eclipse.dd.debug.memory.renderings-feature/feature.properties create mode 100644 features/org.eclipse.dd.debug.memory.renderings-feature/license.html create mode 100644 plugins/org.eclipse.dd.debug.memory.renderings.traditional/about.html diff --git a/features/org.eclipse.dd.debug.memory.renderings-feature/build.properties b/features/org.eclipse.dd.debug.memory.renderings-feature/build.properties index 64f93a9f0b7..66d3261e69c 100644 --- a/features/org.eclipse.dd.debug.memory.renderings-feature/build.properties +++ b/features/org.eclipse.dd.debug.memory.renderings-feature/build.properties @@ -1 +1,3 @@ -bin.includes = feature.xml +bin.includes = feature.xml,\ + feature.properties,\ + license.html diff --git a/features/org.eclipse.dd.debug.memory.renderings-feature/feature.properties b/features/org.eclipse.dd.debug.memory.renderings-feature/feature.properties new file mode 100644 index 00000000000..fc88e04d681 --- /dev/null +++ b/features/org.eclipse.dd.debug.memory.renderings-feature/feature.properties @@ -0,0 +1,126 @@ +############################################################################### +# Copyright (c) 2006, 2007 Wind River Systems and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Ted Williams (Wind River) - initial API and implementation +############################################################################### + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2000, 2007 Wind River Systems and others.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http://www.eclipse.org/legal/epl-v10.html\n\ +################ end of copyright property #################################### + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +licenseURL=license.html + +# "license" property - text of the "Feature Update License" +# should be plain text version of license agreement pointed to be "licenseURL" +license=\ +* Eclipse Public License v1.0 (http://www.eclipse.org/legal/epl-v10.html)\n\ +\n\ +ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ +March 17, 2005\n\ +\n\ +Usage Of Content\n\ +\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ +OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ +USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ +AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ +AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ +OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ +\n\ +Applicable Licenses\n\ +\n\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public\n\ +License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\ +Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ +For purposes of the EPL, "Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code,\n\ +documentation and other files maintained in the Eclipse.org CVS\n\ +repository ("Repository") in CVS modules ("Modules") and made available\n\ +as downloadable archives ("Downloads").\n\ +\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ +\n\ +Features may also include other Features ("Included Features"). Files named\n\ +"feature.xml" may contain a list of the names and version numbers of\n\ +Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be\n\ +contained in files named "about.html" ("Abouts"). The terms and\n\ +conditions governing Features and Included Features should be contained\n\ +in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ +Licenses may be located in any directory of a Download or Module\n\ +including, but not limited to the following locations:\n\ +\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ +Eclipse Update Manager, you must agree to a license ("Feature Update\n\ +License") during the installation process. If the Feature contains\n\ +Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform\n\ +you where you can locate them. Feature Update Licenses may be found in\n\ +the "license" property of files named "feature.properties". Such Abouts,\n\ +Feature Licenses and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your\n\ +use of the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\ +TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ +SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ +\n\ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ +TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ +is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ +govern that particular Content.\n\ +\n\ +Cryptography\n\ +\n\ +Content may contain encryption software. The country in which you are\n\ +currently may have restrictions on the import, possession, and use,\n\ +and/or re-export to another country, of encryption software. BEFORE\n\ +using any encryption software, please check the country's laws,\n\ +regulations and policies concerning the import, possession, or use,\n\ +and re-export of encryption software, to see if this is permitted.\n\ +\n\ +Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n +########### end of license property ########################################## diff --git a/features/org.eclipse.dd.debug.memory.renderings-feature/feature.xml b/features/org.eclipse.dd.debug.memory.renderings-feature/feature.xml index 7c574a462a7..bd754fbb1ac 100644 --- a/features/org.eclipse.dd.debug.memory.renderings-feature/feature.xml +++ b/features/org.eclipse.dd.debug.memory.renderings-feature/feature.xml @@ -11,108 +11,12 @@ Device Debug Memory Renderings - - Copyright (c) 2006-2007 Wind River Systems and others. -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License -v1.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html + + %copyright - - ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT -March 17, 2005 -Usage Of Content -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, -INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY -"CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS -OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE -AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING -THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED -BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE -LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. -IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT -AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS -OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE -THE CONTENT. -Applicable Licenses -Unless otherwise indicated, all Content made available by the -Eclipse Foundation is provided to you under the terms and conditions -of the Eclipse Public License Version 1.0 ("EPL"). A copy of -the EPL is provided with this Content and is also available at -http://www.eclipse.org/legal/epl-v10.html. For purposes of the -EPL, "Program" will mean the Content. -Content includes, but is not limited to, source code, object -code, documentation and other files maintained in the Eclipse.org -CVS repository ("Repository") in CVS modules ("Modules") and -made available as downloadable archives ("Downloads"). -- Content may be structured and packaged into modules to facilitate -delivering, -extending, and upgrading the Content. Typical modules may include -plug-ins ("Plug-ins"), -plug-in fragments ("Fragments"), and features ("Features"). -- Each Plug-in or Fragment may be packaged as a sub-directory -or JAR (Java? ARchive) -in a directory named "plugins". -- A Feature is a bundle of one or more Plug-ins and/or Fragments -and associated material. -Each Feature may be packaged as a sub-directory in a directory -named "features". -Within a Feature, files named "feature.xml" may contain a list -of the names and version -numbers of the Plug-ins and/or Fragments associated with that -Feature. -- Features may also include other Features ("Included Features"). -Within a Feature, files -named "feature.xml" may contain a list of the names and version -numbers of Included Features. -Features may also include other Features ("Included Features"). -Files named "feature.xml" may contain a list of the names and -version numbers of Included Features. -The terms and conditions governing Plug-ins and Fragments should -be contained in files named "about.html" ("Abouts"). The terms -and conditions governing Features and Included Features should -be contained in files named "license.html" ("Feature Licenses"). -Abouts and Feature -Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations: -- The top-level (root) directory -- Plug-in and Fragment directories -- Inside Plug-ins and Fragments packaged as JARs -- Sub-directories of the directory named "src" of certain Plug-ins -- Feature directories -Note: if a Feature made available by the Eclipse Foundation is -installed using the Eclipse Update Manager, you must agree to -a license ("Feature Update License") during the installation -process. If the Feature contains Included Features, the Feature -Update License should either provide you -with the terms and conditions governing the Included Features -or inform you where you can locate them. Feature Update Licenses -may be found in the "license" property of files named "feature.properties". -Such Abouts, Feature Licenses and Feature Update Licenses contain -the terms and conditions (or references to such terms and conditions) -that govern your -use of the associated Content in that directory. -THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY -REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS -AND CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE -(BUT ARE NOT LIMITED TO): -- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html) -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS -PRIOR TO USE OF THE CONTENT. If no About, Feature License or -Feature Update License is provided, please contact the Eclipse -Foundation to determine what terms and conditions govern that -particular Content. -Cryptography -Content may contain encryption software. The country in which -you are currently may have restrictions on the import, possession, -and use, and/or re-export to another country, of encryption software. -BEFORE using any encryption software, please check the country's -laws, -regulations and policies concerning the import, possession, or -use, and re-export of encryption software, to see if this is -permitted. -Java and all Java-based trademarks are trademarks of Sun Microsystem + + %license diff --git a/features/org.eclipse.dd.debug.memory.renderings-feature/license.html b/features/org.eclipse.dd.debug.memory.renderings-feature/license.html new file mode 100644 index 00000000000..c6af966b61e --- /dev/null +++ b/features/org.eclipse.dd.debug.memory.renderings-feature/license.html @@ -0,0 +1,79 @@ + + + + +Eclipse.org Software User Agreement + + + +

Eclipse Foundation Software User Agreement

+

March 17, 2005

+ +

Usage Of Content

+ +

THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE + OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR + NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND + CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.

+ +

Applicable Licenses

+ +

Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. + For purposes of the EPL, "Program" will mean the Content.

+ +

Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS + modules ("Modules") and made available as downloadable archives ("Downloads").

+ +
    +
  • Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
    • +
  • Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
    • +
  • A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins + and/or Fragments associated with that Feature.
    • +
  • Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
    • +
+ +

The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module +including, but not limited to the following locations:

+ +
    +
  • The top-level (root) directory
    • +
  • Plug-in and Fragment directories
    • +
  • Inside Plug-ins and Fragments packaged as JARs
    • +
  • Sub-directories of the directory named "src" of certain Plug-ins
    • +
  • Feature directories
    • +
+ +

Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the +installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in +that directory.

+ +

THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):

+ + + +

IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.

+ +

Cryptography

+ +

Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to + another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + possession, or use, and re-export of encryption software, to see if this is permitted.

+ +Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + + diff --git a/plugins/org.eclipse.dd.debug.memory.renderings.traditional/about.html b/plugins/org.eclipse.dd.debug.memory.renderings.traditional/about.html new file mode 100644 index 00000000000..cb740ae8bc8 --- /dev/null +++ b/plugins/org.eclipse.dd.debug.memory.renderings.traditional/about.html @@ -0,0 +1,24 @@ + + + + +About +

About This Content

+ +

June 5, 2007

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file diff --git a/plugins/org.eclipse.dd.debug.memory.renderings.traditional/build.properties b/plugins/org.eclipse.dd.debug.memory.renderings.traditional/build.properties index e9863e281ea..b3a6164b629 100644 --- a/plugins/org.eclipse.dd.debug.memory.renderings.traditional/build.properties +++ b/plugins/org.eclipse.dd.debug.memory.renderings.traditional/build.properties @@ -2,4 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.xml + plugin.xml \ + about.html