JBoss Tools SVN: r32325 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-23 11:31:37 -0400 (Thu, 23 Jun 2011)
New Revision: 32325
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
bump to new m2e wtp versions
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-06-23 15:10:50 UTC (rev 32324)
+++ trunk/build/target-platform/jbds.target 2011-06-23 15:31:37 UTC (rev 32325)
@@ -15,7 +15,23 @@
<!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/RC2/"/> -->
<!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/RC2/"/> -->
- <!-- Orbit bundles -->
+
+ <!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.20110623-0455"/>
+ <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
+ <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
+ <unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
+ <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
+ <unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
+ <unit id="org.jboss.netty" version="3.2.4.Final-201106061504"/>
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
+ <unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
+ <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
+
+ <!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
@@ -171,19 +187,6 @@
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201103142315-30-7w312213121A22"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>
- <!-- m2e 1.0 / 0.13 -->
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201106020304"/>
- <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
- <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
- <unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
- <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
- <unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
- <unit id="org.jboss.netty" version="3.2.4.Final-201106052308"/>
- <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
- <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
</location>
</locations>
</target>
\ No newline at end of file
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-06-23 15:10:50 UTC (rev 32324)
+++ trunk/build/target-platform/multiple.target 2011-06-23 15:31:37 UTC (rev 32325)
@@ -17,17 +17,16 @@
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/indigo/RC2/"/>
- <!-- m2e 0.13 + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106052308"/>
+ <!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201106020304"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.20110623-0455"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
- <unit id="org.jboss.netty" version="3.2.4.Final-201106052308"/>
-
+ <unit id="org.jboss.netty" version="3.2.4.Final-201106061504"/>
<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-06-23 15:10:50 UTC (rev 32324)
+++ trunk/build/target-platform/unified.target 2011-06-23 15:31:37 UTC (rev 32325)
@@ -17,17 +17,16 @@
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l..."/>
- <!-- m2e 0.13 + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106052308"/>
+ <!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201106020304"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.20110623-0455"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
- <unit id="org.jboss.netty" version="3.2.4.Final-201106052308"/>
-
+ <unit id="org.jboss.netty" version="3.2.4.Final-201106061504"/>
<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
14 years, 9 months
JBoss Tools SVN: r32322 - trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-23 10:57:13 -0400 (Thu, 23 Jun 2011)
New Revision: 32322
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-...
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
Log:
new build script for latest m2e 1.0 / m2e-wtp 0.13 per fbricon
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-... (from rev 32321, trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-... 2011-06-23 14:57:13 UTC (rev 32322)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/m2eclipse/build.xml -Ddestination=/tmp/m2eclipse-repo
+ -->
+ <target name="mirror">
+ <property name="URL1" value="http://download.eclipse.org/technology/m2e/milestones/1.0/"/>
+ <property name="URL2" value="http://m2eclipse.sonatype.org/sites/m2e"/>
+ <property name="URL3" value="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
+
+ <property name="URL4" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse-wtp-e37/"/>
+
+ <!--
+ <property name="URL1" value="https://repository.sonatype.org/content/sites/forge-sites/m2e/0.13.0/N/0...."/>
+ <property name="URL2" value="https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.13..."/>
+ <property name="URL3" value="https://repository.sonatype.org/content/sites/forge-sites/m2eclipse-wtp/0..."/>
+
+ <property name="URL1" value="https://repository.sonatype.org/content/sites/forge-sites/m2e/0.13.0/N/0...."/>
+ <property name="URL2" value="https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.13..."/>
+ <property name="URL3" value="https://repository.sonatype.org/content/sites/forge-sites/m2eclipse-wtp/0..."/>
+
+ <property name="URL1" value="https://repository.sonatype.org/content/sites/forge-sites/m2e/0.13.0/N/0...."/>
+ <property name="URL2" value="https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.13..."/>
+ <property name="URL3" value="https://repository.sonatype.org/content/sites/forge-sites/m2eclipse-wtp/0..."/>
+
+ <property name="URL1" value="http://m2eclipse.sonatype.org/sites/m2e/" />
+ <property name="URL2" value="http://m2eclipse.sonatype.org/sites/m2e-extras/" />
+ <property name="URL3" value="http://download.eclipse.org/technology/m2e/updates/M/" />
+ -->
+
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/m2eclipse/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/20110607-1445" name="m2eclipse 0.13 (1.0) for Eclipse 3.6 - 3.7 (mirrored 20110607-1445" />
+ <source>
+ <repository location="${URL1}" />
+ <repository location="${URL2}" />
+ <repository location="${URL3}" />
+ <repository location="${URL4}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20110607-1445/" artifactRepository="file:${destination}/20110607-1445/"
+ publishartifacts="true" source="${destination}/20110607-1445/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2011-06-23 14:56:57 UTC (rev 32321)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2011-06-23 14:57:13 UTC (rev 32322)
@@ -16,13 +16,15 @@
-f ~/RHDS/updates/requirements/m2eclipse/build.xml -Ddestination=/tmp/m2eclipse-repo
-->
<target name="mirror">
+ <property name="URL1" value"https://repository.sonatype.org/content/sites/forge-sites/m2e/1.0.0/N/1.0..."/>
+ <property name="URL2" value="https://repository.sonatype.org/content/repositories/forge-sites/m2e-extr..."/>
+
+ <!--
<property name="URL1" value="http://download.eclipse.org/technology/m2e/milestones/1.0/"/>
<property name="URL2" value="http://m2eclipse.sonatype.org/sites/m2e"/>
<property name="URL3" value="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
+ <property name="URL4" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse-wtp-e37/"/>
- <property name="URL4" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse-wtp-e37/"/>
-
- <!--
<property name="URL1" value="https://repository.sonatype.org/content/sites/forge-sites/m2e/0.13.0/N/0...."/>
<property name="URL2" value="https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.13..."/>
<property name="URL3" value="https://repository.sonatype.org/content/sites/forge-sites/m2eclipse-wtp/0..."/>
@@ -44,18 +46,20 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/20110607-1445" name="m2eclipse 0.13 (1.0) for Eclipse 3.6 - 3.7 (mirrored 20110607-1445" />
+ <repository location="file:${destination}/20110623-1035" name="m2eclipse 0.13 (1.0) for Eclipse 3.6 - 3.7 (mirrored 20110623-1035" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
+ <!--
<repository location="${URL3}" />
<repository location="${URL4}" />
+ -->
</source>
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20110607-1445/" artifactRepository="file:${destination}/20110607-1445/"
- publishartifacts="true" source="${destination}/20110607-1445/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20110623-1035/" artifactRepository="file:${destination}/20110623-1035/"
+ publishartifacts="true" source="${destination}/20110623-1035/" compress="${compress}" />
</target>
</project>
14 years, 9 months
JBoss Tools SVN: r32318 - in trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b/features: org.jboss.tools.patches.swt.feature and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-23 10:53:13 -0400 (Thu, 23 Jun 2011)
New Revision: 32318
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
Removed:
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
Log:
split single feature into platform-specific ones
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:52:35 UTC (rev 32317)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:52:35 UTC (rev 32317)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
- body {
- size: 8.5in 11.0in;
- margin: 0.25in 0.5in 0.25in 0.5in;
- tab-interval: 0.5in;
- }
- p {
- margin-left: auto;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
- }
- p.list {
- margin-left: 0.5in;
- margin-top: 0.05em;
- margin-bottom: 0.05em;
- }
- </style>
-
-</head>
-
-<body lang="EN-US">
-
-<p align=center><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED 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. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body>
-
-</html>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:52:35 UTC (rev 32317)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -1,38 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 Red Hat, Inc. 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:
-# JBoss by Red Hat - Initial implementation.
-##############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JBoss Tools - SWT Patches
-
-# "providerName" property - name of the company that provides the feature
-providerName=JBoss by Red Hat
-
-# "updateSiteName" property - label for the update site
-updateSiteName=JBossTools Update Site
-
-devUpdateSiteName=JBossTools Development Update Site
-
-# "description" property - description of the feature
-description=Provides SWT patches
-
-copyright=Copyright (c) 2011 Red Hat, Inc.\n\
-Distributed under license by Red Hat, Inc. All rights reserved.\n\
-This program is made available under the terms of the\n\
-Eclipse Public License v1.0 which accompanies this distribution,\n\
-and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
-Contributors\:\n\
-Red Hat, Inc. - initial API and implementation
-
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:52:35 UTC (rev 32317)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.patches.swt.feature"
- label="%featureName"
- version="3.7.0.v3735b">
-
- <description url="http://www.jboss.org/tools">
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license>
- Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
-Raleigh NC 27606 USA.
- </license>
-
- <plugin id="org.eclipse.swt.gtk.linux.x86" download-size="0" install-size="0" version="3.7.0.v3735a"/>
- <plugin id="org.eclipse.swt.gtk.linux.x86.source" download-size="0" install-size="0" version="3.7.0.v3735a"/>
- <plugin id="org.eclipse.swt.gtk.linux.x86_64" download-size="0" install-size="0" version="3.7.0.v3735b"/>
- <plugin id="org.eclipse.swt.gtk.linux.x86_64.source" download-size="0" install-size="0" version="3.7.0.v3735b"/>
-</feature>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:52:35 UTC (rev 32317)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -1,2 +0,0 @@
-providerName=JBoss by Red Hat
-updateSiteName=JBossTools Update Site
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (from rev 32317, trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ feature.properties
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (from rev 32317, trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+ body {
+ size: 8.5in 11.0in;
+ margin: 0.25in 0.5in 0.25in 0.5in;
+ tab-interval: 0.5in;
+ }
+ p {
+ margin-left: auto;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ p.list {
+ margin-left: 0.5in;
+ margin-top: 0.05em;
+ margin-bottom: 0.05em;
+ }
+ </style>
+
+</head>
+
+<body lang="EN-US">
+
+<p align=center><b>Eclipse Public License - v 1.0</b></p>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED 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. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (from rev 32317, trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -0,0 +1,38 @@
+###############################################################################
+# Copyright (c) 2011 Red Hat, Inc. 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Tools - SWT Patches for Linux GTK x86
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=Provides SWT patches for Linux GTK x86
+
+copyright=Copyright (c) 2011 Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Red Hat, Inc. - initial API and implementation
+
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (from rev 32317, trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.patches.swt.gtk.linux.x86.feature"
+ label="%featureName"
+ version="3.7.0.v3735b-201106220-1614">
+
+ <description url="http://www.jboss.org/tools">
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license>
+ Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+ </license>
+
+ <plugin id="org.eclipse.swt.gtk.linux.x86" download-size="0" install-size="0" version="3.7.0" match="compatible"/>
+ <!-- <plugin id="org.eclipse.swt.gtk.linux.x86.source" download-size="0" install-size="0" version="3.7.0.v3735b"/> -->
+</feature>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (from rev 32317, trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -0,0 +1,2 @@
+providerName=JBoss by Red Hat
+updateSiteName=JBossTools Update Site
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (from rev 32317, trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ feature.properties
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (from rev 32317, trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+ body {
+ size: 8.5in 11.0in;
+ margin: 0.25in 0.5in 0.25in 0.5in;
+ tab-interval: 0.5in;
+ }
+ p {
+ margin-left: auto;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ p.list {
+ margin-left: 0.5in;
+ margin-top: 0.05em;
+ margin-bottom: 0.05em;
+ }
+ </style>
+
+</head>
+
+<body lang="EN-US">
+
+<p align=center><b>Eclipse Public License - v 1.0</b></p>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED 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. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (from rev 32317, trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -0,0 +1,38 @@
+###############################################################################
+# Copyright (c) 2011 Red Hat, Inc. 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Tools - SWT Patch for Linux GTK x86_64
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=Provides SWT patch for Linux GTK x86_64
+
+copyright=Copyright (c) 2011 Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Red Hat, Inc. - initial API and implementation
+
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (from rev 32317, trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.patches.swt.gtk.linux.x86_64.feature"
+ label="%featureName"
+ version="3.7.0.v3735b-201106220-1614">
+
+ <description url="http://www.jboss.org/tools">
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license>
+ Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+ </license>
+
+ <plugin id="org.eclipse.swt.gtk.linux.x86_64" download-size="0" install-size="0" version="3.7.0" match="compatible"/>
+ <!-- <plugin id="org.eclipse.swt.gtk.linux.x86_64.source" download-size="0" install-size="0" version="3.7.0.v3735b"/> -->
+</feature>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (from rev 32317, trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/3.7.0.v3735b... 2011-06-23 14:53:13 UTC (rev 32318)
@@ -0,0 +1,2 @@
+providerName=JBoss by Red Hat
+updateSiteName=JBossTools Update Site
14 years, 9 months
JBoss Tools SVN: r32315 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2011-06-23 09:49:58 -0400 (Thu, 23 Jun 2011)
New Revision: 32315
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsUtils.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizardPage.java
Log:
https://issues.jboss.org/browse/JBIDE-9203 , \t\r\n -- escaped, non-ascii relaced by \uXXXX
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsUtils.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsUtils.java 2011-06-23 13:17:57 UTC (rev 32314)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsUtils.java 2011-06-23 13:49:58 UTC (rev 32315)
@@ -17,6 +17,8 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -95,10 +97,12 @@
*/
public class ExternalizeStringsUtils {
+ public static final String NONAME = "noname"; //$NON-NLS-1$
public static final char[] REPLACED_CHARACTERS = new char[] {'~', '!', '@', '#',
'$', '%', '^', '&', '*', '(', ')', '-', '+', '=', '{', '}', '[', ']', ':', ';', ',', '.', '?', '\\', '/', '"', '\''};
public static final char[] LINE_DELEMITERS = new char[] {'\r', '\n', '\t'};
-
+ private static CharsetEncoder asciiEncoder;
+
/**
* Checks that the user has selected a correct string.
*
@@ -340,11 +344,7 @@
} finally {
in = null;
}
-
- } else {
- JspEditorPlugin.getDefault().logError(
- "Bundle File '" + propertiesFile + "' does not exist!"); //$NON-NLS-1$ //$NON-NLS-2$
- }
+ }
return properties;
}
@@ -377,9 +377,6 @@
} finally {
fr = null;
}
- } else {
- JspEditorPlugin.getDefault().logError(
- "Bundle File '" + propertiesFile + "' does not exist!"); //$NON-NLS-1$ //$NON-NLS-2$
}
return properties;
}
@@ -434,6 +431,17 @@
* @return the result string
*/
public static String generatePropertyKey(String text) {
+ /*
+ * If text cannot be represented in standard eclipse encoding
+ * change the key name to "noname"
+ */
+ if (null == asciiEncoder) {
+ asciiEncoder = Charset.forName("ISO-8859-1").newEncoder(); //$NON-NLS-1$
+ }
+ if (!asciiEncoder.canEncode(text)) {
+ text = NONAME;
+ }
+
String result = text.trim();
/*
* Update text string field.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizardPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizardPage.java 2011-06-23 13:17:57 UTC (rev 32314)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizardPage.java 2011-06-23 13:49:58 UTC (rev 32315)
@@ -45,6 +45,7 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.wst.xml.core.internal.document.AttrImpl;
import org.eclipse.wst.xml.core.internal.document.TextImpl;
+import org.jboss.tools.common.model.loaders.impl.EncodedProperties;
import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.bundle.BundleMap;
@@ -384,8 +385,13 @@
text = stringToUpdate;
}
}
- propsValue.setText(text);
+ /*
+ * https://issues.jboss.org/browse/JBIDE-9203
+ * Replace special characters with their string representation.
+ * Key should be generated first.
+ */
propsKey.setText(ExternalizeStringsUtils.generatePropertyKey(text));
+ propsValue.setText(EncodedProperties.saveConvert(text, true));
/*
* Initialize bundle messages field
*/
14 years, 9 months
JBoss Tools SVN: r32314 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-06-23 09:17:57 -0400 (Thu, 23 Jun 2011)
New Revision: 32314
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
Log:
[JBIDE-9927] fall back to kill process if mgmt service call fails
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-23 13:16:07 UTC (rev 32313)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-23 13:17:57 UTC (rev 32314)
@@ -24,6 +24,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.debug.core.DebugEvent;
+import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.IDebugEventSetListener;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
@@ -37,6 +38,7 @@
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
@@ -78,7 +80,8 @@
throws CoreException {
IServer server = getServer();
IRuntime runtime = server.getRuntime();
- new JBoss7RuntimeLaunchConfigurator(launchConfig).apply(server);
+ IJBossServerRuntime serverRuntime = (IJBossServerRuntime) runtime.loadAdapter(IJBossServerRuntime.class, null);
+ new JBoss7RuntimeLaunchConfigurator(launchConfig).apply(server, runtime, serverRuntime);
}
public void setProcess(IProcess process) {
@@ -161,20 +164,23 @@
}
try {
if (force) {
- if( serverProcess != null )
- serverProcess.terminate();
+ terminateProcess();
} else {
serverStopping();
// TODO: for now only local, implement for remote afterwards
- if (isServerRunning(getServer().getHost(), getJBoss7Server().getManagementPort())) {
- // The service and Poller will make sure the server is down
- getService().stop(getServer().getHost(), getJBoss7Server().getManagementPort());
- return;
- } else {
- if( serverProcess != null && !serverProcess.isTerminated()) {
- serverProcess.terminate();
+// disabled because of JBIDE-9173
+ try {
+ if (isServerRunning(getServer().getHost(), getJBoss7Server().getManagementPort())) {
+ // The service and Poller will make sure the server is down
+ getService().stop(getServer().getHost(), getJBoss7Server().getManagementPort());
+ return;
+ } else {
+ terminateProcess();
}
+ } catch(Exception e) {
+ terminateProcess();
}
+// terminateProcess();
}
} catch (Exception e) {
IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, MessageFormat.format(Messages.JBoss7ServerBehavior_could_not_stop, getServer().getName()), e);
@@ -183,6 +189,12 @@
setServerStopped();
}
+ private void terminateProcess() throws DebugException {
+ if( serverProcess != null && !serverProcess.isTerminated()) {
+ serverProcess.terminate();
+ }
+ }
+
@Override
public void dispose() {
super.dispose();
14 years, 9 months
JBoss Tools SVN: r32313 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-06-23 09:16:07 -0400 (Thu, 23 Jun 2011)
New Revision: 32313
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
Log:
added comment to remember to cleanup
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-06-23 13:11:31 UTC (rev 32312)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-06-23 13:16:07 UTC (rev 32313)
@@ -53,6 +53,8 @@
JBoss7Server server = (JBoss7Server)getServer().loadAdapter(JBoss7Server.class, new NullProgressMonitor());
if( server != null )
return server.getManagementPort();
+ // TODO: provide this default in a single place (currently it is spread across the
+ // behavior and this poller). This port is already offered as constant in AS7Manager#MGMT_PORT
return 9999;
}
14 years, 9 months