Attachment #233184 for bug #412211

View | Details | Raw Unified | Return to bug 412211 | Differences between

and this patch

Lines 30-32 temp.folder Link Here

(-)a/.gitignore (+3 lines)
30	src.zip	30	src.zip
31	.fbwarnings	31	.fbwarnings
32	javaCompiler...args	32	javaCompiler...args
		33
		34	# maven
		35	target/




<?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>




<?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>




<?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>




<?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.xpath2.processor.tests</artifactId>
  <version>2.1.1-SNAPSHOT</version>
  <packaging>eclipse-plugin</packaging>
</project>
	<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>




<?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.xpath2.wtptypes.tests</artifactId>
  <version>2.0.0-SNAPSHOT</version>
  <packaging>eclipse-plugin</packaging>
</project>
	<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>




<?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 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>

<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.w3c.xqts.testsuite</artifactId>
  <version>1.0.2-SNAPSHOT</version>
  <packaging>eclipse-plugin</packaging>
</project>
- 

Return to bug 412211

Added Link Here

(-)a/pom.xml (+36 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<!--
3	Copyright (c) 2012, 2013 Eclipse Foundation and others.
4	All rights reserved. This program and the accompanying materials
5	are made available under the terms of the Eclipse Distribution License v1.0
6	which accompanies this distribution, and is available at
7	http://www.eclipse.org/org/documents/edl-v10.php
8
9	Contributors:
10	Thanh Ha (Eclipse Foundation) - initial implementation
11	-->
12
13	<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"
14	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
15	<modelVersion>4.0.0</modelVersion>
16
17	<parent>
18	<groupId>org.eclipse</groupId>
19	<artifactId>wtp-parent</artifactId>
20	<version>3.5.0-SNAPSHOT</version>
21	<relativePath>../wtp-parent</relativePath>
22	</parent>
23
24	<groupId>org.eclipse.webtools.sourceediting</groupId>
25	<artifactId>org.eclipse.webtools.sourceediting.xpath.tests</artifactId>
26	<version>3.5.0-SNAPSHOT</version>
27	<packaging>pom</packaging>
28
29	<modules>
30	<module>tests/org.eclipse.wst.xml.xpath2.processor.tests</module>
31	<module>tests/org.eclipse.wst.xml.xpath2.wtptypes.tests</module>
32	<module>tests/org.eclipse.wst.xml.xpath.core.tests</module>
33	<module>tests/org.eclipse.wst.xml.xpath.ui.tests</module>
34	<module>tests/org.w3c.xqts.testsuite</module>
35	</modules>
36	</project>

Added Link Here

(-)a/tests/org.eclipse.wst.xml.xpath.core.tests/pom.xml (+27 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<!--
3	Copyright (c) 2012, 2013 Eclipse Foundation and others.
4	All rights reserved. This program and the accompanying materials
5	are made available under the terms of the Eclipse Distribution License v1.0
6	which accompanies this distribution, and is available at
7	http://www.eclipse.org/org/documents/edl-v10.php
8
9	Contributors:
10	Thanh Ha (Eclipse Foundation) - initial implementation
11	-->
12
13	<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"
14	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
15	<modelVersion>4.0.0</modelVersion>
16	<parent>
17	<groupId>org.eclipse.webtools.sourceediting</groupId>
18	<artifactId>org.eclipse.webtools.sourceediting.xpath.tests</artifactId>
19	<version>3.5.0-SNAPSHOT</version>
20	<relativePath>../../</relativePath>
21	</parent>
22
23	<groupId>org.eclipse.webtools.sourceediting</groupId>
24	<artifactId>org.eclipse.wst.xml.xpath.core.tests</artifactId>
25	<version>1.1.0-SNAPSHOT</version>
26	<packaging>eclipse-plugin</packaging>
27	</project>

Added Link Here

(-)a/tests/org.eclipse.wst.xml.xpath.ui.tests/pom.xml (+27 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<!--
3	Copyright (c) 2012, 2013 Eclipse Foundation and others.
4	All rights reserved. This program and the accompanying materials
5	are made available under the terms of the Eclipse Distribution License v1.0
6	which accompanies this distribution, and is available at
7	http://www.eclipse.org/org/documents/edl-v10.php
8
9	Contributors:
10	Thanh Ha (Eclipse Foundation) - initial implementation
11	-->
12
13	<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"
14	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
15	<modelVersion>4.0.0</modelVersion>
16	<parent>
17	<groupId>org.eclipse.webtools.sourceediting</groupId>
18	<artifactId>org.eclipse.webtools.sourceediting.xpath.tests</artifactId>
19	<version>3.5.0-SNAPSHOT</version>
20	<relativePath>../../</relativePath>
21	</parent>
22
23	<groupId>org.eclipse.webtools.sourceediting</groupId>
24	<artifactId>org.eclipse.wst.xml.xpath.ui.tests</artifactId>
25	<version>1.0.100-SNAPSHOT</version>
26	<packaging>eclipse-plugin</packaging>
27	</project>

Lines 1-31 Link Here

(-)a/tests/org.eclipse.wst.xml.xpath2.processor.tests/pom.xml (-28 / +24 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"	2	<!--
3	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">	3	Copyright (c) 2012, 2013 Eclipse Foundation and others.
4	<modelVersion>4.0.0</modelVersion>	4	All rights reserved. This program and the accompanying materials
		5	are made available under the terms of the Eclipse Distribution License v1.0
		6	which accompanies this distribution, and is available at
		7	http://www.eclipse.org/org/documents/edl-v10.php
		8
		9	Contributors:
		10	Thanh Ha (Eclipse Foundation) - initial implementation
		11	-->
5		12
6	<parent>	13	<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"
7	<groupId>org.eclipse.wst.xml.xpath2</groupId>	14	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
8	<artifactId>org.eclipse.wst.xml.xpath2-parent</artifactId>	15	<modelVersion>4.0.0</modelVersion>
9	<version>2.1.1-SNAPSHOT</version>	16	<parent>
10	<relativePath>../../development/athena/org.eclipse.wst.xml.xpath2.releng</relativePath>	17	<groupId>org.eclipse.webtools.sourceediting</groupId>
11	</parent>	18	<artifactId>org.eclipse.webtools.sourceediting.xpath.tests</artifactId>
		19	<version>3.5.0-SNAPSHOT</version>
		20	<relativePath>../../</relativePath>
		21	</parent>
12		22
13	<artifactId>org.eclipse.wst.xml.xpath2.processor.tests</artifactId>	23	<groupId>org.eclipse.webtools.sourceediting</groupId>
14	<version>2.1.1-SNAPSHOT</version>	24	<artifactId>org.eclipse.wst.xml.xpath2.processor.tests</artifactId>
15	<packaging>eclipse-test-plugin</packaging>	25	<version>2.1.1-SNAPSHOT</version>
16	<name>PsychoPath XPath 2.0 Processor: Tests</name>	26	<packaging>eclipse-plugin</packaging>
17		27	</project>
18	<build>
19	<plugins>
20	<plugin>
21	<groupId>org.sonatype.tycho</groupId>
22	<artifactId>maven-osgi-test-plugin</artifactId>
23	<version>${tycho-version}</version>
24	<configuration>
25	<testSuite>org.eclipse.wst.xml.xpath2.processor.tests</testSuite>
26	<testClass>org.eclipse.wst.xml.xpath2.processor.test.AllPsychoPathTests</testClass>
27	</configuration>
28	</plugin>
29	</plugins>
30	</build>
31	</project>

Lines 1-31 Link Here

(-)a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml (-28 / +24 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"	2	<!--
3	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">	3	Copyright (c) 2012, 2013 Eclipse Foundation and others.
4	<modelVersion>4.0.0</modelVersion>	4	All rights reserved. This program and the accompanying materials
		5	are made available under the terms of the Eclipse Distribution License v1.0
		6	which accompanies this distribution, and is available at
		7	http://www.eclipse.org/org/documents/edl-v10.php
		8
		9	Contributors:
		10	Thanh Ha (Eclipse Foundation) - initial implementation
		11	-->
5		12
6	<parent>	13	<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"
7	<groupId>org.eclipse.wst.xml.xpath2</groupId>	14	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
8	<artifactId>org.eclipse.wst.xml.xpath2-parent</artifactId>	15	<modelVersion>4.0.0</modelVersion>
9	<version>2.0.0-SNAPSHOT</version>	16	<parent>
10	<relativePath>../../development/athena/org.eclipse.wst.xml.xpath2.releng</relativePath>	17	<groupId>org.eclipse.webtools.sourceediting</groupId>
11	</parent>	18	<artifactId>org.eclipse.webtools.sourceediting.xpath.tests</artifactId>
		19	<version>3.5.0-SNAPSHOT</version>
		20	<relativePath>../../</relativePath>
		21	</parent>
12		22
13	<artifactId>org.eclipse.wst.xml.xpath2.wtptypes.tests</artifactId>	23	<groupId>org.eclipse.webtools.sourceediting</groupId>
14	<version>2.0.0-SNAPSHOT</version>	24	<artifactId>org.eclipse.wst.xml.xpath2.wtptypes.tests</artifactId>
15	<packaging>eclipse-test-plugin</packaging>	25	<version>2.0.0-SNAPSHOT</version>
16	<name>PsychoPath XPath 2.0 Processor: Tests for WTP type support</name>	26	<packaging>eclipse-plugin</packaging>
17		27	</project>
18	<build>
19	<plugins>
20	<plugin>
21	<groupId>org.sonatype.tycho</groupId>
22	<artifactId>maven-osgi-test-plugin</artifactId>
23	<version>${tycho-version}</version>
24	<configuration>
25	<testSuite>org.eclipse.wst.xml.xpath2.wtptypes.tests</testSuite>
26	<testClass>org.eclipse.wst.xml.xpath2.wtptypes.test.AllXPath2TestsForWTP</testClass>
27	</configuration>
28	</plugin>
29	</plugins>
30	</build>
31	</project>

Lines 1-25 Link Here

(-)a/tests/org.w3c.xqts.testsuite/pom.xml (-20 / +21 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<!--	2	<!--
3	Copyright (C) 2010, Robert Munteanu <robert.munteanu@gmail.com>	3	Copyright (c) 2012, 2013 Eclipse Foundation and others.
4		4	All rights reserved. This program and the accompanying materials
5	All rights reserved. This program and the accompanying materials	5	are made available under the terms of the Eclipse Distribution License v1.0
6	are made available under the terms of the Eclipse Public License v1.0	6	which accompanies this distribution, and is available at
7	which accompanies this distribution, and is available at	7	http://www.eclipse.org/org/documents/edl-v10.php
8	http://www.eclipse.org/legal/epl-v10.html	8
		9	Contributors:
		10	Thanh Ha (Eclipse Foundation) - initial implementation
9	-->	11	-->
10	<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
12	<modelVersion>4.0.0</modelVersion>
13		12
14	<parent>	13	<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"
15	<groupId>org.eclipse.wst.xml.xpath2</groupId>	14	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
16	<artifactId>org.eclipse.wst.xml.xpath2-parent</artifactId>	15	<modelVersion>4.0.0</modelVersion>
17	<version>2.0.0-SNAPSHOT</version>	16	<parent>
18	<relativePath>../../development/athena/org.eclipse.wst.xml.xpath2.releng</relativePath>	17	<groupId>org.eclipse.webtools.sourceediting</groupId>
19	</parent>	18	<artifactId>org.eclipse.webtools.sourceediting.xpath.tests</artifactId>
		19	<version>3.5.0-SNAPSHOT</version>
		20	<relativePath>../../</relativePath>
		21	</parent>
20		22
21	<artifactId>org.w3c.xqts.testsuite</artifactId>	23	<groupId>org.eclipse.webtools.sourceediting</groupId>
22	<version>1.0.2-SNAPSHOT</version>	24	<artifactId>org.w3c.xqts.testsuite</artifactId>
23	<packaging>eclipse-plugin</packaging>	25	<version>1.0.2-SNAPSHOT</version>
24	<name>PsychoPath XPath 2.0 Processor: XQuery Test Suite</name>	26	<packaging>eclipse-plugin</packaging>
25	</project>	27	</project>
26	-