pcap: Add feature plug-in

This patch includes
* Integrated in lttng/pom.xml
* Updates for the releng on Linux Tools level and LTTng level.
* Updated version numbers for PCAP to 1.0.0 (not starting at 3.1.0)
* Exported icons in tmf.pcap.ui
* Updated plug-in dependencies

Change-Id: Ie6319a453350193a99050edc4a7b396b771d0b9d
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/31563
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

diff --git a/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF
index 01096e189cbee09e32250bcf22ed990af63dceaf..f72a8131ed8813f2013d07ab38259e1d41dd4273 100644 (file)
--- a/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF
@@ -30,8 +30,8 @@ Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.linuxtools.btf.core.tests;bundle-version="3.0.0",
  org.eclipse.linuxtools.tmf.analysis.xml.core.tests;bundle-version="1.0.0",
  org.eclipse.linuxtools.tmf.analysis.xml.ui.tests;bundle-version="1.0.0",
- org.eclipse.linuxtools.pcap.core.tests;bundle-version="3.1.0",
- org.eclipse.linuxtools.tmf.pcap.core.tests;bundle-version="3.1.0"
+ org.eclipse.linuxtools.pcap.core.tests;bundle-version="1.0.0",
+ org.eclipse.linuxtools.tmf.pcap.core.tests;bundle-version="1.0.0"
 Export-Package: org.eclipse.linuxtools.lttng.alltests;x-internal:=true
 Import-Package: org.apache.derby.jdbc,
  org.json

diff --git a/org.eclipse.linuxtools.lttng.releng-site/category.xml b/org.eclipse.linuxtools.lttng.releng-site/category.xml
index fe7201d26305f5d3c1d01bd1a7d006ce30cdd24c..4fac379ddcbb271f70ca68dd462fc0c006bc74d7 100644 (file)
--- a/org.eclipse.linuxtools.lttng.releng-site/category.xml
+++ b/org.eclipse.linuxtools.lttng.releng-site/category.xml
@@ -12,6 +12,9 @@
    <feature url="features/org.eclipse.linuxtools.gdbtrace_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gdbtrace" version="0.0.0">
       <category name="LTTng"/>
    </feature>
+   <feature url="features/org.eclipse.linuxtools.tmf.pcap_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tmf.pcap" version="0.0.0">
+      <category name="LTTng"/>
+   </feature>
    <feature url="features/org.eclipse.linuxtools.tracing.rcp_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp" version="0.0.0">
       <category name="LTTng RCP"/>
    </feature>

diff --git a/org.eclipse.linuxtools.pcap.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.pcap.core.tests/META-INF/MANIFEST.MF
index 8f3403da5a061bd722bfe3493b215e64f6c38ef5..bce1407433ff01dd6e8fb8092e6c33f4e1fcca61 100644 (file)
--- a/org.eclipse.linuxtools.pcap.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.pcap.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.pcap.core.tests;singleton:=true
 Bundle-ActivationPolicy: lazy
@@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.linuxtools.pcap.core;bundle-version="3.1.0"
+ org.eclipse.linuxtools.pcap.core;bundle-version="1.0.0"
 Export-Package: org.eclipse.linuxtools.pcap.core.tests,
  org.eclipse.linuxtools.pcap.core.tests.file;x-internal:=true,
  org.eclipse.linuxtools.pcap.core.tests.packet;x-internal:=true,

diff --git a/org.eclipse.linuxtools.pcap.core.tests/pom.xml b/org.eclipse.linuxtools.pcap.core.tests/pom.xml
index 530f192794c94df4ff83d26311d1a63c9d7634d1..3a09cca41566389cc2246311c87e2a8cf01eef8d 100644 (file)
--- a/org.eclipse.linuxtools.pcap.core.tests/pom.xml
+++ b/org.eclipse.linuxtools.pcap.core.tests/pom.xml
@@ -20,7 +20,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.pcap.core.tests</artifactId>
-  <version>3.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools Pcap Parser Core Tests Plug-in</name>

diff --git a/org.eclipse.linuxtools.pcap.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.pcap.core/META-INF/MANIFEST.MF
index dce6f70addd5b2abe000875bd2b14445c9ac3078..03ad1ffb5a2afe409120d2efd227ef2ca262d41d 100644 (file)
--- a/org.eclipse.linuxtools.pcap.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.pcap.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.pcap.core;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.pcap.core.Activator

diff --git a/org.eclipse.linuxtools.pcap.core/pom.xml b/org.eclipse.linuxtools.pcap.core/pom.xml
index e64b177ffbf160d11ba546c4ddc7d5d5222a9fbc..f3720b0ac26fef9eff4a9391d28038ea10dcb08d 100644 (file)
--- a/org.eclipse.linuxtools.pcap.core/pom.xml
+++ b/org.eclipse.linuxtools.pcap.core/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.pcap.core</artifactId>
-  <version>3.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools Pcap Parser Core Plug-in</name>

diff --git a/org.eclipse.linuxtools.tmf.pcap.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.pcap.core.tests/META-INF/MANIFEST.MF
index e2aafd6a54141fc4635d899a7bbc9b9bb206c896..9c6def86d26196e55cc8525bc92e2203ddd83d0d 100644 (file)
--- a/org.eclipse.linuxtools.tmf.pcap.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.pcap.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.tmf.pcap.core.tests;singleton:=true
 Bundle-ActivationPolicy: lazy
@@ -10,10 +10,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.linuxtools.pcap.core,
- org.eclipse.linuxtools.pcap.core.tests,
- org.eclipse.linuxtools.tmf.core,
- org.eclipse.linuxtools.tmf.core.tests,
- org.eclipse.linuxtools.tmf.pcap.core
+ org.eclipse.linuxtools.pcap.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.pcap.core.tests;bundle-version="1.0.0",
+ org.eclipse.linuxtools.tmf.core;bundle-version="3.1.0",
+ org.eclipse.linuxtools.tmf.core.tests;bundle-version="3.0.0",
+ org.eclipse.linuxtools.tmf.pcap.core;bundle-version="1.0.0"
 Import-Package: com.google.common.collect
 Export-Package: org.eclipse.linuxtools.tmf.pcap.core.tests

diff --git a/org.eclipse.linuxtools.tmf.pcap.core.tests/pom.xml b/org.eclipse.linuxtools.tmf.pcap.core.tests/pom.xml
index 2841c50839d363a90d59b83d2c945d859ae1830e..de07554ff8f2a716de1fbc553c1774582a454272 100644 (file)
--- a/org.eclipse.linuxtools.tmf.pcap.core.tests/pom.xml
+++ b/org.eclipse.linuxtools.tmf.pcap.core.tests/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.pcap.core.tests</artifactId>
-  <version>3.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Pcap Support for TMF Core Tests Plug-in</name>

diff --git a/org.eclipse.linuxtools.tmf.pcap.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.pcap.core/META-INF/MANIFEST.MF
index f8c18df9aff8ec0653469bdc09aecb5b7bedec37..35c01d6a7667c5ebcd566cdc89e154238806ba01 100644 (file)
--- a/org.eclipse.linuxtools.tmf.pcap.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.pcap.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.tmf.pcap.core;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.tmf.pcap.core.Activator
@@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.linuxtools.tmf.core;bundle-version="3.1.0",
- org.eclipse.linuxtools.pcap.core
+ org.eclipse.linuxtools.pcap.core;bundle-version="1.0.0"
 Export-Package: org.eclipse.linuxtools.internal.tmf.pcap.core;x-internal:=true,
  org.eclipse.linuxtools.internal.tmf.pcap.core.util;x-internal:=true,
  org.eclipse.linuxtools.tmf.pcap.core.analysis,

diff --git a/org.eclipse.linuxtools.tmf.pcap.core/pom.xml b/org.eclipse.linuxtools.tmf.pcap.core/pom.xml
index be3faf1579e259e74094fa6347815fb712ed0fad..2af489b519d93743d1baee1bced7b95a4ea7b590 100644 (file)
--- a/org.eclipse.linuxtools.tmf.pcap.core/pom.xml
+++ b/org.eclipse.linuxtools.tmf.pcap.core/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.pcap.core</artifactId>
-  <version>3.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Pcap support for TMF Core Plug-in</name>

diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.pcap.ui/META-INF/MANIFEST.MF
index 8233c1bcf1fd8c3f5c64559858e7f3b9a4db3ad5..22722441ae8227f3dfa759b3819774617f16b537 100644 (file)
--- a/org.eclipse.linuxtools.tmf.pcap.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.pcap.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.tmf.pcap.ui;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.tmf.pcap.ui.Activator
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.ide,
  org.eclipse.linuxtools.tmf.core;bundle-version="3.1.0",
  org.eclipse.linuxtools.tmf.ui;bundle-version="3.1.0",
- org.eclipse.linuxtools.tmf.pcap.core;bundle-version="3.1.0"
+ org.eclipse.linuxtools.tmf.pcap.core;bundle-version="1.0.0"
 Export-Package: org.eclipse.linuxtools.internal.tmf.pcap.ui;x-internal:=true,
  org.eclipse.linuxtools.tmf.pcap.ui,
  org.eclipse.linuxtools.tmf.pcap.ui.editor,

diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/build.properties b/org.eclipse.linuxtools.tmf.pcap.ui/build.properties
index 78168e28d0e18fcf4b2179c731a16544066341f7..9d5346e88392c4822c59709818716116f700ca18 100644 (file)
--- a/org.eclipse.linuxtools.tmf.pcap.ui/build.properties
+++ b/org.eclipse.linuxtools.tmf.pcap.ui/build.properties
@@ -16,7 +16,8 @@ bin.includes = META-INF/,\
                .,\
                about.html,\
                plugin.properties,\
-               plugin.xml
+               plugin.xml,\
+               icons/
 src.includes = about.html
 additional.bundles = org.eclipse.jdt.annotation
 jars.extra.classpath = platform:/plugin/org.eclipse.jdt.annotation

diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/pom.xml b/org.eclipse.linuxtools.tmf.pcap.ui/pom.xml
index 66309dc23c01fe14e9ac04c999e5f4fc82a73d60..f6b99d5fc5accfd32fadadfb63076e82e20aac50 100644 (file)
--- a/org.eclipse.linuxtools.tmf.pcap.ui/pom.xml
+++ b/org.eclipse.linuxtools.tmf.pcap.ui/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.pcap.ui</artifactId>
-  <version>3.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Pcap support for TMF UI Plug-in</name>

diff --git a/org.eclipse.linuxtools.tmf.pcap/.project b/org.eclipse.linuxtools.tmf.pcap/.project
new file mode 100644 (file)
index 0000000..591da49
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.pcap/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.eclipse.linuxtools.tmf.pcap</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.linuxtools.tmf.pcap/.settings/org.eclipse.core.resources.prefs b/org.eclipse.linuxtools.tmf.pcap/.settings/org.eclipse.core.resources.prefs
new file mode 100644 (file)
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.pcap/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

diff --git a/org.eclipse.linuxtools.tmf.pcap/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.linuxtools.tmf.pcap/.settings/org.eclipse.core.runtime.prefs
new file mode 100644 (file)
index 0000000..5a0ad22
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.pcap/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n

diff --git a/org.eclipse.linuxtools.tmf.pcap/build.properties b/org.eclipse.linuxtools.tmf.pcap/build.properties
new file mode 100644 (file)
index 0000000..fef213d
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.pcap/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2014 Ericsson
+#
+# 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:
+#     Ericsson - Initial API and implementation
+###############################################################################
+
+bin.includes = feature.xml,\
+               feature.properties,\
+               p2.inf

diff --git a/org.eclipse.linuxtools.tmf.pcap/feature.properties b/org.eclipse.linuxtools.tmf.pcap/feature.properties
new file mode 100644 (file)
index 0000000..b16cdd6
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.pcap/feature.properties
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2014 Ericsson
+#
+# 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:
+#     Ericsson - Initial API and implementation
+###############################################################################
+
+featureName=Pcap (Packet Capture Format) Analysis
+
+description=Plug-ins to integrate PCAP into the workbench.
+
+featureProvider=Eclipse Linux Tools
+
+copyright=Copyright 2014 Ericsson
+

diff --git a/org.eclipse.linuxtools.tmf.pcap/feature.xml b/org.eclipse.linuxtools.tmf.pcap/feature.xml
new file mode 100644 (file)
index 0000000..4c89aa3
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.pcap/feature.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.tmf.pcap"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%featureProvider"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description url="http://www.example.com/description">
+      %description
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/linuxtools/update"/>
+   </url>
+
+   <includes
+         id="org.eclipse.linuxtools.tmf"
+         version="0.0.0"/>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="com.google.guava"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.linuxtools.tmf.core" version="3.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.ui" version="3.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.pcap.core" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.pcap.core" version="1.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.pcap.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.tmf.pcap.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.tmf.pcap.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.tmf.pcap.help"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>

diff --git a/org.eclipse.linuxtools.tmf.pcap/p2.inf b/org.eclipse.linuxtools.tmf.pcap/p2.inf
new file mode 100644 (file)
index 0000000..abe8c46
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.pcap/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure=\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false);

diff --git a/org.eclipse.linuxtools.tmf.pcap/pom.xml b/org.eclipse.linuxtools.tmf.pcap/pom.xml
new file mode 100644 (file)
index 0000000..761eb9b
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.pcap/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (C) 2011, 2014 Red Hat, Inc, Ericsson.
+
+   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
+-->
+<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>
+    <artifactId>linuxtools-lttng-parent</artifactId>
+    <groupId>org.eclipse.linuxtools.lttng</groupId>
+    <version>3.1.0-SNAPSHOT</version>
+  </parent>
+
+  <name>Linux Tools Pcap Analysis Feature</name>
+  <artifactId>org.eclipse.linuxtools.tmf.pcap</artifactId>
+  <groupId>org.eclipse.linuxtools.tmf.pcap</groupId>
+  <version>1.0.0-SNAPSHOT</version>
+
+  <packaging>eclipse-feature</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho.extras</groupId>
+        <artifactId>tycho-source-feature-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>source-feature</id>
+            <phase>package</phase>
+            <goals>
+              <goal>source-feature</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <executions>
+          <execution>
+            <id>attached-p2-metadata</id>
+            <phase>package</phase>
+            <goals>
+              <goal>p2-metadata</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

diff --git a/pom.xml b/pom.xml
index 5e616c79e23912b088f1412167fae1c2216d3a60..c38c2b0db0227c3e085f5206051722164d098a07 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -125,9 +125,11 @@
     <module>org.eclipse.linuxtools.tmf.ctf.core.tests</module>
     <module>org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests</module>
 
+    <module>org.eclipse.linuxtools.tmf.pcap</module>
     <module>org.eclipse.linuxtools.tmf.pcap.core</module>
     <module>org.eclipse.linuxtools.tmf.pcap.core.tests</module>
     <module>org.eclipse.linuxtools.tmf.pcap.ui</module>
+    <module>org.eclipse.linuxtools.tmf.pcap.help</module>
 
     <module>org.eclipse.linuxtools.tmf.analysis.xml.core</module>
     <module>org.eclipse.linuxtools.tmf.analysis.xml.core.tests</module>