Bug 396457 - [Releng][Maven] Create a build based on tycho

Second part of adding the necessary machinery to build ECF with
tycho -- it now builds the whole SDK. The resulting p2 site
should now contain the same bundles as the p2 site generated by
buckminster.

Due to the target platform needing APIs available only in Java 1.4,
some bundles have had their compilation profiles bumped up from
Java 1.3. In these cases the BREE remains unchanged.

In order to preserve compatibility with the Java 1.5 BREE specified
in the jive smack library, some @Override annotations were removed.

Change-Id: I7b6acce0ef1204d0ad0146218694c8722c3dbcd8
Signed-off-by: Mat Booth <mat.booth@redhat.com>

16 files changed, 227 insertions, 81 deletions

diff --git a/releng/features/org.eclipse.ecf.core/pom.xml b/releng/features/org.eclipse.ecf.core/pom.xml
new file mode 100644
index 000000000..c05b4af53
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.core/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.core</artifactId>
+  <version>3.13.2-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.discovery.slp.feature/pom.xml b/releng/features/org.eclipse.ecf.discovery.slp.feature/pom.xml
new file mode 100644
index 000000000..d24761b6c
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.discovery.slp.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.discovery.slp.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.eventadmin.examples.feature/pom.xml b/releng/features/org.eclipse.ecf.eventadmin.examples.feature/pom.xml
new file mode 100644
index 000000000..c36f0a3ff
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.eventadmin.examples.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.eventadmin.examples.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.eventadmin.feature/pom.xml b/releng/features/org.eclipse.ecf.eventadmin.feature/pom.xml
new file mode 100644
index 000000000..165921c55
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.eventadmin.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.eventadmin.feature</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/pom.xml b/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/pom.xml
new file mode 100644
index 000000000..5b6af7ba4
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.provider.generic.remoteservice.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml
new file mode 100644
index 000000000..2c4b65360
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.remoteservice.examples.feature</artifactId>
+  <version>1.3.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
index a45ce6d96..852a42c0f 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
@@ -34,6 +34,7 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
       <import plugin="org.apache.commons.logging" version="1.1.1" match="compatible"/>
       <import plugin="org.apache.httpcomponents.httpclient" version="4.2" match="compatible"/>
       <import plugin="org.apache.httpcomponents.httpcore" version="4.2" match="compatible"/>
+      <import plugin="org.json" version="1.0.0" match="compatible"/>
    </requires>
 
    <plugin
@@ -43,11 +44,4 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.json"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml
new file mode 100644
index 000000000..2ea82a366
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.remoteservice.rest.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/pom.xml
new file mode 100644
index 000000000..2b21222c9
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.remoteservice.rest.synd.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml
new file mode 100644
index 000000000..9e82193f5
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.remoteservice.rosgi.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/pom.xml
new file mode 100644
index 000000000..0839e46a0
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.remoteservice.sdk.examples.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml
new file mode 100644
index 000000000..537c5b4fc
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.remoteservice.sdk.feature</artifactId>
+  <version>3.13.2-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml
new file mode 100644
index 000000000..5408d20a5
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.remoteservice.servlet.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.soap.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.soap.feature/pom.xml
new file mode 100644
index 000000000..d5bf6ec38
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.remoteservice.soap.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.remoteservice.soap.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/features/org.eclipse.ecf.xmpp.feature/pom.xml b/releng/features/org.eclipse.ecf.xmpp.feature/pom.xml
new file mode 100644
index 000000000..a0f59e99f
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.xmpp.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.ecf</groupId>
+    <artifactId>ecf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>org.eclipse.ecf.xmpp.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/org.eclipse.ecf.releng.repository/category.xml b/releng/org.eclipse.ecf.releng.repository/category.xml
index 500ccac92..168831c01 100644
--- a/releng/org.eclipse.ecf.releng.repository/category.xml
+++ b/releng/org.eclipse.ecf.releng.repository/category.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
+   <feature id="org.eclipse.ecf.core" version="0.0.0">
+      <category name="sdk"/>
+   </feature>
+   <feature id="org.eclipse.ecf.core.source" version="0.0.0">
+      <category name="sdk"/>
+   </feature>
    <feature id="org.eclipse.ecf.core.feature" version="0.0.0">
       <category name="core"/>
    </feature>
@@ -18,45 +24,6 @@
    <feature id="org.eclipse.ecf.filetransfer.ssl.feature" version="0.0.0">
       <category name="core"/>
    </feature>
-   <feature id="org.eclipse.ecf.discovery.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.discovery.dnssd.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.discovery.jmdns.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.discovery.zookeeper.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.sharedobject.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.provider.generic.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.docshare.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.datashare.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.presence.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.console.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.provider.generic.datashare.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.remoteservice.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.osgi.services.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
    <feature id="org.eclipse.ecf.core.feature.source" version="0.0.0">
       <category name="core sources"/>
    </feature>
@@ -75,45 +42,20 @@
    <feature id="org.eclipse.ecf.filetransfer.ssl.feature.source" version="0.0.0">
       <category name="core sources"/>
    </feature>
-   <feature id="org.eclipse.ecf.discovery.feature.source" version="0.0.0">
-      <category name="core sources"/>
+   <feature id="org.eclipse.ecf.remoteservice.sdk.examples.feature" version="0.0.0">
+      <category name="remoteservices"/>
    </feature>
-   <feature id="org.eclipse.ecf.discovery.dnssd.feature.source" version="0.0.0">
-      <category name="core sources"/>
+   <feature id="org.eclipse.ecf.remoteservice.sdk.examples.feature.source" version="0.0.0">
+      <category name="remoteservices"/>
    </feature>
-   <feature id="org.eclipse.ecf.discovery.jmdns.feature.source" version="0.0.0">
-      <category name="core sources"/>
+   <feature id="org.eclipse.ecf.remoteservice.sdk.feature" version="0.0.0">
+      <category name="remoteservices"/>
    </feature>
-   <feature id="org.eclipse.ecf.discovery.zookeeper.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.sharedobject.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.provider.generic.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.docshare.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.datashare.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.presence.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.console.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.provider.generic.datashare.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.remoteservice.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.osgi.services.feature.source" version="0.0.0">
-      <category name="core sources"/>
+   <feature id="org.eclipse.ecf.remoteservice.sdk.feature.source" version="0.0.0">
+      <category name="remoteservices"/>
    </feature>
+   <category-def name="sdk" label="ECF SDK for Eclipse"/>
    <category-def name="core" label="ECF Core Features"/>
    <category-def name="core sources" label="ECF Core Source Features"/>
+   <category-def name="remoteservices" label="ECF Remote Services SDK"/>
 </site>