r1417 - in trunk/simexplorer-is: simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages - Simexplorer-si-commits

20 Mar 2008

Author: glandais
Date: 2008-03-20 14:25:53 +0000 (Thu, 20 Mar 2008)
New Revision: 1417

Modified:
   trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java
   trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/StorageServiceGenerator.java
   trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GenerateDataAction.java
   trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java
Log:
Element generators moving

Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java
===================================================================

--- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java	2008-03-20 14:25:29 UTC (rev 1416)
+++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java	2008-03-20 14:25:53 UTC (rev 1417)
@@ -15,7 +15,7 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 * ##% */
-package fr.cemagref.simexplorer.is.storage;
+package fr.cemagref.simexplorer.is.service.random;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/StorageServiceGenerator.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/StorageServiceGenerator.java	2008-03-20 14:25:29 UTC (rev 1416)
+++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/StorageServiceGenerator.java	2008-03-20 14:25:53 UTC (rev 1417)
@@ -1,4 +1,4 @@
-package fr.cemagref.simexplorer.is.service;
+package fr.cemagref.simexplorer.is.service.random;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -16,11 +16,10 @@
 import fr.cemagref.simexplorer.is.entities.data.Component;
 import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication;
 import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
-import fr.cemagref.simexplorer.is.entities.metadata.MetaData;
 import fr.cemagref.simexplorer.is.factories.LoggableElementFactory;
-import fr.cemagref.simexplorer.is.storage.ElementGenerator;
+import fr.cemagref.simexplorer.is.service.StorageService;
+import fr.cemagref.simexplorer.is.service.random.ElementGenerator.RandomStream;
 import fr.cemagref.simexplorer.is.storage.VersionGenerator;
-import fr.cemagref.simexplorer.is.storage.ElementGenerator.RandomStream;
 
 /**
  * The Class StorageServiceGenerator. Aimed to generate random elements for a service.

Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java	2008-03-20 14:25:29 UTC (rev 1416)
+++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java	2008-03-20 14:25:53 UTC (rev 1417)
@@ -18,29 +18,17 @@
 package fr.cemagref.simexplorer.is.service;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import junit.framework.TestCase;
 
 import org.codelutin.util.ArrayUtil;
 
-import com.healthmarketscience.rmiio.SerializableInputStream;
-
-import fr.cemagref.simexplorer.is.entities.attachment.Attachment;
-import fr.cemagref.simexplorer.is.entities.data.Code;
-import fr.cemagref.simexplorer.is.entities.data.Component;
-import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication;
-import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
-import fr.cemagref.simexplorer.is.entities.metadata.MetaData;
 import fr.cemagref.simexplorer.is.entities.metadata.Version;
 import fr.cemagref.simexplorer.is.exceptions.SimExplorerException;
-import fr.cemagref.simexplorer.is.factories.LoggableElementFactory;
-import fr.cemagref.simexplorer.is.storage.ElementGenerator;
-import fr.cemagref.simexplorer.is.storage.ElementGenerator.RandomStream;
+import fr.cemagref.simexplorer.is.service.random.StorageServiceGenerator;
 
 /**
  * The Class StorageServiceVersionsTestCase.

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java	2008-03-20 14:25:29 UTC (rev 1416)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java	2008-03-20 14:25:53 UTC (rev 1417)
@@ -18,6 +18,9 @@
 * ##% */
 package fr.cemagref.simexplorer.is.ui.swing;
 
+import org.codelutin.i18n.I18n;
+import org.codelutin.option.ParserFailedException;
+
 import fr.cemagref.simexplorer.is.entities.EntityTypeEnum;
 import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
 import fr.cemagref.simexplorer.is.entities.metadata.MetaData;
@@ -25,15 +28,12 @@
 import fr.cemagref.simexplorer.is.exceptions.SimExplorerException;
 import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException;
 import fr.cemagref.simexplorer.is.exceptions.UnreachableServiceException;
-import fr.cemagref.simexplorer.is.service.MockStorageServiceImpl;
 import fr.cemagref.simexplorer.is.service.StorageService;
 import fr.cemagref.simexplorer.is.service.StorageServiceClient;
 import fr.cemagref.simexplorer.is.service.remote.RemoteService;
 import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService;
 import fr.cemagref.simexplorer.is.storage.SortColumn;
 import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerAbstractContext;
-import org.codelutin.i18n.I18n;
-import org.codelutin.option.ParserFailedException;
 
 /**
  * Le context de l'application, implanté en singleton.
@@ -46,8 +46,6 @@
  */
 public class SimExplorerContext extends SimExplorerAbstractContext {
 
-    private final static boolean mock = false;
-
     /** le token pour la connexion au serveur distant */
     protected String token;
 
@@ -198,14 +196,10 @@
     /** @return le service de storage locale */
     protected StorageService getLocalStorageService() {
         if (localService == null) {
-            if (mock) {
-                localService = new MockStorageServiceImpl(false);
-            } else {
-                try {
-                    localService = new StorageServiceClient(this.getSource().toString(), "local.");
-                } catch (Exception e) {
-                    throw new SimExplorerRuntimeException(e);
-                }
+            try {
+                localService = new StorageServiceClient(this.getSource().toString(), "local.");
+            } catch (Exception e) {
+                throw new SimExplorerRuntimeException(e);
             }
             // init the cache
             localCache = new LoggableElementCache(this, localService);
@@ -216,19 +210,14 @@
     /** @return le service de storage distant */
     protected StorageService getRemoteStorageService() {
         if (remoteService == null) {
-            if (mock) {
-                remoteService = new MockStorageServiceImpl(true);
-            } else {
+            RemoteService.setUri(getRemoteConfig().getURI().toString());
 
-                RemoteService.setUri(getRemoteConfig().getURI().toString());
+            try {
+                remoteService = RemoteStorageService.getStorageService();
 
-                try {
-                    remoteService = RemoteStorageService.getStorageService();
-
-                } catch (Exception e) {
-                    // no remote service available
-                    remoteService = null;
-                }
+            } catch (Exception e) {
+                // no remote service available
+                remoteService = null;
             }
             if (remoteService != null) {
                 // init the cache

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GenerateDataAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GenerateDataAction.java	2008-03-20 14:25:29 UTC (rev 1416)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GenerateDataAction.java	2008-03-20 14:25:53 UTC (rev 1417)
@@ -2,7 +2,7 @@
 
 import java.awt.event.ActionEvent;
 
-import fr.cemagref.simexplorer.is.service.StorageServiceGenerator;
+import fr.cemagref.simexplorer.is.service.random.StorageServiceGenerator;
 import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction;
 
 @jaxx.runtime.builder.ActionConfig(

Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java	2008-03-20 14:25:29 UTC (rev 1416)
+++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java	2008-03-20 14:25:53 UTC (rev 1417)
@@ -19,7 +19,7 @@
 
 import org.apache.tapestry.annotations.InjectPage;
 
-import fr.cemagref.simexplorer.is.service.StorageServiceGenerator;
+import fr.cemagref.simexplorer.is.service.random.StorageServiceGenerator;
 import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService;
 import fr.cemagref.simexplorer.is.ui.web.pages.security.SuperAdminPage;

    

glandais＠users.labs.libre-entreprise.org

tags

participants (1)