Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Overholt2011-02-28 03:44:59 +0000
committerAndrew Overholt2011-02-28 03:44:59 +0000
commit473918270ef63f6a78943ee1259f2af13bf4517b (patch)
tree65f1222520219d316ae4776e36aa2062e658fead
parent878e6d1f02e8d3b970b67a3dec459a65a47ae8ce (diff)
parentd4479c7e4ec1f77eeb98e9a366355e2753c672c6 (diff)
downloadorg.eclipse.linuxtools-473918270ef63f6a78943ee1259f2af13bf4517b.tar.gz
org.eclipse.linuxtools-473918270ef63f6a78943ee1259f2af13bf4517b.tar.xz
org.eclipse.linuxtools-473918270ef63f6a78943ee1259f2af13bf4517b.zip
Merge rpmstubby 0.6.0
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/ChangeLog19
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/feature.properties131
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/license.html102
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog30
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.properties2
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.xml2
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java55
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java23
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java9
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceConstants.java2
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceInitializer.java5
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/StubbyPreferencePage.java2
12 files changed, 215 insertions, 167 deletions
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/ChangeLog b/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/ChangeLog
index 588e825cdb..0c8574ce58 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/ChangeLog
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/ChangeLog
@@ -1,3 +1,22 @@
+2010-05-18 Andrew Overholt <overholt@redhat.com>
+
+ * feature.properties: Fix provider name.
+
+2010-04-26 Andrew Overholt <overholt@redhat.com>
+
+ * feature.properties: Match consistent license text (bug #306627). Update
+ copyright text.
+ * license.html: Update HTML version of SUA (bug #306627).
+ * build.properties: Include license.html.
+
+2010-04-12 Andrew Overholt <overholt@redhat.com>
+
+ * feature.properties: Match consistent license text (bug #306627).
+
+2009-11-10 Andrew Overholt <overholt@redhat.com>
+
+ * feature.properties: Make featureName a bit more user-friendly.
+
2009-05-19 Andrew Overholt <overholt@redhat.com>
* feature.properties: Change provider from Eclipse.org to Eclipse.
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/feature.properties b/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/feature.properties
index 6c8d048952..6ecef98d74 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/feature.properties
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/feature.properties
@@ -13,22 +13,17 @@
# NLS_ENCODING=UTF-8
# "featureName" property - name of the feature
-featureName=RPM Stubby Feature (Incubation)
+featureName=Convert feature.xml/pom.xml to RPM specfiles (Incubation)
# "description" property - description of the feature
description=RPM Stubby Plug-in is a plugin aiming to auto-generate RPM specfile \
from feature.xml.
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse
+providerName=Eclipse Linux Tools
# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2008-2009 Red Hat, Inc and others. All rights reserved.\n\
-\n\
-This program and the accompanying materials are made available under the terms\n\
-of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\
-available at http://www.eclipse.org/legal/epl-v10.html\n
+copyright=Copyright (c) 2008-2010 Red Hat, Inc and others.
################ end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
@@ -38,8 +33,8 @@ 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 FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
\n\
Usage Of Content\n\
\n\
@@ -47,42 +42,38 @@ THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/
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\
+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\
+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\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this 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\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software 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(TM) 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\
+ - 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(TM) 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\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -91,49 +82,79 @@ 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\
+ - 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\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update 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\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\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\
+ - 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\
+ - 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\
+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\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\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\
+regulations and policies concerning the import, possession, or use, and\n\
+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
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/license.html b/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/license.html
index f5a16251a8..c184ca36a9 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/license.html
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/license.html
@@ -1,13 +1,14 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
</head>
-<body lang="EN-US" link=blue vlink=purple>
+<body lang="EN-US">
<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
+<p>April 14, 2010</p>
<h3>Usage Of Content</h3>
@@ -17,38 +18,37 @@
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.</p>
-
-<h3>Applicable Licenses</h3>
-
+
+<h3>Applicable Licenses</h3>
+
<p>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
-(&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+ (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
- modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
- <li>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 &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+ <li>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 &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
+ <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
- <li>Feature directories</li>
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+ <li>Feature directories</li>
</ul>
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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
@@ -58,24 +58,50 @@ that directory.</p>
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
</ul>
<p>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.</p>
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+ on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
<h3>Cryptography</h3>
-
+
<p>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.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
</body>
</html>
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog b/rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog
index c34fb0a109..9073730e22 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog
@@ -1,3 +1,33 @@
+2010-05-31 Alexander Kurtakov <akurtako@redhat.com>
+
+ * src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java (generateJavadocSubpackage): Add missing Requires to javadoc subpackage. (bz#312865)
+
+2010-05-31 Alexander Kurtakov <akurtako@redhat.com>
+
+ * src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java (generateCleanSection): Fix rm call (bug 312864).
+
+2010-02-11 Alexander Kurtakov <akurtako@redhat.com>
+
+ * src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java (generateInstallSection): Proper install for jars in a <packaging>pom</packaging> project and use %{_mavenpomdir} macro.
+
+2010-01-26 Alexander Kurtakov <akurtako@redhat.com>
+ Drop ability to generate gcj specific parts. Use %global not %define.
+ * src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceConstants.java: Remove gcj parts.
+ * src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceInitializer.java (initializeDefaultPreferences): Likewise.
+ * src/org/eclipse/linuxtools/rpmstubby/preferences/StubbyPreferencePage.java (createFieldEditors): Likewise.
+ * src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java (getPackageFiles): Likewise.
+ (generateFilesSections): Likewise.
+ (StubbyGenerator): Likewise.
+ (generateSpecfile): Likewise. Replace %define with %global.
+
+2009-12-03 Alexander Kurtakov <akurtako@redhat.com>
+
+ * plugin.xml: Fix duplicated popup menu ids.
+
+2009-11-04 Alexander Kurtakov <akurtako@redhat.com>
+
+ * src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java (getVersion): Return inherited parent version if one wasn't defined.
+
2009-09-07 Alexander Kurtakov <akurtako@redhat.com>
* src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java (xpathEvalNodes): Format.
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.properties b/rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.properties
index 4b23fda46d..a4ef43d90a 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.properties
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.properties
@@ -9,6 +9,6 @@
# Red Hat, Inc. - initial API and implementation
#################################################################################
bundleName=Feature to RPM specfile Stubber (Incubation)
-provider=Eclipse
+provider=Eclipse Linux Tools
menu.label = Stubby
action.label = Stub out an RPM specfile \ No newline at end of file
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.xml b/rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.xml
index f8fca1de87..4cd44647ce 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.xml
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.xml
@@ -34,7 +34,7 @@
</visibility>
</objectContribution>
<objectContribution objectClass="org.eclipse.core.resources.IFile"
- nameFilter="pom.xml" id="org.eclipse.linuxtools.rpmstubby.contribution1">
+ nameFilter="pom.xml" id="org.eclipse.linuxtools.rpmstubby.contribution3">
<menu label="%menu.label" path="additions"
id="org.eclipse.linuxtools.rpmstubby.menu1" />
<action label="%action.label"
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java
index 5da603df1e..d47cbf6598 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java
@@ -45,7 +45,6 @@ public class StubbyGenerator {
private MainPackage mainPackage;
private List<SubPackage> subPackages;
- private boolean withGCJSupport;
private boolean withFetchScript;
private boolean usePdebuildScript;
private IPreferenceStore store;
@@ -62,8 +61,6 @@ public class StubbyGenerator {
this.mainPackage = mainPackage;
this.subPackages = subPackages;
store = StubbyPlugin.getDefault().getPreferenceStore();
- this.withGCJSupport = store
- .getBoolean(PreferenceConstants.P_STUBBY_WITH_GCJ);
this.withFetchScript = store
.getBoolean(PreferenceConstants.P_STUBBY_WITH_FETCH_SCRIPT);
this.usePdebuildScript = store
@@ -79,12 +76,10 @@ public class StubbyGenerator {
StringBuilder buffer = new StringBuilder();
String simplePackageName = getPackageName(mainPackage.getName());
String packageName = "eclipse-" + simplePackageName;
- if (withGCJSupport)
- buffer.append("%define gcj_support 1\n");
if (withFetchScript)
- buffer.append("%define src_repo_tag #FIXME\n");
- buffer.append("%define eclipse_base %{_libdir}/eclipse\n");
- buffer.append("%define install_loc %{_datadir}/eclipse/dropins/"
+ buffer.append("%global src_repo_tag #FIXME\n");
+ buffer.append("%global eclipse_base %{_libdir}/eclipse\n");
+ buffer.append("%global install_loc %{_datadir}/eclipse/dropins/"
+ simplePackageName.toLowerCase() + "\n\n");
buffer.append("Name: " + packageName.toLowerCase() + "\n");
buffer.append("Version: "
@@ -107,19 +102,6 @@ public class StubbyGenerator {
}
buffer
.append("BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n\n");
- if (withGCJSupport) {
- buffer.append("%if %{gcj_support}\n");
- buffer.append("BuildRequires: gcc-java\n");
- buffer.append("BuildRequires: java-gcj-compat-devel\n");
- buffer.append("Requires(post): java-gcj-compat\n");
- buffer.append("Requires(postun): java-gcj-compat\n");
- buffer.append("%else\n");
- buffer.append("BuildRequires: java-devel >= 1.5.0\n");
- buffer.append("%endif\n");
- buffer.append("%if ! %{gcj_support}\n");
- buffer.append("BuildArch: noarch\n");
- buffer.append("%endif\n\n");
- } else
buffer.append("BuildArch: noarch\n\n");
buffer.append("BuildRequires: eclipse-pde >= 1:3.4.0\n");
buffer.append("Requires: eclipse-platform >= 3.4.0\n");
@@ -149,25 +131,8 @@ public class StubbyGenerator {
buffer.append("%{__unzip} -q -d %{buildroot}%{install_loc} \\\n");
buffer.append(" build/rpmBuild/" + mainPackage.getName()
+ ".zip \n\n");
- if (withGCJSupport) {
- buffer.append("%if %{gcj_support}\n");
- buffer.append(" %{_bindir}/aot-compile-rpm\n");
- buffer.append("%endif\n\n");
- }
buffer.append("%clean\n");
buffer.append("%{__rm} -rf %{buildroot}\n\n");
- if (withGCJSupport) {
- buffer.append("%if %{gcj_support}\n");
- buffer.append("%post\n");
- buffer.append("if [ -x %{_bindir}/rebuild-gcj-db ]; then\n");
- buffer.append(" %{_bindir}/rebuild-gcj-db\n");
- buffer.append("fi\n\n");
- buffer.append("%preun\n");
- buffer.append("if [ -x %{_bindir}/rebuild-gcj-db ]; then\n");
- buffer.append(" %{_bindir}/rebuild-gcj-db\n");
- buffer.append("fi\n");
- buffer.append("%endif\n\n");
- }
generateFilesSections(buffer);
buffer.append("%changelog\n\n");
buffer.append("#FIXME\n");
@@ -192,8 +157,7 @@ public class StubbyGenerator {
+ subPackage.getName() + "_*/*.html\n");
buffer.append("%{eclipse_base}/features/" + subPackage.getName()
+ "_*/feature.*\n");
- buffer.append(getPackageFiles(subPackage.getProvides(),
- withGCJSupport)
+ buffer.append(getPackageFiles(subPackage.getProvides())
+ "\n");
}
}
@@ -404,21 +368,12 @@ public class StubbyGenerator {
return uniqueProvides;
}
- private String getPackageFiles(List<PackageItem> packageItems,
- boolean withGCJSupport) {
+ private String getPackageFiles(List<PackageItem> packageItems) {
StringBuilder toRet = new StringBuilder();
for (PackageItem packageItem : packageItems) {
toRet.append("%{eclipse_base}/plugins/").append(
packageItem.getName()).append("_*.jar\n");
}
- if (withGCJSupport) {
- toRet.append("%if %{gcj_support}\n");
- for (PackageItem packageItem : packageItems) {
- toRet.append("%{_libdir}/gcj/%{name}/").append(
- packageItem.getName()).append("_*\n");
- }
- toRet.append("%endif\n");
- }
return toRet.toString();
}
}
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java
index 1cd2d25d5f..6d1740bf88 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java
@@ -116,7 +116,8 @@ public class StubbyPomGenerator {
private void generateJavadocSubpackage(StringBuilder buffer) {
buffer.append("%package javadoc\n");
buffer.append("Group: Documentation\n");
- buffer.append("Summary: Javadoc for %{name}\n\n");
+ buffer.append("Summary: Javadoc for %{name}\n");
+ buffer.append("Requires: jpackage-utils\n\n");
buffer.append("%description javadoc\n");
buffer.append("API documentation for %{name}.\n\n");
@@ -138,7 +139,7 @@ public class StubbyPomGenerator {
private void generateCleanSection(StringBuilder buffer) {
buffer.append("%clean\n");
- buffer.append("%{__rm} -rf %{buildroot}\n\n");
+ buffer.append("rm -rf %{buildroot}\n\n");
}
private void generateInstallSection(StringBuilder buffer) {
@@ -146,12 +147,12 @@ public class StubbyPomGenerator {
buffer.append("rm -rf %{buildroot}\n\n");
buffer.append("# jars\n");
- buffer.append("install -d -m 0755 %{buildroot}%{_javadir}/%{name}\n");
+ buffer.append("install -d -m 0755 %{buildroot}%{_javadir}\n");
buffer
- .append("install -m 644 #TODO jars %{buildroot}%{_javadir}/%{name}/\n\n");
+ .append("install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar\n\n");
buffer
- .append("(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; \\\n");
+ .append("(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \\\n");
buffer
.append(" do ln -sf ${jar} `echo $jar| sed \"s|-%{version}||g\"`; done)\n\n");
@@ -161,10 +162,10 @@ public class StubbyPomGenerator {
buffer.append("# poms\n");
buffer
- .append("install -d -m 755 %{buildroot}%{_datadir}/maven2/poms\n");
+ .append("install -d -m 755 %{buildroot}%{_mavenpomdir}\n");
buffer.append("install -pm 644 pom.xml \\\n");
buffer
- .append(" %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom\n\n");
+ .append(" %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom\n\n");
buffer.append("# javadoc\n");
buffer
@@ -179,8 +180,8 @@ public class StubbyPomGenerator {
private void generateFilesSections(StringBuilder buffer) {
buffer.append("%files\n");
buffer.append("%defattr(-,root,root,-)\n");
- buffer.append("%{_javadir}/%{name}\n");
- buffer.append("%{_datadir}/maven2/poms/*\n");
+ buffer.append("%{_javadir}/*\n");
+ buffer.append("%{_mavenpomdir}/*\n");
buffer.append("%{_mavendepmapfragdir}/*\n\n");
buffer.append("%files javadoc\n");
@@ -191,9 +192,7 @@ public class StubbyPomGenerator {
private void generatePrepSection(StringBuilder buffer) {
buffer.append("\n%prep\n");
- buffer.append("%setup -q -n FIXME\n\n");
- buffer.append("mkdir external_repo\n");
- buffer.append("ln -s %{_javadir} external_repo/JPP\n\n");
+ buffer.append("%setup -q #You may need to update this according to your Source0\n\n");
}
private void generateBuildSection(StringBuilder buffer) {
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java
index 8836f7242d..46ef33f281 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java
@@ -88,12 +88,17 @@ public class PomModel {
}
/**
- * Returns the project version (xpath:/project/version).
+ * Returns the project version (xpath:/project/version) or the parent version if
+ * version is not present.
*
* @return The version.
*/
public String getVersion() {
- return xpathEval("/project/version");
+ String version = xpathEval("/project/version");
+ if (version.equals("")) {
+ version = xpathEval("/project/parent/version");
+ }
+ return version;
}
/**
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceConstants.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceConstants.java
index ca71856eb3..4b039df172 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceConstants.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceConstants.java
@@ -18,7 +18,6 @@ public class PreferenceConstants {
/*
* keys
*/
- public static final String P_STUBBY_WITH_GCJ = "StubbyWithGCJ";
public static final String P_STUBBY_INTERACTIVE = "StubbyInteractive";
public static final String P_STUBBY_WITH_FETCH_SCRIPT = "StrubbyWithFetchScript";
public static final String P_STUBBY_USE_PDEBUILD_SCRIPT = "StubbyUsePdebuildScript";
@@ -26,7 +25,6 @@ public class PreferenceConstants {
/*
* default values
*/
- public static final boolean DP_STUBBY_WITH_GCJ = false;
public static final boolean DP_STUBBY_INTERACTIVE = true;
public static final boolean DP_STUBBY_WITH_FETCH_SCRIPT = true;
public static final boolean DP_STUBBY_USE_PDEBUILD_SCRIPT = true;
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceInitializer.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceInitializer.java
index 47dfbef1ec..1048fd116d 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceInitializer.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceInitializer.java
@@ -21,15 +21,12 @@ import org.eclipse.linuxtools.rpmstubby.StubbyPlugin;
*/
public class PreferenceInitializer extends AbstractPreferenceInitializer {
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
*/
@Override
public void initializeDefaultPreferences() {
IPreferenceStore store = StubbyPlugin.getDefault().getPreferenceStore();
- store.setDefault(PreferenceConstants.P_STUBBY_WITH_GCJ, PreferenceConstants.DP_STUBBY_WITH_GCJ);
store.setDefault(PreferenceConstants.P_STUBBY_INTERACTIVE, PreferenceConstants.DP_STUBBY_INTERACTIVE);
store.setDefault(PreferenceConstants.P_STUBBY_WITH_FETCH_SCRIPT, PreferenceConstants.DP_STUBBY_WITH_FETCH_SCRIPT);
store.setDefault(PreferenceConstants.P_STUBBY_USE_PDEBUILD_SCRIPT, PreferenceConstants.DP_STUBBY_USE_PDEBUILD_SCRIPT);
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/StubbyPreferencePage.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/StubbyPreferencePage.java
index 58db324eea..6f962750c5 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/StubbyPreferencePage.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/StubbyPreferencePage.java
@@ -40,8 +40,6 @@ public class StubbyPreferencePage extends FieldEditorPreferencePage implements
addField(new BooleanFieldEditor(
PreferenceConstants.P_STUBBY_INTERACTIVE,
"Stubby interactive mode", getFieldEditorParent()));
- addField(new BooleanFieldEditor(PreferenceConstants.P_STUBBY_WITH_GCJ,
- "Add GCJ support to the specfile", getFieldEditorParent()));
addField(new BooleanFieldEditor(
PreferenceConstants.P_STUBBY_WITH_FETCH_SCRIPT,
"Include a fetch script", getFieldEditorParent()));

Back to the top