420890 - [CBI] Build should produce a p2 repo
Signed-off-by: Thanh Ha <thanh.ha@eclipse.org>
diff --git a/pom.xml b/pom.xml
index 400bab2..23396f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
<modules>
<module>wtp-parent</module>
<module>webtools.releng</module>
+ <module>webtools.repositories</module>
<module>webtools.common</module>
<module>webtools.common.fproj</module>
diff --git a/webtools.common b/webtools.common
index 461c702..b101138 160000
--- a/webtools.common
+++ b/webtools.common
@@ -1 +1 @@
-Subproject commit 461c702741be1456b6597a3e7f1d85eeff1d4b3e
+Subproject commit b101138e93aea8bf7f3ae6d1e139370a7cc4d6e1
diff --git a/webtools.dali b/webtools.dali
index 6726d38..699018b 160000
--- a/webtools.dali
+++ b/webtools.dali
@@ -1 +1 @@
-Subproject commit 6726d38906d7d61e952dfade12c98bda28c8b1e4
+Subproject commit 699018b25574bd5a234c5671498a292fd1d9d8f8
diff --git a/webtools.javaee b/webtools.javaee
index 3d8c37c..ab651ce 160000
--- a/webtools.javaee
+++ b/webtools.javaee
@@ -1 +1 @@
-Subproject commit 3d8c37cb4082e45f227faec316bf015b5cdcdec7
+Subproject commit ab651cedace455fee5c4e5d7f23f0a9d309d0532
diff --git a/webtools.jsdt.core b/webtools.jsdt.core
index 76e83f3..c8c8d3c 160000
--- a/webtools.jsdt.core
+++ b/webtools.jsdt.core
@@ -1 +1 @@
-Subproject commit 76e83f3f11017b332a0a03ed7e4ce47524b1ea68
+Subproject commit c8c8d3c5ef286399cb2370d9ff2cad8da75d7329
diff --git a/webtools.jsdt.debug b/webtools.jsdt.debug
index 4b8a031..2eb0896 160000
--- a/webtools.jsdt.debug
+++ b/webtools.jsdt.debug
@@ -1 +1 @@
-Subproject commit 4b8a0314710d51fcd9d55f1cac586dbd82bc3883
+Subproject commit 2eb0896efaba7090f49d572834b98b7d4f94fc73
diff --git a/webtools.jsdt.tests b/webtools.jsdt.tests
index 95caf78..48af55b 160000
--- a/webtools.jsdt.tests
+++ b/webtools.jsdt.tests
@@ -1 +1 @@
-Subproject commit 95caf784818fbab7993f211cc4786498941b7f86
+Subproject commit 48af55b02eb0745b3de6e4bbc64cd15641fb77a8
diff --git a/webtools.jsf b/webtools.jsf
index c99642b..973c43a 160000
--- a/webtools.jsf
+++ b/webtools.jsf
@@ -1 +1 @@
-Subproject commit c99642bdf2f2c8d93b65a1a1a4a909d18d7b1bfb
+Subproject commit 973c43ad95b1a2513d62f364704de35872f511ff
diff --git a/webtools.releng b/webtools.releng
index 27b6110..017afc1 160000
--- a/webtools.releng
+++ b/webtools.releng
@@ -1 +1 @@
-Subproject commit 27b6110e8653706a4d06a7817aaafa4ae54ee4e9
+Subproject commit 017afc143f35112161adcd94abe45e53e98c91b4
diff --git a/webtools.repositories/dali4x-sdk/category.xml b/webtools.repositories/dali4x-sdk/category.xml
new file mode 100644
index 0000000..e832454
--- /dev/null
+++ b/webtools.repositories/dali4x-sdk/category.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature id="org.eclipse.jpt.common_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.common.eclipselink_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.jpa_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.jpa.eclipselink_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.jaxb_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.jaxb.eclipselink_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.dbws.eclipselink_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.jpadiagrameditor_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+
+ <feature id="org.eclipse.jpt.common.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.common.eclipselink.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.jpa.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.jpa.eclipselink.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.jaxb.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.jaxb.eclipselink.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.dbws.eclipselink.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jpt.jpadiagrameditor.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+
+
+
+
+ <category-def
+ name="Web Tools Platform (WTP) @buildversionid@"
+ label="Web Tools Platform (WTP) @buildversionid@">
+ <description>
+ These features provide functionality with the executable code only and are recommended for most users.
+ </description>
+ </category-def>
+ <category-def
+ name="Web Tools Platform SDK (WTP SDK) @buildversionid@"
+ label="Web Tools Platform SDK (WTP SDK) @buildversionid@">
+ <description>
+ These features provide functionality with the executable code and the source code and are recommended for those
+ extending or debugging
+ WTP.
+ </description>
+ </category-def>
+</site>
\ No newline at end of file
diff --git a/webtools.repositories/dali4x-sdk/pom.xml b/webtools.repositories/dali4x-sdk/pom.xml
new file mode 100644
index 0000000..7164c76
--- /dev/null
+++ b/webtools.repositories/dali4x-sdk/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2013 Eclipse Foundation.
+ 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 - 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>repositories</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>dali4x-sdk</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+</project>
diff --git a/webtools.repositories/dali4x.tests/category.xml b/webtools.repositories/dali4x.tests/category.xml
new file mode 100644
index 0000000..b5299fa
--- /dev/null
+++ b/webtools.repositories/dali4x.tests/category.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+ <feature id="org.eclipse.jpt.common.tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+
+ <feature id="org.eclipse.jpt.jpa.tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+
+ <feature id="org.eclipse.jpt.jpa.eclipselink.tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+
+ <feature id="org.eclipse.jpt.jaxb.tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+
+ <feature id="org.eclipse.jpt.jaxb.eclipselink.tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+
+ <feature id="org.eclipse.jpt.jpadiagrameditor.tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+
+ <category-def
+ name="Web Tools Platform Tests (WTP Tests) @buildversionid@"
+ label="Web Tools Platform Tests (WTP Tests) @buildversionid@">
+ <description>
+ These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least
+ their PDE Targets.
+ </description>
+ </category-def>
+</site>
diff --git a/webtools.repositories/dali4x.tests/pom.xml b/webtools.repositories/dali4x.tests/pom.xml
new file mode 100644
index 0000000..5f36349
--- /dev/null
+++ b/webtools.repositories/dali4x.tests/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2013 Eclipse Foundation.
+ 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 - 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>repositories</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>dali4x.tests</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+</project>
diff --git a/webtools.repositories/jst4x-sdk/category.xml b/webtools.repositories/jst4x-sdk/category.xml
new file mode 100644
index 0000000..685037c
--- /dev/null
+++ b/webtools.repositories/jst4x-sdk/category.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+ <feature id="org.eclipse.jst.common.fproj.enablement.jdt">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.common.fproj.enablement.jdt.sdk">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.web_ui.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.web_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.enterprise_ui.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jsf.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.enterprise_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jsf_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+
+ <feature id="org.eclipse.jst.ws.jaxws_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.ws.jaxws.dom_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.ws.cxf_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.ws.axis2tools_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.webpageeditor_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.ws.axis2tools.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.webpageeditor.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.ws.jaxws.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.ws.jaxws.dom.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.ws.cxf.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+
+ <feature id="org.eclipse.jst.server_ui.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.server_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.server_adapters.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.server_adapters.sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.server_adapters.ext.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.server_adapters.ext.sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+
+
+ <category-def
+ name="Web Tools Platform (WTP) @buildversionid@"
+ label="Web Tools Platform (WTP) @buildversionid@">
+ <description>
+ These features provide functionality with the executable code only and are recommended for most users.
+ </description>
+ </category-def>
+ <category-def
+ name="Web Tools Platform SDK (WTP SDK) @buildversionid@"
+ label="Web Tools Platform SDK (WTP SDK) @buildversionid@">
+ <description>
+ These features provide functionality with the executable code and the source code and are recommended for those
+ extending or debugging
+ WTP.
+ </description>
+ </category-def>
+</site>
diff --git a/webtools.repositories/jst4x-sdk/pom.xml b/webtools.repositories/jst4x-sdk/pom.xml
new file mode 100644
index 0000000..4c14ea2
--- /dev/null
+++ b/webtools.repositories/jst4x-sdk/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2013 Eclipse Foundation.
+ 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 - 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>repositories</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>jst4x-sdk</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+</project>
diff --git a/webtools.repositories/jst4x.tests/category.xml b/webtools.repositories/jst4x.tests/category.xml
new file mode 100644
index 0000000..9451dc4
--- /dev/null
+++ b/webtools.repositories/jst4x.tests/category.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+ <feature id="org.eclipse.wst.ws_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+
+ <feature id="org.eclipse.jst.ws.jaxws_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.ws.cxf_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.ws.jaxws.dom_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.jsf.tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.web_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.enterprise_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.server_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.jst.server_adapters.ext_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+
+ <feature id="org.eclipse.jst.ws.jaxws.dom_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <category-def
+ name="Web Tools Platform Tests (WTP Tests) @buildversionid@"
+ label="Web Tools Platform Tests (WTP Tests) @buildversionid@">
+ <description>
+ These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least
+ their PDE Targets.
+ </description>
+ </category-def>
+</site>
diff --git a/webtools.repositories/jst4x.tests/pom.xml b/webtools.repositories/jst4x.tests/pom.xml
new file mode 100644
index 0000000..3afc6da
--- /dev/null
+++ b/webtools.repositories/jst4x.tests/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2013 Eclipse Foundation.
+ 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 - 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>repositories</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>jst4x.tests</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+</project>
diff --git a/webtools.repositories/pom.xml b/webtools.repositories/pom.xml
new file mode 100644
index 0000000..c0cb86c
--- /dev/null
+++ b/webtools.repositories/pom.xml
@@ -0,0 +1,40 @@
+<?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.6.0-SNAPSHOT</version>
+ <relativePath>../wtp-parent</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>repositories</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>dali4x-sdk</module>
+ <module>dali4x.tests</module>
+ <module>jst4x-sdk</module>
+ <module>jst4x.tests</module>
+ <module>wst4x-sdk</module>
+ <module>wst4x.tests</module>
+
+ <module>repository</module>
+ <module>repositoryunittests</module>
+ </modules>
+</project>
diff --git a/webtools.repositories/repository/pom.xml b/webtools.repositories/repository/pom.xml
new file mode 100644
index 0000000..9d876d8
--- /dev/null
+++ b/webtools.repositories/repository/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2013 Eclipse Foundation.
+ 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 - 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>repositories</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>repository</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-p2-extras-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>mirror</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <source>
+ <repository>
+ <url>${project.baseUri}/../dali4x-sdk/target/repository</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>${project.baseUri}/../jst4x-sdk/target/repository</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>${project.baseUri}/../wst4x-sdk/target/repository</url>
+ <layout>p2</layout>
+ </repository>
+ </source>
+
+ <!-- starting from here all configuration parameters are optional -->
+ <!-- they are only shown here with default values for documentation purpose -->
+
+ <!-- List of IUs to mirror. If omitted, allIUs will be mirrored. -->
+ <!-- Omitted IU version element means latest version of the IU -->
+ <!--
+ <ius>
+ <iu>
+ <id>org.eclipse.rcp.feature.group</id>
+ </iu>
+ </ius>
+ -->
+
+ <!-- The destination directory to mirror to. -->
+ <destination>${project.build.directory}/repository</destination>
+ <!-- Whether only strict dependencies should be followed. -->
+ <!-- "strict" means perfect version match -->
+ <followStrictOnly>false</followStrictOnly>
+ <!-- Whether or not to follow optional requirements. -->
+ <includeOptional>false</includeOptional>
+ <!-- Whether or not to follow non-greedy requirements. -->
+ <includeNonGreedy>false</includeNonGreedy>
+ <!-- Filter properties. E.g. filter only one platform -->
+ <!-- Whether to filter the resulting set of IUs to only -->
+ <!-- include the latest version of each IU -->
+ <latestVersionOnly>true</latestVersionOnly>
+ <!-- don't mirror artifacts, only metadata -->
+ <mirrorMetadataOnly>false</mirrorMetadataOnly>
+ <!-- whether to compress the content.xml/artifacts.xml -->
+ <compress>true</compress>
+ <!-- whether to append to the target repository content -->
+ <append>true</append>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/webtools.repositories/repositoryunittests/pom.xml b/webtools.repositories/repositoryunittests/pom.xml
new file mode 100644
index 0000000..ea53324
--- /dev/null
+++ b/webtools.repositories/repositoryunittests/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2013 Eclipse Foundation.
+ 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 - 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>repositories</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>repositoryunittests</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-p2-extras-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>mirror</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <source>
+ <repository>
+ <url>${project.baseUri}/../dali4x.tests/target/repository</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>${project.baseUri}/../jst4x.tests/target/repository</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>${project.baseUri}/../wst4x.tests/target/repository</url>
+ <layout>p2</layout>
+ </repository>
+ </source>
+
+ <!-- starting from here all configuration parameters are optional -->
+ <!-- they are only shown here with default values for documentation purpose -->
+
+ <!-- List of IUs to mirror. If omitted, allIUs will be mirrored. -->
+ <!-- Omitted IU version element means latest version of the IU -->
+ <!--
+ <ius>
+ <iu>
+ <id>org.eclipse.rcp.feature.group</id>
+ </iu>
+ </ius>
+ -->
+
+ <!-- The destination directory to mirror to. -->
+ <destination>${project.build.directory}/repository</destination>
+ <!-- Whether only strict dependencies should be followed. -->
+ <!-- "strict" means perfect version match -->
+ <followStrictOnly>false</followStrictOnly>
+ <!-- Whether or not to follow optional requirements. -->
+ <includeOptional>false</includeOptional>
+ <!-- Whether or not to follow non-greedy requirements. -->
+ <includeNonGreedy>false</includeNonGreedy>
+ <!-- Filter properties. E.g. filter only one platform -->
+ <!-- Whether to filter the resulting set of IUs to only -->
+ <!-- include the latest version of each IU -->
+ <latestVersionOnly>true</latestVersionOnly>
+ <!-- don't mirror artifacts, only metadata -->
+ <mirrorMetadataOnly>false</mirrorMetadataOnly>
+ <!-- whether to compress the content.xml/artifacts.xml -->
+ <compress>true</compress>
+ <!-- whether to append to the target repository content -->
+ <append>true</append>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/webtools.repositories/wst4x-sdk/category.xml b/webtools.repositories/wst4x-sdk/category.xml
new file mode 100644
index 0000000..06838be
--- /dev/null
+++ b/webtools.repositories/wst4x-sdk/category.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature id="org.eclipse.wst.common.fproj.sdk">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.xml_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.web_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.xsl_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.server_adapters.sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.common.fproj">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.xsl.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.server_adapters.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.web_ui.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.xml_ui.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.jsdt.feature">
+ <category name="Web Tools Platform (WTP) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.jsdt_sdk.feature">
+ <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+ </feature>
+ <category-def
+ name="Web Tools Platform (WTP) @buildversionid@"
+ label="Web Tools Platform (WTP) @buildversionid@">
+ <description>
+ These features provide functionality with the executable code only and are recommended for most users.
+ </description>
+ </category-def>
+ <category-def
+ name="Web Tools Platform SDK (WTP SDK) @buildversionid@"
+ label="Web Tools Platform SDK (WTP SDK) @buildversionid@">
+ <description>
+ These features provide functionality with the executable code and the source code and are recommended for those
+ extending or debugging
+ WTP.
+ </description>
+ </category-def>
+</site>
diff --git a/webtools.repositories/wst4x-sdk/pom.xml b/webtools.repositories/wst4x-sdk/pom.xml
new file mode 100644
index 0000000..87bb796
--- /dev/null
+++ b/webtools.repositories/wst4x-sdk/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2013 Eclipse Foundation.
+ 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 - 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>repositories</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>wst4x-sdk</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+</project>
diff --git a/webtools.repositories/wst4x.tests/category.xml b/webtools.repositories/wst4x.tests/category.xml
new file mode 100644
index 0000000..30f72c5
--- /dev/null
+++ b/webtools.repositories/wst4x.tests/category.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature id="org.eclipse.wst.jsdt_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+
+ <feature id="org.eclipse.wst.server_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.common_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wtp.releng.tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wtp.releng.tools.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.web_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.xml_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <feature id="org.eclipse.wst.xsl_tests.feature">
+ <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+ </feature>
+ <category-def
+ name="Web Tools Platform Tests (WTP Tests) @buildversionid@"
+ label="Web Tools Platform Tests (WTP Tests) @buildversionid@">
+ <description>
+ These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least
+ their PDE Targets.
+ </description>
+ </category-def>
+</site>
diff --git a/webtools.repositories/wst4x.tests/pom.xml b/webtools.repositories/wst4x.tests/pom.xml
new file mode 100644
index 0000000..4837585
--- /dev/null
+++ b/webtools.repositories/wst4x.tests/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2013 Eclipse Foundation.
+ 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 - 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>repositories</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.webtools</groupId>
+ <artifactId>wst4x.tests</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+</project>
diff --git a/webtools.servertools b/webtools.servertools
index 2c15014..93776e1 160000
--- a/webtools.servertools
+++ b/webtools.servertools
@@ -1 +1 @@
-Subproject commit 2c15014d40c9061cca0f120fd4d03b84ce3e70d4
+Subproject commit 93776e1e14d3d133b82af751fb2cdad93c729ec2
diff --git a/webtools.sourceediting b/webtools.sourceediting
index 9bf4638..3a440d9 160000
--- a/webtools.sourceediting
+++ b/webtools.sourceediting
@@ -1 +1 @@
-Subproject commit 9bf4638676636187c32daaad54ba196e3fa7fffc
+Subproject commit 3a440d9cfe21de9c3c6d9c0ea24d7fcaba67c78c
diff --git a/webtools.webservices b/webtools.webservices
index d050a94..0dd02b1 160000
--- a/webtools.webservices
+++ b/webtools.webservices
@@ -1 +1 @@
-Subproject commit d050a941485d73193af30a1d4922a805f52e4daa
+Subproject commit 0dd02b152152abb5e4d9b66e64acbbfe6456914e
diff --git a/webtools.webservices.axis2 b/webtools.webservices.axis2
index 6bcea94..570c79e 160000
--- a/webtools.webservices.axis2
+++ b/webtools.webservices.axis2
@@ -1 +1 @@
-Subproject commit 6bcea948a4b8cb8c120df68a63c8fb6c224acc46
+Subproject commit 570c79ec26d574ec985d624ff05279109a97d5df
diff --git a/webtools.webservices.jaxws b/webtools.webservices.jaxws
index abcd956..3d6d78a 160000
--- a/webtools.webservices.jaxws
+++ b/webtools.webservices.jaxws
@@ -1 +1 @@
-Subproject commit abcd9565674bb371c6754eb24fb8a96e9807378c
+Subproject commit 3d6d78a633a55d68908634363d4eae6e519dc345