Skip to content
This repository has been archived by the owner on Oct 19, 2022. It is now read-only.

Commit

Permalink
Fix Itema-as#116: Create Eclipse feature for distributing the client
Browse files Browse the repository at this point in the history
  • Loading branch information
turesheim committed Oct 18, 2016
1 parent e164272 commit 9a2b4eb
Show file tree
Hide file tree
Showing 12 changed files with 385 additions and 134 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down
12 changes: 6 additions & 6 deletions default.tpd
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
33 changes: 9 additions & 24 deletions org.dawnsci.marketplace.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<groupId>org.dawnsci</groupId>
<artifactId>org.dawnsci.marketplace.core</artifactId>
<name>DAWN Marketplace Core</name>
<version>1.0.0-SNAPSHOT</version>

<packaging>${packaging.type}</packaging>
Expand Down Expand Up @@ -129,7 +130,7 @@
<id>client</id>
<properties>
<packaging.type>eclipse-plugin</packaging.type>
<tycho.version>0.24.0</tycho.version>
<tycho.version>0.26.0</tycho.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
Expand All @@ -152,19 +153,21 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<useProjectSettings>true</useProjectSettings>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
Expand Down Expand Up @@ -210,24 +213,6 @@
<pomDependencies>consider</pomDependencies>
</configuration>
</plugin>
<!-- computes git revision for manifest -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
<dependencies>
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-sourceref-jgit</artifactId>
<version>${tycho.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="org.dawnsci.marketplace.core-1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/org.dawnsci.marketplace.core/org.dawnsci.marketplace.core">
<dependent-module archiveName="org.dawnsci.marketplace.core-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/org.dawnsci.marketplace.core/org.dawnsci.marketplace.core">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/org.dawnsci.marketplace.server/target/classes"/>
Expand Down
1 change: 1 addition & 0 deletions org.dawnsci.marketplace.server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<name>DAWN Marketplace Server</name>
<artifactId>org.dawnsci.marketplace.server</artifactId>
<packaging>war</packaging>

Expand Down
121 changes: 28 additions & 93 deletions org.dawnsci.marketplace.ui/pom.xml
Original file line number Diff line number Diff line change
@@ -1,106 +1,41 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../pom.xml</relativePath>
<artifactId>org.dawnsci.marketplace-parent</artifactId>
<groupId>org.dawnsci.marketplace</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>


<name>DAWN Marketplace UI</name>
<artifactId>org.dawnsci.marketplace.ui</artifactId>
<packaging>eclipse-plugin</packaging>

<pluginRepositories>
<pluginRepository>
<id>cbi</id>
<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
</pluginRepository>
</pluginRepositories>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<useProjectSettings>true</useProjectSettings>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<target>
<artifact>
<groupId>org.dawnsci.marketplace</groupId>
<artifactId>org.dawnsci.marketplace-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<classifier>default</classifier>
</artifact>
</target>
<resolver>p2</resolver>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
<pomDependencies>consider</pomDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
<!-- computes git revision for manifest -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
<dependencies>
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-sourceref-jgit</artifactId>
<version>${tycho.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
</plugin>
</plugins>
</build>

</project>
17 changes: 17 additions & 0 deletions org.dawnsci.marketplace/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.dawnsci.marketplace</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions org.dawnsci.marketplace/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bin.includes = feature.xml,\
feature.properties
14 changes: 14 additions & 0 deletions org.dawnsci.marketplace/feature.properties
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 9a2b4eb

Please sign in to comment.