Skip to content

Commit

Permalink
Updated features and products to resolve problems with org.eclipse.rcp.
Browse files Browse the repository at this point in the history
  • Loading branch information
jbobnar committed Mar 18, 2015
1 parent 4bb939b commit 2ce7125
Show file tree
Hide file tree
Showing 27 changed files with 379 additions and 117 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ of the distribution package.
id="org.csstudio.iter.alarm.common.feature"
version="0.0.0"/>

<includes
id="org.csstudio.iter.service.feature"
version="0.0.0"/>

<requires>
<import plugin="org.junit" version="4.8.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime"/>
Expand All @@ -46,4 +50,25 @@ of the distribution package.
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.help"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.core.expressions"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="com.ibm.icu"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,24 @@ of the distribution package.
fragment="true"
unpack="false"/>

<plugin
id="org.junit"
download-size="0"
install-size="0"
version="0.0.0"/>

<plugin
id="org.hamcrest.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.equinox.security"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ of the distribution package.
id="org.csstudio.iter.alarm.common.feature"
version="0.0.0"/>

<includes
id="org.csstudio.iter.service.feature"
version="0.0.0"/>

<requires>
<import plugin="org.junit" version="4.8.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime"/>
Expand Down Expand Up @@ -86,4 +90,25 @@ of the distribution package.
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.help"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.core.expressions"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="com.ibm.icu"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
23 changes: 1 addition & 22 deletions features/org.csstudio.iter.alarm.common.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ of the distribution package.
</license>

<includes
id="org.csstudio.iter.service.feature"
id="org.csstudio.iter.basic.feature"
version="0.0.0"/>

<requires>
Expand All @@ -47,34 +47,13 @@ of the distribution package.
version="0.0.0"
unpack="false"/>

<plugin
id="com.ibm.icu"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.csdata"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.core.expressions"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.help"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.epics.util"
download-size="0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ of the distribution package.
id="org.csstudio.iter.service.feature"
version="0.0.0"/>

<includes
id="org.csstudio.iter.basic.feature"
version="0.0.0"/>

<requires>
<import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.csstudio.archive.vtype" version="1.0.0" match="greaterOrEqual"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ of the distribution package.
id="org.csstudio.iter.service.feature"
version="0.0.0"/>

<includes
id="org.csstudio.iter.basic.feature"
version="0.0.0"/>

<requires>
<import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.junit" version="4.8.2" match="greaterOrEqual"/>
Expand Down
17 changes: 17 additions & 0 deletions features/org.csstudio.iter.basic.feature/.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.csstudio.iter.basic.feature</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>
1 change: 1 addition & 0 deletions features/org.csstudio.iter.basic.feature/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bin.includes = feature.xml
109 changes: 109 additions & 0 deletions features/org.csstudio.iter.basic.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.csstudio.iter.basic.feature"
label="Basic CSStudio Feature"
version="1.0.0.qualifier"
provider-name="ITER">

<copyright>
Copyright (c) : 2010-2015 ITER Organization,
CS 90 046
13067 St. Paul-lez-Durance Cedex
France
</copyright>

<license url="">
This product is part of ITER CODAC software.
For the terms and conditions of redistribution or use of this software
refer to the file ITER-LICENSE.TXT located in the top level directory
of the distribution package.
</license>

<requires>
<import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.registry" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.osgi" version="3.7.0" match="compatible"/>
<import plugin="org.eclipse.equinox.common" version="3.6.100" match="compatible"/>
<import plugin="org.eclipse.core.jobs" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.equinox.preferences" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.core.contenttype" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.equinox.app" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.preferences" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.equinox.registry" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.osgi" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.csstudio.platform.libs.jms" version="1.1.1" match="greaterOrEqual"/>
<import plugin="org.csstudio.java" version="3.0.0" match="greaterOrEqual"/>
<import plugin="org.csstudio.platform.libs.jdbc" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.security" version="1.1.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.util" version="1.0.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.ds" version="1.3.1" match="greaterOrEqual"/>
<import plugin="org.csstudio.java" version="3.1.0" match="greaterOrEqual"/>
</requires>

<plugin
id="org.csstudio.platform.libs.jms"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.platform.utility.jms"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.java"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.logging"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.apputil"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.platform.libs.jdbc"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.platform.utility.rdb"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.security"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.iter.passwordprovider"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
14 changes: 14 additions & 0 deletions features/org.csstudio.iter.basic.feature/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.csstudio</groupId>
<artifactId>iter-features</artifactId>
<version>${global-version}</version>
</parent>
<groupId>org.csstudio</groupId>
<artifactId>org.csstudio.iter.basic.feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
4 changes: 4 additions & 0 deletions features/org.csstudio.iter.jms2rdb.app.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ of the distribution package.
id="org.csstudio.iter.service.feature"
version="0.0.0"/>

<includes
id="org.csstudio.iter.basic.feature"
version="0.0.0"/>

<requires>
<import plugin="org.junit" version="4.8.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime"/>
Expand Down
63 changes: 0 additions & 63 deletions features/org.csstudio.iter.service.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,74 +140,11 @@ of the distribution package.
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.platform.libs.jms"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.platform.utility.jms"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.java"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.logging"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.apputil"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.platform.libs.jdbc"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.platform.utility.rdb"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.security"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="javax.xml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.csstudio.iter.passwordprovider"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
Loading

0 comments on commit 2ce7125

Please sign in to comment.