508880: improved structure of features
PlantUML and Zest are now separate features
Removed duplicate features in core and handlers
Renamed office feature to conform to other handler features
diff --git a/org.eclipse.capra.feature/feature.xml b/org.eclipse.capra.feature/feature.xml
index 4b24850..668e003 100644
--- a/org.eclipse.capra.feature/feature.xml
+++ b/org.eclipse.capra.feature/feature.xml
@@ -44,13 +44,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.capra.handler.cdt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.capra.handler.emf"
download-size="0"
install-size="0"
@@ -79,13 +72,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.capra.handler.jdt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.capra.handler.mylyn"
download-size="0"
install-size="0"
@@ -107,13 +93,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.capra.ui.plantuml"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.capra.documentation"
download-size="0"
install-size="0"
@@ -133,24 +112,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.capra.ui.cdt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.capra.ui.jdt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.capra.ui.zest"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
</feature>
diff --git a/org.eclipse.capra.handler.feature/feature.xml b/org.eclipse.capra.handler.feature/feature.xml
index 386b869..63c599e 100644
--- a/org.eclipse.capra.handler.feature/feature.xml
+++ b/org.eclipse.capra.handler.feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.capra.handler.feature"
- label="Capra Traceability for Java"
+ label="Capra Traceability for Specific Artifacts"
version="0.7.0.qualifier"
provider-name="Capra Development Team"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.capra.office.feature/.project b/org.eclipse.capra.handler.office.feature/.project
similarity index 85%
copy from org.eclipse.capra.office.feature/.project
copy to org.eclipse.capra.handler.office.feature/.project
index 30fcf75..25ab28c 100644
--- a/org.eclipse.capra.office.feature/.project
+++ b/org.eclipse.capra.handler.office.feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.capra.office.feature</name>
+ <name>org.eclipse.capra.handler.office.feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/org.eclipse.capra.office.feature/build.properties b/org.eclipse.capra.handler.office.feature/build.properties
similarity index 100%
rename from org.eclipse.capra.office.feature/build.properties
rename to org.eclipse.capra.handler.office.feature/build.properties
diff --git a/org.eclipse.capra.office.feature/feature.xml b/org.eclipse.capra.handler.office.feature/feature.xml
similarity index 87%
rename from org.eclipse.capra.office.feature/feature.xml
rename to org.eclipse.capra.handler.office.feature/feature.xml
index 7884893..91d3d0a 100644
--- a/org.eclipse.capra.office.feature/feature.xml
+++ b/org.eclipse.capra.handler.office.feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.capra.office.feature"
- label="Capra Microsoft Office Support"
+ id="org.eclipse.capra.handler.office.feature"
+ label="Capra Traceability for Microsoft Office Documents"
version="0.7.0.qualifier"
provider-name="Capra Development Team"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.capra.office.feature/pom.xml b/org.eclipse.capra.handler.office.feature/pom.xml
similarity index 88%
copy from org.eclipse.capra.office.feature/pom.xml
copy to org.eclipse.capra.handler.office.feature/pom.xml
index 3bab929..e0a64e4 100644
--- a/org.eclipse.capra.office.feature/pom.xml
+++ b/org.eclipse.capra.handler.office.feature/pom.xml
@@ -11,7 +11,7 @@
<version>0.7.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.capra.office.feature</artifactId>
+ <artifactId>org.eclipse.capra.handler.office.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/org.eclipse.capra.releng.p2/category.xml b/org.eclipse.capra.releng.p2/category.xml
index f92a148..dcbfde4 100644
--- a/org.eclipse.capra.releng.p2/category.xml
+++ b/org.eclipse.capra.releng.p2/category.xml
@@ -3,15 +3,39 @@
<feature url="features/org.eclipse.capra.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.feature" version="0.7.0.qualifier">
<category name="org.eclipse.capra"/>
</feature>
- <feature url="features/org.eclipse.capra.office.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.office.feature" version="0.7.0.qualifier">
- <category name="org.eclipse.capra"/>
+ <feature url="features/org.eclipse.capra.handler.cdt.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.handler.cdt.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.capra.handler"/>
</feature>
- <feature url="features/org.eclipse.capra.handler.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.handler.feature" version="0.7.0.qualifier">
- <category name="org.eclipse.capra"/>
+ <feature url="features/org.eclipse.capra.handler.hudson.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.handler.hudson.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.capra.handler"/>
</feature>
- <category-def name="org.eclipse.capra" label="Capra">
+ <feature url="features/org.eclipse.capra.handler.jdt.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.handler.jdt.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.capra.handler"/>
+ </feature>
+ <feature url="features/org.eclipse.capra.handler.papyrus.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.handler.papyrus.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.capra.handler"/>
+ </feature>
+ <feature url="features/org.eclipse.capra.handler.reqif.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.handler.reqif.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.capra.handler"/>
+ </feature>
+ <feature url="features/org.eclipse.capra.handler.office.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.handler.office.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.capra.handler"/>
+ </feature>
+ <feature url="features/org.eclipse.capra.ui.plantuml.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.ui.plantuml.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.capra.ui"/>
+ </feature>
+ <feature url="features/org.eclipse.capra.ui.zest.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.ui.zest.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.capra.ui"/>
+ </feature>
+ <category-def name="org.eclipse.capra" label="Capra Traceability">
<description>
Capra is an extensible traceability mangement tool.
</description>
</category-def>
+ <category-def name="org.eclipse.capra.handler" label="Capra Traceability Handlers">
+ <description>
+ Traceability handlers provide functionality to interface with different types of artifacts.
+ </description>
+ </category-def>
+ <category-def name="org.eclipse.capra.ui" label="Capra Traceability Visualisation"/>
</site>
diff --git a/org.eclipse.capra.office.feature/.project b/org.eclipse.capra.ui.plantuml.feature/.project
similarity index 86%
copy from org.eclipse.capra.office.feature/.project
copy to org.eclipse.capra.ui.plantuml.feature/.project
index 30fcf75..5ebee89 100644
--- a/org.eclipse.capra.office.feature/.project
+++ b/org.eclipse.capra.ui.plantuml.feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.capra.office.feature</name>
+ <name>org.eclipse.capra.ui.plantuml.feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/org.eclipse.capra.ui.plantuml.feature/build.properties b/org.eclipse.capra.ui.plantuml.feature/build.properties
new file mode 100644
index 0000000..560c2d8
--- /dev/null
+++ b/org.eclipse.capra.ui.plantuml.feature/build.properties
@@ -0,0 +1,11 @@
+###############################################################################
+# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs 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:
+# Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+###############################################################################
+bin.includes = feature.xml
diff --git a/org.eclipse.capra.ui.plantuml.feature/feature.xml b/org.eclipse.capra.ui.plantuml.feature/feature.xml
new file mode 100644
index 0000000..d7e6cee
--- /dev/null
+++ b/org.eclipse.capra.ui.plantuml.feature/feature.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.capra.ui.plantuml.feature"
+ label="Capra Traceability Visualisation with PlantUML"
+ version="0.7.0.qualifier"
+ provider-name="Capra Development Team"
+ license-feature="org.eclipse.license"
+ license-feature-version="0.0.0">
+
+ <copyright>
+ Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.capra.ui.plantuml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.capra.office.feature/pom.xml b/org.eclipse.capra.ui.plantuml.feature/pom.xml
similarity index 89%
rename from org.eclipse.capra.office.feature/pom.xml
rename to org.eclipse.capra.ui.plantuml.feature/pom.xml
index 3bab929..583b320 100644
--- a/org.eclipse.capra.office.feature/pom.xml
+++ b/org.eclipse.capra.ui.plantuml.feature/pom.xml
@@ -11,7 +11,7 @@
<version>0.7.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.capra.office.feature</artifactId>
+ <artifactId>org.eclipse.capra.ui.plantuml.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/org.eclipse.capra.office.feature/.project b/org.eclipse.capra.ui.zest.feature/.project
similarity index 87%
rename from org.eclipse.capra.office.feature/.project
rename to org.eclipse.capra.ui.zest.feature/.project
index 30fcf75..7e26f48 100644
--- a/org.eclipse.capra.office.feature/.project
+++ b/org.eclipse.capra.ui.zest.feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.capra.office.feature</name>
+ <name>org.eclipse.capra.ui.zest.feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/org.eclipse.capra.ui.zest.feature/build.properties b/org.eclipse.capra.ui.zest.feature/build.properties
new file mode 100644
index 0000000..560c2d8
--- /dev/null
+++ b/org.eclipse.capra.ui.zest.feature/build.properties
@@ -0,0 +1,11 @@
+###############################################################################
+# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs 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:
+# Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+###############################################################################
+bin.includes = feature.xml
diff --git a/org.eclipse.capra.ui.zest.feature/feature.xml b/org.eclipse.capra.ui.zest.feature/feature.xml
new file mode 100644
index 0000000..3018d76
--- /dev/null
+++ b/org.eclipse.capra.ui.zest.feature/feature.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.capra.ui.zest.feature"
+ label="Capra Traceability Visualisation with Eclipse Zest"
+ version="0.7.0.qualifier"
+ provider-name="Capra Development Team"
+ license-feature="org.eclipse.license"
+ license-feature-version="0.0.0">
+
+ <copyright>
+ Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.capra.ui.zest"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.capra.office.feature/pom.xml b/org.eclipse.capra.ui.zest.feature/pom.xml
similarity index 89%
copy from org.eclipse.capra.office.feature/pom.xml
copy to org.eclipse.capra.ui.zest.feature/pom.xml
index 3bab929..3b39010 100644
--- a/org.eclipse.capra.office.feature/pom.xml
+++ b/org.eclipse.capra.ui.zest.feature/pom.xml
@@ -11,7 +11,7 @@
<version>0.7.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.capra.office.feature</artifactId>
+ <artifactId>org.eclipse.capra.ui.zest.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/pom.xml b/pom.xml
index 36bfd3f..2119daa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,6 @@
<modules>
<module>org.eclipse.capra.core</module>
<module>org.eclipse.capra.documentation</module>
- <module>org.eclipse.capra.feature</module>
<module>org.eclipse.capra.generic.persistence</module>
<module>org.eclipse.capra.generic.priority</module>
<module>org.eclipse.capra.generic.tracemodels</module>
@@ -38,6 +37,7 @@
<module>org.eclipse.capra.handler.hudson</module>
<module>org.eclipse.capra.handler.hudson.feature</module>
<module>org.eclipse.capra.handler.office</module>
+ <module>org.eclipse.capra.handler.office.feature</module>
<module>org.eclipse.capra.handler.jdt.tests</module>
<module>org.eclipse.capra.handler.jdt.feature</module>
<module>org.eclipse.capra.handler.reqIf</module>
@@ -45,17 +45,18 @@
<module>org.eclipse.capra.handler.reqIf.feature</module>
<module>org.eclipse.capra.handler.papyrus</module>
<module>org.eclipse.capra.handler.papyrus.feature</module>
- <module>org.eclipse.capra.handler.feature</module>
<module>org.eclipse.capra.ui</module>
<module>org.eclipse.capra.ui.notification</module>
<module>org.eclipse.capra.ui.plantuml</module>
- <module>org.eclipse.capra.releng.target</module>
- <module>org.eclipse.capra.releng.p2</module>
+ <module>org.eclipse.capra.ui.plantuml.feature</module>
<module>org.eclipse.capra.ui.cdt</module>
<module>org.eclipse.capra.ui.jdt</module>
<module>org.eclipse.capra.ui.office</module>
<module>org.eclipse.capra.ui.zest</module>
- <module>org.eclipse.capra.office.feature</module>
+ <module>org.eclipse.capra.ui.zest.feature</module>
+ <module>org.eclipse.capra.feature</module>
+ <module>org.eclipse.capra.releng.target</module>
+ <module>org.eclipse.capra.releng.p2</module>
<module>org.eclipse.capra.testsuite</module>
</modules>
