summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha2013-07-05 15:40:37 (EDT)
committerNick Sandonato2013-09-25 11:57:25 (EDT)
commit3888f3d7d7d2dfdcb574daddc12ae91cff9b6af1 (patch)
treeed26cf305a9ea2c549a105283ef08d31b47a892a
parent4e55a258482b92b69ff54c4a911248d9adcc5d6c (diff)
downloadwebtools.sourceediting.xpath-3888f3d7d7d2dfdcb574daddc12ae91cff9b6af1.zip
webtools.sourceediting.xpath-3888f3d7d7d2dfdcb574daddc12ae91cff9b6af1.tar.gz
webtools.sourceediting.xpath-3888f3d7d7d2dfdcb574daddc12ae91cff9b6af1.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--bundles/org.eclipse.wst.xml.xpath.core/pom.xml27
-rw-r--r--bundles/org.eclipse.wst.xml.xpath.ui/pom.xml27
-rw-r--r--bundles/org.eclipse.wst.xml.xpath2.processor/pom.xml99
-rw-r--r--bundles/org.eclipse.wst.xml.xpath2.wtptypes/pom.xml74
-rw-r--r--bundles/org.eclipse.wst.xml.xpath2/build.properties6
-rw-r--r--bundles/org.eclipse.wst.xml.xpath2/pom.xml39
-rw-r--r--docs/org.eclipse.wst.xml.xpath2.processor.doc.user/pom.xml41
-rw-r--r--docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/pom.xml39
-rw-r--r--features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml78
-rw-r--r--features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml39
-rw-r--r--pom.xml42
12 files changed, 374 insertions, 140 deletions
diff --git a/.gitignore b/.gitignore
index cc43893..574bbe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,6 @@ javaCompiler...args
bundles/org.eclipse.wst.xml.xpath2.processor/lib/javacup10.jar
bundles/org.eclipse.wst.xml.xpath2.processor/JavaCUP-dump.txt
bundles/org.eclipse.wst.xml.xpath2.processor/lib/JFlex.jar
+
+# maven
+target/
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/pom.xml b/bundles/org.eclipse.wst.xml.xpath.core/pom.xml
new file mode 100644
index 0000000..682abe4
--- /dev/null
+++ b/bundles/org.eclipse.wst.xml.xpath.core/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</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath.core</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/pom.xml b/bundles/org.eclipse.wst.xml.xpath.ui/pom.xml
new file mode 100644
index 0000000..302a47c
--- /dev/null
+++ b/bundles/org.eclipse.wst.xml.xpath.ui/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</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath.ui</artifactId>
+ <version>1.1.101-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/bundles/org.eclipse.wst.xml.xpath2.processor/pom.xml b/bundles/org.eclipse.wst.xml.xpath2.processor/pom.xml
index 7be277a..116d1fe 100644
--- a/bundles/org.eclipse.wst.xml.xpath2.processor/pom.xml
+++ b/bundles/org.eclipse.wst.xml.xpath2.processor/pom.xml
@@ -1,49 +1,62 @@
<?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>
- <artifactId>org.eclipse.wst.xml.xpath2.processor</artifactId>
- <packaging>eclipse-plugin</packaging>
- <version>2.1.1-SNAPSHOT</version>
- <name>PsychoPath XPath 2.0 Processor</name>
+<!--
+ 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</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <compilerId>jdt</compilerId>
- <usePdeSourceRoots>true</usePdeSourceRoots>
- <source>1.5</source>
- <target>jsr14</target>
- </configuration>
- </plugin>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath2.processor</artifactId>
+ <version>2.1.100-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <name>PsychoPath XPath 2.0 Processor</name>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- </plugin>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
</plugins>
- </build>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <compilerId>jdt</compilerId>
+ <usePdeSourceRoots>true</usePdeSourceRoots>
+ <source>1.5</source>
+ <target>jsr14</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/bundles/org.eclipse.wst.xml.xpath2.wtptypes/pom.xml b/bundles/org.eclipse.wst.xml.xpath2.wtptypes/pom.xml
index a8c18ed..8bb81e9 100644
--- a/bundles/org.eclipse.wst.xml.xpath2.wtptypes/pom.xml
+++ b/bundles/org.eclipse.wst.xml.xpath2.wtptypes/pom.xml
@@ -1,37 +1,49 @@
<?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>
- <artifactId>org.eclipse.wst.xml.xpath2.wtptypes</artifactId>
- <packaging>eclipse-plugin</packaging>
- <version>2.0.0-SNAPSHOT</version>
- <name>PsychoPath XPath 2.0 Processor</name>
+<!--
+ 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</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- </plugins>
- </pluginManagement>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath2.wtptypes</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <name>PsychoPath XPath 2.0 Processor</name>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
</plugins>
- </build>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/bundles/org.eclipse.wst.xml.xpath2/build.properties b/bundles/org.eclipse.wst.xml.xpath2/build.properties
index 2f68529..7ccfc21 100644
--- a/bundles/org.eclipse.wst.xml.xpath2/build.properties
+++ b/bundles/org.eclipse.wst.xml.xpath2/build.properties
@@ -5,3 +5,9 @@ bin.includes = META-INF/,\
about.properties,\
icons/,\
plugin.properties
+src.includes = about.html,\
+ about.ini,\
+ about.mappings,\
+ about.properties,\
+ icons/,\
+ plugin.properties
diff --git a/bundles/org.eclipse.wst.xml.xpath2/pom.xml b/bundles/org.eclipse.wst.xml.xpath2/pom.xml
index 1ad4bb1..321cfac 100644
--- a/bundles/org.eclipse.wst.xml.xpath2/pom.xml
+++ b/bundles/org.eclipse.wst.xml.xpath2/pom.xml
@@ -1,16 +1,29 @@
<?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>
- <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>
+<!--
+ 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
+-->
- <artifactId>org.eclipse.wst.xml.xpath2</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
- <name>PsychoPath XPath 2.0 Processor: Branding Plug-in</name>
+<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</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath2</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <name>PsychoPath XPath 2.0 Processor: Branding Plug-in</name>
</project>
diff --git a/docs/org.eclipse.wst.xml.xpath2.processor.doc.user/pom.xml b/docs/org.eclipse.wst.xml.xpath2.processor.doc.user/pom.xml
index 543465b..b9a1e3f 100644
--- a/docs/org.eclipse.wst.xml.xpath2.processor.doc.user/pom.xml
+++ b/docs/org.eclipse.wst.xml.xpath2.processor.doc.user/pom.xml
@@ -1,17 +1,30 @@
<?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.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</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
- <artifactId>org.eclipse.wst.xml.xpath2.processor.doc.user</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
- <name>PsychoPath XPath 2.0 Processor: User Documentation</name>
-</project> \ No newline at end of file
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath2.processor.doc.user</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <name>PsychoPath XPath 2.0 Processor: User Documentation</name>
+</project>
diff --git a/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/pom.xml b/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/pom.xml
index 1d8770b..483f024 100644
--- a/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/pom.xml
+++ b/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/pom.xml
@@ -1,17 +1,30 @@
<?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.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</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
- <artifactId>org.eclipse.wst.xml.xpath2.sdk.doc</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
- <name>PsychoPath XPath 2.0 Processor: SDK Documentation</name>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath2.processor.sdk.doc</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <name>PsychoPath XPath 2.0 Processor: SDK Documentation</name>
</project>
diff --git a/features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml b/features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml
index 3c23faa..9786bac 100644
--- a/features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml
+++ b/features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml
@@ -1,17 +1,69 @@
<?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.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</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
- <artifactId>org.eclipse.wst.xml.xpath2.processor.feature</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
- <name>PsychoPath XPath 2.0 Processor Feature</name>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath2.processor.feature</artifactId>
+ <version>2.0.200-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ <name>PsychoPath XPath 2.0 Processor Feature</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tycho-extras.version}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <plugin id="org.apache.xerces"/>
+ <plugin id="java_cup.runtime"/>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml b/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml
index 9b95295..9d7f9af 100644
--- a/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml
+++ b/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml
@@ -1,17 +1,30 @@
<?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.0.0-SNAPSHOT</version>
- <relativePath>../../sdevelopment/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</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
- <artifactId>org.eclipse.wst.xml.xpath2.processor.sdk.feature</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
- <name>PsychoPath XPath 2.0 Processor: SDK Feature</name>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath2.processor.sdk.feature</artifactId>
+ <version>2.0.100-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ <name>PsychoPath XPath 2.0 Processor: SDK Feature</name>
</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..069e45c
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,42 @@
+<?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</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>bundles/org.eclipse.wst.xml.xpath2</module>
+ <module>bundles/org.eclipse.wst.xml.xpath2.processor</module>
+ <module>bundles/org.eclipse.wst.xml.xpath2.wtptypes</module>
+ <module>bundles/org.eclipse.wst.xml.xpath.core</module>
+ <module>bundles/org.eclipse.wst.xml.xpath.ui</module>
+
+ <module>docs/org.eclipse.wst.xml.xpath2.processor.doc.user</module>
+ <module>docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc</module>
+
+ <module>features/org.eclipse.wst.xml.xpath2.processor.feature</module>
+ <module>features/org.eclipse.wst.xml.xpath2.processor.sdk.feature</module>
+ </modules>
+</project>