Attachment #233179 for bug #412211

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

and this patch

Added Link Here

(-)a/.gitignore (+2 lines)
1	# maven
2	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.webtools.servertools</groupId>
    <artifactId>org.eclipse.webtools.servertools.docs</artifactId>
    <version>3.5.0-SNAPSHOT</version>
    <relativePath>../../</relativePath>
  </parent>

  <groupId>org.eclipse.webtools.servertools</groupId>
  <artifactId>org.eclipse.jst.server.ui.doc.user</artifactId>
  <version>1.0.500-SNAPSHOT</version>
  <packaging>eclipse-plugin</packaging>
</project>

Lines 4-7 bin.includes = STjavaContexts.xml,\ Link Here

(-)a/docs/org.eclipse.jst.server.ui.infopop/build.properties (+5 lines)
4	plugin.xml,\	4	plugin.xml,\
5	about.html,\	5	about.html,\
6	META-INF/	6	META-INF/
		7	src.includes = plugin.xml,\
		8	plugin.properties,\
		9	about.html,\
		10	STjavaContexts.xml,\
		11	STtomcatContexts.xml
7	generateSourceBundle=false	12	generateSourceBundle=false




<?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.servertools</groupId>
    <artifactId>org.eclipse.webtools.servertools.docs</artifactId>
    <version>3.5.0-SNAPSHOT</version>
    <relativePath>../../</relativePath>
  </parent>

  <groupId>org.eclipse.webtools.servertools</groupId>
  <artifactId>org.eclipse.jst.server.ui.infopop</artifactId>
  <version>1.0.400-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.servertools</groupId>
    <artifactId>org.eclipse.webtools.servertools.docs</artifactId>
    <version>3.5.0-SNAPSHOT</version>
    <relativePath>../../</relativePath>
  </parent>

  <groupId>org.eclipse.webtools.servertools</groupId>
  <artifactId>org.eclipse.server.doc.isv</artifactId>
  <version>1.0.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.servertools</groupId>
    <artifactId>org.eclipse.webtools.servertools.docs</artifactId>
    <version>3.5.0-SNAPSHOT</version>
    <relativePath>../../</relativePath>
  </parent>

  <groupId>org.eclipse.webtools.servertools</groupId>
  <artifactId>org.eclipse.servertools.doc.isv</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.servertools</groupId>
    <artifactId>org.eclipse.webtools.servertools.docs</artifactId>
    <version>3.5.0-SNAPSHOT</version>
    <relativePath>../../</relativePath>
  </parent>

  <groupId>org.eclipse.webtools.servertools</groupId>
  <artifactId>org.eclipse.wst.server.ui.doc.user</artifactId>
  <version>1.1.500-SNAPSHOT</version>
  <packaging>eclipse-plugin</packaging>
</project>

Lines 5-8 bin.includes = STtcpipContexts.xml,\ Link Here

(-)a/docs/org.eclipse.wst.server.ui.infopop/build.properties (+6 lines)
5	plugin.properties,\	5	plugin.properties,\
6	plugin.xml,\	6	plugin.xml,\
7	META-INF/	7	META-INF/
		8	src.includes = about.html,\
		9	plugin.xml,\
		10	plugin.properties,\
		11	STtcpipContexts.xml,\
		12	STuiContexts.xml,\
		13	STutilitiesContexts.xml
8	generateSourceBundle=false	14	generateSourceBundle=false




<?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.servertools</groupId>
    <artifactId>org.eclipse.webtools.servertools.docs</artifactId>
    <version>3.5.0-SNAPSHOT</version>
    <relativePath>../../</relativePath>
  </parent>

  <groupId>org.eclipse.webtools.servertools</groupId>
  <artifactId>org.eclipse.wst.server.ui.infopop</artifactId>
  <version>1.1.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</groupId>
    <artifactId>wtp-parent</artifactId>
    <version>3.5.0-SNAPSHOT</version>
    <relativePath>../wtp-parent</relativePath>
  </parent>

  <groupId>org.eclipse.webtools.servertools</groupId>
  <artifactId>org.eclipse.webtools.servertools.docs</artifactId>
  <version>3.5.0-SNAPSHOT</version>
  <packaging>pom</packaging>

  <modules>
    <module>docs/org.eclipse.jst.server.ui.doc.user</module>
    <module>docs/org.eclipse.jst.server.ui.infopop</module>
    <module>docs/org.eclipse.servertools.doc.isv</module>
    <module>docs/org.eclipse.wst.server.ui.doc.user</module>
    <module>docs/org.eclipse.wst.server.ui.infopop</module>
  </modules>
</project>

Return to bug 412211

Added Link Here

(-)a/docs/org.eclipse.jst.server.ui.doc.user/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.servertools</groupId>
18	<artifactId>org.eclipse.webtools.servertools.docs</artifactId>
19	<version>3.5.0-SNAPSHOT</version>
20	<relativePath>../../</relativePath>
21	</parent>
22
23	<groupId>org.eclipse.webtools.servertools</groupId>
24	<artifactId>org.eclipse.jst.server.ui.doc.user</artifactId>
25	<version>1.0.500-SNAPSHOT</version>
26	<packaging>eclipse-plugin</packaging>
27	</project>

Added Link Here

(-)a/docs/org.eclipse.server.doc.isv/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.servertools</groupId>
18	<artifactId>org.eclipse.webtools.servertools.docs</artifactId>
19	<version>3.5.0-SNAPSHOT</version>
20	<relativePath>../../</relativePath>
21	</parent>
22
23	<groupId>org.eclipse.webtools.servertools</groupId>
24	<artifactId>org.eclipse.server.doc.isv</artifactId>
25	<version>1.0.0-SNAPSHOT</version>
26	<packaging>eclipse-plugin</packaging>
27	</project>

Added Link Here

(-)a/docs/org.eclipse.servertools.doc.isv/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.servertools</groupId>
18	<artifactId>org.eclipse.webtools.servertools.docs</artifactId>
19	<version>3.5.0-SNAPSHOT</version>
20	<relativePath>../../</relativePath>
21	</parent>
22
23	<groupId>org.eclipse.webtools.servertools</groupId>
24	<artifactId>org.eclipse.servertools.doc.isv</artifactId>
25	<version>1.0.100-SNAPSHOT</version>
26	<packaging>eclipse-plugin</packaging>
27	</project>

Added Link Here

(-)a/docs/org.eclipse.wst.server.ui.doc.user/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.servertools</groupId>
18	<artifactId>org.eclipse.webtools.servertools.docs</artifactId>
19	<version>3.5.0-SNAPSHOT</version>
20	<relativePath>../../</relativePath>
21	</parent>
22
23	<groupId>org.eclipse.webtools.servertools</groupId>
24	<artifactId>org.eclipse.wst.server.ui.doc.user</artifactId>
25	<version>1.1.500-SNAPSHOT</version>
26	<packaging>eclipse-plugin</packaging>
27	</project>

Added Link Here

(-)a/pom.xml (-1 / +36 lines)
0	-	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.servertools</groupId>
		25	<artifactId>org.eclipse.webtools.servertools.docs</artifactId>
		26	<version>3.5.0-SNAPSHOT</version>
		27	<packaging>pom</packaging>
		28
		29	<modules>
		30	<module>docs/org.eclipse.jst.server.ui.doc.user</module>
		31	<module>docs/org.eclipse.jst.server.ui.infopop</module>
		32	<module>docs/org.eclipse.servertools.doc.isv</module>
		33	<module>docs/org.eclipse.wst.server.ui.doc.user</module>
		34	<module>docs/org.eclipse.wst.server.ui.infopop</module>
		35	</modules>
		36	</project>