From e4f1e1d6a2f6355ed75bd754e5cca396b2db1259 Mon Sep 17 00:00:00 2001
From: Chris Wilper <cwilper@duraspace.org>
Date: Wed, 16 Dec 2009 21:57:05 +0000
Subject: [PATCH] organization: moved fcrepo-webadmin to fcrepo-client-webadmin
 Note: this is just a rename; webadmin is still not an integrated part of the
 build, so the swf and other built files are still in svn under
 fcrepo-webapp-fedora/src/main/webapp/admin

---
 fcrepo-client/fcrepo-client-admin/pom.xml     |   2 +-
 .../fcrepo-client-webadmin}/pom.xml           |   4 ++--
 .../src/main/flex/DatastreamDialog.mxml       |   0
 .../src/main/flex/ExportDialog.mxml           |   0
 .../src/main/flex/FedoraAdministrator.mxml    |   0
 .../src/main/flex/FileUploadDialog.mxml       |   0
 .../src/main/flex/LoginDialog.mxml            |   0
 .../src/main/flex/NewDatastreamDialog.mxml    |   0
 .../src/main/flex/ObjectTab.mxml              |   0
 .../src/main/flex/ObjectXMLDialog.mxml        |   0
 .../src/main/flex/ReplaceContentDialog.mxml   |   0
 .../src/main/flex/SearchTab.mxml              |   0
 .../src/main/flex/script/Alerts.as            |   0
 .../src/main/flex/script/ErrorHandler.as      |   0
 .../src/main/flex/script/Util.as              |   0
 .../src/main/flex/styles.css                  |   0
 .../src/main/html-template/AC_OETags.js       |   0
 .../src/main/html-template/crossdomain.xml    |   0
 .../main/html-template/history/history.css    |   0
 .../src/main/html-template/history/history.js |   0
 .../html-template/history/historyFrame.html   |   0
 .../main/html-template/index.template.html    |   0
 .../html-template/playerProductInstall.swf    | Bin
 .../src/main/html-template/upload/loading.gif | Bin
 .../src/main/html-template/upload/upload.html |   0
 fcrepo-client/pom.xml                         |   2 +-
 ...3.3.swf => fcrepo-client-webadmin-3.3.swf} | Bin
 .../src/main/webapp/admin/index.html          |  20 +++++++++---------
 28 files changed, 14 insertions(+), 14 deletions(-)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/pom.xml (96%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/DatastreamDialog.mxml (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/ExportDialog.mxml (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/FedoraAdministrator.mxml (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/FileUploadDialog.mxml (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/LoginDialog.mxml (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/NewDatastreamDialog.mxml (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/ObjectTab.mxml (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/ObjectXMLDialog.mxml (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/ReplaceContentDialog.mxml (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/SearchTab.mxml (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/script/Alerts.as (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/script/ErrorHandler.as (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/script/Util.as (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/flex/styles.css (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/html-template/AC_OETags.js (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/html-template/crossdomain.xml (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/html-template/history/history.css (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/html-template/history/history.js (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/html-template/history/historyFrame.html (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/html-template/index.template.html (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/html-template/playerProductInstall.swf (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/html-template/upload/loading.gif (100%)
 rename {fcrepo-webadmin => fcrepo-client/fcrepo-client-webadmin}/src/main/html-template/upload/upload.html (100%)
 rename fcrepo-webapp/fcrepo-webapp-fedora/src/main/webapp/admin/{fcrepo-webadmin-3.3.swf => fcrepo-client-webadmin-3.3.swf} (100%)

diff --git a/fcrepo-client/fcrepo-client-admin/pom.xml b/fcrepo-client/fcrepo-client-admin/pom.xml
index 9a113b016..2ed8effd8 100644
--- a/fcrepo-client/fcrepo-client-admin/pom.xml
+++ b/fcrepo-client/fcrepo-client-admin/pom.xml
@@ -10,7 +10,7 @@
 
   <artifactId>fcrepo-client-admin</artifactId>
   <packaging>jar</packaging>
-  <name>Fedora Admin Client Library</name>
+  <name>Fedora Admin Client (Swing)</name>
 
   <build>
 
diff --git a/fcrepo-webadmin/pom.xml b/fcrepo-client/fcrepo-client-webadmin/pom.xml
similarity index 96%
rename from fcrepo-webadmin/pom.xml
rename to fcrepo-client/fcrepo-client-webadmin/pom.xml
index 702a60db9..9051fc984 100644
--- a/fcrepo-webadmin/pom.xml
+++ b/fcrepo-client/fcrepo-client-webadmin/pom.xml
@@ -3,10 +3,10 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-webadmin</artifactId>
+  <artifactId>fcrepo-client-webadmin</artifactId>
   <packaging>swf</packaging>
   <version>3.3</version>
-  <name>Fedora Web Administrator</name>
+  <name>Fedora Web Admin Client (Flash)</name>
 
   <!--
     TEMPORARY Instructions:
diff --git a/fcrepo-webadmin/src/main/flex/DatastreamDialog.mxml b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/DatastreamDialog.mxml
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/DatastreamDialog.mxml
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/DatastreamDialog.mxml
diff --git a/fcrepo-webadmin/src/main/flex/ExportDialog.mxml b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/ExportDialog.mxml
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/ExportDialog.mxml
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/ExportDialog.mxml
diff --git a/fcrepo-webadmin/src/main/flex/FedoraAdministrator.mxml b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/FedoraAdministrator.mxml
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/FedoraAdministrator.mxml
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/FedoraAdministrator.mxml
diff --git a/fcrepo-webadmin/src/main/flex/FileUploadDialog.mxml b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/FileUploadDialog.mxml
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/FileUploadDialog.mxml
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/FileUploadDialog.mxml
diff --git a/fcrepo-webadmin/src/main/flex/LoginDialog.mxml b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/LoginDialog.mxml
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/LoginDialog.mxml
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/LoginDialog.mxml
diff --git a/fcrepo-webadmin/src/main/flex/NewDatastreamDialog.mxml b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/NewDatastreamDialog.mxml
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/NewDatastreamDialog.mxml
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/NewDatastreamDialog.mxml
diff --git a/fcrepo-webadmin/src/main/flex/ObjectTab.mxml b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/ObjectTab.mxml
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/ObjectTab.mxml
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/ObjectTab.mxml
diff --git a/fcrepo-webadmin/src/main/flex/ObjectXMLDialog.mxml b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/ObjectXMLDialog.mxml
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/ObjectXMLDialog.mxml
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/ObjectXMLDialog.mxml
diff --git a/fcrepo-webadmin/src/main/flex/ReplaceContentDialog.mxml b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/ReplaceContentDialog.mxml
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/ReplaceContentDialog.mxml
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/ReplaceContentDialog.mxml
diff --git a/fcrepo-webadmin/src/main/flex/SearchTab.mxml b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/SearchTab.mxml
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/SearchTab.mxml
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/SearchTab.mxml
diff --git a/fcrepo-webadmin/src/main/flex/script/Alerts.as b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/script/Alerts.as
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/script/Alerts.as
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/script/Alerts.as
diff --git a/fcrepo-webadmin/src/main/flex/script/ErrorHandler.as b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/script/ErrorHandler.as
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/script/ErrorHandler.as
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/script/ErrorHandler.as
diff --git a/fcrepo-webadmin/src/main/flex/script/Util.as b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/script/Util.as
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/script/Util.as
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/script/Util.as
diff --git a/fcrepo-webadmin/src/main/flex/styles.css b/fcrepo-client/fcrepo-client-webadmin/src/main/flex/styles.css
similarity index 100%
rename from fcrepo-webadmin/src/main/flex/styles.css
rename to fcrepo-client/fcrepo-client-webadmin/src/main/flex/styles.css
diff --git a/fcrepo-webadmin/src/main/html-template/AC_OETags.js b/fcrepo-client/fcrepo-client-webadmin/src/main/html-template/AC_OETags.js
similarity index 100%
rename from fcrepo-webadmin/src/main/html-template/AC_OETags.js
rename to fcrepo-client/fcrepo-client-webadmin/src/main/html-template/AC_OETags.js
diff --git a/fcrepo-webadmin/src/main/html-template/crossdomain.xml b/fcrepo-client/fcrepo-client-webadmin/src/main/html-template/crossdomain.xml
similarity index 100%
rename from fcrepo-webadmin/src/main/html-template/crossdomain.xml
rename to fcrepo-client/fcrepo-client-webadmin/src/main/html-template/crossdomain.xml
diff --git a/fcrepo-webadmin/src/main/html-template/history/history.css b/fcrepo-client/fcrepo-client-webadmin/src/main/html-template/history/history.css
similarity index 100%
rename from fcrepo-webadmin/src/main/html-template/history/history.css
rename to fcrepo-client/fcrepo-client-webadmin/src/main/html-template/history/history.css
diff --git a/fcrepo-webadmin/src/main/html-template/history/history.js b/fcrepo-client/fcrepo-client-webadmin/src/main/html-template/history/history.js
similarity index 100%
rename from fcrepo-webadmin/src/main/html-template/history/history.js
rename to fcrepo-client/fcrepo-client-webadmin/src/main/html-template/history/history.js
diff --git a/fcrepo-webadmin/src/main/html-template/history/historyFrame.html b/fcrepo-client/fcrepo-client-webadmin/src/main/html-template/history/historyFrame.html
similarity index 100%
rename from fcrepo-webadmin/src/main/html-template/history/historyFrame.html
rename to fcrepo-client/fcrepo-client-webadmin/src/main/html-template/history/historyFrame.html
diff --git a/fcrepo-webadmin/src/main/html-template/index.template.html b/fcrepo-client/fcrepo-client-webadmin/src/main/html-template/index.template.html
similarity index 100%
rename from fcrepo-webadmin/src/main/html-template/index.template.html
rename to fcrepo-client/fcrepo-client-webadmin/src/main/html-template/index.template.html
diff --git a/fcrepo-webadmin/src/main/html-template/playerProductInstall.swf b/fcrepo-client/fcrepo-client-webadmin/src/main/html-template/playerProductInstall.swf
similarity index 100%
rename from fcrepo-webadmin/src/main/html-template/playerProductInstall.swf
rename to fcrepo-client/fcrepo-client-webadmin/src/main/html-template/playerProductInstall.swf
diff --git a/fcrepo-webadmin/src/main/html-template/upload/loading.gif b/fcrepo-client/fcrepo-client-webadmin/src/main/html-template/upload/loading.gif
similarity index 100%
rename from fcrepo-webadmin/src/main/html-template/upload/loading.gif
rename to fcrepo-client/fcrepo-client-webadmin/src/main/html-template/upload/loading.gif
diff --git a/fcrepo-webadmin/src/main/html-template/upload/upload.html b/fcrepo-client/fcrepo-client-webadmin/src/main/html-template/upload/upload.html
similarity index 100%
rename from fcrepo-webadmin/src/main/html-template/upload/upload.html
rename to fcrepo-client/fcrepo-client-webadmin/src/main/html-template/upload/upload.html
diff --git a/fcrepo-client/pom.xml b/fcrepo-client/pom.xml
index db4935cd4..df4f49a43 100644
--- a/fcrepo-client/pom.xml
+++ b/fcrepo-client/pom.xml
@@ -10,7 +10,7 @@
 
   <artifactId>fcrepo-client</artifactId>
   <packaging>pom</packaging>
-  <name>All Fedora Client Libraries</name>
+  <name>All Fedora Clients</name>
 
   <modules>
     <module>fcrepo-client-admin</module>
diff --git a/fcrepo-webapp/fcrepo-webapp-fedora/src/main/webapp/admin/fcrepo-webadmin-3.3.swf b/fcrepo-webapp/fcrepo-webapp-fedora/src/main/webapp/admin/fcrepo-client-webadmin-3.3.swf
similarity index 100%
rename from fcrepo-webapp/fcrepo-webapp-fedora/src/main/webapp/admin/fcrepo-webadmin-3.3.swf
rename to fcrepo-webapp/fcrepo-webapp-fedora/src/main/webapp/admin/fcrepo-client-webadmin-3.3.swf
diff --git a/fcrepo-webapp/fcrepo-webapp-fedora/src/main/webapp/admin/index.html b/fcrepo-webapp/fcrepo-webapp-fedora/src/main/webapp/admin/index.html
index 2d630d1a1..e32a6be06 100644
--- a/fcrepo-webapp/fcrepo-webapp-fedora/src/main/webapp/admin/index.html
+++ b/fcrepo-webapp/fcrepo-webapp-fedora/src/main/webapp/admin/index.html
@@ -43,7 +43,7 @@
 
   // Provides multi-browser access to the Flex application
   function getFlexApp() {
-    var appName = "fcrepo-webadmin";
+    var appName = "fcrepo-client-webadmin";
     if (navigator.appName.indexOf("Microsoft") !=-1)
     {
       return window[appName];
@@ -108,10 +108,10 @@
 		"width", "100%",
 		"height", "100%",
 		"align", "middle",
-		"id", "fcrepo-webadmin",
+		"id", "fcrepo-client-webadmin",
 		"quality", "high",
 		"bgcolor", "#ffffff",
-		"name", "fcrepo-webadmin",
+		"name", "fcrepo-client-webadmin",
 		"allowScriptAccess","sameDomain",
 		"type", "application/x-shockwave-flash",
 		"pluginspage", "http://www.adobe.com/go/getflashplayer"
@@ -120,14 +120,14 @@
 	// if we've detected an acceptable version
 	// embed the Flash Content SWF when all tests are passed
 	AC_FL_RunContent(
-			"src", "fcrepo-webadmin-3.3",
+			"src", "fcrepo-client-webadmin-3.3",
 			"width", "100%",
 			"height", "100%",
 			"align", "middle",
-			"id", "fcrepo-webadmin",
+			"id", "fcrepo-client-webadmin",
 			"quality", "high",
 			"bgcolor", "#ffffff",
-			"name", "fcrepo-webadmin",
+			"name", "fcrepo-client-webadmin",
 			"allowScriptAccess","sameDomain",
 			"type", "application/x-shockwave-flash",
 			"pluginspage", "http://www.adobe.com/go/getflashplayer"
@@ -142,14 +142,14 @@
 </script>
 <noscript>
   	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-			id="fcrepo-webadmin" width="100%" height="100%"
+			id="fcrepo-client-webadmin" width="100%" height="100%"
 			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
-			<param name="movie" value="fcrepo-webadmin-3.3.swf" />
+			<param name="movie" value="fcrepo-client-webadmin-3.3.swf" />
 			<param name="quality" value="high" />
 			<param name="bgcolor" value="#ffffff" />
 			<param name="allowScriptAccess" value="sameDomain" />
-			<embed src="fcrepo-webadmin-3.3.swf" quality="high" bgcolor="#ffffff"
-				width="100%" height="100%" name="fcrepo-webadmin" align="middle"
+			<embed src="fcrepo-client-webadmin-3.3.swf" quality="high" bgcolor="#ffffff"
+				width="100%" height="100%" name="fcrepo-client-webadmin" align="middle"
 				play="true"
 				loop="false"
 				quality="high"