summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha2013-07-05 18:53:21 (EDT)
committer Nick Sandonato2013-09-25 11:58:43 (EDT)
commit6c6667dedf99a769c1ce1526c47b5eb8df0de838 (patch)
treedaac28497091414304283aa730f00d852ad90571
parentb2d7ae5c30145ccca49a8272421283d447f0bea9 (diff)
downloadwebtools.sourceediting.xpath.tests-6c6667dedf99a769c1ce1526c47b5eb8df0de838.zip
webtools.sourceediting.xpath.tests-6c6667dedf99a769c1ce1526c47b5eb8df0de838.tar.gz
webtools.sourceediting.xpath.tests-6c6667dedf99a769c1ce1526c47b5eb8df0de838.tar.bz2
Bug 414714: [CBI] webtools.sourceediting.xpath patches for building with Maven/Tycho
Signed-off-by: Thanh Ha <thanh.ha@eclipse.org>
-rw-r--r--.gitignore3
-rw-r--r--pom.xml36
-rw-r--r--tests/org.eclipse.wst.xml.xpath.core.tests/pom.xml27
-rw-r--r--tests/org.eclipse.wst.xml.xpath.ui.tests/pom.xml27
-rw-r--r--tests/org.eclipse.wst.xml.xpath2.processor.tests/pom.xml67
-rw-r--r--tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml66
-rw-r--r--tests/org.w3c.xqts.testsuite/pom.xml42
7 files changed, 195 insertions, 73 deletions
diff --git a/.gitignore b/.gitignore
index 749e075..1e8d462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@ temp.folder
src.zip
.fbwarnings
javaCompiler...args
+
+# maven
+target/
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..19fb93a
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<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>
+ <groupId>org.eclipse</groupId>
+ <artifactId>wtp-parent</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../wtp-parent</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.webtools.sourceediting.xpath.tests</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>tests/org.eclipse.wst.xml.xpath2.processor.tests</module>
+ <module>tests/org.eclipse.wst.xml.xpath2.wtptypes.tests</module>
+ <module>tests/org.eclipse.wst.xml.xpath.core.tests</module>
+ <module>tests/org.eclipse.wst.xml.xpath.ui.tests</module>
+ <module>tests/org.w3c.xqts.testsuite</module>
+ </modules>
+</project>
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/pom.xml b/tests/org.eclipse.wst.xml.xpath.core.tests/pom.xml
new file mode 100644
index 0000000..a5cb84f
--- /dev/null
+++ b/tests/org.eclipse.wst.xml.xpath.core.tests/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<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>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.webtools.sourceediting.xpath.tests</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath.core.tests</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/pom.xml b/tests/org.eclipse.wst.xml.xpath.ui.tests/pom.xml
new file mode 100644
index 0000000..7d55526
--- /dev/null
+++ b/tests/org.eclipse.wst.xml.xpath.ui.tests/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<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>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.webtools.sourceediting.xpath.tests</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath.ui.tests</artifactId>
+ <version>1.0.100-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/tests/org.eclipse.wst.xml.xpath2.processor.tests/pom.xml b/tests/org.eclipse.wst.xml.xpath2.processor.tests/pom.xml
index 2843d1e..5de0044 100644
--- a/tests/org.eclipse.wst.xml.xpath2.processor.tests/pom.xml
+++ b/tests/org.eclipse.wst.xml.xpath2.processor.tests/pom.xml
@@ -1,31 +1,44 @@
<?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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<!--
+ Copyright (c) 2010, 2013 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ David Carver - Initial implementation
+ Jesper Moller - Initial implementation
+ Thanh Ha (Eclipse Foundation) - CBI Webtools implementation
+-->
- <parent>
- <groupId>org.eclipse.wst.xml.xpath2</groupId>
- <artifactId>org.eclipse.wst.xml.xpath2-parent</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <relativePath>../../development/athena/org.eclipse.wst.xml.xpath2.releng</relativePath>
- </parent>
+<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>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.webtools.sourceediting.xpath.tests</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
- <artifactId>org.eclipse.wst.xml.xpath2.processor.tests</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
- <name>PsychoPath XPath 2.0 Processor: Tests</name>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath2.processor.tests</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <name>PsychoPath XPath 2.0 Processor: Tests</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <testSuite>org.eclipse.wst.xml.xpath2.processor.tests</testSuite>
- <testClass>org.eclipse.wst.xml.xpath2.processor.test.AllPsychoPathTests</testClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <testSuite>org.eclipse.wst.xml.xpath2.processor.tests</testSuite>
+ <testClass>org.eclipse.wst.xml.xpath2.processor.test.AllPsychoPathTests</testClass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml
index 4b065f0..5d557eb 100644
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml
+++ b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml
@@ -1,31 +1,43 @@
<?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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<!--
+ Copyright (c) 2011, 2013 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Jesper Moller - Initial implementation
+ Thanh Ha (Eclipse Foundation) - CBI Webtools implementation
+-->
- <parent>
- <groupId>org.eclipse.wst.xml.xpath2</groupId>
- <artifactId>org.eclipse.wst.xml.xpath2-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../../development/athena/org.eclipse.wst.xml.xpath2.releng</relativePath>
- </parent>
+<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>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.webtools.sourceediting.xpath.tests</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
- <artifactId>org.eclipse.wst.xml.xpath2.wtptypes.tests</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
- <name>PsychoPath XPath 2.0 Processor: Tests for WTP type support</name>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath2.wtptypes.tests</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <name>PsychoPath XPath 2.0 Processor: Tests for WTP type support</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <testSuite>org.eclipse.wst.xml.xpath2.wtptypes.tests</testSuite>
- <testClass>org.eclipse.wst.xml.xpath2.wtptypes.test.AllXPath2TestsForWTP</testClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <testSuite>org.eclipse.wst.xml.xpath2.wtptypes.tests</testSuite>
+ <testClass>org.eclipse.wst.xml.xpath2.wtptypes.test.AllXPath2TestsForWTP</testClass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/tests/org.w3c.xqts.testsuite/pom.xml b/tests/org.w3c.xqts.testsuite/pom.xml
index 039d2fb..e2a9c36 100644
--- a/tests/org.w3c.xqts.testsuite/pom.xml
+++ b/tests/org.w3c.xqts.testsuite/pom.xml
@@ -1,25 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (C) 2010, Robert Munteanu <robert.munteanu@gmail.com>
-
- 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
+ Copyright (c) 2010, 2013 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ David Carver - Initial implementation
+ Thanh Ha (Eclipse Foundation) - CBI Webtools implementation
-->
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.wst.xml.xpath2</groupId>
- <artifactId>org.eclipse.wst.xml.xpath2-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../../development/athena/org.eclipse.wst.xml.xpath2.releng</relativePath>
- </parent>
+<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>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.webtools.sourceediting.xpath.tests</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
- <artifactId>org.w3c.xqts.testsuite</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
- <name>PsychoPath XPath 2.0 Processor: XQuery Test Suite</name>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.w3c.xqts.testsuite</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <name>PsychoPath XPath 2.0 Processor: XQuery Test Suite</name>
</project>