Merge branch 'develop'

Conflicts:
	pom.xml
	src/main/java/org/cristalise/kernel/graph/model/GraphableVertex.java

Author: kovax

.travis.yml

@@ -1,8 +1,10 @@
 language: java
 jdk: oraclejdk8
 branches: 
-only:
-- master
+  only:
+  - master
+  - release
+  - develop
 cache:
   directories:
   - "$HOME/.m2"

pom.xml

@@ -27,7 +27,7 @@
     <groupId>org.cristalise</groupId>
     <artifactId>cristalise-kernel</artifactId>
     <name>cristalise-kernel</name>
-    <version>3.4.2</version>
+    <version>3.5.0</version>
     <description>Cristal-ise is a description-driven software platform originally developed to track the construction of 
 	the CMS ECAL detector of the LHC at CERN. This is its core library, known as the kernel, which manages 
 	business objects called Items. Items are entirely configured from data, called descriptions, held in other Items. 
@@ -133,6 +133,12 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.spockframework</groupId>
             <artifactId>spock-core</artifactId>
@@ -148,7 +154,7 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
-            <version>2.4.12</version>
+            <version>2.4.15</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/idl/CommonExceptions.idl

@@ -59,6 +59,7 @@ module common
     **************************************************************************/
     exception InvalidCollectionModification
     {
+        string details;
     };
 
 

src/main/idl/Entity.idl

@@ -41,7 +41,7 @@ module entity
     * in a tree structure. 
     **/ 
 
-     interface Item
+    interface Item
     {
 
         /**
@@ -57,12 +57,16 @@ module entity
     	* Property objects of the Item
         * @param workflow The XML marshalled new lifecycle of the Item
         * @param collection The XML marshalled CollectionArrayList of the initial state of the Item's collections
+        * @param viewpoint the XML marshalled Viewpoint to be stored to find the Outcome 
+        * @param outcome the XML data to be stored 
         * @exception ObjectNotFoundException
         **/
         void initialise( in common::SystemKey  agentKey,
-        				 in string             itemProps,
+                         in string             itemProps,
                          in string             workflow,
-                         in string             collections )
+                         in string             collections,
+                         in string             viewpoint,
+                         in string             outcome )
             raises( common::AccessRightsException,
                     common::InvalidDataException,
                     common::PersistencyException,
@@ -94,6 +98,8 @@ module entity
                     common::ObjectNotFoundException,
                     common::PersistencyException );
 
+        typedef sequence<octet> OctetSequence;
+
         /**
         * Requests a transition of an Activity in this Item's workflow. If possible and permitted, an Event is 
         * generated and stored, the Activity's state is updated, which may cause the Workflow to proceed. If 
@@ -114,6 +120,10 @@ module entity
         * @param requestData The XML Outcome of the work defined by the Activity. Must be valid to the XML Schema,
         * though this is not verified on the server, rather in the AgentProxy in the Client API.
         *
+        * @param attachmentType the MimeType of the attachment (can be empty)
+        *
+        * @param attachment binary data associated with the Outcome (can be empty)
+        *
         * @throws AccessRightsException The Agent is not permitted to perform the operation. Either it does not 
         * have the correct role, or the Activity is reserved by another Agent. Also thrown when the given Agent ID doesn't exist.
         * @throws InvalidTransitionException The Activity is not in the correct state to make the requested transition.
@@ -126,7 +136,9 @@ module entity
         string requestAction( in common::SystemKey agentKey,
                             in string              stepPath,
                             in unsigned long       transitionID,
-                            in string    			requestData
+                            in string              requestData,
+                            in string              attachmentType,
+                            in OctetSequence       attachment
                           )
             raises( common::AccessRightsException,
                     common::InvalidTransitionException,
@@ -137,10 +149,12 @@ module entity
                     common::InvalidCollectionModification);
 
         string delegatedAction( in common::SystemKey agentKey,
-					        in common::SystemKey delegateAgentKey,
-                            in string              stepPath,
-                            in unsigned long       transitionID,
-                            in string    			requestData
+                                in common::SystemKey delegateAgentKey,
+                                in string            stepPath,
+                                in unsigned long     transitionID,
+                                in string            requestData,
+                                in string            attachmentType,
+                                in OctetSequence     attachment
                           )
             raises( common::AccessRightsException,
                     common::InvalidTransitionException,

src/main/java/org/cristalise/kernel/collection/BuiltInCollections.java

@@ -49,6 +49,10 @@ public enum BuiltInCollections {
      */
     SCHEMA("Schema"),
 
+    SCHEMA_INITIALISE("SchemaInitialise"),
+
+    SCHEMA_MASTER("SchemaMaster"),
+
     /**
      * CollectionDescription of elementary ActivityDef. It is instantiated as two Activity properties (see bellow). 
      * Also it is Dependency Collection of Workflow.

src/main/java/org/cristalise/kernel/collection/Dependency.java

@@ -43,6 +43,7 @@
 import org.cristalise.kernel.common.InvalidDataException;
 import org.cristalise.kernel.common.ObjectAlreadyExistsException;
 import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.graph.model.BuiltInVertexProperties;
 import org.cristalise.kernel.lifecycle.ActivityDef;
 import org.cristalise.kernel.lookup.ItemPath;
 import org.cristalise.kernel.process.Gateway;
@@ -173,6 +174,30 @@ public void updateMember(ItemPath childPath, int memberID, CastorHashMap memberN
     public DependencyMember addMember(ItemPath itemPath) 
             throws InvalidCollectionModification, ObjectAlreadyExistsException
     {
+        DependencyMember depMember = createMember(itemPath);
+        mMembers.list.add(depMember);
+
+        Logger.msg(8, "Dependency.addMember(" + itemPath + ") added to children with slotId:"+depMember.getID());
+        return depMember;
+    }
+
+    /**
+     * 
+     * @param depMember
+     * @throws InvalidCollectionModification
+     * @throws ObjectAlreadyExistsException
+     */
+    public void addMember(DependencyMember depMember) throws InvalidCollectionModification, ObjectAlreadyExistsException {
+        mMembers.list.add(depMember);
+    }
+    /**
+     * 
+     * @param itemPath
+     * @return
+     * @throws InvalidCollectionModification
+     * @throws ObjectAlreadyExistsException
+     */
+    public DependencyMember createMember(ItemPath itemPath) throws InvalidCollectionModification, ObjectAlreadyExistsException {
         if (itemPath == null) 
             throw new InvalidCollectionModification("Cannot add empty slot to Dependency collection");
 
@@ -187,9 +212,6 @@ public DependencyMember addMember(ItemPath itemPath)
 
         // assign entity
         depMember.assignItem(itemPath);
-        mMembers.list.add(depMember);
-        
-        Logger.msg(8, "Dependency.addMember(" + itemPath + ") added to children with slotId:"+depMember.getID());
         return depMember;
     }
 
@@ -215,11 +237,29 @@ public List<DependencyMember> compare(Dependency other) {
     @Override
     public DependencyMember addMember(ItemPath itemPath, CastorHashMap props, String classProps)
             throws InvalidCollectionModification, ObjectAlreadyExistsException
+    {
+        DependencyMember depMember = createMember(itemPath, props);
+        mMembers.list.add(depMember);
+        Logger.msg(8, "Dependency.addMember(" + itemPath + ") added to children with slotId:"+depMember.getID());
+        return depMember;
+    }
+
+    /**
+     * 
+     * @param itemPath
+     * @param props
+     * @return
+     * @throws InvalidCollectionModification
+     * @throws ObjectAlreadyExistsException
+     */
+    public DependencyMember createMember(ItemPath itemPath, CastorHashMap props) 
+            throws InvalidCollectionModification, ObjectAlreadyExistsException
     {
         if (itemPath == null)
             throw new InvalidCollectionModification("Cannot add empty slot to Dependency collection");
 
         boolean checkUniqueness = Gateway.getProperties().getBoolean("Dependency.checkMemberUniqueness", true);
+
         if (checkUniqueness && contains(itemPath))
             throw new ObjectAlreadyExistsException("Item "+itemPath+" already exists in Dependency "+getName());
 
@@ -239,8 +279,6 @@ public DependencyMember addMember(ItemPath itemPath, CastorHashMap props, String
 
         // assign entity
         depMember.assignItem(itemPath);
-        mMembers.list.add(depMember);
-        Logger.msg(8, "Dependency.addMember(" + itemPath + ") added to children with slotId:"+depMember.getID());
         return depMember;
     }
 
@@ -383,7 +421,7 @@ public void addToVertexProperties(CastorHashMap props) throws InvalidDataExcepti
                     }
                     catch (ObjectNotFoundException e) {
                         //Schema dependency could be defined in Properties
-                        if(props.containsKey(SCHEMA_NAME)) {
+                        if(props.containsKey(SCHEMA_NAME.getName())) {
                             Logger.msg(8, "Dependency.addToVertexProperties() - BACKWARD COMPABILITY: Dependency '"+getName()+"' is defined in Properties");
                             String uuid = LocalObjectLoader.getSchema(props).getItemPath().getUUID().toString();
                             props.setBuiltInProperty(SCHEMA_NAME, uuid);
@@ -399,7 +437,7 @@ public void addToVertexProperties(CastorHashMap props) throws InvalidDataExcepti
                     }
                     catch (ObjectNotFoundException e) {
                         //Backward compability: Script dependency could be defined in Properties
-                        if(props.containsKey(SCRIPT_NAME)) {
+                        if(props.containsKey(SCRIPT_NAME.getName())) {
                             Logger.msg(8, "Dependency.addToVertexProperties() - BACKWARD COMPABILITY: Dependency '"+getName()+"' is defined in Properties");
                             String uuid = LocalObjectLoader.getScript(props).getItemPath().getUUID().toString();
                             props.setBuiltInProperty(SCRIPT_NAME, uuid);
@@ -415,7 +453,7 @@ public void addToVertexProperties(CastorHashMap props) throws InvalidDataExcepti
                     }
                     catch (ObjectNotFoundException e) {
                         //Backward compability: Query dependency could be defined in Properties
-                        if(props.containsKey(QUERY_NAME)) {
+                        if(props.containsKey(QUERY_NAME.getName())) {
                             Logger.msg(8, "Dependency.addToVertexProperties() - BACKWARD COMPABILITY: Dependency '"+getName()+"' is defined in Properties");
                             String uuid = LocalObjectLoader.getQuery(props).getItemPath().getUUID().toString();
                             props.setBuiltInProperty(QUERY_NAME, uuid);
@@ -430,7 +468,7 @@ public void addToVertexProperties(CastorHashMap props) throws InvalidDataExcepti
                         props.setBuiltInProperty(STATE_MACHINE_VERSION, memberVer);
                     }
                     catch (ObjectNotFoundException e) {
-                        if(props.containsKey(STATE_MACHINE_NAME)) {
+                        if(props.containsKey(STATE_MACHINE_NAME.getName())) {
                             Logger.msg(8, "Dependency.addToVertexProperties() -  BACKWARD COMPABILITY: Dependency '"+getName()+"' is defined in Properties");
                             String uuid = LocalObjectLoader.getStateMachine(props).getItemPath().getUUID().toString();
                             props.setBuiltInProperty(STATE_MACHINE_NAME, uuid);
@@ -442,7 +480,7 @@ public void addToVertexProperties(CastorHashMap props) throws InvalidDataExcepti
                     ActivityDef actDef = LocalObjectLoader.getActDef(memberUUID, memberVer);
                     CastorHashMap chm = null;
 
-                    if(props.containsKey(ACTIVITY_DEF_URN)) {
+                    if(props.containsKey(ACTIVITY_DEF_URN.getName())) {
                         chm = (CastorHashMap)props.getBuiltInProperty(ACTIVITY_DEF_URN);
                     }
                     else {
@@ -483,4 +521,24 @@ private boolean convertToVertextPropsByScript(CastorHashMap props, DependencyMem
         }
         return false;
     }
+    
+    /**
+     * Method of convenience to get property value using BuiltInVertexProperties
+     * 
+     * @param prop the property to read
+     * @return the value, can be null
+     */
+    public Object getBuiltInProperty(BuiltInVertexProperties prop) {
+        return mProperties.get(prop.getName());
+    }
+
+    /**
+     * Method of convenience to check if property exists
+     * 
+     * @param prop the property to check
+     * @return true if property exist, false otherwise
+     */
+    public boolean containsBuiltInProperty(BuiltInVertexProperties prop) {
+        return mProperties.containsKey(prop.getName());
+    }
 }