[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. upstream/3.6.4+fix1-34-g918d865
Jakub Adam
jakub.adam at ktknet.cz
Sun Jan 15 10:02:30 UTC 2012
The following commit has been merged in the master branch:
commit dc0198dcc2ff4825dc0f3a40e66f32c2c2b32e22
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Fri Jan 6 01:52:21 2012 +0100
Enable Hudson/Jenkins integration
diff --git a/debian/control b/debian/control
index d984804..0a65604 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,8 @@ Build-Depends: debhelper (>= 8~),
libcommons-discovery-java (>= 0.5-2),
libcommons-lang-java,
libgnumail-java (>= 1.1.2-6),
+ libgoogle-gson-java,
+ libjaxme-java (>= 0.5.2+dfsg-6),
libjaxp1.3-java (>= 1.3.05-2),
libjdom1-java (>= 1.1.2+dfsg-2),
librome-java (>= 1.0-3),
@@ -33,6 +35,7 @@ Homepage: http://www.eclipse.org/mylyn
Package: eclipse-mylyn
Architecture: all
Depends: eclipse-platform (>= 3.7~exp),
+ eclipse-emf,
${misc:Depends},
${orbit:Depends}
Description: Task-Focused Interface for Eclipse
@@ -179,3 +182,18 @@ Description: Mylyn WikiText
.
Enables parsing and display of lightweight markup (wiki text). Extends
the Mylyn task editor to create a markup-aware editor.
+
+Package: eclipse-mylyn-builds-hudson
+Architecture: all
+Depends: eclipse-mylyn (= ${source:Version}),
+ ${misc:Depends}
+Description: Mylyn Hudson/Jenkins Connector
+ Mylyn integrates task support into Eclipse. It supports offline editing
+ for certain task repositories and monitors work activity to hide
+ information that is not relevant to the current task. Also included is
+ the Mylyn Focused UI for reducing information overload when working with
+ tasks and the Bugzilla task connector.
+ .
+ This package provides integration with Hudson and Jenkins continuous
+ integration servers.
+
diff --git a/debian/eclipse-mylyn-builds-hudson.eh-install b/debian/eclipse-mylyn-builds-hudson.eh-install
new file mode 100644
index 0000000..ca371ea
--- /dev/null
+++ b/debian/eclipse-mylyn-builds-hudson.eh-install
@@ -0,0 +1 @@
+org.eclipse.mylyn.hudson
diff --git a/debian/eclipse-mylyn.eh-install b/debian/eclipse-mylyn.eh-install
index a251ea3..28838e7 100644
--- a/debian/eclipse-mylyn.eh-install
+++ b/debian/eclipse-mylyn.eh-install
@@ -3,3 +3,4 @@ org.eclipse.mylyn_feature
org.eclipse.mylyn.context_feature
org.eclipse.mylyn.versions
org.eclipse.mylyn.team_feature
+org.eclipse.mylyn.builds
diff --git a/debian/eclipse.environment b/debian/eclipse.environment
index 6f0e669..8349766 100644
--- a/debian/eclipse.environment
+++ b/debian/eclipse.environment
@@ -1,3 +1,4 @@
+org.eclipse.mylyn.builds/org.eclipse.mylyn*
org.eclipse.mylyn.commons/org.eclipse.mylyn*
org.eclipse.mylyn.context/org.eclipse.mylyn*
org.eclipse.mylyn.docs/org.eclipse.mylyn*
diff --git a/debian/eclipse.features b/debian/eclipse.features
index 6d75167..8d8848f 100644
--- a/debian/eclipse.features
+++ b/debian/eclipse.features
@@ -11,3 +11,5 @@ org.eclipse.mylyn.git egit jgit
org.eclipse.mylyn.bugzilla_feature
org.eclipse.mylyn.trac_feature
org.eclipse.mylyn.wikitext_feature
+org.eclipse.mylyn.builds emf
+org.eclipse.mylyn.hudson
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index b7c661a..d05fc05 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -5,6 +5,8 @@ axis-saaj
commons-discovery
commons-lang
gnumail
+gson
+jaxmeapi
jdom1
rome
ws-commons-util
diff --git a/debian/ecoreToJava.xml b/debian/ecoreToJava.xml
new file mode 100644
index 0000000..9955f5c
--- /dev/null
+++ b/debian/ecoreToJava.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="codegen" default="default">
+ <description>
+ Generates Java code from Ecore model
+ </description>
+
+ <property name="projectDir"
+ value=".eclipse-build/org.eclipse.mylyn.builds.core"/>
+
+ <target name="default">
+ <emf.Ecore2Java genModel="${projectDir}/models/builds.genmodel"
+ model="${projectDir}/models/builds.ecore"
+ generateModelProject="false"
+ generateEditProject="false"
+ generateEditorProject="false"
+ reconcilegenmodel="reload">
+ </emf.Ecore2Java>
+ </target>
+</project>
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index 05a9aaa..d443ff3 100644
--- a/debian/patches/debian-orbit-deps.patch
+++ b/debian/patches/debian-orbit-deps.patch
@@ -13,15 +13,73 @@ Subject: debian-orbit-deps
* remove versions from Import-Package directives so that distribution jars in
/usr/share/java can be used
---
+ .../org.eclipse.mylyn.hudson-feature/feature.xml | 19 +++++++-
+ .../META-INF/MANIFEST.MF | 5 +-
.../org.eclipse.mylyn.commons-feature/feature.xml | 46 ++++++++++++++------
.../META-INF/MANIFEST.MF | 7 +--
.../META-INF/MANIFEST.MF | 3 +-
.../META-INF/MANIFEST.MF | 10 ++--
.../META-INF/MANIFEST.MF | 3 +-
- 7 files changed, 53 insertions(+), 26 deletions(-)
+ 7 files changed, 62 insertions(+), 31 deletions(-)
+diff --git a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
+index 232c47b..1820bcc 100644
+--- a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
++++ b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
+@@ -32,15 +32,28 @@
+ <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.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"/>
+- <import plugin="javax.xml.bind" version="2.1.0" match="compatible"/>
+- <import plugin="javax.xml.stream" version="1.0.1" match="compatible"/>
++ <!--import plugin="javax.xml.stream" version="1.0.1" match="compatible"/-->
+ <import feature="org.eclipse.mylyn.builds" version="0.7.0" match="compatible"/>
+ </requires>
+
+ <plugin
++ id="com.google.gson"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="javax.xml.bind"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++
++ <plugin
+ id="org.eclipse.mylyn.hudson.core"
+ download-size="0"
+ install-size="0"
+diff --git a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
+index 7760b98..3ef5c57 100644
+--- a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
++++ b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
+@@ -10,7 +10,7 @@ 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.1.0",
++ javax.xml.bind,
+ com.sun.xml.bind;bundle-version="2.2.0";resolution:=optional
+ Bundle-ActivationPolicy: lazy
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+@@ -19,5 +19,4 @@ 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: com.google.gson;version="1.6.0",
+- javax.xml.stream;version="1.0.1"
++Import-Package: com.google.gson
diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml
-index 312741f..a085fde 100644
+index b2959b6..e2c9129 100644
--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml
+++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml
@@ -78,24 +78,32 @@
@@ -198,7 +256,7 @@ index c795c68..fffc132 100644
+ org.jdom;resolution:=optional
Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
-index f27e33a..565d68b 100644
+index 8091b18..984d35e 100644
--- a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.runtime,
diff --git a/debian/patches/remove-eclipse-ecf-usage.patch b/debian/patches/remove-eclipse-ecf-usage.patch
new file mode 100644
index 0000000..c76b119
--- /dev/null
+++ b/debian/patches/remove-eclipse-ecf-usage.patch
@@ -0,0 +1,79 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Fri, 6 Jan 2012 19:01:29 +0100
+Subject: remove-eclipse-ecf-usage
+
+---
+ .../mylyn/internal/hudson/ui/HudsonDiscovery.java | 18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
+index 69db5ab..987ea18 100644
+--- a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
++++ b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
+@@ -18,7 +18,7 @@ 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.ContainerConnectException;
+ import org.eclipse.ecf.core.ContainerCreateException;
+ import org.eclipse.ecf.core.ContainerFactory;
+ import org.eclipse.ecf.core.IContainer;
+@@ -28,7 +28,7 @@ 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.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;
+@@ -53,7 +53,7 @@ public class HudsonDiscovery extends BuildsUiStartup {
+
+ private static HudsonDiscovery instance;
+
+- private IContainer container;
++ //private IContainer container;
+
+ public static HudsonDiscovery getInstance() {
+ return instance;
+@@ -63,9 +63,9 @@ public class HudsonDiscovery extends BuildsUiStartup {
+ instance = this;
+ }
+
+- protected IContainer getContainer() throws ContainerCreateException {
++ /*protected IContainer getContainer() throws ContainerCreateException {
+ return ContainerFactory.getDefault().createContainer(ECF_DISCOVERY_JMDNS);
+- }
++ }*/
+
+ private boolean isNew(URI uri) {
+ List<IBuildServer> servers = BuildsUi.getModel().getServers();
+@@ -85,7 +85,7 @@ public class HudsonDiscovery extends BuildsUiStartup {
+
+ @Override
+ public void lazyStartup() {
+- try {
++ /*try {
+ container = getContainer();
+ final IDiscoveryLocator adapter = (IDiscoveryLocator) container.getAdapter(IDiscoveryLocator.class);
+ adapter.addServiceListener(new IServiceListener() {
+@@ -132,14 +132,14 @@ public class HudsonDiscovery extends BuildsUiStartup {
+ } catch (ContainerConnectException e) {
+ StatusHandler.log(new Status(IStatus.WARNING, HudsonConnectorUi.ID_PLUGIN,
+ Messages.HudsonDiscovery_CouldNotStartService, e));
+- }
++ }*/
+ }
+
+ public void stop() {
+- if (container != null) {
++ /*if (container != null) {
+ container.disconnect();
+ container = null;
+- }
++ }*/
+ }
+
+ private void notifyMessage(String title, String description) {
+--
diff --git a/debian/patches/series b/debian/patches/series
index 05e5f4d..3879625 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
debian-orbit-deps.patch
rebuild-prepare-install-profile-job-3-6.patch
correct-wikitext-core-version.patch
+remove-eclipse-ecf-usage.patch
diff --git a/debian/rules b/debian/rules
index 54f1bf7..c81dede 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,13 @@ export JAVA_HOME:=/usr/lib/jvm/default-java
%:
dh $@ --with eclipse-helper
+
+override_jh_compilefeatures:
+ # Regenerate org.eclipse.mylyn.builds.core code from model
+ eclipse -application org.eclipse.ant.core.antRunner \
+ -buildfile debian/ecoreToJava.xml \
+ -data debian/.eclipse-build \
+ -Dosgi.sharedConfiguration.area=debian/.eclipse-build/build/home \
+ -consoleLog -noSplash
+
+ jh_compilefeatures --build-opts="-DjavacTarget=1.5 -DjavacSource=1.5"
--
eclipse-mylyn - Plug-in for eclipse - Debian package.
More information about the pkg-java-commits
mailing list