From 9a2b4eb7f9ad0b4cbc2aa21f009b0c2ded2606ef Mon Sep 17 00:00:00 2001 From: "Torkild U. Resheim" Date: Tue, 18 Oct 2016 15:04:15 +0200 Subject: [PATCH] Fix #116: Create Eclipse feature for distributing the client Task-Url: http://github.com/Itema-as/dawn-marketplace-server/issues/116 --- .gitignore | 1 + default.tpd | 12 +- org.dawnsci.marketplace.core/pom.xml | 33 ++-- .../org.eclipse.wst.common.component | 2 +- org.dawnsci.marketplace.server/pom.xml | 1 + org.dawnsci.marketplace.ui/pom.xml | 121 ++++----------- org.dawnsci.marketplace/.project | 17 +++ org.dawnsci.marketplace/build.properties | 2 + org.dawnsci.marketplace/feature.properties | 14 ++ org.dawnsci.marketplace/feature.xml | 135 +++++++++++++++++ org.dawnsci.marketplace/pom.xml | 38 +++++ pom.xml | 143 ++++++++++++++++-- 12 files changed, 385 insertions(+), 134 deletions(-) create mode 100644 org.dawnsci.marketplace/.project create mode 100644 org.dawnsci.marketplace/build.properties create mode 100644 org.dawnsci.marketplace/feature.properties create mode 100644 org.dawnsci.marketplace/feature.xml create mode 100644 org.dawnsci.marketplace/pom.xml diff --git a/.gitignore b/.gitignore index 6e917b1..c20998e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ # Temporary files *~ +target/ # Virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* diff --git a/default.tpd b/default.tpd index 04aae04..5339e63 100644 --- a/default.tpd +++ b/default.tpd @@ -5,19 +5,19 @@ location "http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/" org.eclipse.equinox.p2.sdk.feature.group org.eclipse.sdk.feature.group org.eclipse.pde.core - org.eclipse.emf.ecore - org.eclipse.emf.ecore.xmi - org.eclipse.emf.ecore.change - org.eclipse.emf.common + org.eclipse.emf.ecore [2.11.2,2.12.0) + org.eclipse.emf.ecore.xmi [2.11.1,2.12.0) + org.eclipse.emf.ecore.change [2.11.0,2.12.0) + org.eclipse.emf.common [2.11.1,2.12.0) } -location "http://download.eclipse.org/modeling/emf/updates/releases/" { +location "http://download.eclipse.org/modeling/emf/updates/releases/" { org.eclipse.emf.databinding org.eclipse.emf.databinding.edit } location "http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/" { org.apache.log4j - org.apache.commons.collections + org.apache.commons.collections org.apache.httpcomponents.httpclient org.apache.httpcomponents.httpcore } diff --git a/org.dawnsci.marketplace.core/pom.xml b/org.dawnsci.marketplace.core/pom.xml index 18885b0..e6487e6 100644 --- a/org.dawnsci.marketplace.core/pom.xml +++ b/org.dawnsci.marketplace.core/pom.xml @@ -4,6 +4,7 @@ org.dawnsci org.dawnsci.marketplace.core + DAWN Marketplace Core 1.0.0-SNAPSHOT ${packaging.type} @@ -129,7 +130,7 @@ client eclipse-plugin - 0.24.0 + 0.26.0 UTF-8 @@ -152,19 +153,21 @@ + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + org.eclipse.tycho tycho-compiler-plugin ${tycho.version} - - true - org.eclipse.tycho - tycho-maven-plugin + tycho-packaging-plugin ${tycho.version} - true org.eclipse.tycho @@ -210,24 +213,6 @@ consider - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - false - - - - - org.eclipse.tycho.extras - tycho-sourceref-jgit - ${tycho.version} - - - diff --git a/org.dawnsci.marketplace.server/.settings/org.eclipse.wst.common.component b/org.dawnsci.marketplace.server/.settings/org.eclipse.wst.common.component index a1129c2..87a2a6f 100644 --- a/org.dawnsci.marketplace.server/.settings/org.eclipse.wst.common.component +++ b/org.dawnsci.marketplace.server/.settings/org.eclipse.wst.common.component @@ -4,7 +4,7 @@ - + uses diff --git a/org.dawnsci.marketplace.server/pom.xml b/org.dawnsci.marketplace.server/pom.xml index 40e2762..19670dc 100644 --- a/org.dawnsci.marketplace.server/pom.xml +++ b/org.dawnsci.marketplace.server/pom.xml @@ -2,6 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + DAWN Marketplace Server org.dawnsci.marketplace.server war diff --git a/org.dawnsci.marketplace.ui/pom.xml b/org.dawnsci.marketplace.ui/pom.xml index b76af4e..4acda44 100644 --- a/org.dawnsci.marketplace.ui/pom.xml +++ b/org.dawnsci.marketplace.ui/pom.xml @@ -1,106 +1,41 @@ 4.0.0 - + ../pom.xml org.dawnsci.marketplace-parent org.dawnsci.marketplace 1.0.0-SNAPSHOT - + + DAWN Marketplace UI org.dawnsci.marketplace.ui eclipse-plugin - - - cbi - https://repo.eclipse.org/content/repositories/cbi-releases/ - - - - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho.version} - - true - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho.version} - true - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - - - org.dawnsci.marketplace - org.dawnsci.marketplace-parent - 1.0.0-SNAPSHOT - default - - - p2 - - - linux - gtk - x86 - - - win32 - win32 - x86 - - - win32 - win32 - x86_64 - - - linux - gtk - x86_64 - - - macosx - cocoa - x86_64 - - - consider - - - - org.codehaus.mojo - build-helper-maven-plugin - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - false - - - - - org.eclipse.tycho.extras - tycho-sourceref-jgit - ${tycho.version} - - - - - + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + + diff --git a/org.dawnsci.marketplace/.project b/org.dawnsci.marketplace/.project new file mode 100644 index 0000000..cf628b7 --- /dev/null +++ b/org.dawnsci.marketplace/.project @@ -0,0 +1,17 @@ + + + org.dawnsci.marketplace + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/org.dawnsci.marketplace/build.properties b/org.dawnsci.marketplace/build.properties new file mode 100644 index 0000000..b692f5f --- /dev/null +++ b/org.dawnsci.marketplace/build.properties @@ -0,0 +1,2 @@ +bin.includes = feature.xml,\ + feature.properties \ No newline at end of file diff --git a/org.dawnsci.marketplace/feature.properties b/org.dawnsci.marketplace/feature.properties new file mode 100644 index 0000000..b746e78 --- /dev/null +++ b/org.dawnsci.marketplace/feature.properties @@ -0,0 +1,14 @@ +############################################################################### +# Copyright (c) 2016 Torkild U. Resheim +# 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: +# Torkild U. Resheim - initial API and implementation +############################################################################### +featureName=DAWN Marketplace Client +description=Author integration with the DAWN Marketplace. +providerName=Diamond Light Source +copyright=Copyright (c) 2016 Diamond Light Source and others \ No newline at end of file diff --git a/org.dawnsci.marketplace/feature.xml b/org.dawnsci.marketplace/feature.xml new file mode 100644 index 0000000..da3104a --- /dev/null +++ b/org.dawnsci.marketplace/feature.xml @@ -0,0 +1,135 @@ + + + + + %description + + + + %copyright + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.dawnsci.marketplace/pom.xml b/org.dawnsci.marketplace/pom.xml new file mode 100644 index 0000000..3fadfe6 --- /dev/null +++ b/org.dawnsci.marketplace/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + DAWN Marketplace Eclipse Feature + org.dawnsci.marketplace + eclipse-feature + + + ../pom.xml + org.dawnsci.marketplace-parent + org.dawnsci.marketplace + 1.0.0-SNAPSHOT + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + + + diff --git a/pom.xml b/pom.xml index 76ba2ec..a3d5249 100644 --- a/pom.xml +++ b/pom.xml @@ -20,16 +20,11 @@ 1.0.0-SNAPSHOT pom - DAWN Marketplace + DAWN Marketplace Parent Diamond Light Source - - 0.24.0 - UTF-8 - - https://github.com/itemaas/eclipse-marketplace-server/issues GitHub @@ -55,20 +50,148 @@ + + + cbi + https://repo.eclipse.org/content/repositories/cbi-releases/ + + + server org.dawnsci.marketplace.core - org.dawnsci.marketplace.server - + org.dawnsci.marketplace.server + client + + 0.26.0 + UTF-8 + org.dawnsci.marketplace.core - org.dawnsci.marketplace.ui - + org.dawnsci.marketplace.ui + org.dawnsci.marketplace + + + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho.version} + + true + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + + org.dawnsci.marketplace + org.dawnsci.marketplace-parent + 1.0.0-SNAPSHOT + default + + + p2 + + + linux + gtk + x86 + + + win32 + win32 + x86 + + + win32 + win32 + x86_64 + + + linux + gtk + x86_64 + + + macosx + cocoa + x86_64 + + + consider + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + false + + + + + org.eclipse.tycho.extras + tycho-sourceref-jgit + ${tycho.version} + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.eclipse.tycho + + + tycho-packaging-plugin + + + [0.26.0,) + + + + build-qualifier-aggregator + + + + + + + + + + + + + +