[eclipse-mylyn-builds] Initial commit.
jerboaa
jerboaa at fedoraproject.org
Sat Apr 30 19:08:23 UTC 2011
commit cfb237faedb009bb054c580006dcb14cefacdb94
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date: Sat Apr 30 15:06:33 2011 -0400
Initial commit.
.gitignore | 1 +
eclipse-mylyn-builds.spec | 126 +++++++++
fetch-eclipse-mylyn-builds.sh | 18 ++
...on.ui-remove-glassfish-specific-impl-jaxb.patch | 291 ++++++++++++++++++++
sources | 1 +
5 files changed, 437 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..4e738b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+eclipse-mylyn-builds-R_3_5_1-fetched-src.tar.bz2
diff --git a/eclipse-mylyn-builds.spec b/eclipse-mylyn-builds.spec
new file mode 100644
index 0000000..f34c421
--- /dev/null
+++ b/eclipse-mylyn-builds.spec
@@ -0,0 +1,126 @@
+%global eclipse_base %{_libdir}/eclipse
+%global install_loc %{_datadir}/eclipse/dropins
+# Taken from update site so we match upstream
+# http://download.eclipse.org/mylyn/archive/3.5.1/v20110422-0200/
+%global qualifier v20110422-0200
+
+Name: eclipse-mylyn-builds
+Summary: Eclipse Mylyn Builds
+Version: 3.5.1
+Release: 2%{?dist}
+License: EPL
+URL: http://www.eclipse.org/mylyn/builds/
+
+# bash fetch-eclipse-mylyn-builds.sh
+Source0: eclipse-mylyn-builds-R_3_5_1-fetched-src.tar.bz2
+Source1: fetch-eclipse-mylyn-builds.sh
+
+# This patches hudson related plug-ins so as to
+# - use non-glassfish specific JAXBContextBuilder class
+# - use java 6 exec environment
+# - remove ecf-based auto-discovery
+# See also, Eclipse Bz: 325176.
+Patch0: remove-auto-discovery-o.e.m.hudson.ui-remove-glassfish-specific-impl-jaxb.patch
+
+BuildArch: noarch
+
+BuildRequires: java-devel >= 1.6.0
+BuildRequires: eclipse-platform >= 1:3.4.0
+BuildRequires: eclipse-pde >= 1:3.4.0
+BuildRequires: eclipse-mylyn-commons >= 3.5.0
+BuildRequires: eclipse-mylyn >= 3.5.0
+BuildRequires: eclipse-mylyn-context-team >= 3.5.0
+BuildRequires: eclipse-mylyn-versions >= 3.5.0
+BuildRequires: eclipse-emf
+# Required for RestfulHudsonClient.java. However, this will only
+# work with java 1.6 and up, but that's better than not working at all.
+BuildRequires: ws-jaxme
+# The following is required for javax.xml.stream (apparently openjdk ships it too)
+# not sure what's best here.
+BuildRequires: xml-commons-apis
+Requires: eclipse-mylyn >= 3.5.0
+Requires: eclipse-mylyn-commons >= 3.5.0
+Requires: eclipse-mylyn-context-team >= 3.5.0
+Requires: eclipse-emf
+Requires: eclipse-mylyn-versions >= 3.5.0
+Requires: xml-commons-apis
+
+
+%description
+Provides a common framework to interact with continuous integration
+build providers using Eclipse Mylyn.
+
+
+# eclipse-mylyn-builds-hudson
+
+%package hudson
+Summary: Mylyn Builds Connector: Hudson/Jenkins
+Requires: java >= 1:1.6.0
+Requires: eclipse-platform >= 1:3.4.0
+Requires: eclipse-mylyn-commons >= 3.5.0
+Requires: ws-jaxme
+Requires: %{name} = %{version}-%{release}
+Group: Development/Tools
+
+%description hudson
+Support for the open source Hudson and Jenkins continuous integration servers.
+
+
+%prep
+%setup -q -n org.eclipse.mylyn.builds
+%patch0 -p1
+
+
+%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"
+%{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 \
+ -d "mylyn-commons"
+
+
+%install
+install -d -m 755 %{buildroot}%{_datadir}/eclipse
+install -d -m 755 %{buildroot}%{install_loc}/mylyn-builds
+install -d -m 755 %{buildroot}%{install_loc}/mylyn-builds-hudson
+
+unzip -q -o -d %{buildroot}%{install_loc}/mylyn-builds \
+ build/rpmBuild/org.eclipse.mylyn.builds.zip
+unzip -q -o -d %{buildroot}%{install_loc}/mylyn-builds-hudson \
+ build/rpmBuild/org.eclipse.mylyn.hudson.zip
+
+
+# eclipse-mylyn-builds
+
+%files
+%defattr(-,root,root,-)
+%{install_loc}/mylyn-builds
+%doc org.eclipse.mylyn.builds-feature/epl-v10.html
+%doc org.eclipse.mylyn.builds-feature/license.html
+
+
+# eclipse-mylyn-builds-hudson
+
+%files hudson
+%defattr(-,root,root,-)
+%{install_loc}/mylyn-builds-hudson
+%doc org.eclipse.mylyn.hudson-feature/epl-v10.html
+%doc org.eclipse.mylyn.hudson-feature/license.html
+
+
+%changelog
+* Thu Apr 28 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.5.1-2
+- Fixed typo.
+
+* Thu Apr 28 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.5.1-1
+- Package latest version (3.5.1).
+
+* Wed Apr 27 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.5.0-2
+- Add patch to fix build.
+
+* Thu Apr 21 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.5.0-1
+- Introducing eclipse-mylyn-builds. This is due to the Mylyn
+ 3.5.0 restructuring.
diff --git a/fetch-eclipse-mylyn-builds.sh b/fetch-eclipse-mylyn-builds.sh
new file mode 100644
index 0000000..fd540e0
--- /dev/null
+++ b/fetch-eclipse-mylyn-builds.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Pulls sources for eclipse-mylyn-builds SRPM
+# - org.eclipse.mylyn.builds-feature
+# - org.eclipse.mylyn.hudson-feature
+#
+RELEASE_TAG="R_3_5_1"
+OUTPUT_TAR=eclipse-mylyn-builds-$RELEASE_TAG-fetched-src.tar
+
+rm -rf org.eclipse.mylyn.builds
+git clone git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.builds.git \
+ org.eclipse.mylyn.builds
+pushd org.eclipse.mylyn.builds
+git archive --format=tar -o $OUTPUT_TAR --prefix="org.eclipse.mylyn.builds/" \
+ refs/tags/$RELEASE_TAG
+bzip2 $OUTPUT_TAR
+mv $OUTPUT_TAR.bz2 ../
+popd
diff --git a/remove-auto-discovery-o.e.m.hudson.ui-remove-glassfish-specific-impl-jaxb.patch b/remove-auto-discovery-o.e.m.hudson.ui-remove-glassfish-specific-impl-jaxb.patch
new file mode 100644
index 0000000..964c86f
--- /dev/null
+++ b/remove-auto-discovery-o.e.m.hudson.ui-remove-glassfish-specific-impl-jaxb.patch
@@ -0,0 +1,291 @@
+diff --git a/org.eclipse.mylyn.hudson.core/.classpath b/org.eclipse.mylyn.hudson.core/.classpath
+index 7e8449d..5d0495e 100644
+--- a/org.eclipse.mylyn.hudson.core/.classpath
++++ b/org.eclipse.mylyn.hudson.core/.classpath
+@@ -2,7 +2,7 @@
+ <classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src-gen"/>
+- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
++ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+ </classpath>
+diff --git a/org.eclipse.mylyn.hudson.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.hudson.core/.settings/org.eclipse.jdt.core.prefs
+index bbaca6d..cab3af8 100644
+--- a/org.eclipse.mylyn.hudson.core/.settings/org.eclipse.jdt.core.prefs
++++ b/org.eclipse.mylyn.hudson.core/.settings/org.eclipse.jdt.core.prefs
+@@ -1,4 +1,4 @@
+-#Wed Mar 02 16:00:06 PST 2011
++#Wed Apr 27 17:25:08 EDT 2011
+ eclipse.preferences.version=1
+ org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+ org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+@@ -9,9 +9,9 @@ org.eclipse.jdt.core.codeComplete.localSuffixes=
+ org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+ org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+-org.eclipse.jdt.core.compiler.compliance=1.5
++org.eclipse.jdt.core.compiler.compliance=1.6
+ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+ org.eclipse.jdt.core.compiler.debug.localVariable=generate
+ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+@@ -75,7 +75,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
+ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+-org.eclipse.jdt.core.compiler.source=1.5
++org.eclipse.jdt.core.compiler.source=1.6
+ org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+ org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
+ org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
+@@ -124,11 +124,9 @@ org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+ org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+ org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+ org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
+ org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+ org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
+ org.eclipse.jdt.core.formatter.comment.format_block_comments=false
+-org.eclipse.jdt.core.formatter.comment.format_comments=true
+ org.eclipse.jdt.core.formatter.comment.format_header=false
+ org.eclipse.jdt.core.formatter.comment.format_html=true
+ org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+@@ -141,7 +139,6 @@ org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+ org.eclipse.jdt.core.formatter.comment.line_length=120
+ org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+ org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+ org.eclipse.jdt.core.formatter.compact_else_if=true
+ org.eclipse.jdt.core.formatter.continuation_indentation=2
+ org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+@@ -160,14 +157,9 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+ org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+ org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+ org.eclipse.jdt.core.formatter.indentation.size=4
+-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+ org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+ org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+ org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+diff --git a/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
+index dcbab91..18a3b93 100644
+--- a/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
++++ b/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
+@@ -10,14 +10,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.eclipse.mylyn.commons.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.mylyn.commons.net;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.mylyn.commons.repositories,
+- javax.xml.bind;bundle-version="2.2.0",
+- com.sun.xml.bind;bundle-version="2.2.0"
++ javax.xml.bind
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Localization: plugin
+ Export-Package: org.eclipse.mylyn.internal.hudson.core;x-internal:=true,
+ org.eclipse.mylyn.internal.hudson.core.client;x-internal:=true,
+ org.eclipse.mylyn.internal.hudson.model;x-internal:=true
+ Bundle-Activator: org.eclipse.mylyn.internal.hudson.core.HudsonCorePlugin
+-Import-Package: javax.xml.stream;version="1.0.1",
++Import-Package: javax.xml.stream,
+ org.json
+diff --git a/org.eclipse.mylyn.hudson.core/src/org/eclipse/mylyn/internal/hudson/core/client/RestfulHudsonClient.java b/org.eclipse.mylyn.hudson.core/src/org/eclipse/mylyn/internal/hudson/core/client/RestfulHudsonClient.java
+index 79bc4f4..bbcb894 100644
+--- a/org.eclipse.mylyn.hudson.core/src/org/eclipse/mylyn/internal/hudson/core/client/RestfulHudsonClient.java
++++ b/org.eclipse.mylyn.hudson.core/src/org/eclipse/mylyn/internal/hudson/core/client/RestfulHudsonClient.java
+@@ -65,8 +65,6 @@ import org.w3c.dom.Element;
+ import org.w3c.dom.Node;
+ import org.xml.sax.SAXException;
+
+-import com.sun.xml.bind.v2.runtime.JAXBContextImpl.JAXBContextBuilder;
+-
+ /**
+ * Represents the Hudson repository that is accessed through REST.
+ *
+@@ -407,7 +405,8 @@ public class RestfulHudsonClient {
+ public static <T> T unmarshal(Node node, Class<T> clazz) throws JAXBException {
+ // fails on Java 5, see bug 325176
+ // JAXBContext ctx = JAXBContext.newInstance(clazz);
+- JAXBContext ctx = new JAXBContextBuilder().setClasses(new Class<?>[] { clazz }).build();
++ JAXBContext ctx = JAXBContext.newInstance(clazz);
++ //JAXBContext ctx = new JAXBContextBuilder().setClasses(new Class<?>[] { clazz }).build();
+ Unmarshaller unmarshaller = ctx.createUnmarshaller();
+
+ JAXBElement<T> hudsonElement = unmarshaller.unmarshal(node, clazz);
+diff --git a/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF
+index dbaa1f9..3f1b085 100644
+--- a/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF
++++ b/org.eclipse.mylyn.hudson.ui/META-INF/MANIFEST.MF
+@@ -10,10 +10,6 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.mylyn.builds.ui,
+ org.eclipse.mylyn.commons.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.mylyn.hudson.core,
+- org.eclipse.ecf;bundle-version="3.0.0";resolution:=optional,
+- org.eclipse.ecf.discovery;bundle-version="3.0.0";resolution:=optional,
+- org.eclipse.ecf.provider.discovery;bundle-version="2.0.0";resolution:=optional,
+- org.eclipse.ecf.provider.jmdns;bundle-version="3.0.0";resolution:=optional,
+ org.eclipse.mylyn.commons.team;bundle-version="0.1.0",
+ org.eclipse.mylyn.commons.notifications;bundle-version="0.1.0"
+ Bundle-ActivationPolicy: lazy
+diff --git a/org.eclipse.mylyn.hudson.ui/plugin.xml b/org.eclipse.mylyn.hudson.ui/plugin.xml
+index 6612ca7..256fd08 100644
+--- a/org.eclipse.mylyn.hudson.ui/plugin.xml
++++ b/org.eclipse.mylyn.hudson.ui/plugin.xml
+@@ -34,11 +34,5 @@
+ </description>
+ </wizard>
+ </extension>
+- <extension
+- point="org.eclipse.mylyn.builds.ui.startup">
+- <startup
+- class="org.eclipse.mylyn.internal.hudson.ui.HudsonDiscovery">
+- </startup>
+- </extension>
+
+ </plugin>
+diff --git a/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java b/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
+deleted file mode 100644
+index 6bbe42e..0000000
+--- a/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
++++ /dev/null
+@@ -1,130 +0,0 @@
+-/*******************************************************************************
+- * Copyright (c) 2010 Itema AS 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:
+- * Itema AS - initial API and implementation
+- *******************************************************************************/
+-
+-package org.eclipse.mylyn.internal.hudson.ui;
+-
+-import java.net.MalformedURLException;
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-import java.util.List;
+-import java.util.UUID;
+-
+-import org.eclipse.core.runtime.IStatus;
+-import org.eclipse.core.runtime.Status;
+-import org.eclipse.ecf.core.ContainerConnectException;
+-import org.eclipse.ecf.core.ContainerCreateException;
+-import org.eclipse.ecf.core.ContainerFactory;
+-import org.eclipse.ecf.core.IContainer;
+-import org.eclipse.ecf.discovery.IDiscoveryLocator;
+-import org.eclipse.ecf.discovery.IServiceEvent;
+-import org.eclipse.ecf.discovery.IServiceInfo;
+-import org.eclipse.ecf.discovery.IServiceListener;
+-import org.eclipse.ecf.discovery.IServiceProperties;
+-import org.eclipse.ecf.discovery.identity.IServiceID;
+-import org.eclipse.ecf.discovery.identity.IServiceTypeID;
+-import org.eclipse.mylyn.builds.core.IBuildServer;
+-import org.eclipse.mylyn.builds.ui.BuildsUi;
+-import org.eclipse.mylyn.builds.ui.BuildsUiStartup;
+-import org.eclipse.mylyn.commons.core.StatusHandler;
+-import org.eclipse.osgi.util.NLS;
+-
+-/**
+- * This class implements a mechanism for discovering Hudson servers through the use of Multicast DNS (MDNS).
+- *
+- * @author Torkild U. Resheim
+- * @since 3.5
+- */
+-public class HudsonDiscovery extends BuildsUiStartup {
+-
+- private static final String ECF_DISCOVERY_JMDNS = "ecf.discovery.jmdns"; //$NON-NLS-1$
+-
+- private static final String ECF_SINGLETON_DISCOVERY = "ecf.singleton.discovery"; //$NON-NLS-1$
+-
+- private static final String HUDSON_MDNS_ID = "_hudson._tcp.local._iana"; //$NON-NLS-1$
+-
+- private static final String HUDSON_URL_PROPERTY_ID = "url"; //$NON-NLS-1$
+-
+- protected IContainer getContainer() throws ContainerCreateException {
+- return ContainerFactory.getDefault().createContainer(ECF_SINGLETON_DISCOVERY,
+- new Object[] { 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())) {
+- return false;
+- }
+- } catch (MalformedURLException e) {
+- StatusHandler.log(new Status(IStatus.ERROR, HudsonConnectorUi.ID_PLUGIN,
+- Messages.HudsonDiscovery_CannotConvertURI, e));
+- }
+- }
+- return true;
+- }
+-
+- @Override
+- public void lazyStartup() {
+- try {
+- final IContainer container = getContainer();
+- final IDiscoveryLocator adapter = (IDiscoveryLocator) getContainer().getAdapter(IDiscoveryLocator.class);
+- adapter.addServiceListener(new IServiceListener() {
+- public void serviceDiscovered(IServiceEvent anEvent) {
+- IServiceInfo serviceInfo = anEvent.getServiceInfo();
+- IServiceID serviceId = serviceInfo.getServiceID();
+- IServiceTypeID serviceTypeId = serviceId.getServiceTypeID();
+- if (serviceTypeId.getName().equals(HUDSON_MDNS_ID)) {
+- IServiceProperties properties = serviceInfo.getServiceProperties();
+- try {
+- if (properties.getProperty(HUDSON_URL_PROPERTY_ID) == null) {
+- notifyMessage(Messages.HudsonDiscovery_MessageTitle, NLS.bind(
+- Messages.HudsonDiscovery_MissingURL, new Object[] { serviceInfo.getLocation()
+- .getHost() }));
+-
+- } else {
+- URI uri = new URI(properties.getProperty(HUDSON_URL_PROPERTY_ID).toString());
+- if (isNew(uri)) {
+- notifyMessage(
+- Messages.HudsonDiscovery_MessageTitle,
+- NLS.bind(Messages.HudsonDiscovery_MessageText, new Object[] { uri,
+- Messages.HudsonDiscovery_ServerName, uri.toString(),
+- UUID.randomUUID().toString() }));
+- }
+- }
+- } catch (URISyntaxException e) {
+- StatusHandler.log(new Status(IStatus.ERROR, HudsonConnectorUi.ID_PLUGIN, NLS.bind(
+- Messages.HudsonDiscovery_IncorrectURI,
+- new Object[] { properties.getProperty(HUDSON_URL_PROPERTY_ID).toString() }), e));
+- }
+- }
+- }
+-
+- public void serviceUndiscovered(IServiceEvent anEvent) {
+- // Ignore this for now
+- }
+- });
+- container.connect(null, null);
+-
+- } catch (ContainerCreateException e) {
+- StatusHandler.log(new Status(IStatus.WARNING, HudsonConnectorUi.ID_PLUGIN,
+- Messages.HudsonDiscovery_CouldNotStartService, e));
+- } catch (ContainerConnectException e) {
+- StatusHandler.log(new Status(IStatus.WARNING, HudsonConnectorUi.ID_PLUGIN,
+- Messages.HudsonDiscovery_CouldNotStartService, e));
+- }
+- }
+-
+- private void notifyMessage(String title, String description) {
+- BuildsUi.serverDiscovered(title, description);
+- }
+-
+-}
diff --git a/sources b/sources
index e69de29..9fd37f0 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a5a5debcf23697291073001007a3758e eclipse-mylyn-builds-R_3_5_1-fetched-src.tar.bz2
More information about the scm-commits
mailing list