From 3dff9eb15a6133f93a0989b0dd006eae873c9c25 Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Wed, 3 Jun 2015 10:02:20 -0400
Subject: [PATCH] Revert "Releng: Move Remote Terminal Connection into its own
 profile so it can be excluded on demand"

This reverts commit 601770a23319dbce0ca540d7d0f7745808312395.
---
 pom.xml                                       | 24 +++-----
 .../.project                                  | 11 ----
 .../category.xml                              | 16 -----
 .../pom.xml                                   | 58 -------------------
 .../org.eclipse.tm.terminal.repo/category.xml |  6 ++
 5 files changed, 14 insertions(+), 101 deletions(-)
 delete mode 100644 repos/org.eclipse.tm.terminal.remote.repo/.project
 delete mode 100644 repos/org.eclipse.tm.terminal.remote.repo/category.xml
 delete mode 100644 repos/org.eclipse.tm.terminal.remote.repo/pom.xml

diff --git a/pom.xml b/pom.xml
index 5a8fb181061..1a85d69cf3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,15 @@
         <!-- Terminal Connector features and plug-ins -->
         <module>plugins/org.eclipse.tm.terminal.connector.local</module>
         <module>plugins/org.eclipse.tm.terminal.connector.process</module>
+        <module>plugins/org.eclipse.tm.terminal.connector.remote</module>
         <module>plugins/org.eclipse.tm.terminal.connector.serial</module>
         <module>plugins/org.eclipse.tm.terminal.connector.ssh</module>
         <module>plugins/org.eclipse.tm.terminal.connector.telnet</module>
         
         <module>features/org.eclipse.tm.terminal.connector.local.feature</module>
         <module>features/org.eclipse.tm.terminal.connector.local.sdk.feature</module>
+        <module>features/org.eclipse.tm.terminal.connector.remote.feature</module>
+        <module>features/org.eclipse.tm.terminal.connector.remote.sdk.feature</module>
         <module>features/org.eclipse.tm.terminal.connector.serial.feature</module>
         <module>features/org.eclipse.tm.terminal.connector.serial.sdk.feature</module>
         <module>features/org.eclipse.tm.terminal.connector.ssh.feature</module>
@@ -60,21 +63,10 @@
 
     <profiles>
         <profile>
-            <id>tests</id>
-            <modules>
-                <module>plugins/org.eclipse.tm.terminal.test</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>build-remote-connector</id>
-            <modules>
-                <module>plugins/org.eclipse.tm.terminal.connector.remote</module>
-                
-                <module>features/org.eclipse.tm.terminal.connector.remote.feature</module>
-                <module>features/org.eclipse.tm.terminal.connector.remote.sdk.feature</module>
-                
-                <module>repos/org.eclipse.tm.terminal.remote.repo</module>
-            </modules>
-        </profile>
+        <id>tests</id>
+        <modules>
+            <module>plugins/org.eclipse.tm.terminal.test</module>
+        </modules>
+    </profile>
     </profiles>
 </project>
diff --git a/repos/org.eclipse.tm.terminal.remote.repo/.project b/repos/org.eclipse.tm.terminal.remote.repo/.project
deleted file mode 100644
index f7d77c3b101..00000000000
--- a/repos/org.eclipse.tm.terminal.remote.repo/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.terminal.remote.repo</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/repos/org.eclipse.tm.terminal.remote.repo/category.xml b/repos/org.eclipse.tm.terminal.remote.repo/category.xml
deleted file mode 100644
index ab26b91f11c..00000000000
--- a/repos/org.eclipse.tm.terminal.remote.repo/category.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <!-- Terminal Connector Features -->
-   <feature url="features/org.eclipse.tm.terminal.connector.remote.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.remote.feature" version="0.0.0">
-      <category name="terminal_main"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.connector.remote.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.remote.sdk.feature" version="0.0.0">
-      <category name="terminal_main"/>
-   </feature>
-   
-   <category-def name="terminal_main" label="TM Terminal 4.0 Main Features">
-      <description>
-         TM Terminal Main Features
-      </description>
-   </category-def>
-</site>
diff --git a/repos/org.eclipse.tm.terminal.remote.repo/pom.xml b/repos/org.eclipse.tm.terminal.remote.repo/pom.xml
deleted file mode 100644
index 690cf855a83..00000000000
--- a/repos/org.eclipse.tm.terminal.remote.repo/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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.tm.terminal</groupId>
-		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../admin/pom-build.xml</relativePath>
-	</parent>
-
-	<version>4.0.0-SNAPSHOT</version>
-    <artifactId>org.eclipse.tm.terminal.remote.repo</artifactId>
-    <packaging>eclipse-repository</packaging>
-
-    <profiles>
-        <profile>
-            <id>deploy</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>deploy</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <target>
-                                        <delete includeemptydirs="false">
-                                            <fileset dir="${terminal-install}">
-                                                <include name="${terminal-zipfile}"/>
-                                            </fileset>
-                                        </delete>
-                                        <copy includeemptydirs="false" todir="${terminal-install}">
-                                            <fileset dir="target">
-                                                <include name="${terminal-zipfile}"/>
-                                            </fileset>
-                                        </copy>
-                                        <chmod perm="g+w">
-                                            <fileset dir="${terminal-install}">
-                                                <include name="${terminal-zipfile}"/>
-                                            </fileset>
-                                        </chmod>
-                                    </target>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/repos/org.eclipse.tm.terminal.repo/category.xml b/repos/org.eclipse.tm.terminal.repo/category.xml
index 25fd3f053cc..cd76b8c54c8 100644
--- a/repos/org.eclipse.tm.terminal.repo/category.xml
+++ b/repos/org.eclipse.tm.terminal.repo/category.xml
@@ -33,6 +33,12 @@
    <feature url="features/org.eclipse.tm.terminal.connector.telnet.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.telnet.sdk.feature" version="0.0.0">
       <category name="terminal_main"/>
    </feature>
+   <feature url="features/org.eclipse.tm.terminal.connector.remote.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.remote.feature" version="0.0.0">
+      <category name="terminal_main"/>
+   </feature>
+   <feature url="features/org.eclipse.tm.terminal.connector.remote.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.remote.sdk.feature" version="0.0.0">
+      <category name="terminal_main"/>
+   </feature>
 
    <!-- Terminal View Features -->
    <feature url="features/org.eclipse.tm.terminal.view.feature_0.0.0.jar" id="org.eclipse.tm.terminal.view.feature" version="0.0.0">