[eclipse-mylyn-builds] Update to upstream 3.6.2.
Andrew Robinson
arobinso at fedoraproject.org
Mon Oct 17 13:13:55 UTC 2011
commit eacb0b2b2a52faa5c5b491b9a99cfa1d0bff7882
Author: Andrew Robinson <arobinso at redhat.com>
Date: Thu Oct 13 16:17:57 2011 -0400
Update to upstream 3.6.2.
.gitignore | 1 +
eclipse-mylyn-builds.spec | 19 +++++----
fix_hudson_feature.patch | 6 +-
remove_hudson_discovery.patch | 91 ++++++++++++++++++++++++++++++++++++-----
sources | 2 +-
5 files changed, 96 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a2c0a7d..0951531 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
eclipse-mylyn-builds-R_3_5_1-fetched-src.tar.bz2
R_3_6_0.tar.bz2
+R_3_6_2.tar.bz2
diff --git a/eclipse-mylyn-builds.spec b/eclipse-mylyn-builds.spec
index a828dbb..c7f21ec 100644
--- a/eclipse-mylyn-builds.spec
+++ b/eclipse-mylyn-builds.spec
@@ -2,16 +2,16 @@
%global install_loc %{_datadir}/eclipse/dropins
# Taken from update site so we match upstream
# http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/
-%global qualifier v20110608-1400
+%global qualifier v20110908-0706
Name: eclipse-mylyn-builds
Summary: Eclipse Mylyn Builds
-Version: 3.6.0
+Version: 3.6.2
Release: 1%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn/builds/
-Source0: http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.builds.git/snapshot/R_3_6_0.tar.bz2
+Source0: http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.builds.git/snapshot/R_3_6_2.tar.bz2
# This patches hudson.core so as to
# - remove ecf-based auto-discovery
@@ -43,7 +43,7 @@ BuildRequires: xml-commons-apis
BuildRequires: google-gson >= 1.6.0
Requires: eclipse-mylyn >= 3.5.0
Requires: eclipse-mylyn-commons >= 3.6.0
-Requires: eclipse-mylyn-context-team >= 3.6.0
+Requires: eclipse-mylyn-context >= 3.6.0
Requires: eclipse-emf
Requires: eclipse-mylyn-versions >= 3.6.0
Requires: xml-commons-apis
@@ -71,7 +71,7 @@ Support for the open source Hudson and Jenkins continuous integration servers.
%prep
-%setup -q -n R_3_6_0
+%setup -q -n R_3_6_2
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -84,9 +84,9 @@ popd
%build
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.builds \
- -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
- -d "mylyn mylyn-commons mylyn-context-team emf mylyn-versions"
+ -a "-DjavacSource=1.6 -DjavacTarget=1.6 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
+ -j -DJ2SE-1.6=%{_jvmdir}/java/jre/lib/rt.jar \
+ -d "mylyn mylyn-commons mylyn-context-team mylyn-context emf mylyn-versions" -o `pwd`/orbitDeps
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.hudson \
-a "-DjavacSource=1.6 -DjavacTarget=1.6 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-j -DJavaSE-1.6=%{_jvmdir}/java/jre/lib/rt.jar \
@@ -127,6 +127,9 @@ popd
%changelog
+* Wed Oct 12 2011 Andrew Robinson <arobinso at redhat.com> 3.6.2-1
+- Update to upstream 3.6.2 release.
+
* Thu Jul 14 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.6.0-1
- Update to upstream's 3.6.0 release.
diff --git a/fix_hudson_feature.patch b/fix_hudson_feature.patch
index 3c0d3c6..4018bd6 100644
--- a/fix_hudson_feature.patch
+++ b/fix_hudson_feature.patch
@@ -3,9 +3,9 @@ index f5403faf9409afdd01999a340838f87755be79c5..a253e287fccda3cbc62288a45193273c
--- a/org.eclipse.mylyn.hudson-feature/feature.xml
+++ b/org.eclipse.mylyn.hudson-feature/feature.xml
@@ -32,7 +32,6 @@
- <import plugin="org.eclipse.mylyn.commons.net" version="3.4.0" match="compatible"/>
+ <import plugin="org.eclipse.mylyn.commons.net" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.mylyn.commons.repositories" version="0.8.0" match="compatible"/>
- <import plugin="org.eclipse.mylyn.commons.ui" version="3.4.0" match="compatible"/>
+ <import plugin="org.eclipse.mylyn.commons.ui" version="3.6.1" match="compatible"/>
- <import plugin="com.google.gson" version="1.6.0" match="compatible"/>
<import plugin="com.sun.xml.bind" version="2.2.0" match="compatible"/>
<import plugin="javax.xml" version="1.3.4" match="compatible"/>
@@ -13,7 +13,7 @@ index f5403faf9409afdd01999a340838f87755be79c5..a253e287fccda3cbc62288a45193273c
@@ -54,4 +53,11 @@
version="0.0.0"
unpack="false"/>
-
+
+ <plugin
+ id="com.google.gson"
+ download-size="0"
diff --git a/remove_hudson_discovery.patch b/remove_hudson_discovery.patch
index 2df906e..fab6f4d 100644
--- a/remove_hudson_discovery.patch
+++ b/remove_hudson_discovery.patch
@@ -19,7 +19,7 @@ deleted file mode 100644
index 6bbe42ea6a4302b22b84d7d052e992b3cf9ce803..0000000000000000000000000000000000000000
--- a/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
+++ /dev/null
-@@ -1,130 +0,0 @@
+@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Itema AS and others.
- * All rights reserved. This program and the accompanying materials
@@ -33,7 +33,6 @@ index 6bbe42ea6a4302b22b84d7d052e992b3cf9ce803..00000000000000000000000000000000
-
-package org.eclipse.mylyn.internal.hudson.ui;
-
--import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
@@ -74,21 +73,33 @@ index 6bbe42ea6a4302b22b84d7d052e992b3cf9ce803..00000000000000000000000000000000
-
- private static final String HUDSON_URL_PROPERTY_ID = "url"; //$NON-NLS-1$
-
+- private static HudsonDiscovery instance;
+-
+- private IContainer container;
+-
+- public static HudsonDiscovery getInstance() {
+- return instance;
+- }
+-
+- public HudsonDiscovery() {
+- instance = this;
+- }
+-
- protected IContainer getContainer() throws ContainerCreateException {
-- return ContainerFactory.getDefault().createContainer(ECF_SINGLETON_DISCOVERY,
-- new Object[] { ECF_DISCOVERY_JMDNS });
+- return ContainerFactory.getDefault().createContainer(ECF_DISCOVERY_JMDNS);
- }
-
- private boolean isNew(URI uri) {
- List<IBuildServer> servers = BuildsUi.getModel().getServers();
- for (IBuildServer server : servers) {
- try {
-- if (server.getUrl().equalsIgnoreCase(uri.toURL().toExternalForm())) {
+- if (new URI(server.getUrl() + "/").normalize().equals(uri)) {
- return false;
- }
-- } catch (MalformedURLException e) {
-- StatusHandler.log(new Status(IStatus.ERROR, HudsonConnectorUi.ID_PLUGIN,
-- Messages.HudsonDiscovery_CannotConvertURI, e));
+- } catch (URISyntaxException e) {
+- // disable, this could get logged very frequently
+-// StatusHandler.log(new Status(IStatus.ERROR, HudsonConnectorUi.ID_PLUGIN,
+-// Messages.HudsonDiscovery_CannotConvertURI, e));
- }
- }
- return true;
@@ -97,8 +108,8 @@ index 6bbe42ea6a4302b22b84d7d052e992b3cf9ce803..00000000000000000000000000000000
- @Override
- public void lazyStartup() {
- try {
-- final IContainer container = getContainer();
-- final IDiscoveryLocator adapter = (IDiscoveryLocator) getContainer().getAdapter(IDiscoveryLocator.class);
+- container = getContainer();
+- final IDiscoveryLocator adapter = (IDiscoveryLocator) container.getAdapter(IDiscoveryLocator.class);
- adapter.addServiceListener(new IServiceListener() {
- public void serviceDiscovered(IServiceEvent anEvent) {
- IServiceInfo serviceInfo = anEvent.getServiceInfo();
@@ -113,7 +124,8 @@ index 6bbe42ea6a4302b22b84d7d052e992b3cf9ce803..00000000000000000000000000000000
- .getHost() }));
-
- } else {
-- URI uri = new URI(properties.getProperty(HUDSON_URL_PROPERTY_ID).toString());
+- String hudsonUrl = properties.getProperty(HUDSON_URL_PROPERTY_ID).toString();
+- URI uri = new URI(hudsonUrl + "/").normalize(); //$NON-NLS-1$
- if (isNew(uri)) {
- notifyMessage(
- Messages.HudsonDiscovery_MessageTitle,
@@ -145,8 +157,65 @@ index 6bbe42ea6a4302b22b84d7d052e992b3cf9ce803..00000000000000000000000000000000
- }
- }
-
+- public void stop() {
+- if (container != null) {
+- container.disconnect();
+- container = null;
+- }
+- }
+-
- private void notifyMessage(String title, String description) {
- BuildsUi.serverDiscovered(title, description);
- }
-
-}
+diff --git a/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.java b/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.java
+deleted file mode 100644
+index 6bbe42ea6a4302b22b84d7d052e992b3cf9ce803..0000000000000000000000000000000000000000
+--- a/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.java
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/*******************************************************************************
+- * Copyright (c) 2011 Tasktop Technologies.
+- * 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:
+- * Tasktop Technologies - initial API and implementation
+- *******************************************************************************/
+-
+-package org.eclipse.mylyn.internal.hudson.ui;
+-
+-import org.eclipse.ui.plugin.AbstractUIPlugin;
+-import org.osgi.framework.BundleContext;
+-
+-/**
+- * @author Steffen Pingel
+- */
+-public class HudsonUiPlugin extends AbstractUIPlugin {
+-
+- public HudsonUiPlugin() {
+- }
+-
+- @Override
+- public void stop(BundleContext context) throws Exception {
+- if (HudsonDiscovery.getInstance() != null) {
+- HudsonDiscovery.getInstance().stop();
+- }
+- super.stop(context);
+- }
+-
+-}
+diff --git a/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF
+index 6612ca72a99699db3ccc98a98e7003d2003dd5e6..b6f298555692dc5de5d32591ab7351bd18f8dd62 100644
+--- a/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF 2011-08-31 10:16:51.000000000 -0400
++++ b/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF 2011-10-13 15:57:26.511385949 -0400
+@@ -19,5 +19,4 @@
+ Bundle-ActivationPolicy: lazy
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-Localization: plugin
+-Export-Package: org.eclipse.mylyn.internal.hudson.ui;x-internal:=true
+-Bundle-Activator: org.eclipse.mylyn.internal.hudson.ui.HudsonUiPlugin
++Export-Package: org.eclipse.mylyn.internal.hudson.ui;x-internal:=true
diff --git a/sources b/sources
index 9c9818f..4b2b015 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0bac8de5dca30499e2469694ff097eb R_3_6_0.tar.bz2
+ec151a3001360946d641ce80d7b74b4e R_3_6_2.tar.bz2
More information about the scm-commits
mailing list