Salome HOME
New study creation is fixed. Search page is also accessible now.
authorrkv <rkv@opencascade.com>
Wed, 10 Oct 2012 12:55:34 +0000 (12:55 +0000)
committerrkv <rkv@opencascade.com>
Wed, 10 Oct 2012 12:55:34 +0000 (12:55 +0000)
16 files changed:
Workspace/Siman-Common/src/org/splat/dal/dao/som/Database.java
Workspace/Siman-Common/src/org/splat/service/KnowledgeElementService.java
Workspace/Siman-Common/src/org/splat/service/KnowledgeElementServiceImpl.java
Workspace/Siman-Common/src/org/splat/service/StudyService.java
Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java
Workspace/Siman/src/org/splat/simer/Action.java
Workspace/Siman/src/org/splat/simer/DisplayKnowledgeAction.java
Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java
Workspace/Siman/src/org/splat/simer/OpenKnowledge.java
Workspace/Siman/src/org/splat/simer/OpenStudy.java
Workspace/Siman/src/org/splat/simer/SimulationContextFacade.java
Workspace/Siman/src/org/splat/simer/admin/DatabaseIndexingAction.java
Workspace/Siman/src/org/splat/simer/admin/SimulationContextAction.java
Workspace/Siman/src/spring/applicationContext.xml
Workspace/Siman/src/struts.xml

index 3764a3d38f13f546e569944ddcbe5b390bbf97ba..9daff682d28fdeefbbbc5f30f9632c16ba4f3c49 100644 (file)
@@ -331,17 +331,6 @@ public class Database extends org.splat.dal.dao.kernel.Database {
                                .uniqueResult();
        }
 
-       public static KnowledgeElement selectKnowledgeElement(int index) {
-               // -----------------------------------------------------------------
-               StringBuffer query = new StringBuffer(
-                               "from KnowledgeElement where rid='").append(index).append("'");
-               KnowledgeElement result = (KnowledgeElement) Database.getSession()
-                               .createQuery(query.toString()).uniqueResult();
-
-               result.getOwnerScenario().getOwnerStudy().loadWorkflow();
-               return result;
-       }
-
        public static SimulationContext selectSimulationContext(int index) {
                // -------------------------------------------------------------------
                StringBuffer query = new StringBuffer(
@@ -400,28 +389,6 @@ public class Database extends org.splat.dal.dao.kernel.Database {
                                query.toString()).list();
        }
 
-       public static Study selectStudy(int index) {
-               // -------------------------------------------
-               StringBuffer query = new StringBuffer("from Study where rid='").append(
-                               index).append("'");
-               Study result = (Study) Database.getSession().createQuery(
-                               query.toString()).uniqueResult();
-
-               result.loadWorkflow();
-               return result;
-       }
-
-       public static Study selectStudy(String refid) {
-               // ----------------------------------------------
-               StringBuffer query = new StringBuffer("from Study where sid='").append(
-                               refid).append("'");
-               Study result = (Study) Database.getSession().createQuery(
-                               query.toString()).uniqueResult();
-
-               result.loadWorkflow();
-               return result;
-       }
-
        protected static IDBuilder selectIDBuilder(int cycle) {
                // ------------------------------------------------------
                StringBuffer buffer = new StringBuffer("from IDBuilder where cycle='")
index 5ccb94c0bb49db0549f684513d1a1157b3add3c1..12cdc275274c3a65aae6654514e454912b32ee96 100644 (file)
@@ -26,4 +26,6 @@ public interface KnowledgeElementService {
 
        public void rename(KnowledgeElement knowledgeElement, String title)
                        throws InvalidPropertyException;
+
+       public KnowledgeElement selectKnowledgeElement(int index);
 }
index 1c107d545aa496765d674095b84250f698861833..b2c9b39e2a3be0c379ce39202a66a2cefe8381c6 100644 (file)
@@ -68,6 +68,17 @@ public class KnowledgeElementServiceImpl implements KnowledgeElementService {
       update(knowledgeElement);
     }
 
+       public KnowledgeElement selectKnowledgeElement(int index) {
+               // -----------------------------------------------------------------
+               StringBuffer query = new StringBuffer(
+                               "from KnowledgeElement where rid='").append(index).append("'");
+               KnowledgeElement result = (KnowledgeElement) Database.getSession()
+                               .createQuery(query.toString()).uniqueResult();
+
+               result.getOwnerScenario().getOwnerStudy().loadWorkflow();
+               return result;
+       }
+
        /**
         * @return
         */
index e8d8c6fd8258980f30b3c0074c42f0a1e66224e1..d697bb41a75de5ff4eb6fc9b5d8bef9273b3b879 100644 (file)
@@ -29,6 +29,8 @@ public interface StudyService {
 
        public int generateLocalIndex(Study aStudy);
 
+       public Study selectStudy(int index);
+
        public Study createStudy(Study.Properties sprop)
                        throws MissedPropertyException, InvalidPropertyException,
                        MultiplyDefinedException, RuntimeException;
index 374c04317d8ef27faca3eda61eab6778488a4e4a..a9fe8b47155581055b4a83a0a6264b9c38d4b807 100644 (file)
@@ -63,6 +63,28 @@ public class StudyServiceImpl implements StudyService {
 
        private ProjectElementService _projectElementService;
 
+       public Study selectStudy(int index) {
+               // -------------------------------------------
+               StringBuffer query = new StringBuffer("from Study where rid='").append(
+                               index).append("'");
+               Study result = (Study) Database.getSession().createQuery(
+                               query.toString()).uniqueResult();
+
+               result.loadWorkflow();
+               return result;
+       }
+
+       public Study selectStudy(String refid) {
+               // ----------------------------------------------
+               StringBuffer query = new StringBuffer("from Study where sid='").append(
+                               refid).append("'");
+               Study result = (Study) Database.getSession().createQuery(
+                               query.toString()).uniqueResult();
+
+               result.loadWorkflow();
+               return result;
+       }
+
        public Study createStudy(Study.Properties sprop)
                        throws MissedPropertyException, InvalidPropertyException,
                        MultiplyDefinedException, RuntimeException {
@@ -292,7 +314,7 @@ public class StudyServiceImpl implements StudyService {
 
        public int generateLocalIndex(Study aStudy) {
                aStudy.setLastLocalIndex(aStudy.getLastLocalIndex() + 1);
-               Database.getSession().update(this);
+               Database.getSession().update(aStudy);
                return aStudy.getLastLocalIndex();
        }
 
@@ -320,7 +342,7 @@ public class StudyServiceImpl implements StudyService {
                        aStudy.getScenariiList().add(
                                        aStudy.getScenariiList().indexOf(previous) + 1, scenario);
                }
-               session.update(this); // No need to update the Lucene index
+               session.update(aStudy); // No need to update the Lucene index
                session.save(scenario); // Must be done after updating this study because of the back reference to the study
                if (sprop.getBaseStep() != null) {
                        // No need to update the Knowledge Element index as Knowledge Elements are not copied
index 9d6cfece431d4ea74da177d6c1a97ff6b79d5bc8..35b0665518eb483d994f2151469d702cdc2f98b5 100644 (file)
@@ -86,16 +86,11 @@ public class ProjectSettingsServiceImpl implements ProjectSettingsService {
 //  ==============================================================================================================================
 //  Construction
 //  ==============================================================================================================================
-
-    public static ProjectSettingsServiceImpl getMe () {
-//  --------------------------------------
-      if (my == null) my = new ProjectSettingsServiceImpl();
-      return my;
-    }
        protected ProjectSettingsServiceImpl () {
 //  ----------------------------
          reprop = new Properties();
       steps  = new Vector<ProjectSettingsService.Step>();
+      my = this;
        }       
     
 //  ==============================================================================================================================
index 9766ed302cdf4419542d6d216ef126dbdc653431..610ca53bd04e492870a3c9da503d897491984771 100644 (file)
@@ -23,6 +23,8 @@ public class Action extends ActionSupport implements SessionAware {
 
        private   Map<String, Object>  session;
        private   String               mercode;
+       private OpenStudy _openStudy;
+       private OpenKnowledge _openKnowledge;
 
        private   static final long    serialVersionUID = -895295026709526501L;
     protected static final Logger  logger           = Logger.getLogger(Action.class);
@@ -99,17 +101,23 @@ public class Action extends ActionSupport implements SessionAware {
 //  ------------------------------------
       return (Menu)session.get("menu." + name);
     }
+    public void setOpenKnowledge (OpenKnowledge kelm) {
+        _openKnowledge = kelm;
+      }
     protected OpenKnowledge getOpenKnowledge () {
-//  -------------------------------------------
-      return (OpenKnowledge)session.get("knowledge.open");               // May be null
+       _openKnowledge = (OpenKnowledge)session.get("knowledge.open");               // May be null
+       return _openKnowledge;
     }
-    protected OpenStudy getOpenStudy () {
-//  -----------------------------------
-      return (OpenStudy)session.get("study.open");                       // May be null
+    public void setOpenStudy (OpenStudy aStudy) {
+      _openStudy = aStudy;
     }
+    public OpenStudy getOpenStudy () {
+       _openStudy = (OpenStudy)session.get("study.open");
+          return _openStudy;                       // May be null
+        }
     protected OpenKnowledge open (KnowledgeElement kelm) {
 //  ----------------------------------------------------
-      OpenKnowledge open = new OpenKnowledge(kelm);
+      OpenKnowledge open = _openKnowledge.open(kelm);
 
       closeKnowledge();   // Just in case
          session.put("knowledge.open", open);
@@ -117,7 +125,7 @@ public class Action extends ActionSupport implements SessionAware {
     }
     protected OpenStudy open (Study study) {
 //  --------------------------------------
-         OpenStudy open = new OpenStudy(getConnectedUser(), study);         // The connected user may be null
+         OpenStudy open = _openStudy.open(getConnectedUser(), study);         // The connected user may be null
 
       closeStudy();       // Just in case
          session.put("study.open", open);
index 988d6d5cc35f79f577edd971c12431c54f07304d..a5fec95a8cfd28e174f9a060564a5d436bf73800 100644 (file)
@@ -6,12 +6,15 @@ import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.splat.dal.dao.som.Database;
 import org.splat.dal.bo.som.KnowledgeElement;
+import org.splat.service.KnowledgeElementService;
 import org.splat.som.Step;
 
 
 public class DisplayKnowledgeAction extends DisplayBaseAction {
 
        protected  OpenKnowledge  myknelm   = null;    // Knowledge Element details
+
+       private KnowledgeElementService _knowledgeElementService;
     
        private static final long serialVersionUID = 8473504456981431762L;
 
@@ -30,7 +33,7 @@ public class DisplayKnowledgeAction extends DisplayBaseAction {
        if (myknelm != null && myknelm.getIndex() == index) {   // - The selected knowledge is currently open
           selection = myknelm.getSelection();        // Current selection
        } else {                                                // - The selected knowledge is new
-         KnowledgeElement kelm = Database.selectKnowledgeElement(index);
+         KnowledgeElement kelm = getKnowledgeElementService().selectKnowledgeElement(index);
           myknelm   = open(kelm);
           selection = myknelm.getSelection();        // Default selection
        }
@@ -40,7 +43,7 @@ public class DisplayKnowledgeAction extends DisplayBaseAction {
         return ERROR;
       }
       else if (selection != null) {                             // Re-opening (refreshing) the currently open knowledge
-           KnowledgeElement kelm = Database.selectKnowledgeElement(myknelm.getIndex());
+           KnowledgeElement kelm = getKnowledgeElementService().selectKnowledgeElement(myknelm.getIndex());
            myknelm  =  open(kelm);                      // Closes the previously open knowledge
            myknelm.setSelection(selection);
       }      
@@ -114,4 +117,21 @@ public class DisplayKnowledgeAction extends DisplayBaseAction {
 //  -------------------------------
       return "false";
     }
+
+       /**
+        * Get the knowledgeElementService.
+        * @return the knowledgeElementService
+        */
+       public KnowledgeElementService getKnowledgeElementService() {
+               return _knowledgeElementService;
+       }
+
+       /**
+        * Set the knowledgeElementService.
+        * @param knowledgeElementService the knowledgeElementService to set
+        */
+       public void setKnowledgeElementService(
+                       KnowledgeElementService knowledgeElementService) {
+               _knowledgeElementService = knowledgeElementService;
+       }
 }
\ No newline at end of file
index 0c7d45f9e98ce522d0e709d504560ea8fa5e3fde..b2d468c878facb70c850d7bfa2448c5da8eb4408 100644 (file)
@@ -7,6 +7,7 @@ import org.hibernate.Transaction;
 import org.splat.dal.dao.som.Database;
 import org.splat.dal.bo.som.ProjectElement;
 import org.splat.dal.bo.som.Scenario;
+import org.splat.service.StudyService;
 import org.splat.som.StepRights;
 import org.splat.dal.bo.som.Study;
 import org.splat.wapp.PopupMenu;
@@ -17,6 +18,8 @@ public class DisplayStudyStepAction extends DisplayBaseAction {
 
        protected OpenStudy   mystudy = null;    // Presented study
 
+       private StudyService _studyService;
+
        private static final long serialVersionUID = 6467920934724352021L;
 
 //  ==============================================================================================================================
@@ -36,7 +39,7 @@ public class DisplayStudyStepAction extends DisplayBaseAction {
           selection = mystudy.getSelection();                   // Current selection
           study     = mystudy.getStudyObject();                 // Current Study object
        } else {                                                // - The selected study is new
-         study     = Database.selectStudy(index);
+         study     = getStudyService().selectStudy(index);
          mystudy   = open(study);
           selection = mystudy.getSelection();                   // Default selection
        }
@@ -50,7 +53,7 @@ public class DisplayStudyStepAction extends DisplayBaseAction {
         study     = mystudy.getStudyObject();
       }
       else {                                                    // Re-opening (refreshing) the currently open study
-           study     = Database.selectStudy(mystudy.getIndex());
+           study     = getStudyService().selectStudy(mystudy.getIndex());
         mystudy   = open(study);                                // Closes the previously open study
         mystudy.setSelection(selection);
       }
@@ -161,4 +164,23 @@ public class DisplayStudyStepAction extends DisplayBaseAction {
 //  -------------------------------
       return String.valueOf(mystudy.isOpenForWriting());
     }
+
+       /**
+        * Get the studyService.
+        * 
+        * @return the studyService
+        */
+       public StudyService getStudyService() {
+               return _studyService;
+       }
+
+       /**
+        * Set the studyService.
+        * 
+        * @param studyService
+        *            the studyService to set
+        */
+       public void setStudyService(StudyService studyService) {
+               _studyService = studyService;
+       }
 }
\ No newline at end of file
index 6e5a90381d47ef3ea9e723686f29cfbbcda1d56b..86dfc0c1a5adb3a2873df250bb95dc01c6d48c4b 100644 (file)
@@ -12,6 +12,7 @@ import org.splat.dal.bo.som.ProgressState;
 import org.splat.dal.bo.som.Scenario;
 import org.splat.dal.bo.som.SimulationContext;
 import org.splat.service.ProjectElementService;
+import org.splat.service.technical.ProjectSettingsService;
 import org.splat.som.Step;
 import org.splat.wapp.SimpleMenu;
 
@@ -20,6 +21,7 @@ public class OpenKnowledge extends OpenObject {
        private KnowledgeElement myknelm;
        private String credate;
        private ProjectElementService _projectElementService;
+       private ProjectSettingsService _projectSettingsService;
 
        public class Menu extends SimpleMenu {
                // ------------------------------------
@@ -48,7 +50,7 @@ public class OpenKnowledge extends OpenObject {
        // Constructor
        // ==============================================================================================================================
 
-       public OpenKnowledge(KnowledgeElement knelm) {
+       public OpenKnowledge open (KnowledgeElement knelm) {
                // ---------------------------------------------
                ResourceBundle label = ResourceBundle.getBundle("labels",
                                ApplicationSettings.getCurrentLocale());
@@ -74,7 +76,7 @@ public class OpenKnowledge extends OpenObject {
                                ustep = next;
                        for (Iterator<SimulationContext> j = next
                                        .getAllSimulationContexts().iterator(); j.hasNext();) {
-                               context.add(new SimulationContextFacade(j.next()));
+                               context.add(new SimulationContextFacade(j.next(), getProjectSettings().getAllSteps()));
                        }
                }
                value.append("<p>").append("<b>")
@@ -85,6 +87,7 @@ public class OpenKnowledge extends OpenObject {
                                .append(".").append("</p>");
                description = value.toString();
                setupContents(); // Initializes documents and knowledge at ustep
+               return this;
        }
 
        // ==============================================================================================================================
@@ -198,4 +201,21 @@ public class OpenKnowledge extends OpenObject {
                        ProjectElementService projectElementService) {
                _projectElementService = projectElementService;
        }
+
+       /**
+        * Get project settings.
+        * @return Project settings service
+        */
+       private ProjectSettingsService getProjectSettings() {
+               return _projectSettingsService;
+       }
+
+       /**
+        * Set project settings service.
+        * @param projectSettingsService project settings service
+        */
+       public void setProjectSettings(
+                       ProjectSettingsService projectSettingsService) {
+               _projectSettingsService = projectSettingsService;
+       }
 }
\ No newline at end of file
index 30f40f56865c7c307b295b3ebed331332768dfef..92673d24305853dbdbef61994874d91d2343ffee 100644 (file)
@@ -27,6 +27,7 @@ import org.splat.dal.bo.som.DocumentType;
 import org.splat.dal.bo.som.KnowledgeElement;
 import org.splat.dal.bo.som.ProgressState;
 import org.splat.service.ProjectElementService;
+import org.splat.service.ScenarioService;
 import org.splat.service.technical.ProjectSettingsService;
 import org.splat.dal.bo.som.Publication;
 import org.splat.som.Revision;
@@ -50,6 +51,7 @@ public class OpenStudy extends OpenObject implements OpenStudyServices {
     private  Publication selecdoc;
        private ProjectSettingsService _projectSettingsService;
        private ProjectElementService _projectElementService;
+       private ScenarioService _scenarioService;
     
     protected final static Logger   logger = org.splat.simer.Action.logger;
     
@@ -57,12 +59,12 @@ public class OpenStudy extends OpenObject implements OpenStudyServices {
 //  Constructor
 //  ==============================================================================================================================
 
-    public OpenStudy (User user, Study study) {
+    public OpenStudy open (User user, Study study) {
 //  -----------------------------------------
       ResourceBundle    custom    = ResourceBundle.getBundle("som", ApplicationSettings.getCurrentLocale());
-         SimpleDateFormat  datstring = new SimpleDateFormat(custom.getString("date.format"));
+      SimpleDateFormat  datstring = new SimpleDateFormat(custom.getString("date.format"));
       Revision.Format   verstring = new Revision.Format(getProjectSettings().getRevisionPattern());
-
+        
       cuser       = user;                           // May be null if nobody connected
       mystudy     = study;
       selection   = "0.1";                          // Default selection
@@ -79,7 +81,7 @@ public class OpenStudy extends OpenObject implements OpenStudyServices {
       ustep.setActor(cuser);
       involving.add(ustep);
       for (Iterator<SimulationContext> i=ustep.getAllSimulationContexts().iterator(); i.hasNext(); ) {
-        context.add( new SimulationContextFacade(i.next()) );
+        context.add( new SimulationContextFacade(i.next(), getProjectSettings().getAllSteps()) );
       }
       if (mystudy.isStaffedBy(cuser) || mystudy.hasActor(cuser)) {
 //     ProgressState state = mystudy.getProgressState();
@@ -92,8 +94,11 @@ public class OpenStudy extends OpenObject implements OpenStudyServices {
       urightstep  = new StepRights(cuser, ustep);
 
       menu = new StudyMenu(mystudy);
+      ((StudyMenu)menu).setProjectElementService(getProjectElementService());
+      ((StudyMenu)menu).setScenarioService(getScenarioService());
       menu.selects(selection);                      // Initializes menu items to be displayed
       setupContents();                              // Initializes documents and knowledge at ustep
+      return this;
     }
 
 //  ==============================================================================================================================
@@ -285,7 +290,7 @@ public class OpenStudy extends OpenObject implements OpenStudyServices {
 
     protected void add (SimulationContext contex) {
 //  ---------------------------------------------
-      SimulationContextFacade  facade = new SimulationContextFacade(contex);
+      SimulationContextFacade  facade = new SimulationContextFacade(contex, getProjectSettings().getAllSteps());
 
       context.add(facade);
     }
@@ -377,7 +382,7 @@ public class OpenStudy extends OpenObject implements OpenStudyServices {
       context.clear();
       for (Iterator<Step> i=involving.iterator(); i.hasNext(); ) {
         for (Iterator<SimulationContext> j=i.next().getAllSimulationContexts().iterator(); j.hasNext(); ) {
-          context.add( new SimulationContextFacade(j.next()) );
+          context.add( new SimulationContextFacade(j.next(), getProjectSettings().getAllSteps()) );
         }
       }
     }
@@ -451,4 +456,23 @@ public class OpenStudy extends OpenObject implements OpenStudyServices {
                        ProjectElementService projectElementService) {
                _projectElementService = projectElementService;
        }
+
+       /**
+        * Get the scenarioService.
+        * 
+        * @return the scenarioService
+        */
+       public ScenarioService getScenarioService() {
+               return _scenarioService;
+       }
+
+       /**
+        * Set the scenarioService.
+        * 
+        * @param scenarioService
+        *            the scenarioService to set
+        */
+       public void setScenarioService(ScenarioService scenarioService) {
+               _scenarioService = scenarioService;
+       }
 }
\ No newline at end of file
index 1909107b54e4e849b7453d1b5db344f22abed6f1..3cd145fe02185072094c5762a13375cc485dc662 100644 (file)
@@ -1,6 +1,7 @@
 package org.splat.simer;
 
 import java.util.Iterator;
+import java.util.List;
 import java.util.ResourceBundle;
 
 import org.splat.dal.bo.som.ProgressState;
@@ -17,19 +18,18 @@ public class SimulationContextFacade {
     private int                step;
     private ProgressState      state;
     private PopupMenu          popup;
-       private ProjectSettingsService _projectSettingsService;
 
 //  ==============================================================================================================================
 //  Constructor
 //  ==============================================================================================================================
 
-    public SimulationContextFacade (SimulationContext represented) {
+    public SimulationContextFacade (SimulationContext represented, List<ProjectSettingsService.Step> allSteps) {
 //  --------------------------------------------------------------
       my    = represented;
       popup = ApplicationSettings.getPopupMenu("scontext");
 
       SimulationContextType type = my.getType();
-      for (Iterator<ProjectSettingsService.Step> i=getProjectSettings().getAllSteps().iterator(); i.hasNext(); ) {
+      for (Iterator<ProjectSettingsService.Step> i=allSteps.iterator(); i.hasNext(); ) {
         ProjectSettingsService.Step   next = i.next();
        if (!type.isAttachedTo(next)) continue;
         step = next.getNumber();
@@ -90,20 +90,4 @@ public class SimulationContextFacade {
 //  ---------------------------------------------------------
       return  my.equals(represented);
     }
-    /**
-     * Get project settings.
-        * @return Project settings service
-        */
-       private ProjectSettingsService getProjectSettings() {
-               return _projectSettingsService;
-       }
-
-       /**
-        * Set project settings service.
-        * @param projectSettingsService project settings service
-        */
-       public void setProjectSettings(
-                       ProjectSettingsService projectSettingsService) {
-               _projectSettingsService = projectSettingsService;
-       }
 }
\ No newline at end of file
index 303bde8a000d3788f010d98462f737199defbb3e..b3b00415ab399722e2d42658c726a29833e4defb 100644 (file)
@@ -7,6 +7,7 @@ import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.splat.service.SearchService;
 import org.splat.service.SearchServiceImpl;
+import org.splat.service.StudyService;
 import org.splat.simer.Action;
 import org.splat.dal.dao.som.Database;
 import org.splat.dal.bo.som.Study;
@@ -18,6 +19,7 @@ public class DatabaseIndexingAction extends Action {
     private String              indices;
        private SearchService _searchService;
        private ImportedStudy _importedStudy;
+       private StudyService _studyService;
 
     private static final long serialVersionUID = 4194268823457749655L;
 
@@ -47,7 +49,7 @@ public class DatabaseIndexingAction extends Action {
 
       for (int i=0; i<ridlist.length; i++) {
        int                 index = Integer.valueOf(ridlist[i].trim());
-       Study               study = Database.selectStudy(index);
+       Study               study = getStudyService().selectStudy(index);
         getSearchService().indexStudy(study);
       }
       filter.put("owner", "all");   // Just in case of 1st study search
@@ -105,4 +107,23 @@ public class DatabaseIndexingAction extends Action {
        public void setImportedStudy(ImportedStudy importedStudy) {
                _importedStudy = importedStudy;
        }
+
+       /**
+        * Get the studyService.
+        * 
+        * @return the studyService
+        */
+       public StudyService getStudyService() {
+               return _studyService;
+       }
+
+       /**
+        * Set the studyService.
+        * 
+        * @param studyService
+        *            the studyService to set
+        */
+       public void setStudyService(StudyService studyService) {
+               _studyService = studyService;
+       }
 }
\ No newline at end of file
index 81018d77934ded877a24dfbfaf793dd683119507..693609c343b4b204b5db1eddfbfd2849f89c32b1 100644 (file)
@@ -19,6 +19,7 @@ import org.splat.simer.ApplicationSettings;
 import org.splat.dal.dao.som.Database;
 import org.splat.dal.bo.som.KnowledgeElement;
 import org.splat.dal.bo.som.ProgressState;
+import org.splat.service.KnowledgeElementService;
 import org.splat.service.SearchService;
 import org.splat.service.technical.ProjectSettingsService;
 import org.splat.service.dto.Proxy;
@@ -39,6 +40,7 @@ public class SimulationContextAction extends Action {
     private List<SimulationContext>       existing;    // Existing simulation contexts of selected type
        private SearchService _searchService;
        private ProjectSettingsService _projectSettingsService;
+       private KnowledgeElementService _knowledgeElementService;
 
        private static final long serialVersionUID = 7083323229359094699L;
 
@@ -136,7 +138,7 @@ public class SimulationContextAction extends Action {
         step  = edition.getType().getAttachedStep();
         owner = new HashSet<ProjectElementFacade>();
         for (Iterator<Proxy> i=kelm.iterator(); i.hasNext(); ) {
-          KnowledgeElement      next = Database.selectKnowledgeElement(i.next().getIndex());
+          KnowledgeElement      next = getKnowledgeElementService().selectKnowledgeElement(i.next().getIndex());
           ProjectElementFacade  facade;
           if (step.appliesTo(Study.class)) facade = new ProjectElementFacade(next.getOwnerScenario().getOwnerStudy(), step);
           else                             facade = new ProjectElementFacade(next.getOwnerScenario(), step);
@@ -241,4 +243,21 @@ public class SimulationContextAction extends Action {
 //  ---------------------------------------
       selection = Integer.valueOf(index);
     }
+
+       /**
+        * Get the knowledgeElementService.
+        * @return the knowledgeElementService
+        */
+       public KnowledgeElementService getKnowledgeElementService() {
+               return _knowledgeElementService;
+       }
+
+       /**
+        * Set the knowledgeElementService.
+        * @param knowledgeElementService the knowledgeElementService to set
+        */
+       public void setKnowledgeElementService(
+                       KnowledgeElementService knowledgeElementService) {
+               _knowledgeElementService = knowledgeElementService;
+       }
 }
\ No newline at end of file
index df90319dd1779c58dfce9b8c101fb8b0be965819..d915f684acb3872180ae463859ecc1bd37473be5 100644 (file)
@@ -12,6 +12,27 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
        <bean id="importedStudy" class="org.splat.simer.admin.ImportedStudy"
                scope="prototype" />
 
+       <bean id="openStudy" class="org.splat.simer.OpenStudy"
+               scope="prototype">
+               <property name="projectElementService"
+                       ref="projectElementService" />
+               <property name="projectSettings" ref="projectSettings" />
+               <property name="scenarioService" ref="scenarioService" />
+       </bean>
+
+       <bean id="openKnowledge" class="org.splat.simer.OpenKnowledge"
+               scope="prototype">
+               <property name="projectElementService"
+                       ref="projectElementService" />
+               <property name="projectSettings" ref="projectSettings" />
+       </bean>
+
+       <bean id="baseAction" class="org.splat.simer.Action"
+               scope="prototype">
+               <property name="openStudy" ref="openStudy" />
+               <property name="openKnowledge" ref="openKnowledge" />
+       </bean>
+
        <bean id="startAction" class="org.splat.simer.StartAction"
                scope="prototype">
                <property name="applicationSettings" ref="applicationSettings" />
@@ -44,8 +65,9 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
                class="org.splat.simer.SearchDocumentAction" scope="prototype">
        </bean>
 
-       <bean id="displayStudyStepAction"
+       <bean id="displayStudyStepAction" parent="baseAction"
                class="org.splat.simer.DisplayStudyStepAction" scope="prototype">
+               <property name="studyService" ref="studyService" />
        </bean>
 
        <bean id="studyPropertiesAction"
@@ -55,6 +77,8 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
        <bean id="displayKnowledgeAction"
                class="org.splat.simer.DisplayKnowledgeAction" scope="prototype">
+               <property name="knowledgeElementService"
+                       ref="knowledgeElementService" />
        </bean>
 
        <bean id="editStudyAction" class="org.splat.simer.EditStudyAction"
@@ -62,6 +86,11 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
                <property name="studyService" ref="studyService" />
        </bean>
 
+       <bean id="newStudyAction" class="org.splat.simer.NewStudyAction"
+               parent="baseAction" scope="prototype">
+               <property name="studyService" ref="studyService" />
+       </bean>
+
        <bean id="newScenarioAction"
                class="org.splat.simer.NewScenarioAction" scope="prototype">
                <property name="projectElementService"
@@ -116,6 +145,7 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
        <bean id="databaseIndexingAction"
                class="org.splat.simer.admin.DatabaseIndexingAction"
                scope="prototype">
+               <property name="studyService" ref="studyService" />
                <property name="importedStudy" ref="importedStudy" />
                <property name="searchService" ref="searchService" />
        </bean>
@@ -127,6 +157,8 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
        <bean id="simulationContextAction"
                class="org.splat.simer.admin.SimulationContextAction"
                scope="prototype">
+               <property name="knowledgeElementService"
+                       ref="knowledgeElementService" />
                <property name="searchService" ref="searchService" />
                <property name="projectSettings" ref="projectSettings" />
        </bean>
index 210cdb0a3023dad3a73d1b07c937c576ce4c42e6..65f7873257f33127f5c323274d8569d82708be0c 100644 (file)
 
         <default-action-ref name="index" />
 
-        <action name="index" class="org.splat.simer.StartAction" method="initialize">
+        <action name="index" class="startAction" method="initialize">
             <result name="success">/welcome.jsp</result>
             <result name="error">/error.jsp?error=initialization</result>
         </action>        
-        <action name="login" class="org.splat.simer.ConnectionAction" method="login">
+        <action name="login" class="connectionAction" method="login">
             <result name="none">/home.jsp</result>
             <result name="open"      type="redirectAction">select?menu=search</result>
             <result name="study"     type="redirectAction">study/step-study</result>
@@ -30,7 +30,7 @@
             <result name="input">/login.jsp</result>
             <result name="error">/home.jsp?error=login</result>
         </action>
-        <action name="logout" class="org.splat.simer.ConnectionAction" method="logout">
+        <action name="logout" class="connectionAction" method="logout">
             <result name="none">/home.jsp</result>
             <result name="create">/home.jsp</result>
             <result name="open"      type="redirectAction">select?menu=search</result>
@@ -39,7 +39,7 @@
             <result name="datadmin">/home.jsp</result>
             <result name="sysadmin">/home.jsp</result>
         </action>
-        <action name="select" class="org.splat.simer.MenuAction" method="selectItem">
+        <action name="select" class="menuAction" method="selectItem">
             <result name="new-empty"        type="redirectAction">study/new-empty</result>
             <result name="search-study"     type="redirectAction">study/search-study</result>
             <result name="search-knowledge" type="redirectAction">study/search-knowledge</result>
 
     <package name="study" namespace="/study" extends="simer-default">
 
-        <action name="notyetimplemented" class="org.splat.simer.NotYetImplementedAction" method="initialize">
+        <action name="notyetimplemented" class="notYetImplementedAction" method="initialize">
             <result name="success">/study/error.jsp?message=notyetimplemented</result>
         </action>
 
         <!-- Creation of a study
           -->        
-        <action name="new-empty" class="org.splat.simer.NewStudyAction" method="initialize">
+        <action name="new-empty" class="newStudyAction" method="initialize">
             <result name="success">/study/newStudy.jsp</result>
         </action>
-        <action name="valid-new" class="org.splat.simer.NewStudyAction" method="create">
+        <action name="valid-new" class="newStudyAction" method="create">
             <result name="success" type="redirectAction">open-study?selection=0.1</result>
             <result name="input">/study/newStudy.jsp</result>
             <result name="error">/home.jsp?error=newstudy</result>
 
         <!-- Search for studies, knowledge elements and documents
           -->
-        <action name="search-study" class="org.splat.simer.SearchStudyAction" method="initialize">
+        <action name="search-study" class="searchStudyAction" method="initialize">
             <result name="success">/study/searchStudy.jsp</result>
             <result name="error">/home.jsp</result>
         </action>
-        <action name="refresh-study" class="org.splat.simer.SearchStudyAction" method="submitForm">
+        <action name="refresh-study" class="searchStudyAction" method="submitForm">
             <result name="selectype">/study/searchStudy.jsp?action=setContext</result>
             <result name="refresh">/study/searchStudy.jsp</result>
             <result name="wait">/study/searchStudy.jsp</result>
             <result name="error" type="redirectAction">search-study</result>
         </action>
 
-        <action name="search-knowledge" class="org.splat.simer.SearchKnowledgeAction" method="initialize">
+        <action name="search-knowledge" class="searchKnowledgeAction" method="initialize">
             <result name="success">/study/searchKnowledge.jsp</result>
         </action>
-        <action name="refresh-knowledge" class="org.splat.simer.SearchKnowledgeAction" method="submitForm">
+        <action name="refresh-knowledge" class="searchKnowledgeAction" method="submitForm">
             <result name="selectype">/study/searchKnowledge.jsp?action=setContext</result>
             <result name="refresh">/study/searchKnowledge.jsp</result>
             <result name="wait">/study/searchKnowledge.jsp</result>
             <result name="error" type="redirectAction">search-knowledge</result>
         </action>
 
-        <action name="search-document" class="org.splat.simer.SearchDocumentAction" method="initialize">
+        <action name="search-document" class="searchDocumentAction" method="initialize">
             <result name="success">/study/searchDocument.jsp</result>
         </action>
 
         <!-- Display of studies
           -->
-        <action name="open-study" class="org.splat.simer.DisplayStudyStepAction" method="open">
+        <action name="open-study" class="displayStudyStepAction" method="open">
             <result name="success">/study/displayStudyStep.jsp</result>
         </action>
-        <action name="step-study" class="org.splat.simer.DisplayStudyStepAction" method="selectStep">
+        <action name="step-study" class="displayStudyStepAction" method="selectStep">
             <result name="success">/study/displayStudyStep.jsp</result>
         </action>
-        <action name="document-study" class="org.splat.simer.DisplayStudyStepAction" method="selectDocument">
+        <action name="document-study" class="displayStudyStepAction" method="selectDocument">
             <result name="success">/study/displayStudyStep.jsp</result>
         </action>
-        <action name="knowledge-study" class="org.splat.simer.DisplayStudyStepAction" method="selectKnowledge">
+        <action name="knowledge-study" class="displayStudyStepAction" method="selectKnowledge">
             <result name="success">/study/displayStudyStep.jsp</result>
         </action>
-        <action name="close-study" class="org.splat.simer.DisplayStudyStepAction" method="close">
+        <action name="close-study" class="displayStudyStepAction" method="close">
             <result name="success">/home.jsp</result>
         </action>
-        <action name="prop-study" class="org.splat.simer.StudyPropertiesAction" method="initialize">
+        <action name="prop-study" class="studyPropertiesAction" method="initialize">
             <result name="display">/study/displayStudyProperties.jsp</result>
             <result name="edit">/study/editStudyProperties.jsp</result>
         </action>
 
         <!-- Display of knowledge elements
           -->        
-        <action name="open-knowledge" class="org.splat.simer.DisplayKnowledgeAction" method="open">
+        <action name="open-knowledge" class="displayKnowledgeAction" method="open">
             <result name="success">/study/displayKnowledge.jsp</result>
         </action>
-        <action name="step-knowledge" class="org.splat.simer.DisplayKnowledgeAction" method="selectStep">
+        <action name="step-knowledge" class="displayKnowledgeAction" method="selectStep">
             <result name="success">/study/displayKnowledge.jsp</result>
         </action>
-        <action name="document-knowledge" class="org.splat.simer.DisplayKnowledgeAction" method="selectDocument">
+        <action name="document-knowledge" class="displayKnowledgeAction" method="selectDocument">
             <result name="success">/study/displayKnowledge.jsp</result>
         </action>
-        <action name="knowledge-knowledge" class="org.splat.simer.DisplayKnowledgeAction" method="selectKnowledge">
+        <action name="knowledge-knowledge" class="displayKnowledgeAction" method="selectKnowledge">
             <result name="success">/study/displayKnowledge.jsp</result>
         </action>
-        <action name="close-knowledge" class="org.splat.simer.DisplayKnowledgeAction" method="close">
+        <action name="close-knowledge" class="displayKnowledgeAction" method="close">
             <result name="success">/home.jsp</result>
         </action>
 
         <!-- Edition of study
           -->        
-        <action name="edit-study" class="org.splat.simer.EditStudyAction" method="edition">
+        <action name="edit-study" class="editStudyAction" method="edition">
             <result name="success">/study/displayStudyStep.jsp</result>
         </action>
-        <action name="add-scenario" class="org.splat.simer.NewScenarioAction" method="initialize">
+        <action name="add-scenario" class="newScenarioAction" method="initialize">
             <result name="success">/study/newScenario.jsp?init=focus</result>
         </action>
-        <action name="edit-title" class="org.splat.simer.StudyPropertiesAction" method="editTitle">
+        <action name="edit-title" class="studyPropertiesAction" method="editTitle">
             <result name="success">/study/editStudyProperties.jsp?action=edititle</result>
         </action>
-        <action name="edit-contributor" class="org.splat.simer.StudyPropertiesAction" method="editContributors">
+        <action name="edit-contributor" class="studyPropertiesAction" method="editContributors">
             <result name="success">/study/editStudyProperties.jsp?action=edibutor</result>
         </action>
-        <action name="edit-cycle" class="org.splat.simer.StudyPropertiesAction" method="editCycle">
+        <action name="edit-cycle" class="studyPropertiesAction" method="editCycle">
             <result name="success">/study/editStudyProperties.jsp?action=edicycle</result>
         </action>
-        <action name="select-step" class="org.splat.simer.NewScenarioAction" method="selectStep">
+        <action name="select-step" class="newScenarioAction" method="selectStep">
             <result name="success">/study/newScenario.jsp</result>
         </action>
-        <action name="valid-add" class="org.splat.simer.NewScenarioAction" method="create">
+        <action name="valid-add" class="newScenarioAction" method="create">
             <result name="cancel"  type="redirectAction">step-study</result>
             <result name="success" type="redirectAction">step-study</result>
            <result name="error">/study/displayStudyStep.jsp?error=addScenario</result>
         </action>
-        <action name="valid-edit" class="org.splat.simer.StudyPropertiesAction" method="edition">
+        <action name="valid-edit" class="studyPropertiesAction" method="edition">
             <result name="success">/study/editStudyProperties.jsp</result>
         </action>
-        <action name="prop-scenario" class="org.splat.simer.EditScenarioPropertiesAction" method="initialize">
+        <action name="prop-scenario" class="editScenarioPropertiesAction" method="initialize">
             <result name="success">/study/editScenarioProperties.jsp</result>
         </action>
 
         <!-- Edition of scenario
           -->
-        <action name="checkin-scenario" class="org.splat.simer.EditScenarioPropertiesAction" method="checkin">
+        <action name="checkin-scenario" class="editScenarioPropertiesAction" method="checkin">
             <result name="success">/study/displayStudyStep.jsp</result>
         </action>
 
         <!-- Edition of simulation contexts
           -->        
-        <action name="add-context" class="org.splat.simer.EditSimulationContextAction" method="initialize">
+        <action name="add-context" class="editSimulationContextAction" method="initialize">
             <result name="create">/study/displayStudyStep.jsp?action=newContext</result>
             <result name="select">/study/displayStudyStep.jsp?action=selectContext</result>
         </action>
-        <action name="selectContext" class="org.splat.simer.EditSimulationContextAction" method="selectContext">
+        <action name="selectContext" class="editSimulationContextAction" method="selectContext">
             <result name="create">/study/displayStudyStep.jsp?action=newContext</result>
             <result name="set">/study/displayStudyStep.jsp?action=setContext&amp;index=%{contextType.index}</result>
         </action>
-        <action name="newContext" class="org.splat.simer.EditSimulationContextAction" method="createContext">
+        <action name="newContext" class="editSimulationContextAction" method="createContext">
             <result name="success">/study/displayStudyStep.jsp</result>
             <result name="input">/study/displayStudyStep.jsp?action=newContext</result>
             <result name="error">/study/displayStudyStep.jsp?error=addContext</result>
         </action>
-        <action name="setContext" class="org.splat.simer.EditSimulationContextAction" method="setContext">
+        <action name="setContext" class="editSimulationContextAction" method="setContext">
             <result name="success">/study/displayStudyStep.jsp</result>
             <result name="input">/study/displayStudyStep.jsp?action=setContext&amp;index=%{contextType.index}</result>
             <result name="error">/study/displayStudyStep.jsp?error=addContext</result>
         </action>
-        <action name="remove-context" class="org.splat.simer.EditSimulationContextAction" method="deleteContext">
+        <action name="remove-context" class="editSimulationContextAction" method="deleteContext">
             <result name="success">/study/displayStudyStep.jsp</result>
             <result name="error">/study/displayStudyStep.jsp?error=removeContext</result>
         </action>
 
         <!-- Edition of documents
           -->
-        <action name="select-file" class="org.splat.simer.UploadAction" method="initialize">
+        <action name="select-file" class="uploadAction" method="initialize">
             <result name="success">/study/upload.jsp</result>
         </action>
-        <action name="upload" class="org.splat.simer.UploadAction" method="upload">
+        <action name="upload" class="uploadAction" method="upload">
             <result name="cancel"  type="redirectAction">step-study</result>
             <result name="import"  type="redirectAction">import-document?fileName=%{fileName}</result>
             <result name="version" type="redirectAction">version-document?index=%{index}&amp;fileName=%{fileName}</result>
             <result name="attach"  type="redirectAction">attach-document?index=%{index}&amp;fileName=%{fileName}</result>
             <result name="outofmemory">/study/error.jsp?message=outofmemory</result>
         </action>
-        <action name="import-document" class="org.splat.simer.ImportDocumentAction" method="initialize">
+        <action name="import-document" class="importDocumentAction" method="initialize">
             <result name="success">/study/importDocument.jsp</result>
             <result name="error">/study/importError.jsp?message=%{errorCode}</result>
         </action>
-        <action name="valid-import" class="org.splat.simer.ImportDocumentAction" method="import">
+        <action name="valid-import" class="importDocumentAction" method="import">
             <result name="success" type="redirectAction">step-study</result>
             <result name="cancel"  type="redirectAction">step-study</result>
             <result name="error">/study/importError.jsp?message=%{errorCode}&amp;action=back</result>
         </action>
-        <action name="version-document" class="org.splat.simer.VersionDocumentAction" method="initialize">
+        <action name="version-document" class="versionDocumentAction" method="initialize">
             <result name="success">/study/versionDocument.jsp</result>
             <result name="error">/study/importError.jsp?message=%{errorCode}</result>
         </action>
-        <action name="valid-version" class="org.splat.simer.VersionDocumentAction" method="version">
+        <action name="valid-version" class="versionDocumentAction" method="version">
             <result name="success" type="redirectAction">step-study</result>
             <result name="cancel"  type="redirectAction">step-study</result>
             <result name="error">/study/importError.jsp?message=%{errorCode}&amp;action=back</result>
         </action>
-        <action name="attach-document" class="org.splat.simer.EditDocumentAction" method="attach">
+        <action name="attach-document" class="editDocumentAction" method="attach">
             <result name="success">/study/displayStudyStep.jsp?action=display</result>
         </action>
-        <action name="edit-document" class="org.splat.simer.EditDocumentAction" method="initialize">
+        <action name="edit-document" class="editDocumentAction" method="initialize">
             <result name="success">/study/displayStudyStep.jsp</result>
         </action>
-        <action name="setDocument" class="org.splat.simer.EditDocumentAction" method="setDocument">
+        <action name="setDocument" class="editDocumentAction" method="setDocument">
             <result name="success">/study/displayStudyStep.jsp?action=display</result>
         </action>
-        <action name="remove-document" class="org.splat.simer.EditDocumentAction" method="deleteDocument">
+        <action name="remove-document" class="editDocumentAction" method="deleteDocument">
             <result name="success">/study/displayStudyStep.jsp</result>
             <result name="error">/study/displayStudyStep.jsp?error=removeDocument</result>
         </action>
 
         <!-- Edition of knowledge elements
           -->        
-        <action name="add-knowledge" class="org.splat.simer.EditKnowledgeElementAction" method="initialize">
+        <action name="add-knowledge" class="editKnowledgeElementAction" method="initialize">
             <result name="success">/study/displayStudyStep.jsp?action=addKnowledge&amp;index=%{knowledgeType}</result>
         </action>
-        <action name="edit-knowledge" class="org.splat.simer.EditKnowledgeElementAction" method="initialize">
+        <action name="edit-knowledge" class="editKnowledgeElementAction" method="initialize">
             <result name="success">/study/displayStudyStep.jsp</result>
         </action>
-        <action name="setKnowledge" class="org.splat.simer.EditKnowledgeElementAction" method="setKnowledge">
+        <action name="setKnowledge" class="editKnowledgeElementAction" method="setKnowledge">
             <result name="success">/study/displayStudyStep.jsp?action=display</result>
         </action>
-        <action name="remove-knowledge" class="org.splat.simer.EditKnowledgeElementAction" method="deleteKnowledge">
+        <action name="remove-knowledge" class="editKnowledgeElementAction" method="deleteKnowledge">
             <result name="success">/study/displayStudyStep.jsp</result>
             <result name="error">/study/displayStudyStep.jsp?error=removeKnowledge</result>
         </action>
 
         <!-- Menus of database administration
           -->        
-        <action name="indexing" class="org.splat.simer.admin.DatabaseIndexingAction" method="initialize">
+        <action name="indexing" class="databaseIndexingAction" method="initialize">
             <result name="success">/sadmin/indexStudies.jsp</result>
         </action>
-        <action name="valid-indexing" class="org.splat.simer.admin.DatabaseIndexingAction" method="indexing">
+        <action name="valid-indexing" class="databaseIndexingAction" method="indexing">
             <result name="success" type="redirectAction">../study/search-study</result>
         </action>
-        <action name="select-file" class="org.splat.simer.UploadAction" method="initialize">
+        <action name="select-file" class="uploadAction" method="initialize">
             <result name="success">/sadmin/upload.jsp</result>
         </action>
-        <action name="upload"      class="org.splat.simer.UploadAction" method="upload">
+        <action name="upload"      class="uploadAction" method="upload">
             <result name="importuser" type="redirectAction">importuser?fileName=%{fileName}</result>
         </action>
-        <action name="importuser" class="org.splat.simer.admin.ImportUserAction" method="import">
+        <action name="importuser" class="importUserAction" method="import">
             <result name="success">/sadmin/displayUser.jsp</result>
         </action>
 
         <!-- Menus of knowledge administration
           -->        
-        <action name="scontext" class="org.splat.simer.admin.SimulationContextAction" method="initialize">
+        <action name="scontext" class="simulationContextAction" method="initialize">
             <result name="success">/sadmin/approveSContext.jsp</result>
         </action>
-        <action name="scontext-edit" class="org.splat.simer.admin.SimulationContextAction" method="select">
+        <action name="scontext-edit" class="simulationContextAction" method="select">
             <result name="success">/sadmin/approveSContext.jsp</result>
         </action>
-        <action name="knowelm"  class="org.splat.simer.admin.KnowledgeElementAction" method="initialize">
+        <action name="knowelm"  class="knowledgeElementAction" method="initialize">
             <result name="success">/sadmin/approveKnowelm.jsp</result>
         </action>
     </package>
 
     <package name="sgeom" namespace="/sgeom" extends="simer-default">
 
-        <action name="valid-save"    class="org.splat.module.SaveDocumentAction" method="save">
+        <action name="valid-save"    class="saveDocumentAction" method="save">
             <result name="success">/sgeom/index.jsp</result>
         </action>
-        <action name="valid-update"  class="org.splat.module.SaveDocumentAction" method="update">
+        <action name="valid-update"  class="saveDocumentAction" method="update">
             <result name="success">/sgeom/index.jsp</result>
         </action>
-        <action name="valid-version" class="org.splat.module.SaveDocumentAction" method="version">
+        <action name="valid-version" class="saveDocumentAction" method="version">
             <result name="success">/sgeom/index.jsp</result>
         </action>
 
 
     <package name="smesh" namespace="/smesh" extends="simer-default">
 
-        <action name="valid-save"    class="org.splat.module.SaveDocumentAction" method="save">
+        <action name="valid-save"    class="saveDocumentAction" method="save">
             <result name="success">/smesh/index.jsp</result>
         </action>
-        <action name="valid-update"  class="org.splat.module.SaveDocumentAction" method="update">
+        <action name="valid-update"  class="saveDocumentAction" method="update">
             <result name="success">/smesh/index.jsp</result>
         </action>
-        <action name="valid-version" class="org.splat.module.SaveDocumentAction" method="version">
+        <action name="valid-version" class="saveDocumentAction" method="version">
             <result name="success">/smesh/index.jsp</result>
         </action>