From: Matthew Khouzam Date: Wed, 13 Aug 2014 19:28:28 +0000 (-0400) Subject: pcap: Add feature plug-in X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=852669a22676a7257f84695b71a4004b778d6711;p=deliverable%2Ftracecompass.git 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 Signed-off-by: Bernd Hufmann Reviewed-on: https://git.eclipse.org/r/31563 Reviewed-by: Alexandre Montplaisir Tested-by: Hudson CI Reviewed-by: Bernd Hufmann Tested-by: Bernd Hufmann --- diff --git a/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF index 01096e189c..f72a8131ed 100644 --- 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 fe7201d263..4fac379ddc 100644 --- a/org.eclipse.linuxtools.lttng.releng-site/category.xml +++ b/org.eclipse.linuxtools.lttng.releng-site/category.xml @@ -12,6 +12,9 @@ + + + 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 8f3403da5a..bce1407433 100644 --- 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 530f192794..3a09cca415 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/pom.xml +++ b/org.eclipse.linuxtools.pcap.core.tests/pom.xml @@ -20,7 +20,7 @@ org.eclipse.linuxtools.pcap.core.tests - 3.1.0-SNAPSHOT + 1.0.0-SNAPSHOT eclipse-test-plugin Linux Tools Pcap Parser Core Tests Plug-in diff --git a/org.eclipse.linuxtools.pcap.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.pcap.core/META-INF/MANIFEST.MF index dce6f70add..03ad1ffb5a 100644 --- 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 e64b177ffb..f3720b0ac2 100644 --- a/org.eclipse.linuxtools.pcap.core/pom.xml +++ b/org.eclipse.linuxtools.pcap.core/pom.xml @@ -18,7 +18,7 @@ org.eclipse.linuxtools.pcap.core - 3.1.0-SNAPSHOT + 1.0.0-SNAPSHOT eclipse-plugin Linux Tools Pcap Parser Core Plug-in 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 e2aafd6a54..9c6def86d2 100644 --- 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 2841c50839..de07554ff8 100644 --- a/org.eclipse.linuxtools.tmf.pcap.core.tests/pom.xml +++ b/org.eclipse.linuxtools.tmf.pcap.core.tests/pom.xml @@ -18,7 +18,7 @@ org.eclipse.linuxtools.tmf.pcap.core.tests - 3.1.0-SNAPSHOT + 1.0.0-SNAPSHOT eclipse-test-plugin Pcap Support for TMF Core Tests Plug-in 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 f8c18df9af..35c01d6a76 100644 --- 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 be3faf1579..2af489b519 100644 --- a/org.eclipse.linuxtools.tmf.pcap.core/pom.xml +++ b/org.eclipse.linuxtools.tmf.pcap.core/pom.xml @@ -18,7 +18,7 @@ org.eclipse.linuxtools.tmf.pcap.core - 3.1.0-SNAPSHOT + 1.0.0-SNAPSHOT eclipse-plugin Pcap support for TMF Core Plug-in 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 8233c1bcf1..22722441ae 100644 --- 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 78168e28d0..9d5346e883 100644 --- 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 66309dc23c..f6b99d5fc5 100644 --- a/org.eclipse.linuxtools.tmf.pcap.ui/pom.xml +++ b/org.eclipse.linuxtools.tmf.pcap.ui/pom.xml @@ -18,7 +18,7 @@ org.eclipse.linuxtools.tmf.pcap.ui - 3.1.0-SNAPSHOT + 1.0.0-SNAPSHOT eclipse-plugin Pcap support for TMF UI Plug-in diff --git a/org.eclipse.linuxtools.tmf.pcap/.project b/org.eclipse.linuxtools.tmf.pcap/.project new file mode 100644 index 0000000000..591da4940e --- /dev/null +++ b/org.eclipse.linuxtools.tmf.pcap/.project @@ -0,0 +1,17 @@ + + + org.eclipse.linuxtools.tmf.pcap + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + 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 index 0000000000..99f26c0203 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.pcap/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=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 index 0000000000..5a0ad22d2a --- /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 index 0000000000..fef213dbc0 --- /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 index 0000000000..b16cdd66b4 --- /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 index 0000000000..4c89aa3bc3 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.pcap/feature.xml @@ -0,0 +1,68 @@ + + + + + %description + + + + %copyright + + + + %license + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.linuxtools.tmf.pcap/p2.inf b/org.eclipse.linuxtools.tmf.pcap/p2.inf new file mode 100644 index 0000000000..abe8c46aeb --- /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 index 0000000000..761eb9b59e --- /dev/null +++ b/org.eclipse.linuxtools.tmf.pcap/pom.xml @@ -0,0 +1,58 @@ + + + + 4.0.0 + + + linuxtools-lttng-parent + org.eclipse.linuxtools.lttng + 3.1.0-SNAPSHOT + + + Linux Tools Pcap Analysis Feature + org.eclipse.linuxtools.tmf.pcap + org.eclipse.linuxtools.tmf.pcap + 1.0.0-SNAPSHOT + + eclipse-feature + + + + + org.eclipse.tycho.extras + tycho-source-feature-plugin + + + source-feature + package + + source-feature + + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho-version} + + + attached-p2-metadata + package + + p2-metadata + + + + + + + diff --git a/pom.xml b/pom.xml index 5e616c79e2..c38c2b0db0 100644 --- a/pom.xml +++ b/pom.xml @@ -125,9 +125,11 @@ org.eclipse.linuxtools.tmf.ctf.core.tests org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests + org.eclipse.linuxtools.tmf.pcap org.eclipse.linuxtools.tmf.pcap.core org.eclipse.linuxtools.tmf.pcap.core.tests org.eclipse.linuxtools.tmf.pcap.ui + org.eclipse.linuxtools.tmf.pcap.help org.eclipse.linuxtools.tmf.analysis.xml.core org.eclipse.linuxtools.tmf.analysis.xml.core.tests