From 579560456cc897f82bffbed049624d26d6927e59 Mon Sep 17 00:00:00 2001 From: rkv Date: Mon, 1 Oct 2012 08:22:59 +0000 Subject: [PATCH 1/1] Refactoring: kernel and som are moved to Siman-Common. --- Workspace/SPlat/.classpath | 2 +- Workspace/SPlat/build.xml | 20 +- Workspace/SPlat/src/META-INF/MANIFEST.MF | 3 - .../org/splat/kernel/TextAttribute.hbm.xml | 17 -- .../src/org/splat/manox/WordXMLDocument.java | 1 - .../src/org/splat/{kernel => manox}/XDOM.java | 2 +- .../splat/{kernel => manox}/XMLException.java | 2 +- Workspace/Siman-Common/.classpath | 2 - Workspace/Siman-Common/build.xml | 2 +- .../src/cast3m.som.xml | 0 .../src/hibernate.cfg.xml | 0 .../src/log4j.properties | 0 .../src/org/splat/kernel/Any.hbm.xml | 0 .../src/org/splat/kernel/Any.java | 0 .../src/org/splat/kernel/Attribute.hbm.xml | 0 .../src/org/splat/kernel/Attribute.java | 0 .../src/org/splat/kernel/Database.java | 0 .../src/org/splat/kernel/Do.java | 0 .../kernel/DuplicatePropertyException.java | 0 .../src/org/splat/kernel/Entity.hbm.xml | 0 .../src/org/splat/kernel/Entity.java | 0 .../src/org/splat/kernel/GenericEnumType.java | 4 +- .../src/org/splat/kernel/IDGenerator.java | 0 .../src/org/splat/kernel/IDPool.hbm.xml | 0 .../src/org/splat/kernel/IDPool.java | 0 .../kernel/InvalidPropertyException.java | 0 .../org/splat/kernel/MismatchException.java | 0 .../splat/kernel/MissedPropertyException.java | 0 .../kernel/MultiplyDefinedException.java | 0 .../src/org/splat/kernel/Name.java | 0 .../splat/kernel/NotApplicableException.java | 0 .../org/splat/kernel/ObjectProperties.java | 0 .../src/org/splat/kernel/Persistent.hbm.xml | 0 .../src/org/splat/kernel/Persistent.java | 0 .../org/splat/kernel/RealmLoginModule.java | 0 .../src/org/splat/kernel/Relation.hbm.xml | 0 .../src/org/splat/kernel/Relation.java | 0 .../src/org/splat/kernel/Role.java | 0 .../src/org/splat/kernel/Text.hbm.xml | 2 +- .../src/org/splat/kernel/Text.java | 2 +- .../org/splat/kernel/TextAttribute.hbm.xml | 20 ++ .../src/org/splat/kernel/TextAttribute.java | 14 +- .../src/org/splat/kernel/User.hbm.xml | 0 .../src/org/splat/kernel/User.java | 0 .../src/org/splat/kernel/UserDirectory.java | 2 + .../src/org/splat/som/ActorRelation.java | 1 + .../src/org/splat/som/ApplicationRights.java | 0 .../src/org/splat/som/Attributes.hbm.xml | 6 +- .../src/org/splat/som/CommentAttribute.java | 2 +- .../org/splat/som/ContributorRelation.java | 0 .../src/org/splat/som/ConvertsRelation.java | 0 .../src/org/splat/som/Database.java | 0 .../org/splat/som/DescriptionAttribute.java | 6 +- .../src/org/splat/som/Document.hbm.xml | 0 .../src/org/splat/som/Document.java | 0 .../src/org/splat/som/DocumentRights.java | 0 .../src/org/splat/som/DocumentType.java | 0 .../src/org/splat/som/Entity.java | 0 .../src/org/splat/som/File.hbm.xml | 0 .../src/org/splat/som/File.java | 0 .../src/org/splat/som/IDBuilder.hbm.xml | 0 .../src/org/splat/som/IDBuilder.java | 0 .../src/org/splat/som/Index.java | 0 .../org/splat/som/KnowledgeElement.hbm.xml | 2 +- .../src/org/splat/som/KnowledgeElement.java | 0 .../org/splat/som/KnowledgeElementType.java | 0 .../src/org/splat/som/Profile.java | 0 .../src/org/splat/som/ProgressState.java | 0 .../src/org/splat/som/ProjectElement.hbm.xml | 0 .../src/org/splat/som/ProjectElement.java | 0 .../src/org/splat/som/ProjectSettings.java | 2 +- .../src/org/splat/som/Proxy.java | 0 .../src/org/splat/som/Publication.hbm.xml | 0 .../src/org/splat/som/Publication.java | 0 .../src/org/splat/som/Relations.hbm.xml | 6 +- .../src/org/splat/som/Revision.java | 0 .../src/org/splat/som/Scenario.hbm.xml | 0 .../src/org/splat/som/Scenario.java | 0 .../org/splat/som/SimulationContext.hbm.xml | 2 +- .../src/org/splat/som/SimulationContext.java | 0 .../org/splat/som/SimulationContextType.java | 0 .../src/org/splat/som/StampRelation.java | 0 .../src/org/splat/som/Step.java | 0 .../src/org/splat/som/StepRights.java | 0 .../src/org/splat/som/Study.hbm.xml | 0 .../src/org/splat/som/Study.java | 0 .../src/org/splat/som/StudyRights.java | 0 .../src/org/splat/som/Timestamp.hbm.xml | 0 .../src/org/splat/som/Timestamp.java | 0 .../src/org/splat/som/UsedByRelation.java | 0 .../src/org/splat/som/UsesRelation.java | 0 .../src/org/splat/som/ValidationCycle.hbm.xml | 0 .../src/org/splat/som/ValidationCycle.java | 0 .../splat/som/ValidationCycleRelation.java | 0 .../src/org/splat/som/ValidationStep.java | 0 .../src/org/splat/som/VersionsRelation.java | 0 .../src/org/splat/som/Visibility.java | 0 .../src/som.properties | 0 Workspace/{SPlat => Siman-Common}/src/som.xml | 0 .../src/som_en.properties | 0 .../Siman-Common/src/spring/globalContext.xml | 8 +- .../{SPlat => Siman-Common}/src/study.xml | 0 .../src => Siman-Common/src/test}/Test.java | 1 + .../{SPlat => Siman-Common}/src/users.xml | 0 Workspace/Siman/WebContent/jvs/search.js | 73 ++---- .../WebContent/study/searchKnowledge.jsp | 186 +++++++++------ .../Siman/WebContent/study/searchStudy.jsp | 212 +++++++++++------- Workspace/Siman/src/labels.properties | 45 ++-- Workspace/Siman/src/labels_en.properties | 47 ++-- .../org/splat/simer/ApplicationSettings.java | 27 +-- .../src/org/splat/simer/ConnectionAction.java | 19 +- .../src/org/splat/simer/SearchBaseAction.java | 22 +- .../splat/simer/SearchKnowledgeAction.java | 148 ++++++------ .../org/splat/simer/SearchStudyAction.java | 157 ++++++------- Workspace/Siman/src/siman.properties | 2 +- Workspace/Siman/src/simer.properties | 2 +- 116 files changed, 561 insertions(+), 510 deletions(-) delete mode 100644 Workspace/SPlat/src/META-INF/MANIFEST.MF delete mode 100644 Workspace/SPlat/src/org/splat/kernel/TextAttribute.hbm.xml rename Workspace/SPlat/src/org/splat/{kernel => manox}/XDOM.java (99%) rename Workspace/SPlat/src/org/splat/{kernel => manox}/XMLException.java (91%) rename Workspace/{SPlat => Siman-Common}/src/cast3m.som.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/hibernate.cfg.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/log4j.properties (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Any.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Any.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Attribute.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Attribute.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Database.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Do.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/DuplicatePropertyException.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Entity.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Entity.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/GenericEnumType.java (97%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/IDGenerator.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/IDPool.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/IDPool.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/InvalidPropertyException.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/MismatchException.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/MissedPropertyException.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/MultiplyDefinedException.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Name.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/NotApplicableException.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/ObjectProperties.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Persistent.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Persistent.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/RealmLoginModule.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Relation.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Relation.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Role.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Text.hbm.xml (81%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/Text.java (94%) create mode 100644 Workspace/Siman-Common/src/org/splat/kernel/TextAttribute.hbm.xml rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/TextAttribute.java (84%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/User.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/User.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/kernel/UserDirectory.java (99%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/ActorRelation.java (99%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/ApplicationRights.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Attributes.hbm.xml (55%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/CommentAttribute.java (96%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/ContributorRelation.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/ConvertsRelation.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Database.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/DescriptionAttribute.java (94%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Document.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Document.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/DocumentRights.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/DocumentType.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Entity.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/File.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/File.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/IDBuilder.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/IDBuilder.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Index.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/KnowledgeElement.hbm.xml (94%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/KnowledgeElement.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/KnowledgeElementType.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Profile.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/ProgressState.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/ProjectElement.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/ProjectElement.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/ProjectSettings.java (99%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Proxy.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Publication.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Publication.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Relations.hbm.xml (81%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Revision.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Scenario.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Scenario.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/SimulationContext.hbm.xml (93%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/SimulationContext.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/SimulationContextType.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/StampRelation.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Step.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/StepRights.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Study.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Study.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/StudyRights.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Timestamp.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Timestamp.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/UsedByRelation.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/UsesRelation.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/ValidationCycle.hbm.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/ValidationCycle.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/ValidationCycleRelation.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/ValidationStep.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/VersionsRelation.java (100%) rename Workspace/{SPlat => Siman-Common}/src/org/splat/som/Visibility.java (100%) rename Workspace/{SPlat => Siman-Common}/src/som.properties (100%) rename Workspace/{SPlat => Siman-Common}/src/som.xml (100%) rename Workspace/{SPlat => Siman-Common}/src/som_en.properties (100%) rename Workspace/{SPlat => Siman-Common}/src/study.xml (100%) rename Workspace/{SPlat/src => Siman-Common/src/test}/Test.java (99%) rename Workspace/{SPlat => Siman-Common}/src/users.xml (100%) diff --git a/Workspace/SPlat/.classpath b/Workspace/SPlat/.classpath index d47e245..dbb0b6d 100644 --- a/Workspace/SPlat/.classpath +++ b/Workspace/SPlat/.classpath @@ -6,7 +6,7 @@ - + diff --git a/Workspace/SPlat/build.xml b/Workspace/SPlat/build.xml index 4b34aca..51e74f3 100644 --- a/Workspace/SPlat/build.xml +++ b/Workspace/SPlat/build.xml @@ -48,28 +48,10 @@ - - - - - - - - - - - - - - - - - - - + diff --git a/Workspace/SPlat/src/META-INF/MANIFEST.MF b/Workspace/SPlat/src/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e..0000000 --- a/Workspace/SPlat/src/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/Workspace/SPlat/src/org/splat/kernel/TextAttribute.hbm.xml b/Workspace/SPlat/src/org/splat/kernel/TextAttribute.hbm.xml deleted file mode 100644 index 7089eb5..0000000 --- a/Workspace/SPlat/src/org/splat/kernel/TextAttribute.hbm.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Workspace/SPlat/src/org/splat/manox/WordXMLDocument.java b/Workspace/SPlat/src/org/splat/manox/WordXMLDocument.java index 8b6a295..474caaa 100644 --- a/Workspace/SPlat/src/org/splat/manox/WordXMLDocument.java +++ b/Workspace/SPlat/src/org/splat/manox/WordXMLDocument.java @@ -4,7 +4,6 @@ import java.io.File; import java.util.HashMap; import java.util.Vector; -import org.splat.kernel.XDOM; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/Workspace/SPlat/src/org/splat/kernel/XDOM.java b/Workspace/SPlat/src/org/splat/manox/XDOM.java similarity index 99% rename from Workspace/SPlat/src/org/splat/kernel/XDOM.java rename to Workspace/SPlat/src/org/splat/manox/XDOM.java index 3f9c6e8..8cc4598 100644 --- a/Workspace/SPlat/src/org/splat/kernel/XDOM.java +++ b/Workspace/SPlat/src/org/splat/manox/XDOM.java @@ -1,4 +1,4 @@ -package org.splat.kernel; +package org.splat.manox; /** * * @author Daniel Brunier-Coulin diff --git a/Workspace/SPlat/src/org/splat/kernel/XMLException.java b/Workspace/SPlat/src/org/splat/manox/XMLException.java similarity index 91% rename from Workspace/SPlat/src/org/splat/kernel/XMLException.java rename to Workspace/SPlat/src/org/splat/manox/XMLException.java index dc7cbb1..7f7917a 100644 --- a/Workspace/SPlat/src/org/splat/kernel/XMLException.java +++ b/Workspace/SPlat/src/org/splat/manox/XMLException.java @@ -1,4 +1,4 @@ -package org.splat.kernel; +package org.splat.manox; /** * * @author Daniel Brunier-Coulin diff --git a/Workspace/Siman-Common/.classpath b/Workspace/Siman-Common/.classpath index 34a3771..c00fad4 100644 --- a/Workspace/Siman-Common/.classpath +++ b/Workspace/Siman-Common/.classpath @@ -3,9 +3,7 @@ - - diff --git a/Workspace/Siman-Common/build.xml b/Workspace/Siman-Common/build.xml index b28c036..10f8462 100644 --- a/Workspace/Siman-Common/build.xml +++ b/Workspace/Siman-Common/build.xml @@ -31,7 +31,7 @@ - + diff --git a/Workspace/SPlat/src/cast3m.som.xml b/Workspace/Siman-Common/src/cast3m.som.xml similarity index 100% rename from Workspace/SPlat/src/cast3m.som.xml rename to Workspace/Siman-Common/src/cast3m.som.xml diff --git a/Workspace/SPlat/src/hibernate.cfg.xml b/Workspace/Siman-Common/src/hibernate.cfg.xml similarity index 100% rename from Workspace/SPlat/src/hibernate.cfg.xml rename to Workspace/Siman-Common/src/hibernate.cfg.xml diff --git a/Workspace/SPlat/src/log4j.properties b/Workspace/Siman-Common/src/log4j.properties similarity index 100% rename from Workspace/SPlat/src/log4j.properties rename to Workspace/Siman-Common/src/log4j.properties diff --git a/Workspace/SPlat/src/org/splat/kernel/Any.hbm.xml b/Workspace/Siman-Common/src/org/splat/kernel/Any.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Any.hbm.xml rename to Workspace/Siman-Common/src/org/splat/kernel/Any.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/kernel/Any.java b/Workspace/Siman-Common/src/org/splat/kernel/Any.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Any.java rename to Workspace/Siman-Common/src/org/splat/kernel/Any.java diff --git a/Workspace/SPlat/src/org/splat/kernel/Attribute.hbm.xml b/Workspace/Siman-Common/src/org/splat/kernel/Attribute.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Attribute.hbm.xml rename to Workspace/Siman-Common/src/org/splat/kernel/Attribute.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/kernel/Attribute.java b/Workspace/Siman-Common/src/org/splat/kernel/Attribute.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Attribute.java rename to Workspace/Siman-Common/src/org/splat/kernel/Attribute.java diff --git a/Workspace/SPlat/src/org/splat/kernel/Database.java b/Workspace/Siman-Common/src/org/splat/kernel/Database.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Database.java rename to Workspace/Siman-Common/src/org/splat/kernel/Database.java diff --git a/Workspace/SPlat/src/org/splat/kernel/Do.java b/Workspace/Siman-Common/src/org/splat/kernel/Do.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Do.java rename to Workspace/Siman-Common/src/org/splat/kernel/Do.java diff --git a/Workspace/SPlat/src/org/splat/kernel/DuplicatePropertyException.java b/Workspace/Siman-Common/src/org/splat/kernel/DuplicatePropertyException.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/DuplicatePropertyException.java rename to Workspace/Siman-Common/src/org/splat/kernel/DuplicatePropertyException.java diff --git a/Workspace/SPlat/src/org/splat/kernel/Entity.hbm.xml b/Workspace/Siman-Common/src/org/splat/kernel/Entity.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Entity.hbm.xml rename to Workspace/Siman-Common/src/org/splat/kernel/Entity.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/kernel/Entity.java b/Workspace/Siman-Common/src/org/splat/kernel/Entity.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Entity.java rename to Workspace/Siman-Common/src/org/splat/kernel/Entity.java diff --git a/Workspace/SPlat/src/org/splat/kernel/GenericEnumType.java b/Workspace/Siman-Common/src/org/splat/kernel/GenericEnumType.java similarity index 97% rename from Workspace/SPlat/src/org/splat/kernel/GenericEnumType.java rename to Workspace/Siman-Common/src/org/splat/kernel/GenericEnumType.java index 365a39d..1c02adb 100644 --- a/Workspace/SPlat/src/org/splat/kernel/GenericEnumType.java +++ b/Workspace/Siman-Common/src/org/splat/kernel/GenericEnumType.java @@ -76,7 +76,7 @@ public class GenericEnumType implements EnhancedUserType, ParameterizedType { public void nullSafeSet (PreparedStatement st, Object value, int index) throws HibernateException, SQLException { // ----------------------------------------------------------------------- if (value==null) { - st.setNull(index, Types.VARCHAR); + st.setNull(index, Types.CHAR); } else { st.setString( index, ( (Enum) value ).name() ); @@ -96,7 +96,7 @@ public class GenericEnumType implements EnhancedUserType, ParameterizedType { public int[] sqlTypes () { // ------------------------ - return new int[] { Types.VARCHAR }; + return new int[] { Types.CHAR }; } @SuppressWarnings("unchecked") diff --git a/Workspace/SPlat/src/org/splat/kernel/IDGenerator.java b/Workspace/Siman-Common/src/org/splat/kernel/IDGenerator.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/IDGenerator.java rename to Workspace/Siman-Common/src/org/splat/kernel/IDGenerator.java diff --git a/Workspace/SPlat/src/org/splat/kernel/IDPool.hbm.xml b/Workspace/Siman-Common/src/org/splat/kernel/IDPool.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/IDPool.hbm.xml rename to Workspace/Siman-Common/src/org/splat/kernel/IDPool.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/kernel/IDPool.java b/Workspace/Siman-Common/src/org/splat/kernel/IDPool.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/IDPool.java rename to Workspace/Siman-Common/src/org/splat/kernel/IDPool.java diff --git a/Workspace/SPlat/src/org/splat/kernel/InvalidPropertyException.java b/Workspace/Siman-Common/src/org/splat/kernel/InvalidPropertyException.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/InvalidPropertyException.java rename to Workspace/Siman-Common/src/org/splat/kernel/InvalidPropertyException.java diff --git a/Workspace/SPlat/src/org/splat/kernel/MismatchException.java b/Workspace/Siman-Common/src/org/splat/kernel/MismatchException.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/MismatchException.java rename to Workspace/Siman-Common/src/org/splat/kernel/MismatchException.java diff --git a/Workspace/SPlat/src/org/splat/kernel/MissedPropertyException.java b/Workspace/Siman-Common/src/org/splat/kernel/MissedPropertyException.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/MissedPropertyException.java rename to Workspace/Siman-Common/src/org/splat/kernel/MissedPropertyException.java diff --git a/Workspace/SPlat/src/org/splat/kernel/MultiplyDefinedException.java b/Workspace/Siman-Common/src/org/splat/kernel/MultiplyDefinedException.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/MultiplyDefinedException.java rename to Workspace/Siman-Common/src/org/splat/kernel/MultiplyDefinedException.java diff --git a/Workspace/SPlat/src/org/splat/kernel/Name.java b/Workspace/Siman-Common/src/org/splat/kernel/Name.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Name.java rename to Workspace/Siman-Common/src/org/splat/kernel/Name.java diff --git a/Workspace/SPlat/src/org/splat/kernel/NotApplicableException.java b/Workspace/Siman-Common/src/org/splat/kernel/NotApplicableException.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/NotApplicableException.java rename to Workspace/Siman-Common/src/org/splat/kernel/NotApplicableException.java diff --git a/Workspace/SPlat/src/org/splat/kernel/ObjectProperties.java b/Workspace/Siman-Common/src/org/splat/kernel/ObjectProperties.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/ObjectProperties.java rename to Workspace/Siman-Common/src/org/splat/kernel/ObjectProperties.java diff --git a/Workspace/SPlat/src/org/splat/kernel/Persistent.hbm.xml b/Workspace/Siman-Common/src/org/splat/kernel/Persistent.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Persistent.hbm.xml rename to Workspace/Siman-Common/src/org/splat/kernel/Persistent.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/kernel/Persistent.java b/Workspace/Siman-Common/src/org/splat/kernel/Persistent.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Persistent.java rename to Workspace/Siman-Common/src/org/splat/kernel/Persistent.java diff --git a/Workspace/SPlat/src/org/splat/kernel/RealmLoginModule.java b/Workspace/Siman-Common/src/org/splat/kernel/RealmLoginModule.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/RealmLoginModule.java rename to Workspace/Siman-Common/src/org/splat/kernel/RealmLoginModule.java diff --git a/Workspace/SPlat/src/org/splat/kernel/Relation.hbm.xml b/Workspace/Siman-Common/src/org/splat/kernel/Relation.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Relation.hbm.xml rename to Workspace/Siman-Common/src/org/splat/kernel/Relation.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/kernel/Relation.java b/Workspace/Siman-Common/src/org/splat/kernel/Relation.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Relation.java rename to Workspace/Siman-Common/src/org/splat/kernel/Relation.java diff --git a/Workspace/SPlat/src/org/splat/kernel/Role.java b/Workspace/Siman-Common/src/org/splat/kernel/Role.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/Role.java rename to Workspace/Siman-Common/src/org/splat/kernel/Role.java diff --git a/Workspace/SPlat/src/org/splat/kernel/Text.hbm.xml b/Workspace/Siman-Common/src/org/splat/kernel/Text.hbm.xml similarity index 81% rename from Workspace/SPlat/src/org/splat/kernel/Text.hbm.xml rename to Workspace/Siman-Common/src/org/splat/kernel/Text.hbm.xml index cebf35d..b0b405b 100644 --- a/Workspace/SPlat/src/org/splat/kernel/Text.hbm.xml +++ b/Workspace/Siman-Common/src/org/splat/kernel/Text.hbm.xml @@ -15,7 +15,7 @@ - + diff --git a/Workspace/SPlat/src/org/splat/kernel/Text.java b/Workspace/Siman-Common/src/org/splat/kernel/Text.java similarity index 94% rename from Workspace/SPlat/src/org/splat/kernel/Text.java rename to Workspace/Siman-Common/src/org/splat/kernel/Text.java index 9e55031..5410ac0 100644 --- a/Workspace/SPlat/src/org/splat/kernel/Text.java +++ b/Workspace/Siman-Common/src/org/splat/kernel/Text.java @@ -38,6 +38,6 @@ public class Text extends Persistent { public void setValue (String value) { // ----------------------------------- this.value = value; - if (this.isSaved()) Database.getSession().update(this); +//RKV if (this.isSaved()) Database.getSession().update(this); } } \ No newline at end of file diff --git a/Workspace/Siman-Common/src/org/splat/kernel/TextAttribute.hbm.xml b/Workspace/Siman-Common/src/org/splat/kernel/TextAttribute.hbm.xml new file mode 100644 index 0000000..d5d0682 --- /dev/null +++ b/Workspace/Siman-Common/src/org/splat/kernel/TextAttribute.hbm.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Workspace/SPlat/src/org/splat/kernel/TextAttribute.java b/Workspace/Siman-Common/src/org/splat/kernel/TextAttribute.java similarity index 84% rename from Workspace/SPlat/src/org/splat/kernel/TextAttribute.java rename to Workspace/Siman-Common/src/org/splat/kernel/TextAttribute.java index 1e2c93f..5de4bf9 100644 --- a/Workspace/SPlat/src/org/splat/kernel/TextAttribute.java +++ b/Workspace/Siman-Common/src/org/splat/kernel/TextAttribute.java @@ -8,7 +8,8 @@ package org.splat.kernel; public abstract class TextAttribute extends Attribute { - private Text mytext; + //private Text mytext; + private String mytext; // ============================================================================================================================== // Constructors @@ -19,6 +20,13 @@ public abstract class TextAttribute extends Attribute { } // Initialization constructor protected TextAttribute (Any from, Text value) { +// ---------------------------------------------- + super(from); +// mytext = value; + } + +// Initialization constructor + protected TextAttribute (Any from, String value) { // ---------------------------------------------- super(from); mytext = value; @@ -30,7 +38,7 @@ public abstract class TextAttribute extends Attribute { public String getValue () { // ------------------------- - return mytext.getValue(); + return mytext; } // ============================================================================================================================== @@ -39,7 +47,7 @@ public abstract class TextAttribute extends Attribute { protected void setValue (String value) { // -------------------------------------- - mytext.setValue(value); + mytext = value; if (this.isSaved()) Database.getSession().update(this); } } \ No newline at end of file diff --git a/Workspace/SPlat/src/org/splat/kernel/User.hbm.xml b/Workspace/Siman-Common/src/org/splat/kernel/User.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/User.hbm.xml rename to Workspace/Siman-Common/src/org/splat/kernel/User.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/kernel/User.java b/Workspace/Siman-Common/src/org/splat/kernel/User.java similarity index 100% rename from Workspace/SPlat/src/org/splat/kernel/User.java rename to Workspace/Siman-Common/src/org/splat/kernel/User.java diff --git a/Workspace/SPlat/src/org/splat/kernel/UserDirectory.java b/Workspace/Siman-Common/src/org/splat/kernel/UserDirectory.java similarity index 99% rename from Workspace/SPlat/src/org/splat/kernel/UserDirectory.java rename to Workspace/Siman-Common/src/org/splat/kernel/UserDirectory.java index d46adb9..d196344 100644 --- a/Workspace/SPlat/src/org/splat/kernel/UserDirectory.java +++ b/Workspace/Siman-Common/src/org/splat/kernel/UserDirectory.java @@ -28,6 +28,8 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.hibernate.Session; +import org.splat.manox.XDOM; +import org.splat.manox.XMLException; import org.splat.som.Database; import org.w3c.dom.Node; import org.apache.log4j.Logger; diff --git a/Workspace/SPlat/src/org/splat/som/ActorRelation.java b/Workspace/Siman-Common/src/org/splat/som/ActorRelation.java similarity index 99% rename from Workspace/SPlat/src/org/splat/som/ActorRelation.java rename to Workspace/Siman-Common/src/org/splat/som/ActorRelation.java index 72fed4f..c8bca9a 100644 --- a/Workspace/SPlat/src/org/splat/som/ActorRelation.java +++ b/Workspace/Siman-Common/src/org/splat/som/ActorRelation.java @@ -41,6 +41,7 @@ public abstract class ActorRelation extends Relation { // Public member functions // ============================================================================================================================== + @Override public User getTo () { // -------------------- return refer; diff --git a/Workspace/SPlat/src/org/splat/som/ApplicationRights.java b/Workspace/Siman-Common/src/org/splat/som/ApplicationRights.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/ApplicationRights.java rename to Workspace/Siman-Common/src/org/splat/som/ApplicationRights.java diff --git a/Workspace/SPlat/src/org/splat/som/Attributes.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/Attributes.hbm.xml similarity index 55% rename from Workspace/SPlat/src/org/splat/som/Attributes.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/Attributes.hbm.xml index c1eb9e0..282fed5 100644 --- a/Workspace/SPlat/src/org/splat/som/Attributes.hbm.xml +++ b/Workspace/Siman-Common/src/org/splat/som/Attributes.hbm.xml @@ -11,14 +11,12 @@ - - + - - + \ No newline at end of file diff --git a/Workspace/SPlat/src/org/splat/som/CommentAttribute.java b/Workspace/Siman-Common/src/org/splat/som/CommentAttribute.java similarity index 96% rename from Workspace/SPlat/src/org/splat/som/CommentAttribute.java rename to Workspace/Siman-Common/src/org/splat/som/CommentAttribute.java index ff8636d..942c721 100644 --- a/Workspace/SPlat/src/org/splat/som/CommentAttribute.java +++ b/Workspace/Siman-Common/src/org/splat/som/CommentAttribute.java @@ -28,6 +28,6 @@ public class CommentAttribute extends TextAttribute { */ protected CommentAttribute (Timestamp from, String value) { // --------------------------------------------------------- - super(from, new Text(value)); + super(from, value); } } \ No newline at end of file diff --git a/Workspace/SPlat/src/org/splat/som/ContributorRelation.java b/Workspace/Siman-Common/src/org/splat/som/ContributorRelation.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/ContributorRelation.java rename to Workspace/Siman-Common/src/org/splat/som/ContributorRelation.java diff --git a/Workspace/SPlat/src/org/splat/som/ConvertsRelation.java b/Workspace/Siman-Common/src/org/splat/som/ConvertsRelation.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/ConvertsRelation.java rename to Workspace/Siman-Common/src/org/splat/som/ConvertsRelation.java diff --git a/Workspace/SPlat/src/org/splat/som/Database.java b/Workspace/Siman-Common/src/org/splat/som/Database.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Database.java rename to Workspace/Siman-Common/src/org/splat/som/Database.java diff --git a/Workspace/SPlat/src/org/splat/som/DescriptionAttribute.java b/Workspace/Siman-Common/src/org/splat/som/DescriptionAttribute.java similarity index 94% rename from Workspace/SPlat/src/org/splat/som/DescriptionAttribute.java rename to Workspace/Siman-Common/src/org/splat/som/DescriptionAttribute.java index 906ccf1..9ca56d9 100644 --- a/Workspace/SPlat/src/org/splat/som/DescriptionAttribute.java +++ b/Workspace/Siman-Common/src/org/splat/som/DescriptionAttribute.java @@ -28,7 +28,7 @@ public class DescriptionAttribute extends TextAttribute { */ protected DescriptionAttribute (ProjectElement from, String value) { // ------------------------------------------------------------------ - super(from, new Text(value)); + super(from, value); } /** * Constructs the description attached to a version relation. @@ -38,7 +38,7 @@ public class DescriptionAttribute extends TextAttribute { */ protected DescriptionAttribute (VersionsRelation from, String value) { // -------------------------------------------------------------------- - super(from, new Text(value)); + super(from, value); } /** * Constructs the description attached to a conversion relation. @@ -48,6 +48,6 @@ public class DescriptionAttribute extends TextAttribute { */ protected DescriptionAttribute (ConvertsRelation from, String value) { // -------------------------------------------------------------------- - super(from, new Text(value)); + super(from, value); } } \ No newline at end of file diff --git a/Workspace/SPlat/src/org/splat/som/Document.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/Document.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Document.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/Document.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/som/Document.java b/Workspace/Siman-Common/src/org/splat/som/Document.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Document.java rename to Workspace/Siman-Common/src/org/splat/som/Document.java diff --git a/Workspace/SPlat/src/org/splat/som/DocumentRights.java b/Workspace/Siman-Common/src/org/splat/som/DocumentRights.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/DocumentRights.java rename to Workspace/Siman-Common/src/org/splat/som/DocumentRights.java diff --git a/Workspace/SPlat/src/org/splat/som/DocumentType.java b/Workspace/Siman-Common/src/org/splat/som/DocumentType.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/DocumentType.java rename to Workspace/Siman-Common/src/org/splat/som/DocumentType.java diff --git a/Workspace/SPlat/src/org/splat/som/Entity.java b/Workspace/Siman-Common/src/org/splat/som/Entity.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Entity.java rename to Workspace/Siman-Common/src/org/splat/som/Entity.java diff --git a/Workspace/SPlat/src/org/splat/som/File.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/File.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/som/File.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/File.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/som/File.java b/Workspace/Siman-Common/src/org/splat/som/File.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/File.java rename to Workspace/Siman-Common/src/org/splat/som/File.java diff --git a/Workspace/SPlat/src/org/splat/som/IDBuilder.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/IDBuilder.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/som/IDBuilder.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/IDBuilder.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/som/IDBuilder.java b/Workspace/Siman-Common/src/org/splat/som/IDBuilder.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/IDBuilder.java rename to Workspace/Siman-Common/src/org/splat/som/IDBuilder.java diff --git a/Workspace/SPlat/src/org/splat/som/Index.java b/Workspace/Siman-Common/src/org/splat/som/Index.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Index.java rename to Workspace/Siman-Common/src/org/splat/som/Index.java diff --git a/Workspace/SPlat/src/org/splat/som/KnowledgeElement.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/KnowledgeElement.hbm.xml similarity index 94% rename from Workspace/SPlat/src/org/splat/som/KnowledgeElement.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/KnowledgeElement.hbm.xml index fbd7abe..4b63058 100644 --- a/Workspace/SPlat/src/org/splat/som/KnowledgeElement.hbm.xml +++ b/Workspace/Siman-Common/src/org/splat/som/KnowledgeElement.hbm.xml @@ -25,7 +25,7 @@ - + diff --git a/Workspace/SPlat/src/org/splat/som/KnowledgeElement.java b/Workspace/Siman-Common/src/org/splat/som/KnowledgeElement.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/KnowledgeElement.java rename to Workspace/Siman-Common/src/org/splat/som/KnowledgeElement.java diff --git a/Workspace/SPlat/src/org/splat/som/KnowledgeElementType.java b/Workspace/Siman-Common/src/org/splat/som/KnowledgeElementType.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/KnowledgeElementType.java rename to Workspace/Siman-Common/src/org/splat/som/KnowledgeElementType.java diff --git a/Workspace/SPlat/src/org/splat/som/Profile.java b/Workspace/Siman-Common/src/org/splat/som/Profile.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Profile.java rename to Workspace/Siman-Common/src/org/splat/som/Profile.java diff --git a/Workspace/SPlat/src/org/splat/som/ProgressState.java b/Workspace/Siman-Common/src/org/splat/som/ProgressState.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/ProgressState.java rename to Workspace/Siman-Common/src/org/splat/som/ProgressState.java diff --git a/Workspace/SPlat/src/org/splat/som/ProjectElement.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/ProjectElement.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/som/ProjectElement.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/ProjectElement.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/som/ProjectElement.java b/Workspace/Siman-Common/src/org/splat/som/ProjectElement.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/ProjectElement.java rename to Workspace/Siman-Common/src/org/splat/som/ProjectElement.java diff --git a/Workspace/SPlat/src/org/splat/som/ProjectSettings.java b/Workspace/Siman-Common/src/org/splat/som/ProjectSettings.java similarity index 99% rename from Workspace/SPlat/src/org/splat/som/ProjectSettings.java rename to Workspace/Siman-Common/src/org/splat/som/ProjectSettings.java index 7bd1d8f..413c33f 100644 --- a/Workspace/SPlat/src/org/splat/som/ProjectSettings.java +++ b/Workspace/Siman-Common/src/org/splat/som/ProjectSettings.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.splat.kernel.XDOM; +import org.splat.manox.XDOM; import org.splat.som.ValidationCycle.Actor; diff --git a/Workspace/SPlat/src/org/splat/som/Proxy.java b/Workspace/Siman-Common/src/org/splat/som/Proxy.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Proxy.java rename to Workspace/Siman-Common/src/org/splat/som/Proxy.java diff --git a/Workspace/SPlat/src/org/splat/som/Publication.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/Publication.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Publication.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/Publication.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/som/Publication.java b/Workspace/Siman-Common/src/org/splat/som/Publication.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Publication.java rename to Workspace/Siman-Common/src/org/splat/som/Publication.java diff --git a/Workspace/SPlat/src/org/splat/som/Relations.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/Relations.hbm.xml similarity index 81% rename from Workspace/SPlat/src/org/splat/som/Relations.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/Relations.hbm.xml index ad4b6ea..7e7cd6a 100644 --- a/Workspace/SPlat/src/org/splat/som/Relations.hbm.xml +++ b/Workspace/Siman-Common/src/org/splat/som/Relations.hbm.xml @@ -43,13 +43,15 @@ - + + - + + \ No newline at end of file diff --git a/Workspace/SPlat/src/org/splat/som/Revision.java b/Workspace/Siman-Common/src/org/splat/som/Revision.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Revision.java rename to Workspace/Siman-Common/src/org/splat/som/Revision.java diff --git a/Workspace/SPlat/src/org/splat/som/Scenario.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/Scenario.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Scenario.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/Scenario.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/som/Scenario.java b/Workspace/Siman-Common/src/org/splat/som/Scenario.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Scenario.java rename to Workspace/Siman-Common/src/org/splat/som/Scenario.java diff --git a/Workspace/SPlat/src/org/splat/som/SimulationContext.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/SimulationContext.hbm.xml similarity index 93% rename from Workspace/SPlat/src/org/splat/som/SimulationContext.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/SimulationContext.hbm.xml index 71936c6..adae01e 100644 --- a/Workspace/SPlat/src/org/splat/som/SimulationContext.hbm.xml +++ b/Workspace/Siman-Common/src/org/splat/som/SimulationContext.hbm.xml @@ -28,7 +28,7 @@ - + diff --git a/Workspace/SPlat/src/org/splat/som/SimulationContext.java b/Workspace/Siman-Common/src/org/splat/som/SimulationContext.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/SimulationContext.java rename to Workspace/Siman-Common/src/org/splat/som/SimulationContext.java diff --git a/Workspace/SPlat/src/org/splat/som/SimulationContextType.java b/Workspace/Siman-Common/src/org/splat/som/SimulationContextType.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/SimulationContextType.java rename to Workspace/Siman-Common/src/org/splat/som/SimulationContextType.java diff --git a/Workspace/SPlat/src/org/splat/som/StampRelation.java b/Workspace/Siman-Common/src/org/splat/som/StampRelation.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/StampRelation.java rename to Workspace/Siman-Common/src/org/splat/som/StampRelation.java diff --git a/Workspace/SPlat/src/org/splat/som/Step.java b/Workspace/Siman-Common/src/org/splat/som/Step.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Step.java rename to Workspace/Siman-Common/src/org/splat/som/Step.java diff --git a/Workspace/SPlat/src/org/splat/som/StepRights.java b/Workspace/Siman-Common/src/org/splat/som/StepRights.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/StepRights.java rename to Workspace/Siman-Common/src/org/splat/som/StepRights.java diff --git a/Workspace/SPlat/src/org/splat/som/Study.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/Study.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Study.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/Study.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/som/Study.java b/Workspace/Siman-Common/src/org/splat/som/Study.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Study.java rename to Workspace/Siman-Common/src/org/splat/som/Study.java diff --git a/Workspace/SPlat/src/org/splat/som/StudyRights.java b/Workspace/Siman-Common/src/org/splat/som/StudyRights.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/StudyRights.java rename to Workspace/Siman-Common/src/org/splat/som/StudyRights.java diff --git a/Workspace/SPlat/src/org/splat/som/Timestamp.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/Timestamp.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Timestamp.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/Timestamp.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/som/Timestamp.java b/Workspace/Siman-Common/src/org/splat/som/Timestamp.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Timestamp.java rename to Workspace/Siman-Common/src/org/splat/som/Timestamp.java diff --git a/Workspace/SPlat/src/org/splat/som/UsedByRelation.java b/Workspace/Siman-Common/src/org/splat/som/UsedByRelation.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/UsedByRelation.java rename to Workspace/Siman-Common/src/org/splat/som/UsedByRelation.java diff --git a/Workspace/SPlat/src/org/splat/som/UsesRelation.java b/Workspace/Siman-Common/src/org/splat/som/UsesRelation.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/UsesRelation.java rename to Workspace/Siman-Common/src/org/splat/som/UsesRelation.java diff --git a/Workspace/SPlat/src/org/splat/som/ValidationCycle.hbm.xml b/Workspace/Siman-Common/src/org/splat/som/ValidationCycle.hbm.xml similarity index 100% rename from Workspace/SPlat/src/org/splat/som/ValidationCycle.hbm.xml rename to Workspace/Siman-Common/src/org/splat/som/ValidationCycle.hbm.xml diff --git a/Workspace/SPlat/src/org/splat/som/ValidationCycle.java b/Workspace/Siman-Common/src/org/splat/som/ValidationCycle.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/ValidationCycle.java rename to Workspace/Siman-Common/src/org/splat/som/ValidationCycle.java diff --git a/Workspace/SPlat/src/org/splat/som/ValidationCycleRelation.java b/Workspace/Siman-Common/src/org/splat/som/ValidationCycleRelation.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/ValidationCycleRelation.java rename to Workspace/Siman-Common/src/org/splat/som/ValidationCycleRelation.java diff --git a/Workspace/SPlat/src/org/splat/som/ValidationStep.java b/Workspace/Siman-Common/src/org/splat/som/ValidationStep.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/ValidationStep.java rename to Workspace/Siman-Common/src/org/splat/som/ValidationStep.java diff --git a/Workspace/SPlat/src/org/splat/som/VersionsRelation.java b/Workspace/Siman-Common/src/org/splat/som/VersionsRelation.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/VersionsRelation.java rename to Workspace/Siman-Common/src/org/splat/som/VersionsRelation.java diff --git a/Workspace/SPlat/src/org/splat/som/Visibility.java b/Workspace/Siman-Common/src/org/splat/som/Visibility.java similarity index 100% rename from Workspace/SPlat/src/org/splat/som/Visibility.java rename to Workspace/Siman-Common/src/org/splat/som/Visibility.java diff --git a/Workspace/SPlat/src/som.properties b/Workspace/Siman-Common/src/som.properties similarity index 100% rename from Workspace/SPlat/src/som.properties rename to Workspace/Siman-Common/src/som.properties diff --git a/Workspace/SPlat/src/som.xml b/Workspace/Siman-Common/src/som.xml similarity index 100% rename from Workspace/SPlat/src/som.xml rename to Workspace/Siman-Common/src/som.xml diff --git a/Workspace/SPlat/src/som_en.properties b/Workspace/Siman-Common/src/som_en.properties similarity index 100% rename from Workspace/SPlat/src/som_en.properties rename to Workspace/Siman-Common/src/som_en.properties diff --git a/Workspace/Siman-Common/src/spring/globalContext.xml b/Workspace/Siman-Common/src/spring/globalContext.xml index f291fd4..aaffeaf 100644 --- a/Workspace/Siman-Common/src/spring/globalContext.xml +++ b/Workspace/Siman-Common/src/spring/globalContext.xml @@ -2,10 +2,14 @@ +http://www.springframework.org/schema/aop/spring-aop-3.0.xsd +http://www.springframework.org/schema/tx +http://www.springframework.org/schema/tx/spring-tx-3.0.xsd"> + diff --git a/Workspace/SPlat/src/study.xml b/Workspace/Siman-Common/src/study.xml similarity index 100% rename from Workspace/SPlat/src/study.xml rename to Workspace/Siman-Common/src/study.xml diff --git a/Workspace/SPlat/src/Test.java b/Workspace/Siman-Common/src/test/Test.java similarity index 99% rename from Workspace/SPlat/src/Test.java rename to Workspace/Siman-Common/src/test/Test.java index 05b962b..e0e7083 100644 --- a/Workspace/SPlat/src/Test.java +++ b/Workspace/Siman-Common/src/test/Test.java @@ -1,3 +1,4 @@ +package test; import java.io.File; import java.text.SimpleDateFormat; diff --git a/Workspace/SPlat/src/users.xml b/Workspace/Siman-Common/src/users.xml similarity index 100% rename from Workspace/SPlat/src/users.xml rename to Workspace/Siman-Common/src/users.xml diff --git a/Workspace/Siman/WebContent/jvs/search.js b/Workspace/Siman/WebContent/jvs/search.js index b1f41d0..91956e1 100644 --- a/Workspace/Siman/WebContent/jvs/search.js +++ b/Workspace/Siman/WebContent/jvs/search.js @@ -1,22 +1,30 @@ function initialize (result) { // ---------------------------- - var refon = search.owner[3].checked; - if (refon) { - var contx = document.getElementById("contlist"); - var words = document.getElementById("wordin"); - contx.style.display = "none"; - words.style.display = "none"; - } else { - var refin = document.getElementById("refid"); - refin.style.display = "none"; + var state = search.state.value; + + if (state == "inWORK" || state == "inDRAFT" || state == "inCHECK") { + search.visibility[0].checked = true; + search.visibility[1].disabled = true; + search.visibility[2].disabled = true; } - search.state.disabled = !search.owner[0].checked; - search.author.disabled = !search.owner[1].checked; - if (search.owner[0].checked && search.state.value == "0") result = "obsolete"; - if (search.owner[1].checked && search.author.value == "0") result = "obsolete"; if (result == "obsolete") changeFilter(); // Hides the result section and enables the Search button } + function setState () { +// -------------------- + var state = search.state.value; + + if (state == "inWORK" || state == "inDRAFT" || state == "inCHECK") { + search.visibility[0].checked = true; + search.visibility[1].disabled = true; + search.visibility[2].disabled = true; + } else if (search.visibility[1].value != "onlypublic") { + search.visibility[1].disabled = false; + search.visibility[2].disabled = false; + } + changeFilter(); + } + function changeFilter () { // ------------------------ var result = document.getElementById("resulist"); @@ -24,45 +32,6 @@ search.elements[0].value = "0"; // Marks the result obsolete result.style.display = "none"; // Hides the result section search.refresh.disabled = false; // Enables the Search button - if (search.owner[0].checked) { - if (search.state.value == "0") search.refresh.disabled = true; - } else search.state.value = "0"; - if (search.owner[1].checked) { - if (search.author.value == "0") search.refresh.disabled = true; - } else search.author.value = "0"; - } - - function setReference () { -// ------------------------ - var result = document.getElementById("resulist"); - var refin = document.getElementById("refid"); - var words = document.getElementById("wordin"); - var contx = document.getElementById("contlist"); - - result.style.display = "none"; - words.style.display = "none"; - contx.style.display = "none"; - refin.style.display = "block"; - search.elements[4].focus(); - search.refresh.disabled = false; - } - - function unsetReference () { -// ------------------------ - var result = document.getElementById("resulist"); - var refin = document.getElementById("refid"); - var words = document.getElementById("wordin"); - var contx = document.getElementById("contlist"); - - result.style.display = "none"; - refin.style.display = "none"; - words.style.display = "block"; - contx.style.display = "block"; - search.refresh.disabled = false; - search.state.disabled = !search.owner[0].checked; - search.author.disabled = !search.owner[1].checked; - if (search.owner[0].checked && search.state.value == "0") search.refresh.disabled = true; - if (search.owner[1].checked && search.author.value == "0") search.refresh.disabled = true; } function removeContext (index) { diff --git a/Workspace/Siman/WebContent/study/searchKnowledge.jsp b/Workspace/Siman/WebContent/study/searchKnowledge.jsp index b93a981..c832584 100644 --- a/Workspace/Siman/WebContent/study/searchKnowledge.jsp +++ b/Workspace/Siman/WebContent/study/searchKnowledge.jsp @@ -3,6 +3,10 @@ %> <%@ page import="org.splat.som.KnowledgeElement"%> <%@ page import="org.splat.som.ApplicationRights"%> +<%@ page import="org.splat.simer.ApplicationSettings"%> +<%@ page import="java.util.ResourceBundle"%> +<%@ page import="java.util.Calendar"%> +<%@ page import="java.text.SimpleDateFormat"%> <%@ taglib prefix="s" uri="/struts-tags" %> @@ -13,14 +17,20 @@ --> <% String action = request.getParameter("action"); - ApplicationRights user = (ApplicationRights)session.getAttribute("user.rights"); + ApplicationRights rights = (ApplicationRights)session.getAttribute("user.rights"); + ResourceBundle locale = ResourceBundle.getBundle("som", ApplicationSettings.getCurrentLocale()); + String format = locale.getString("date.format"); + SimpleDateFormat tostring = new SimpleDateFormat(format); String result = "uptodate"; - boolean anonymous = true; + boolean connected = false; - if (user.canCreateStudy()) anonymous = false; + if (rights.getUser() != null) connected = true; if (session.getAttribute("search.result") == null) result = "obsolete"; %> <%=action%> +<%=connected%> +<%=format%> +<%=tostring.format(java.util.Calendar.getInstance().getTime())%> @@ -56,51 +66,93 @@ -
- -
-
+
- + + + + - - - - - - + + + +
    
-
- - +
+     + + +   + + + +   + + + |   +     + + +   + - + +   + - -
+ + + + -
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
  + - -
- - - - - - -
+ +    +    + + + +    +    + + + +    +    + + + +    +    + + +
  + - -
-<% if (anonymous) { -%> -<% } else { -%> - - - - -<% } %>
-
- - - - - -
- " size="18" onKeydown="changeFilter()"/> -
-
+
  " />  " />
+ + + + + + + + +
: " value="" onKeydown="changeFilter()" title="" />
: " value="" onKeydown="changeFilter()" title="" />
 -
- +
@@ -183,21 +238,14 @@ - - - - - +
-
-
 : " onKeydown="changeFilter()" /> -
+ + - - + +
- " disabled/> - " disabled/>
diff --git a/Workspace/Siman/WebContent/study/searchStudy.jsp b/Workspace/Siman/WebContent/study/searchStudy.jsp index faf4796..62285d5 100644 --- a/Workspace/Siman/WebContent/study/searchStudy.jsp +++ b/Workspace/Siman/WebContent/study/searchStudy.jsp @@ -3,6 +3,10 @@ %> <%@ page import="org.splat.som.Study"%> <%@ page import="org.splat.som.ApplicationRights"%> +<%@ page import="org.splat.simer.ApplicationSettings"%> +<%@ page import="java.util.ResourceBundle"%> +<%@ page import="java.util.Calendar"%> +<%@ page import="java.text.SimpleDateFormat"%> <%@ taglib prefix="s" uri="/struts-tags" %> @@ -13,14 +17,20 @@ --> <% String action = request.getParameter("action"); - ApplicationRights user = (ApplicationRights)session.getAttribute("user.rights"); + ApplicationRights rights = (ApplicationRights)session.getAttribute("user.rights"); + ResourceBundle locale = ResourceBundle.getBundle("som", ApplicationSettings.getCurrentLocale()); + String format = locale.getString("date.format"); + SimpleDateFormat tostring = new SimpleDateFormat(format); String result = "uptodate"; - boolean anonymous = true; + boolean connected = false; - if (user.canCreateStudy()) anonymous = false; + if (rights.getUser() != null) connected = true; if (session.getAttribute("search.result") == null) result = "obsolete"; %> <%=action%> +<%=connected%> +<%=format%> +<%=tostring.format(java.util.Calendar.getInstance().getTime())%> @@ -56,58 +66,99 @@ -
- -
-
+
- + + + - - - - - - + + + +
    
-
- - +
+     + + +   + - + +   + - - -
- - +
|   +     + + +   + - + +   + - -
+ + + + -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  + +
+ +    +    + + + +    +    + + + +    +    + + + +    +    + + +
  + - -
-<% if (anonymous) { -%> -<% } else { -%> - - - - -<% } %>
-
- - - - - -
- " size="18" onKeydown="changeFilter()"/> -
-
+
  " />  " />
  " />  " />
+ + + + + + + + +
: " value="" onKeydown="changeFilter()" title="" />
: " value="" onKeydown="changeFilter()" title="" />
 -
- +
@@ -185,21 +244,14 @@ - - - - - +
-
-
 : " onKeydown="changeFilter()" /> -
+ + - - + +
- " disabled/> - " disabled/>
diff --git a/Workspace/Siman/src/labels.properties b/Workspace/Siman/src/labels.properties index bfcbd68..42847bd 100644 --- a/Workspace/Siman/src/labels.properties +++ b/Workspace/Siman/src/labels.properties @@ -51,6 +51,7 @@ menu.admin.study = Les title.login = Saisissez vos coordonnées +title.criteria = Critères de recherche title.newstudy = Entrez les caractéristiques de votre étude title.newscenario = Ajout d''un scénario title.private = Dans mon espace de travail @@ -158,7 +159,17 @@ field.documentitle = Titre du document field.product = Produit étudié field.among = Parmi field.context = Contexte +field.matchall = Tous les critères +field.matchany = Au moins un +field.private = Me concernant +field.public = Publiques +field.either = N''importe +field.credate = Créé +field.lasdate = Modifié +field.after = après +field.before = avant field.contain = Dont le titre contient +field.reference = Dont la reference est field.contextype = Type de contexte field.documentype = Type du document field.upload = Fichier à télécharger @@ -170,26 +181,20 @@ field.label = Nom en field.context.value = Valeur -criterion.study.all = Toutes les études -criterion.study.mine = Mes études -criterion.study.his = Les études de -criterion.study.ref = L''étude référencée... -criterion.knowledge.all = Toutes les -criterion.knowledge.mine = Toutes mes connaissances -criterion.knowledge.his = Les acquis de -criterion.knowledge.ref = La connaissance référencée... -criterion.inprogress = En cours -criterion.indraft = A valider -criterion.incheck = A approuver -criterion.approved = Terminées -criterion.archived = Archivées -criterion.template = Modèles +criterion.study = Les études +criterion.knowledge = Toutes les +criterion.author = Dont l''auteur est +criterion.inwork = en cours +criterion.indraft = à valider +criterion.incheck = à approuver +criterion.approved = approuvées +criterion.template = de référence +criterion.any = quel que soit leur état +criterion.anybody = indifférent -size.study.state = 158px -size.study.author = 179px -size.knowledge.state = 201px -size.knowledge.author = 180px +size.search.select = 192px +size.search.input = 160px button.newstudy = Créer l''étude @@ -241,11 +246,15 @@ tooltip.version = Versionner ce document tooltip.refresh = Actualiser tooltip.close = Fermer tooltip.cancel = Abandonner + tooltip.shared = Document partagé entre plusieurs scénarios tooltip.versioned = Document modifié dans cette version de l''étude help.contextcode = Le code interne est un nom utilisable depuis l''interface de programmation pour référencer les contextes de simulation indépendamment de leur nom affiché à l''écran dans la langue en cours. +help.search.date = Saisissez une date dans le format {0}.\nExemple: {1} +help.search.title = Saisissez tous les termes qui doivent correspondre, si besoin avec des caractères de remplacement simples (symbole \?) ou multiples (symbole \*). +help.search.refid = Saisissez votre reference, si besoin avec des caractères de remplacement simples (symbole \?) ou multiples (symbole \*). message.welcome = Bienvenue dans votre outil de gestion des études de simulation. diff --git a/Workspace/Siman/src/labels_en.properties b/Workspace/Siman/src/labels_en.properties index d9c57b4..fe4d72d 100644 --- a/Workspace/Siman/src/labels_en.properties +++ b/Workspace/Siman/src/labels_en.properties @@ -51,6 +51,7 @@ menu.admin.study = The studies title.login = Enter your login identification +title.criteria = Search criteria title.newstudy = Define your study title.newscenario = Add a scenario title.private = From my Workspace @@ -156,9 +157,19 @@ field.studytitle = Title of the study field.scenariotitle = Title of the scenario field.documentitle = Title of the document field.product = Studied product -field.among = Amongst +field.among = Among field.context = Context +field.matchall = Match all of +field.matchany = Match any of +field.private = I''m involved in +field.public = Public +field.either = Either +field.credate = Created  +field.lasdate = Modified +field.after = after +field.before = before field.contain = Whose title contains +field.reference = Whose reference is field.contextype = Context type field.documentype = Document type field.upload = File to be uploaded @@ -170,26 +181,20 @@ field.label = Name in field.context.value = Value -criterion.study.all = All studies -criterion.study.mine = My studies -criterion.study.his = The studies of -criterion.study.ref = The study referenced... -criterion.knowledge.all = All the -criterion.knowledge.mine = All my knowledges -criterion.knowledge.his = Knowledges of -criterion.knowledge.ref = The knowledge referenced... -criterion.inprogress = on going -criterion.indraft = currently being reviewed -criterion.incheck = currently being approved -criterion.approved = completed -criterion.archived = archived -criterion.template = making a Template +criterion.study = All studies +criterion.knowledge = All the +criterion.author = Authored by +criterion.inwork = in-progress +criterion.indraft = to be validated +criterion.incheck = to be approved +criterion.approved = approved +criterion.template = approved as reference +criterion.any = whatever their status +criterion.anybody = anybody -size.study.state = 202px -size.study.author = 182px -size.knowledge.state = 226px -size.knowledge.author = 179px +size.search.select = 197px +size.search.input = 150px button.newstudy = Create the study @@ -245,7 +250,11 @@ tooltip.cancel = Cancel tooltip.shared = Document shared by several scenarios tooltip.versioned = Document modified in this version of the study + help.contextcode = The internal code is a name used from the Application Programming Interface for referencing the simulation contexts apart from any locale (English, French, Russian or whatever). +help.search.date = Enter a date in the format {0}.\nExample: {1} +help.search.title = Enter all terms the title must match, possibly with single (\? symbol) and multiple (\* symbol) character wildcard searches. +help.search.refid = Enter your reference, possibly with single (\? symbol) and multiple (\* symbol) character wildcard searches. message.welcome = Welcome to your Simulation Study Management Tool. diff --git a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java index da27a57..a6cb601 100644 --- a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java +++ b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java @@ -21,7 +21,7 @@ import org.w3c.dom.NamedNodeMap; import org.apache.log4j.Logger; import org.splat.kernel.User; -import org.splat.kernel.XDOM; +import org.splat.manox.XDOM; import org.splat.som.Document; import org.splat.som.DocumentRights; import org.splat.som.DocumentType; @@ -35,7 +35,6 @@ import org.splat.wapp.MenuItem; import org.splat.wapp.PopupMenu; import org.splat.wapp.PopupItem; import org.splat.wapp.SimpleMenu; -import org.splat.wapp.TabBar; import org.splat.wapp.ToolBar; @@ -439,29 +438,21 @@ public class ApplicationSettings { // Default customizable mandatory settings Map fprop = new HashMap(); - TabBar sbar = new TabBar(); - sbar.addItem("private", "search-study?area=private"); - sbar.addItem("public", "search-study?area=public"); - sbar.addItem("reference", "search-study?area=reference"); - sbar.selects("private"); - fprop.put("area", sbar); - fprop.put("state", "inPROGRESS"); + fprop.put("visibility", "PRIVATE"); + fprop.put("matchamong", "all"); + fprop.put("matcontext", "all"); + fprop.put("state", "END"); fprop.put("author", "0"); - fprop.put("owner", "all"); fprop.put("reference", ""); fprop.put("title", ""); fprop.put("context", new Vector()); Map gprop = new HashMap(); - sbar = new TabBar(); - sbar.addItem("private", "search-knowledge?area=private"); - sbar.addItem("public", "search-knowledge?area=public"); - sbar.addItem("reference", "search-knowledge?area=reference"); - sbar.selects("public"); - gprop.put("area", sbar); - gprop.put("author", "0"); - gprop.put("owner", "all"); + gprop.put("visibility", "PUBLIC"); + gprop.put("matchamong", "all"); + gprop.put("matcontext", "all"); gprop.put("type", "2"); //TODO: Get the index from the type name + gprop.put("author", "0"); gprop.put("reference", ""); gprop.put("title", ""); gprop.put("context", new Vector()); diff --git a/Workspace/Siman/src/org/splat/simer/ConnectionAction.java b/Workspace/Siman/src/org/splat/simer/ConnectionAction.java index fee1e70..f427826 100644 --- a/Workspace/Siman/src/org/splat/simer/ConnectionAction.java +++ b/Workspace/Siman/src/org/splat/simer/ConnectionAction.java @@ -12,7 +12,6 @@ import org.hibernate.Transaction; import org.splat.kernel.User; import org.splat.som.ApplicationRights; import org.splat.som.Database; -import org.splat.wapp.TabBar; import java.io.IOException; import javax.security.auth.login.FailedLoginException; @@ -77,15 +76,12 @@ public class ConnectionAction extends Action { if (logged.canContributeToStudy() || logged.canValidate()) { //TODO: Set the search filter according to user preferences Map session = getSession(); - Map kfilter = (Map)session.get("knowledge.filter"); +// Map kfilter = (Map)session.get("knowledge.filter"); Map sfilter = (Map)session.get("study.filter"); - TabBar kbar = (TabBar)kfilter.get("area"); - TabBar sbar = (TabBar)sfilter.get("area"); - kbar.enables("private"); - sbar.enables("private"); - sbar.selects("private"); - if (logged.canCreateStudy()) sfilter.put("owner", "mine"); // Supposed being initialized to "all" + sfilter.put("state", "ANY"); + sfilter.put("visibility", "PRIVATE"); + if (logged.canCreateStudy()) sfilter.put("author", String.valueOf(user.getIndex())); } this.connect(context, user); // Updates the session context return backmenu; @@ -105,7 +101,7 @@ public class ConnectionAction extends Action { // ------------------------- try { Map session = getSession(); - Map kfilter = (Map)session.get("knowledge.filter"); +// Map kfilter = (Map)session.get("knowledge.filter"); Map sfilter = (Map)session.get("study.filter"); LoginContext context = (LoginContext)session.get("login.context"); @@ -113,9 +109,8 @@ public class ConnectionAction extends Action { context.logout(); //TODO: ProjectSettings.deleteDownloadDirectory(user); - sfilter.put("owner", "all"); - ((TabBar)sfilter.get("area")).disables("private"); - ((TabBar)kfilter.get("area")).disables("private"); + sfilter.put("state", "ANY"); + sfilter.put("author", "0"); this.disconnect(); // Updates the session context return backmenu; diff --git a/Workspace/Siman/src/org/splat/simer/SearchBaseAction.java b/Workspace/Siman/src/org/splat/simer/SearchBaseAction.java index af545e9..bb24e0a 100644 --- a/Workspace/Siman/src/org/splat/simer/SearchBaseAction.java +++ b/Workspace/Siman/src/org/splat/simer/SearchBaseAction.java @@ -8,6 +8,7 @@ import java.util.Vector; import org.hibernate.Session; import org.hibernate.Transaction; import org.splat.kernel.InvalidPropertyException; +import org.splat.kernel.Name; import org.splat.kernel.User; import org.splat.kernel.UserDirectory; import org.splat.som.ApplicationRights; @@ -23,9 +24,8 @@ public abstract class SearchBaseAction extends Action { protected String ctype = null; // Context type index, when selected protected String cvalue = null; // Context value index, when selected protected String cindex = ""; // Context index, when removed - protected String newarea = null; // Selected repository area protected String author = null; - protected List manager = null; + protected List manager = null; protected SimulationContextType newtype; // Context type to be valued protected List newvalue; // Context value to be selected protected List critext; // Addable context types @@ -139,7 +139,7 @@ public abstract class SearchBaseAction extends Action { // -------------------------- return author; } - public List getCandidates () { + public List getCandidates () { // ---------------------------------- return manager; } @@ -168,10 +168,6 @@ public abstract class SearchBaseAction extends Action { // Setters // ============================================================================================================================== - public void setArea (String name) { -// --------------------------------- - this.newarea = name; - } public void setAuthor (String index) { // ------------------------------------ this.author = index; @@ -191,14 +187,16 @@ public abstract class SearchBaseAction extends Action { protected void setCandidates () { // ------------------------------- - manager = new Vector(); + manager = new Vector(); List users = UserDirectory.selectAllUsers(); User me = getConnectedUser(); // May be null for (Iterator i=users.iterator(); i.hasNext(); ) { - User next = i.next(); - if ( next.equals(me) ) continue; - ApplicationRights he = new ApplicationRights(next); - if (he.canCreateStudy()) manager.add(next); + User next = i.next(); + ApplicationRights he = new ApplicationRights(next); + if (he.canCreateStudy()) { + if (next.equals(me)) manager.add(0, new ValidationFacade.ByManager(me)); + else manager.add(next); + } } } diff --git a/Workspace/Siman/src/org/splat/simer/SearchKnowledgeAction.java b/Workspace/Siman/src/org/splat/simer/SearchKnowledgeAction.java index b426e31..e71219e 100644 --- a/Workspace/Siman/src/org/splat/simer/SearchKnowledgeAction.java +++ b/Workspace/Siman/src/org/splat/simer/SearchKnowledgeAction.java @@ -15,17 +15,16 @@ import org.splat.som.ProgressState; import org.splat.som.SimulationContext; import org.splat.som.SimulationContextType; import org.splat.som.Visibility; -import org.splat.wapp.Item; -import org.splat.wapp.TabBar; public class SearchKnowledgeAction extends SearchBaseAction { - private TabBar area = null; // Active repository area - private String among = null; // "all", "inCHECK" or "ref" - private String typid = null; // Knowledge type index when among all - private String refid = null; // Knowledge reference when among ref - private String words = null; // Full text search words + private String visibility = null; // "Private", "Public", "All" + private String typid = null; // Knowledge type index when among all + private String matchamong = null; // "all" or "any" + private String matcontext = null; // "all" or "any" + private String refid = null; // Knowledge reference when among ref + private String words = null; // Full text search words private List types; // Available knowledge types filter (initialized below) private static final long serialVersionUID = -3104321907432838476L; @@ -40,9 +39,6 @@ public class SearchKnowledgeAction extends SearchBaseAction { Transaction transax = connex.beginTransaction(); try { loadFilter(); - if (newarea != null) { // New selected repository area - area.selects(newarea); - } doSearch(); // Final initialization of the form @@ -66,45 +62,36 @@ public class SearchKnowledgeAction extends SearchBaseAction { User user = getConnectedUser(); KnowledgeElement.Properties sprop = new KnowledgeElement.Properties(); - KnowledgeElement.Properties other = null; - -// Set of the selected repository area - String selectab = area.getSelection().toUpperCase(); - Visibility reparea = Visibility.valueOf(selectab); - sprop.setVisibility(reparea); - -// Search from a given reference - if (among.equals("ref")) { - if (refid.length() == 0) { - getSession().remove("search.result"); // The current result is obsolete - return "wait"; - } - sprop.setReference(refid); - if (reparea == Visibility.PRIVATE) { // Restriction to studies in which the connected user is involved - other = sprop.copy().setActor(user); - sprop.setAuthor(user); - } - } else { -// Search from other available criteria + +// Search matching all criteria + sprop.setType( KnowledgeElement.selectType(Integer.valueOf(typid)) ); if (words.length() > 0) sprop.setTitle(words); + if (refid.length() > 0) sprop.setReference(refid); if (context.size() > 0) sprop.setSimulationContexts(context); - if ( among.equals("mine") ) sprop.setAuthor(user); - else if ( among.equals("his") ) { - User him = UserDirectory.selectUser(Integer.valueOf(author)); + int index = Integer.valueOf(author); + if (index > 0) { + User him = UserDirectory.selectUser(index); sprop.setAuthor(him); - if (reparea == Visibility.PRIVATE) sprop.setActor(user); - } else {//among.equals("all") - KnowledgeElementType type = KnowledgeElement.selectType(Integer.valueOf(typid)); - sprop.setType(type); - if (reparea == Visibility.PRIVATE) { // Restriction to studies in which the connected user is involved - other = sprop.copy().setActor(user); - sprop.setAuthor(user); - } } - } - if (other == null) result = Database.selectKnowledgeElementsWhere(sprop); - else result = Database.selectKnowledgeElementsWhere(sprop, other); +// Set of the visibility + if (visibility.equals("all")) { + KnowledgeElement.Properties other = sprop.copy(); + + other.setVisibility(Visibility.PUBLIC); + sprop.setVisibility(Visibility.PRIVATE); + sprop.setActor(user); + result = Database.selectKnowledgeElementsWhere(sprop, other); + } + else { + Visibility reparea = null; + if (visibility.equals("onlypublic")) reparea = Visibility.PUBLIC; + else reparea = Visibility.valueOf(visibility); + sprop.setVisibility(reparea); + if (reparea == Visibility.PRIVATE) sprop.setActor(user); + + result = Database.selectKnowledgeElementsWhere(sprop); + } session.put("search.result", result); // For redisplaying the page without re-executing the search return "refresh"; } @@ -113,14 +100,18 @@ public class SearchKnowledgeAction extends SearchBaseAction { // Getters // ============================================================================================================================== + public String getContextMatch () { +// -------------------------------- + return matcontext; + } + public String getCriteriaMatch () { +// --------------------------------- + return matchamong; + } public List getKnowledgeTypes () { // ------------------------------------------------------ return types; } - public String getOwner () { -// ------------------------- - return among; - } public String getReference () { // ----------------------------- return refid; @@ -129,9 +120,9 @@ public class SearchKnowledgeAction extends SearchBaseAction { // ------------------------ return typid; } - public List getTabs () { -// ---------------------------- - return area.asList(); + public String getVisibility () { +// ------------------------------ + return visibility; } public String getWords () { // ------------------------- @@ -142,9 +133,13 @@ public class SearchKnowledgeAction extends SearchBaseAction { // Setters // ============================================================================================================================== - public void setOwner (String value) { -// ----------------------------------- - this.among = value; + public void setContextMatch (String value) { +// ------------------------------------------ + this.matcontext = value; + } + public void setCriteriaMatch (String value) { +// ------------------------------------------- + this.matchamong = value; } public void setReference (String value) { // --------------------------------------- @@ -154,6 +149,10 @@ public class SearchKnowledgeAction extends SearchBaseAction { // ---------------------------------- this.typid = value; } + public void setVisibility (String value) { +// ---------------------------------------- + this.visibility = value; + } public void setWords (String value) { // ----------------------------------- this.words = value; @@ -175,17 +174,17 @@ public class SearchKnowledgeAction extends SearchBaseAction { User user = getConnectedUser(); Map filter = (Map)session.get("knowledge.filter"); // A default filter is supposed being set at start - area = (TabBar)filter.get("area"); - among = (String)filter.get("owner"); - author = (String)filter.get("author"); - typid = (String)filter.get("type"); - refid = (String)filter.get("reference"); - words = (String)filter.get("title"); - context = (List)filter.get("context"); + visibility = (String)filter.get("visibility"); + matchamong = (String)filter.get("matchamong"); + matcontext = (String)filter.get("matcontext"); + typid = (String)filter.get("type"); + author = (String)filter.get("author"); + refid = (String)filter.get("reference"); + words = (String)filter.get("title"); + context = (List)filter.get("context"); if (user == null) { - area.disables("private"); - if (area.getSelection().equals("private")) area.selects("public"); + visibility = "onlypublic"; } } @@ -195,19 +194,16 @@ public class SearchKnowledgeAction extends SearchBaseAction { Map session = getSession(); Map filter = (Map)session.get("knowledge.filter"); // A default filter is supposed being set at start - area = (TabBar)filter.get("area"); // The area being not an input, it is null when submitting the form - if (among.equals("ref")) { - filter.put("owner", "ref"); - filter.put("reference", this.refid); - } else { - filter.put("owner", this.among); - filter.put("author", this.author); - filter.put("type", this.typid); - filter.put("reference", ""); - filter.put("title", this.words); - - context = (List)filter.get("context"); // Only criteria not part of the form - } + filter.put("visibility", this.visibility); + filter.put("matchamong", this.matchamong); + filter.put("matcontext", this.matcontext); + filter.put("type", this.typid); + filter.put("author", this.author); + filter.put("reference", ""); + filter.put("title", this.words); + + context = (List)filter.get("context"); // Only criteria not part of the form + // Initialization required by all do functions types = KnowledgeElement.selectTypesWhere(ProgressState.APPROVED); } diff --git a/Workspace/Siman/src/org/splat/simer/SearchStudyAction.java b/Workspace/Siman/src/org/splat/simer/SearchStudyAction.java index 68bf1de..4e38b95 100644 --- a/Workspace/Siman/src/org/splat/simer/SearchStudyAction.java +++ b/Workspace/Siman/src/org/splat/simer/SearchStudyAction.java @@ -15,17 +15,16 @@ import org.splat.som.SimulationContext; import org.splat.som.SimulationContextType; import org.splat.som.Study; import org.splat.som.Visibility; -import org.splat.wapp.Item; -import org.splat.wapp.TabBar; public class SearchStudyAction extends SearchBaseAction { - private TabBar area = null; // Active repository area - private String state = null; // "inPROGRESS", "inCHECK" or "END" - private String among = null; // "all", "mine" or "ref" - private String refid = null; // Study reference when among ref - private String words = null; // Full text search words + private String visibility = null; // "Private", "Public", "All" + private String state = null; // "In-Work", "In-Draft", "In-Check"... + private String matchamong = null; // "all" or "any" + private String matcontext = null; // "all" or "any" + private String refid = null; // Study reference + private String words = null; // Full text search words private static final long serialVersionUID = -1910481357051393077L; @@ -35,15 +34,12 @@ public class SearchStudyAction extends SearchBaseAction { // Action methods // ============================================================================================================================== - public String doInitialize () { + public String doInitialize () { // ----------------------------- Session connex = Database.getSession(); Transaction transax = connex.beginTransaction(); try { loadFilter(); - if (newarea != null) { // New selected repository area - area.selects(newarea); - } doSearch(); // Final initialization of the form @@ -60,53 +56,42 @@ public class SearchStudyAction extends SearchBaseAction { } } - protected String doSearch () throws InvalidPropertyException { + protected String doSearch () throws InvalidPropertyException { // ---------------------------- Map session = getSession(); User user = getConnectedUser(); Study.Properties sprop = new Study.Properties(); - Study.Properties other = null; - -// Set of the selected repository area - String selectab = area.getSelection().toUpperCase(); - Visibility reparea = Visibility.valueOf(selectab); - sprop.setVisibility(reparea); - -// Search from a given reference - if (among.equals("ref")) { - if (refid.length() == 0) { - getSession().remove("search.result"); // The current result is obsolete - return "wait"; - } - sprop.setReference(refid); - if (reparea == Visibility.PRIVATE) { // Restriction to studies in which the connected user is involved - other = sprop.copy().setActor(user); - sprop.setManager(user); + +// Search matching all criteria + if (!this.state.equals("ANY")) sprop.setState( ProgressState.valueOf(this.state) ); + if (words.length() > 0) sprop.setTitle(words); + if (refid.length() > 0) sprop.setReference(refid); + if (context.size() > 0) sprop.setSimulationContexts(context); + int index = Integer.valueOf(author); + if (index > 0) { + User him = UserDirectory.selectUser(index); + sprop.setManager(him); } - } else { -// Search from other available criteria - if (this.state != null) { - ProgressState state = ProgressState.APPROVED; // Trick for the Public and Reference areas to not share the APPROVED state - if (!this.state.equals("ARCHIVED")) state = ProgressState.valueOf(this.state); - sprop.setState(state); +// Set of the visibility + if (visibility.equals("all")) { + Study.Properties other = sprop.copy(); + + other.setVisibility(Visibility.PUBLIC); + sprop.setVisibility(Visibility.PRIVATE); + sprop.setActor(user); + + result = Database.selectStudiesWhere(sprop, other); } - if (words.length() > 0) sprop.setTitle(words); - if (context.size() > 0) sprop.setSimulationContexts(context); - if (among.equals("mine")) sprop.setManager(user); - else if (among.equals("his")) { - User him = UserDirectory.selectUser(Integer.valueOf(author)); - sprop.setManager(him); + else { + Visibility reparea = null; + if (visibility.equals("onlypublic")) reparea = Visibility.PUBLIC; + else reparea = Visibility.valueOf(visibility); + sprop.setVisibility(reparea); if (reparea == Visibility.PRIVATE) sprop.setActor(user); - } else //among.equals("all") - if (reparea == Visibility.PRIVATE) { - other = sprop.copy().setActor(user); - sprop.setManager(user); - } - } - if (other == null) result = Database.selectStudiesWhere(sprop); - else result = Database.selectStudiesWhere(sprop, other); + result = Database.selectStudiesWhere(sprop); + } session.put("search.result", result); // For redisplaying the page without re-executing the search return "refresh"; } @@ -115,13 +100,13 @@ public class SearchStudyAction extends SearchBaseAction { // Getters // ============================================================================================================================== - public String getArea () { -// ------------------------ - return area.getSelection(); + public String getContextMatch () { +// -------------------------------- + return matcontext; } - public String getOwner () { -// ------------------------- - return among; + public String getCriteriaMatch () { +// --------------------------------- + return matchamong; } public String getReference () { // ----------------------------- @@ -131,9 +116,9 @@ public class SearchStudyAction extends SearchBaseAction { // ------------------------- return state; } - public List getTabs () { -// ---------------------------- - return area.asList(); + public String getVisibility () { +// ------------------------------ + return visibility; } public String getWords () { // ------------------------- @@ -144,9 +129,13 @@ public class SearchStudyAction extends SearchBaseAction { // Setters // ============================================================================================================================== - public void setOwner (String value) { -// ----------------------------------- - this.among = value; + public void setContextMatch (String value) { +// ------------------------------------------ + this.matcontext = value; + } + public void setCriteriaMatch (String value) { +// ------------------------------------------- + this.matchamong = value; } public void setReference (String value) { // --------------------------------------- @@ -156,6 +145,10 @@ public class SearchStudyAction extends SearchBaseAction { // ----------------------------------- this.state = value; } + public void setVisibility (String value) { +// ---------------------------------------- + this.visibility = value; + } public void setWords (String value) { // ----------------------------------- this.words = value; @@ -180,18 +173,17 @@ public class SearchStudyAction extends SearchBaseAction { User user = getConnectedUser(); Map filter = (Map)session.get("study.filter"); // A default filter is supposed being set at start - area = (TabBar)filter.get("area"); - state = (String)filter.get("state"); - among = (String)filter.get("owner"); - author = (String)filter.get("author"); - refid = (String)filter.get("reference"); - words = (String)filter.get("title"); - context = (List)filter.get("context"); + visibility = (String)filter.get("visibility"); + matchamong = (String)filter.get("matchamong"); + matcontext = (String)filter.get("matcontext"); + state = (String)filter.get("state"); + author = (String)filter.get("author"); + refid = (String)filter.get("reference"); + words = (String)filter.get("title"); + context = (List)filter.get("context"); if (user == null) { - area.disables("private"); - if (area.getSelection().equals("private")) area.selects("public"); - if (among.equals("mine")) among = "all"; + visibility = "onlypublic"; } } @@ -201,18 +193,15 @@ public class SearchStudyAction extends SearchBaseAction { Map session = getSession(); Map filter = (Map)session.get("study.filter"); // A default filter is supposed being set at start - area = (TabBar)filter.get("area"); // The area being not an input, it is null when submitting the form - if (among.equals("ref")) { - filter.put("owner", "ref"); - filter.put("reference", this.refid); - } else { - filter.put("state", this.state); - filter.put("owner", this.among); - filter.put("author", this.author); - filter.put("reference", ""); - filter.put("title", this.words); - - context = (List)filter.get("context"); // Only criteria not part of the form - } + filter.put("visibility", this.visibility); + filter.put("matchamong", this.matchamong); + filter.put("matcontext", this.matcontext); + filter.put("state", this.state); + filter.put("author", this.author); + filter.put("reference", this.refid); + filter.put("title", this.words); + + context = (List)filter.get("context"); // Only criteria not part of the form + } } \ No newline at end of file diff --git a/Workspace/Siman/src/siman.properties b/Workspace/Siman/src/siman.properties index 8e1a432..8f8e78a 100644 --- a/Workspace/Siman/src/siman.properties +++ b/Workspace/Siman/src/siman.properties @@ -1,7 +1,7 @@ schema.version = D-0.3 wapp.version = D-0.5 -wapp.root = D:/users/rkv/SIMAN/Workspace/Siman/WebContent/ +wapp.root = D:/users/rkv/SIMAN/SIMAN_SRC/Workspace/Siman/WebContent/ wapp.login = conf/login.conf wapp.configuration = conf/som.xml wapp.customization = conf/my.xml diff --git a/Workspace/Siman/src/simer.properties b/Workspace/Siman/src/simer.properties index 8e1a432..8f8e78a 100644 --- a/Workspace/Siman/src/simer.properties +++ b/Workspace/Siman/src/simer.properties @@ -1,7 +1,7 @@ schema.version = D-0.3 wapp.version = D-0.5 -wapp.root = D:/users/rkv/SIMAN/Workspace/Siman/WebContent/ +wapp.root = D:/users/rkv/SIMAN/SIMAN_SRC/Workspace/Siman/WebContent/ wapp.login = conf/login.conf wapp.configuration = conf/som.xml wapp.customization = conf/my.xml -- 2.39.2