From 9d8e8eb25aa9a8f0bc7a758ae0ca2d2754bb907c Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <jfiat@eiffel.com>
Date: Thu, 28 Feb 2013 17:00:13 +0100
Subject: [PATCH] Move draft\library\security\openid under
 library\security\openid

---
 draft/library/security/openid/consumer/demo/demo.rc    |  6 ------
 {draft/library => library}/security/openid/README.md   |  0
 .../security/openid/consumer/README.md                 |  0
 .../security/openid/consumer/demo/application.e        |  0
 .../security/openid/consumer/demo/demo-safe.ecf        | 10 +++++-----
 .../security/openid/consumer/openid-safe.ecf           |  4 ++--
 .../security/openid/consumer/openid.ecf                |  4 ++--
 .../security/openid/consumer/src/openid_consumer.e     |  0
 .../openid/consumer/src/openid_consumer_validation.e   |  0
 .../security/openid/consumer/src/openid_discover.e     |  0
 .../security/openid/consumer/tests/application.e       |  0
 .../security/openid/consumer/tests/test_openid.e       |  0
 .../security/openid/consumer/tests/tests-safe.ecf      |  0
 tests/all-safe.ecf                                     |  2 +-
 14 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 draft/library/security/openid/consumer/demo/demo.rc
 rename {draft/library => library}/security/openid/README.md (100%)
 rename {draft/library => library}/security/openid/consumer/README.md (100%)
 rename {draft/library => library}/security/openid/consumer/demo/application.e (100%)
 rename {draft/library => library}/security/openid/consumer/demo/demo-safe.ecf (65%)
 rename {draft/library => library}/security/openid/consumer/openid-safe.ecf (84%)
 rename {draft/library => library}/security/openid/consumer/openid.ecf (84%)
 rename {draft/library => library}/security/openid/consumer/src/openid_consumer.e (100%)
 rename {draft/library => library}/security/openid/consumer/src/openid_consumer_validation.e (100%)
 rename {draft/library => library}/security/openid/consumer/src/openid_discover.e (100%)
 rename {draft/library => library}/security/openid/consumer/tests/application.e (100%)
 rename {draft/library => library}/security/openid/consumer/tests/test_openid.e (100%)
 rename {draft/library => library}/security/openid/consumer/tests/tests-safe.ecf (100%)

diff --git a/draft/library/security/openid/consumer/demo/demo.rc b/draft/library/security/openid/consumer/demo/demo.rc
deleted file mode 100644
index b0ec159c..00000000
--- a/draft/library/security/openid/consumer/demo/demo.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <windows.h>
-
-STRINGTABLE
-BEGIN
-	1 "This Program was made using EiffelStudio using Visual Studio C++"
-END
diff --git a/draft/library/security/openid/README.md b/library/security/openid/README.md
similarity index 100%
rename from draft/library/security/openid/README.md
rename to library/security/openid/README.md
diff --git a/draft/library/security/openid/consumer/README.md b/library/security/openid/consumer/README.md
similarity index 100%
rename from draft/library/security/openid/consumer/README.md
rename to library/security/openid/consumer/README.md
diff --git a/draft/library/security/openid/consumer/demo/application.e b/library/security/openid/consumer/demo/application.e
similarity index 100%
rename from draft/library/security/openid/consumer/demo/application.e
rename to library/security/openid/consumer/demo/application.e
diff --git a/draft/library/security/openid/consumer/demo/demo-safe.ecf b/library/security/openid/consumer/demo/demo-safe.ecf
similarity index 65%
rename from draft/library/security/openid/consumer/demo/demo-safe.ecf
rename to library/security/openid/consumer/demo/demo-safe.ecf
index 9a829782..10bd0633 100644
--- a/draft/library/security/openid/consumer/demo/demo-safe.ecf
+++ b/library/security/openid/consumer/demo/demo-safe.ecf
@@ -12,12 +12,12 @@
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="ewsgi" location="..\..\..\..\..\..\library\server\ewsgi\ewsgi-safe.ecf" readonly="false"/>
-		<library name="ewsgi_nino_connector" location="..\..\..\..\..\..\library\server\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\..\..\..\library\network\protocol\http\http-safe.ecf"/>
+		<library name="ewsgi" location="../../../../server/ewsgi/ewsgi-safe.ecf" readonly="false"/>
+		<library name="ewsgi_nino_connector" location="../../../../server/ewsgi/connectors/nino/nino-safe.ecf" readonly="false"/>
+		<library name="http" location="../../../../network/protocol/http/http-safe.ecf"/>
 		<library name="openid" location="..\openid-safe.ecf" readonly="false"/>
-		<library name="wsf" location="..\..\..\..\..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
-		<library name="wsf_nino_connector" location="..\..\..\..\..\..\library\server\wsf\connector\nino-safe.ecf" readonly="false"/>
+		<library name="wsf" location="../../../../server/wsf/wsf-safe.ecf" readonly="false"/>
+		<library name="wsf_nino_connector" location="../../../../server/wsf/connector/nino-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\" recursive="true"/>
 	</target>
 </system>
diff --git a/draft/library/security/openid/consumer/openid-safe.ecf b/library/security/openid/consumer/openid-safe.ecf
similarity index 84%
rename from draft/library/security/openid/consumer/openid-safe.ecf
rename to library/security/openid/consumer/openid-safe.ecf
index 251f1957..b68c1f4a 100644
--- a/draft/library/security/openid/consumer/openid-safe.ecf
+++ b/library/security/openid/consumer/openid-safe.ecf
@@ -11,10 +11,10 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL-safe.ecf" readonly="false"/>
-		<library name="uri" location="../../../../../contrib/ise_library/text/uri/uri-safe.ecf" readonly="false"/>
+		<library name="uri" location="../../../../contrib/ise_library/text/uri/uri-safe.ecf" readonly="false"/>
 		<library name="xml_parser" location="$ISE_LIBRARY\library\text\parser\xml\parser\xml_parser-safe.ecf"/>
 		<library name="xml_tree" location="$ISE_LIBRARY\library\text\parser\xml\tree\xml_tree-safe.ecf" readonly="false"/>
-		<library name="http_client" location="..\..\..\..\..\library\network\http_client\http_client-safe.ecf"/>
+		<library name="http_client" location="../../../network/http_client/http_client-safe.ecf"/>
 		<cluster name="src" location="src" recursive="true"/>
 	</target>
 </system>
diff --git a/draft/library/security/openid/consumer/openid.ecf b/library/security/openid/consumer/openid.ecf
similarity index 84%
rename from draft/library/security/openid/consumer/openid.ecf
rename to library/security/openid/consumer/openid.ecf
index 182ffc07..822d2df7 100644
--- a/draft/library/security/openid/consumer/openid.ecf
+++ b/library/security/openid/consumer/openid.ecf
@@ -11,10 +11,10 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL.ecf" readonly="false"/>
-		<library name="uri" location="../../../../../contrib/ise_library/text/uri/uri.ecf" readonly="false"/>
+		<library name="uri" location="../../../../contrib/ise_library/text/uri/uri.ecf" readonly="false"/>
 		<library name="xml_parser" location="$ISE_LIBRARY\library\text\parser\xml\parser\xml_parser.ecf"/>
 		<library name="xml_tree" location="$ISE_LIBRARY\library\text\parser\xml\tree\xml_tree.ecf" readonly="false"/>
-		<library name="http_client" location="..\..\..\..\..\library\network\http_client\http_client.ecf"/>
+		<library name="http_client" location="../../../network/http_client/http_client.ecf"/>
 		<cluster name="src" location="src" recursive="true"/>
 
 	</target>
diff --git a/draft/library/security/openid/consumer/src/openid_consumer.e b/library/security/openid/consumer/src/openid_consumer.e
similarity index 100%
rename from draft/library/security/openid/consumer/src/openid_consumer.e
rename to library/security/openid/consumer/src/openid_consumer.e
diff --git a/draft/library/security/openid/consumer/src/openid_consumer_validation.e b/library/security/openid/consumer/src/openid_consumer_validation.e
similarity index 100%
rename from draft/library/security/openid/consumer/src/openid_consumer_validation.e
rename to library/security/openid/consumer/src/openid_consumer_validation.e
diff --git a/draft/library/security/openid/consumer/src/openid_discover.e b/library/security/openid/consumer/src/openid_discover.e
similarity index 100%
rename from draft/library/security/openid/consumer/src/openid_discover.e
rename to library/security/openid/consumer/src/openid_discover.e
diff --git a/draft/library/security/openid/consumer/tests/application.e b/library/security/openid/consumer/tests/application.e
similarity index 100%
rename from draft/library/security/openid/consumer/tests/application.e
rename to library/security/openid/consumer/tests/application.e
diff --git a/draft/library/security/openid/consumer/tests/test_openid.e b/library/security/openid/consumer/tests/test_openid.e
similarity index 100%
rename from draft/library/security/openid/consumer/tests/test_openid.e
rename to library/security/openid/consumer/tests/test_openid.e
diff --git a/draft/library/security/openid/consumer/tests/tests-safe.ecf b/library/security/openid/consumer/tests/tests-safe.ecf
similarity index 100%
rename from draft/library/security/openid/consumer/tests/tests-safe.ecf
rename to library/security/openid/consumer/tests/tests-safe.ecf
diff --git a/tests/all-safe.ecf b/tests/all-safe.ecf
index dfd9b434..16747e1a 100644
--- a/tests/all-safe.ecf
+++ b/tests/all-safe.ecf
@@ -21,7 +21,7 @@
 		<library name="dft_connector_cgi" location="..\library\server\wsf\default\cgi-safe.ecf" readonly="false"/>
 		<library name="dft_connector_nino" location="..\library\server\wsf\default\nino-safe.ecf" readonly="false"/>
 		<library name="dft_connector_openshift" location="..\library\server\wsf\default\openshift-safe.ecf" readonly="false"/>
-		<library name="conneg" location="..\library\network\protocol\conneg\conneg-safe.ecf" readonly="false"/>
+		<library name="conneg" location="../library/network/protocol/CONNEG/conneg-safe.ecf" readonly="false"/>
 		<library name="ewsgi" location="..\library\server\ewsgi\ewsgi-safe.ecf" readonly="false"/>
 		<library name="http" location="..\library\network\protocol\http\http-safe.ecf" readonly="false"/>
 		<library name="http_authorization" location="..\library\server\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>