From 4edac1e0c94380b1b669743c6c4abdd3efcde39c Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 23 Dec 2008 08:24:52 -0500
Subject: [PATCH] Move core application classes to apps/core module

---
 apps/cli/pom.xml                                   | 12 +------
 apps/{cli => core}/pom.xml                         | 39 ++--------------------
 .../remote/apps/core/ApplicationAuthenticator.java |  0
 .../apps/core/ApplicationProfileManager.java       |  0
 .../java/remote/apps/core/ApplicationSystem.java   |  0
 .../main/java/remote/apps/core/package-info.java   |  0
 apps/pom.xml                                       |  1 +
 7 files changed, 5 insertions(+), 47 deletions(-)
 copy apps/{cli => core}/pom.xml (67%)
 rename apps/{cli => core}/src/main/java/remote/apps/core/ApplicationAuthenticator.java (100%)
 rename apps/{cli => core}/src/main/java/remote/apps/core/ApplicationProfileManager.java (100%)
 rename apps/{cli => core}/src/main/java/remote/apps/core/ApplicationSystem.java (100%)
 rename apps/{cli => core}/src/main/java/remote/apps/core/package-info.java (100%)

diff --git a/apps/cli/pom.xml b/apps/cli/pom.xml
index d9d4fbd..a629b3f 100644
--- a/apps/cli/pom.xml
+++ b/apps/cli/pom.xml
@@ -59,17 +59,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>remote-axis-spi</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>remote-client-net</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>remote-client-xrt</artifactId>
+			<artifactId>remote-apps-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/apps/cli/pom.xml b/apps/core/pom.xml
similarity index 67%
copy from apps/cli/pom.xml
copy to apps/core/pom.xml
index d9d4fbd..e4159c5 100644
--- a/apps/cli/pom.xml
+++ b/apps/core/pom.xml
@@ -8,13 +8,13 @@
 		<version>2.0-snapshot</version>
 	</parent>
 
-	<artifactId>remote-apps-cli</artifactId>
+	<artifactId>remote-apps-core</artifactId>
 	<packaging>jar</packaging>
 
-	<name>Re·Mote Testbed Apps CLI</name>
+	<name>Re·Mote Testbed Apps Core</name>
 	<description>
 
-		Command line tools for testing and working with the
+		Utilities for creating rich client applications for the
 		Re·Mote Testbed Framework.
 
 	</description>
@@ -23,39 +23,6 @@
 		<url>${scmweb}</url>
 	</scm>
 
-	<properties>
-		<mainClass>remote.apps.cli.Main</mainClass>
-	</properties>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>1.2</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<finalName>remote-cli</finalName>
-							<transformers>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"></transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<manifestEntries>
-										<Main-Class>${mainClass}</Main-Class>
-									</manifestEntries>
-								</transformer>
-							</transformers>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/apps/cli/src/main/java/remote/apps/core/ApplicationAuthenticator.java b/apps/core/src/main/java/remote/apps/core/ApplicationAuthenticator.java
similarity index 100%
rename from apps/cli/src/main/java/remote/apps/core/ApplicationAuthenticator.java
rename to apps/core/src/main/java/remote/apps/core/ApplicationAuthenticator.java
diff --git a/apps/cli/src/main/java/remote/apps/core/ApplicationProfileManager.java b/apps/core/src/main/java/remote/apps/core/ApplicationProfileManager.java
similarity index 100%
rename from apps/cli/src/main/java/remote/apps/core/ApplicationProfileManager.java
rename to apps/core/src/main/java/remote/apps/core/ApplicationProfileManager.java
diff --git a/apps/cli/src/main/java/remote/apps/core/ApplicationSystem.java b/apps/core/src/main/java/remote/apps/core/ApplicationSystem.java
similarity index 100%
rename from apps/cli/src/main/java/remote/apps/core/ApplicationSystem.java
rename to apps/core/src/main/java/remote/apps/core/ApplicationSystem.java
diff --git a/apps/cli/src/main/java/remote/apps/core/package-info.java b/apps/core/src/main/java/remote/apps/core/package-info.java
similarity index 100%
rename from apps/cli/src/main/java/remote/apps/core/package-info.java
rename to apps/core/src/main/java/remote/apps/core/package-info.java
diff --git a/apps/pom.xml b/apps/pom.xml
index 27118dc..11ba7de 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -12,6 +12,7 @@
 	<packaging>pom</packaging>
 
 	<modules>
+		<module>core</module>
 		<module>gui</module>
 		<module>cli</module>
 	</modules>
-- 
2.11.4.GIT