508880: [Fix] Use implicit dependencies to avoid forcing the installation of specific plugins

Handlers that have external dependencies (i.e., dependencies that are not part of the Eclipse Modelling Environment) can now be independently selected

Change-Id: I41a228c30e23c87719b45d76b6142a39d3e64d9e
diff --git a/org.eclipse.capra.feature/feature.xml b/org.eclipse.capra.feature/feature.xml
index bb4ebeb..4b24850 100644
--- a/org.eclipse.capra.feature/feature.xml
+++ b/org.eclipse.capra.feature/feature.xml
@@ -153,19 +153,4 @@
          install-size="0"
          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"/>
-
 </feature>
diff --git a/org.eclipse.capra.handler.cdt.feature/.project b/org.eclipse.capra.handler.cdt.feature/.project
new file mode 100644
index 0000000..4f6e4bd
--- /dev/null
+++ b/org.eclipse.capra.handler.cdt.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.capra.handler.cdt.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>
diff --git a/org.eclipse.capra.handler.cdt.feature/build.properties b/org.eclipse.capra.handler.cdt.feature/build.properties
new file mode 100644
index 0000000..560c2d8
--- /dev/null
+++ b/org.eclipse.capra.handler.cdt.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.handler.cdt.feature/feature.xml b/org.eclipse.capra.handler.cdt.feature/feature.xml
new file mode 100644
index 0000000..8dad534
--- /dev/null
+++ b/org.eclipse.capra.handler.cdt.feature/feature.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.capra.handler.cdt.feature"
+      label="Capra Traceability for C/C++"
+      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.handler.cdt"
+         download-size="0"
+         install-size="0"
+         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"/>
+
+</feature>
diff --git a/org.eclipse.capra.handler.cdt.feature/pom.xml b/org.eclipse.capra.handler.cdt.feature/pom.xml
new file mode 100644
index 0000000..1846eda
--- /dev/null
+++ b/org.eclipse.capra.handler.cdt.feature/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+        <modelVersion>4.0.0</modelVersion>
+
+        <parent>
+                <relativePath>../pom.xml</relativePath>
+                <groupId>org.eclipse.capra</groupId>
+                <artifactId>parent</artifactId>
+                <version>0.7.0-SNAPSHOT</version>
+        </parent>
+
+        <artifactId>org.eclipse.capra.handler.cdt.feature</artifactId>
+        <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/org.eclipse.capra.handler.feature/.project b/org.eclipse.capra.handler.feature/.project
new file mode 100644
index 0000000..9603806
--- /dev/null
+++ b/org.eclipse.capra.handler.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.capra.handler.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>
diff --git a/org.eclipse.capra.handler.feature/build.properties b/org.eclipse.capra.handler.feature/build.properties
new file mode 100644
index 0000000..560c2d8
--- /dev/null
+++ b/org.eclipse.capra.handler.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.handler.feature/feature.xml b/org.eclipse.capra.handler.feature/feature.xml
new file mode 100644
index 0000000..386b869
--- /dev/null
+++ b/org.eclipse.capra.handler.feature/feature.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.capra.handler.feature"
+      label="Capra Traceability for Java"
+      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>
+
+   <includes
+         id="org.eclipse.capra.handler.cdt.feature"
+         version="0.0.0"
+         optional="true"/>
+
+   <includes
+         id="org.eclipse.capra.handler.jdt.feature"
+         version="0.0.0"
+         optional="true"/>
+
+   <includes
+         id="org.eclipse.capra.handler.hudson.feature"
+         version="0.0.0"
+         optional="true"/>
+
+   <includes
+         id="org.eclipse.capra.handler.papyrus.feature"
+         version="0.0.0"
+         optional="true"/>
+
+   <includes
+         id="org.eclipse.capra.handler.reqif.feature"
+         version="0.0.0"
+         optional="true"/>
+
+</feature>
diff --git a/org.eclipse.capra.handler.feature/pom.xml b/org.eclipse.capra.handler.feature/pom.xml
new file mode 100644
index 0000000..720b952
--- /dev/null
+++ b/org.eclipse.capra.handler.feature/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+        <modelVersion>4.0.0</modelVersion>
+
+        <parent>
+                <relativePath>../pom.xml</relativePath>
+                <groupId>org.eclipse.capra</groupId>
+                <artifactId>parent</artifactId>
+                <version>0.7.0-SNAPSHOT</version>
+        </parent>
+
+        <artifactId>org.eclipse.capra.handler.feature</artifactId>
+        <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/org.eclipse.capra.handler.hudson.feature/.project b/org.eclipse.capra.handler.hudson.feature/.project
new file mode 100644
index 0000000..0f6dfac
--- /dev/null
+++ b/org.eclipse.capra.handler.hudson.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.capra.handler.hudson.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>
diff --git a/org.eclipse.capra.handler.hudson.feature/build.properties b/org.eclipse.capra.handler.hudson.feature/build.properties
new file mode 100644
index 0000000..560c2d8
--- /dev/null
+++ b/org.eclipse.capra.handler.hudson.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.handler.hudson.feature/feature.xml b/org.eclipse.capra.handler.hudson.feature/feature.xml
new file mode 100644
index 0000000..206308d
--- /dev/null
+++ b/org.eclipse.capra.handler.hudson.feature/feature.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.capra.handler.hudson.feature"
+      label="Capra Traceability for Hudson"
+      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.handler.hudson"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.capra.handler.hudson.feature/pom.xml b/org.eclipse.capra.handler.hudson.feature/pom.xml
new file mode 100644
index 0000000..03fe264
--- /dev/null
+++ b/org.eclipse.capra.handler.hudson.feature/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+        <modelVersion>4.0.0</modelVersion>
+
+        <parent>
+                <relativePath>../pom.xml</relativePath>
+                <groupId>org.eclipse.capra</groupId>
+                <artifactId>parent</artifactId>
+                <version>0.7.0-SNAPSHOT</version>
+        </parent>
+
+        <artifactId>org.eclipse.capra.handler.hudson.feature</artifactId>
+        <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/org.eclipse.capra.handler.jdt.feature/.project b/org.eclipse.capra.handler.jdt.feature/.project
new file mode 100644
index 0000000..a47209c
--- /dev/null
+++ b/org.eclipse.capra.handler.jdt.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.capra.handler.jdt.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>
diff --git a/org.eclipse.capra.handler.jdt.feature/build.properties b/org.eclipse.capra.handler.jdt.feature/build.properties
new file mode 100644
index 0000000..560c2d8
--- /dev/null
+++ b/org.eclipse.capra.handler.jdt.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.handler.jdt.feature/feature.xml b/org.eclipse.capra.handler.jdt.feature/feature.xml
new file mode 100644
index 0000000..7719f46
--- /dev/null
+++ b/org.eclipse.capra.handler.jdt.feature/feature.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.capra.handler.jdt.feature"
+      label="Capra Traceability for Java"
+      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.handler.jdt"
+         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"/>
+
+</feature>
diff --git a/org.eclipse.capra.handler.jdt.feature/pom.xml b/org.eclipse.capra.handler.jdt.feature/pom.xml
new file mode 100644
index 0000000..95c7c38
--- /dev/null
+++ b/org.eclipse.capra.handler.jdt.feature/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+        <modelVersion>4.0.0</modelVersion>
+
+        <parent>
+                <relativePath>../pom.xml</relativePath>
+                <groupId>org.eclipse.capra</groupId>
+                <artifactId>parent</artifactId>
+                <version>0.7.0-SNAPSHOT</version>
+        </parent>
+
+        <artifactId>org.eclipse.capra.handler.jdt.feature</artifactId>
+        <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/org.eclipse.capra.handler.papyrus.feature/.project b/org.eclipse.capra.handler.papyrus.feature/.project
new file mode 100644
index 0000000..7d5751f
--- /dev/null
+++ b/org.eclipse.capra.handler.papyrus.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.capra.handler.papyrus.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>
diff --git a/org.eclipse.capra.handler.papyrus.feature/build.properties b/org.eclipse.capra.handler.papyrus.feature/build.properties
new file mode 100644
index 0000000..560c2d8
--- /dev/null
+++ b/org.eclipse.capra.handler.papyrus.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.handler.papyrus.feature/feature.xml b/org.eclipse.capra.handler.papyrus.feature/feature.xml
new file mode 100644
index 0000000..9dbf7a4
--- /dev/null
+++ b/org.eclipse.capra.handler.papyrus.feature/feature.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.capra.handler.papyrus.feature"
+      label="Capra Traceability for Papyrus Models"
+      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.handler.papyrus"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.capra.handler.papyrus.feature/pom.xml b/org.eclipse.capra.handler.papyrus.feature/pom.xml
new file mode 100644
index 0000000..900cf1d
--- /dev/null
+++ b/org.eclipse.capra.handler.papyrus.feature/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+        <modelVersion>4.0.0</modelVersion>
+
+        <parent>
+                <relativePath>../pom.xml</relativePath>
+                <groupId>org.eclipse.capra</groupId>
+                <artifactId>parent</artifactId>
+                <version>0.7.0-SNAPSHOT</version>
+        </parent>
+
+        <artifactId>org.eclipse.capra.handler.papyrus.feature</artifactId>
+        <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/org.eclipse.capra.handler.reqIf.feature/.project b/org.eclipse.capra.handler.reqIf.feature/.project
new file mode 100644
index 0000000..1a7bd54
--- /dev/null
+++ b/org.eclipse.capra.handler.reqIf.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.capra.handler.reqIf.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>
diff --git a/org.eclipse.capra.handler.reqIf.feature/build.properties b/org.eclipse.capra.handler.reqIf.feature/build.properties
new file mode 100644
index 0000000..560c2d8
--- /dev/null
+++ b/org.eclipse.capra.handler.reqIf.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.handler.reqIf.feature/feature.xml b/org.eclipse.capra.handler.reqIf.feature/feature.xml
new file mode 100644
index 0000000..162181c
--- /dev/null
+++ b/org.eclipse.capra.handler.reqIf.feature/feature.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.capra.handler.reqif.feature"
+      label="Capra Traceability for ReqIF"
+      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.handler.reqIf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.capra.handler.reqIf.feature/pom.xml b/org.eclipse.capra.handler.reqIf.feature/pom.xml
new file mode 100644
index 0000000..8a40e0c
--- /dev/null
+++ b/org.eclipse.capra.handler.reqIf.feature/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+        <modelVersion>4.0.0</modelVersion>
+
+        <parent>
+                <relativePath>../pom.xml</relativePath>
+                <groupId>org.eclipse.capra</groupId>
+                <artifactId>parent</artifactId>
+                <version>0.7.0-SNAPSHOT</version>
+        </parent>
+
+        <artifactId>org.eclipse.capra.handler.reqif.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 e0c3b1d..f92a148 100644
--- a/org.eclipse.capra.releng.p2/category.xml
+++ b/org.eclipse.capra.releng.p2/category.xml
@@ -6,6 +6,9 @@
    <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>
+   <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>
    <category-def name="org.eclipse.capra" label="Capra">
       <description>
          Capra is an extensible traceability mangement tool.
diff --git a/pom.xml b/pom.xml
index c5c7689..36bfd3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,17 +30,22 @@
 		<module>org.eclipse.capra.generic.tracemodels</module>
 		<module>org.eclipse.capra.handler.cdt</module>
 		<module>org.eclipse.capra.handler.cdt.tests</module>
+		<module>org.eclipse.capra.handler.cdt.feature</module>
 		<module>org.eclipse.capra.handler.emf</module>
 		<module>org.eclipse.capra.handler.file</module>
 		<module>org.eclipse.capra.handler.gef</module>
-		<module>org.eclipse.capra.handler.hudson</module>
 		<module>org.eclipse.capra.handler.jdt</module>
-		<module>org.eclipse.capra.handler.jdt.tests</module>
+		<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.mylyn</module>
-		<module>org.eclipse.capra.handler.papyrus</module>
+		<module>org.eclipse.capra.handler.jdt.tests</module>
+		<module>org.eclipse.capra.handler.jdt.feature</module>
 		<module>org.eclipse.capra.handler.reqIf</module>
-		<module>org.eclipse.capra.testsuite</module>
+		<module>org.eclipse.capra.handler.mylyn</module>
+		<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>
@@ -51,6 +56,7 @@
 		<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.testsuite</module>
 	</modules>
 
 	<properties>