Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2011-04-06 15:25:39 -0400
committerJeff Johnston2011-04-06 15:25:39 -0400
commitb2ac5fe88a814fd941375ea3c60f9179691384d7 (patch)
tree709bdca3d54dec8a675578181071d0dd45d6b7b1 /libhover
parent9b6cd6d1c762df6d8e3490348650a7048fec1c97 (diff)
parent5845d8634f6907b85125186551ea10b1d3ecd099 (diff)
downloadorg.eclipse.linuxtools-b2ac5fe88a814fd941375ea3c60f9179691384d7.tar.gz
org.eclipse.linuxtools-b2ac5fe88a814fd941375ea3c60f9179691384d7.tar.xz
org.eclipse.linuxtools-b2ac5fe88a814fd941375ea3c60f9179691384d7.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/linuxtools/org.eclipse.linuxtools
Diffstat (limited to 'libhover')
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/pom.xml26
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/.gitignore1
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/pom.xml55
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/Activator.java7
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/AllTests.java26
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/CheckDevhelp.java7
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/pom.xml25
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties1
8 files changed, 1 insertions, 147 deletions
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/pom.xml
deleted file mode 100644
index 367ff06c67..0000000000
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, Red Hat, Inc.
-
- 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-libhover-parent</artifactId>
- <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.cdt.libhover</artifactId>
- <version>0.7.1-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-
- <name>Linux Tools Devhelp Libhover Feature</name>
-
-</project>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/.gitignore b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/.gitignore
deleted file mode 100644
index e660fd93d3..0000000000
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin/
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/pom.xml
deleted file mode 100644
index 1047367405..0000000000
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, Red Hat, Inc.
-
- 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-libhover-parent</artifactId>
- <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.cdt.devhelp.tests</artifactId>
- <version>0.7.1-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <name>Linux Tools Devhelp Core Tests Plug-in</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <excludes>
- <!-- test mojo matches TestProject be default and treats it as PojoTest -->
- <exclude>**/Test*.class</exclude>
- </excludes>
- <testSuite>org.eclipse.linuxtools.cdt.libhover.devhelp.tests</testSuite>
- <testClass>org.eclipse.linuxtools.cdt.libhover.devhelp.test.AllTests</testClass>
- <useUIHarness>true</useUIHarness>
- <useUIThread>true</useUIThread>
- <product>org.eclipse.sdk.ide</product>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/Activator.java b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/Activator.java
index f48d69fb3a..43ad04d3f1 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/Activator.java
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/Activator.java
@@ -1,10 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat Inc. 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
- *******************************************************************************/
package org.eclipse.linuxtools.cdt.libhover.devhelp.test;
import org.osgi.framework.BundleActivator;
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/AllTests.java b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/AllTests.java
deleted file mode 100644
index 483f838776..0000000000
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/AllTests.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat Inc. 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
- *******************************************************************************/
-package org.eclipse.linuxtools.cdt.libhover.devhelp.test;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-/**
- * Run this suite as JUnit plug-in test.
- *
- */
-@RunWith(Suite.class)
-@SuiteClasses({
- CheckDevhelp.class,
- }
-)
-
-public class AllTests {
- // empty
-}
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/CheckDevhelp.java b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/CheckDevhelp.java
index 4210c6f1d3..e12664a958 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/CheckDevhelp.java
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/CheckDevhelp.java
@@ -1,10 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat Inc. 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
- *******************************************************************************/
package org.eclipse.linuxtools.cdt.libhover.devhelp.test;
import java.io.File;
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/pom.xml
deleted file mode 100644
index 5f84aa5d1f..0000000000
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, Red Hat, Inc.
-
- 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-libhover-parent</artifactId>
- <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.cdt.libhover.devhelp</artifactId>
- <version>0.7.1-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <name>Linux Tools Devhelp Libhover Plug-in</name>
-</project>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties b/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties
index 2220fabe27..513b917ab0 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties
@@ -1,5 +1,6 @@
bin.includes = META-INF/,\
plugin.xml,\
toc.xml,\
+ data/,\
plugin.properties
src.includes = about.html

Back to the top