From 1460e612e7d831070b170529d167786e86c294e2 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 23 Feb 2010 09:28:38 +0000
Subject: [PATCH]

---
 inc/prepend.php                                       |  4 ++++
 inc/ws/Controlleur/_common.php                        |  8 ++++++++
 .../Controlleur/class.ws.conversion.session.php       |  0
 inc/{extranet => ws}/Controlleur/class.ws.droits.php  |  0
 inc/{extranet => ws}/Controlleur/class.ws.flash.php   |  0
 inc/{extranet => ws}/Controlleur/class.ws.url.php     |  0
 inc/ws/DAO/_common.php                                |  5 +++++
 inc/{extranet => ws}/DAO/class.ws.dao.book.php        |  0
 inc/{extranet => ws}/DAO/class.ws.dao.document.php    |  0
 inc/ws/Metier/_common.php                             | 11 +++++++++++
 .../Metier/class.ws.book.parametres.php               |  0
 inc/{extranet => ws}/Metier/class.ws.book.php         |  0
 .../Metier/class.ws.document.localinfos.php           |  0
 inc/{extranet => ws}/Metier/class.ws.document.php     |  0
 .../Metier/class.ws.langue.textes.php                 |  0
 inc/{extranet => ws}/Metier/class.ws.link.php         |  0
 inc/{extranet => ws}/Metier/class.ws.parametres.php   |  0
 .../Metier/class.ws.theme.parametres.php              |  0
 18 files changed, 28 insertions(+)
 create mode 100644 inc/ws/Controlleur/_common.php
 rename inc/{extranet => ws}/Controlleur/class.ws.conversion.session.php (100%)
 rename inc/{extranet => ws}/Controlleur/class.ws.droits.php (100%)
 rename inc/{extranet => ws}/Controlleur/class.ws.flash.php (100%)
 rename inc/{extranet => ws}/Controlleur/class.ws.url.php (100%)
 create mode 100644 inc/ws/DAO/_common.php
 rename inc/{extranet => ws}/DAO/class.ws.dao.book.php (100%)
 rename inc/{extranet => ws}/DAO/class.ws.dao.document.php (100%)
 create mode 100644 inc/ws/Metier/_common.php
 rename inc/{extranet => ws}/Metier/class.ws.book.parametres.php (100%)
 rename inc/{extranet => ws}/Metier/class.ws.book.php (100%)
 rename inc/{extranet => ws}/Metier/class.ws.document.localinfos.php (100%)
 rename inc/{extranet => ws}/Metier/class.ws.document.php (100%)
 rename inc/{extranet => ws}/Metier/class.ws.langue.textes.php (100%)
 rename inc/{extranet => ws}/Metier/class.ws.link.php (100%)
 rename inc/{extranet => ws}/Metier/class.ws.parametres.php (100%)
 rename inc/{extranet => ws}/Metier/class.ws.theme.parametres.php (100%)

diff --git a/inc/prepend.php b/inc/prepend.php
index 3f64a7aa6..5454c289f 100644
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -7,6 +7,10 @@ require_once(dirname(__FILE__) . '/cube/_common.php');
 require_once(dirname(__FILE__) . '/extranet/Metier/_common.php');
 require_once(dirname(__FILE__) . '/extranet/Controlleur/_common.php');
 require_once(dirname(__FILE__) . '/extranet/DAO/_common.php');
+// Inclusion des classes propres au Fluidbook Workshop
+require_once(dirname(__FILE__) . '/ws/Metier/_common.php');
+require_once(dirname(__FILE__) . '/ws/Controlleur/_common.php');
+require_once(dirname(__FILE__) . '/ws/DAO/_common.php');
 $GLOBALS['ajaxClasses'][] = 'extranetAjax';
 // Instantiation de la classe de contrôle
 $core = new extranetCore();
diff --git a/inc/ws/Controlleur/_common.php b/inc/ws/Controlleur/_common.php
new file mode 100644
index 000000000..6284ce1d0
--- /dev/null
+++ b/inc/ws/Controlleur/_common.php
@@ -0,0 +1,8 @@
+<?php
+// Workshop
+$__autoload['wsFlash'] = dirname(__FILE__) . '/class.ws.flash.php';
+$__autoload['wsUrl'] = dirname(__FILE__) . '/class.ws.url.php';
+$__autoload['wsDroits'] = dirname(__FILE__) . '/class.ws.droits.php';
+$__autoload['wsConversionSession'] = dirname(__FILE__) . '/class.ws.conversion.session.php';
+
+?>
\ No newline at end of file
diff --git a/inc/extranet/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php
similarity index 100%
rename from inc/extranet/Controlleur/class.ws.conversion.session.php
rename to inc/ws/Controlleur/class.ws.conversion.session.php
diff --git a/inc/extranet/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
similarity index 100%
rename from inc/extranet/Controlleur/class.ws.droits.php
rename to inc/ws/Controlleur/class.ws.droits.php
diff --git a/inc/extranet/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
similarity index 100%
rename from inc/extranet/Controlleur/class.ws.flash.php
rename to inc/ws/Controlleur/class.ws.flash.php
diff --git a/inc/extranet/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
similarity index 100%
rename from inc/extranet/Controlleur/class.ws.url.php
rename to inc/ws/Controlleur/class.ws.url.php
diff --git a/inc/ws/DAO/_common.php b/inc/ws/DAO/_common.php
new file mode 100644
index 000000000..05a6d0d95
--- /dev/null
+++ b/inc/ws/DAO/_common.php
@@ -0,0 +1,5 @@
+<?php
+$__autoload['wsDAOBook'] = dirname(__FILE__) . '/class.ws.dao.book.php';
+$__autoload['wsDAODocument'] = dirname(__FILE__) . '/class.ws.dao.document.php';
+
+?>
\ No newline at end of file
diff --git a/inc/extranet/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
similarity index 100%
rename from inc/extranet/DAO/class.ws.dao.book.php
rename to inc/ws/DAO/class.ws.dao.book.php
diff --git a/inc/extranet/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
similarity index 100%
rename from inc/extranet/DAO/class.ws.dao.document.php
rename to inc/ws/DAO/class.ws.dao.document.php
diff --git a/inc/ws/Metier/_common.php b/inc/ws/Metier/_common.php
new file mode 100644
index 000000000..f9f0fda47
--- /dev/null
+++ b/inc/ws/Metier/_common.php
@@ -0,0 +1,11 @@
+<?php
+$__autoload['wsBook'] = dirname(__FILE__) . '/class.ws.book.php';
+$__autoload['wsParametres'] = dirname(__FILE__) . '/class.ws.parametres.php';
+$__autoload['wsThemeParametres'] = dirname(__FILE__) . '/class.ws.theme.parametres.php';
+$__autoload['wsBookParametres'] = dirname(__FILE__) . '/class.ws.book.parametres.php';
+$__autoload['wsLangueTextes'] = dirname(__FILE__) . '/class.ws.langue.textes.php';
+$__autoload['wsDocument'] = dirname(__FILE__) . '/class.ws.document.php';
+$__autoload['wsLink'] = dirname(__FILE__) . '/class.ws.link.php';
+$__autoload['wsDocumentLocalInfos'] = dirname(__FILE__) . '/class.ws.document.localinfos.php';
+
+?>
\ No newline at end of file
diff --git a/inc/extranet/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
similarity index 100%
rename from inc/extranet/Metier/class.ws.book.parametres.php
rename to inc/ws/Metier/class.ws.book.parametres.php
diff --git a/inc/extranet/Metier/class.ws.book.php b/inc/ws/Metier/class.ws.book.php
similarity index 100%
rename from inc/extranet/Metier/class.ws.book.php
rename to inc/ws/Metier/class.ws.book.php
diff --git a/inc/extranet/Metier/class.ws.document.localinfos.php b/inc/ws/Metier/class.ws.document.localinfos.php
similarity index 100%
rename from inc/extranet/Metier/class.ws.document.localinfos.php
rename to inc/ws/Metier/class.ws.document.localinfos.php
diff --git a/inc/extranet/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
similarity index 100%
rename from inc/extranet/Metier/class.ws.document.php
rename to inc/ws/Metier/class.ws.document.php
diff --git a/inc/extranet/Metier/class.ws.langue.textes.php b/inc/ws/Metier/class.ws.langue.textes.php
similarity index 100%
rename from inc/extranet/Metier/class.ws.langue.textes.php
rename to inc/ws/Metier/class.ws.langue.textes.php
diff --git a/inc/extranet/Metier/class.ws.link.php b/inc/ws/Metier/class.ws.link.php
similarity index 100%
rename from inc/extranet/Metier/class.ws.link.php
rename to inc/ws/Metier/class.ws.link.php
diff --git a/inc/extranet/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
similarity index 100%
rename from inc/extranet/Metier/class.ws.parametres.php
rename to inc/ws/Metier/class.ws.parametres.php
diff --git a/inc/extranet/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
similarity index 100%
rename from inc/extranet/Metier/class.ws.theme.parametres.php
rename to inc/ws/Metier/class.ws.theme.parametres.php
-- 
2.39.5