- isidorus-cvs@common-lisp.net - mailman3.common-lisp.net

[isidorus-cvs] r749 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 06:33:41 2011 New Revision: 749 Log: trunk: changed some addresses Modified: trunk/src/shell_scripts/startIsidorus.lisp Modified: trunk/src/shell_scripts/startIsidorus.lisp ============================================================================== --- trunk/src/shell_scripts/startIsidorus.lisp Wed Aug 17 06:25:39 2011 (r748) +++ trunk/src/shell_scripts/startIsidorus.lisp Wed Aug 17 06:33:41 2011 (r749) @@ -3,10 +3,10 @@ ;;(xtm-importer:import-from-xtm "/home/isidorus/.sbcl/site/isidorus/src/unit_tests/textgrid_07.15.2011.xtm" "data_base" :tm-id "http::/isidor.us/tm-1") (setf rest-interface:*users* (list (list :uname "isidorus" :passwd "Ar8g7Pw"))) (setf rest-interface:*use-http-authentication* 2) ;only the host page isidorus.html and the commit handlers are protected -(setf rest-interface:*local-backup-remote-address* "143.93.190.247") ;the allowed other remove peer ip -(setf rest-interface:*remote-backup-remote-address* "143.93.190.247") ;the allowed other remove peer ip +(setf rest-interface:*local-backup-remote-address* "12.34.56.78") ;the allowed other remove peer ip +(setf rest-interface:*remote-backup-remote-address* "12.34.56.78") ;the allowed other remove peer ip (setf rest-interface:*shutdown-remote-address* "127.0.0.1") ;the allowed other remove peer ip -(rest-interface:start-json-engine "/home/isidorus/data_base" :host-name "143.93.190.176" :port 7000) +(rest-interface:start-json-engine "/home/isidorus/data_base" :host-name "12.34.56,78" :port 12345) (rest-interface:start-admin-server) (format t "will enter die-when-finished") (rest-interface:die-when-finished)

1 0

[isidorus-cvs] r748 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 06:25:39 2011 New Revision: 748 Log: gdl-frontend: Widgets: started to implement the GDl-Schema for creating instances of http://textgrid.org/serviceregistry/model/Hash-Object Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Wed Aug 17 04:59:20 2011 (r747) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Wed Aug 17 06:25:39 2011 (r748) @@ -0,0 +1,139 @@ +{"version":"1.1", + + "prefixes":{"tmcl":"http://psi.topicmaps.org/tmcl/", + "tmdm":"http://psi.topicmaps.org/iso13250/model/", + "tg":"http://textgrid.org/serviceregistry/", + "tgm":"http://textgrid.org/serviceregistry/model/", + "tgg":"http://textgrid.org/serviceregistry/gdl/", + "gdl":"http://psi.isidor.us/gdl/"}, + + "item_type":"topicmap", + + "item_identifiers":["[tg:services-tm]"], + + "topics":[{"subject_identifiers":["[tmcl:topic-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:name-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:occurrence-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:role-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:association-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:card-min]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tmcl:card-max]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[tmcl:constraint]"], "instance_of":["si:[tmcl:topic-type]", "si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tmcl:topic-name-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, + + {"subject_identifiers":["[tmdm:supertype]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tmdm:subtype]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tmdm:supertype-subtype]"], "instance_of":["si:[tmcl:association-type]"]}, + + {"subject_identifiers":["[tgm:Hash-Object]"], "instance_of":["si:[tmcl:topic-type]"]}, + + {"subject_identifiers":["[gdl:contains]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[gdl:topic-view-binding]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[gdl:tm-binding]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[gdl:view-binding]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[gdl:value-binding]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[gdl:position]"], "instance_of":["si:[tmcl:association-type]"]}, + + {"subject_identifiers":["[gdl:container]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:containee]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:tm-value]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:tm-construct]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:descriptor]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:value-group]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:value]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:ancestor]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:descendant]"], "instance_of":["si:[tmcl:role-type]"]}, + + {"subject_identifiers":["[gdl:Schema]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[gdl:schema-name]"], "instance_of":["si:[tmcl:name-type]"]}, + {"subject_identifiers":["[gdl:Descriptor]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[gdl:Visible-Object]"]}, + {"subject_identifiers":["[gdl:width]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:height]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:border-style]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:background-color]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:id]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:View]"]}, + {"subject_identifiers":["[gdl:view-name]"], "instance_of":["si:[tmcl:name-type]"]}, + {"subject_identifiers":["[gdl:Topic-View]"]}, + {"subject_identifiers":["[gdl:Default-Topic-View]"]}, + {"subject_identifiers":["[gdl:Default-Creator-Topic-View]"]}, + {"subject_identifiers":["[gdl:Association-View]"]}, + {"subject_identifiers":["[gdl:Creator-Association-View]"]}, + {"subject_identifiers":["[gdl:Value]"]}, + {"subject_identifiers":["[gdl:TM-Value]"]}, + {"subject_identifiers":["[gdl:TM-Single-Type-Value]"]}, + {"subject_identifiers":["[gdl:Literal-Value]"]}, + {"subject_identifiers":["[gdl:literal-value]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:Default-Value]"]}, + {"subject_identifiers":["[gdl:fixed]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:Default-Literal-Value]"]}, + {"subject_identifiers":["[gdl:Text-Object]"]}, + {"subject_identifiers":["[gdl:List-Box]"]}, + {"subject_identifiers":["[gdl:Text]"]}, + {"subject_identifiers":["[gdl:readonly]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:Position]"]}, + {"subject_identifiers":["[gdl:position-style]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:top]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:left]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:right]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:Value-Group]"]}, + + {"subject_identifiers":["[tgg:textgrid-ui-schema]"], "instance_of":["si:[gdl:Schema]"], "names":[{"type":"si:[gdl:schema-name]", "value":"GDL Schema for the TextGrid-ServiceRegistry-UI"}]}, + {"subject_identifiers":["[tgg:hash-object-default-creator-topic-view]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"GDL Default Creator Topic View for instances of http://textgrid.org/serviceregistry/model/Hash-Object"}], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_default_creator_topic_view_id"}, {"type":"si:[gdl:width]", "value":"300px"}, {"type":"si:[gdl:height]", "value":"100px"},{"type":"si:[gdl:background-color]", "value":"gray"}]}, + {"subject_identifiers":["[tgg:hash-object-creator-view-binding]"], "instance_of":["si:[gdl:TM-Single-Type-Value]"]}, + + {"subject_identifiers":["[tgg:hash-object-text-label-env]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_env_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"40px"},{"type":"si:[gdl:background-color]", "value":"gray"}, {"type":"si:[gdl:border-style]", "value":"none"}]}, + {"subject_identifiers":["[tgg:hash-object-text-label-env-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-label-env-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + {"subject_identifiers":["[tgg:hash-object-text-label-env-value]"], "instance_of":["si:[gdl:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"name:"}]}, + + {"subject_identifiers":["[tgg:has-hash-creator-association-view]"], "instance_of":["si:[gdl:Creator-Association-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"A Creator View for associations of the type http://textgrid.org/serviceregistry/model/has-hash"}], "occurrences":[{"type":"si:[gdl:id]", "value":"has_hash_createor_association_view_id"}, {"type":"si:[gdl:width]", "value":"230px"}]}, + {"subject_identifiers":["[tgg:hash-object-has-hash-creator-association-view-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"60px"}]}, + {"subject_identifiers":["[tgg:hash-object-has-hash-creator-association-view-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, + + {"subject_identifiers":["[tgg:hash-object-text-list-box-env]"], "instance_of":["si:[gdl:List-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_env_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"230px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-list-box-env-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"0px"}, {"type":"si:[gdl:left]", "value":"0px"}]}, + {"subject_identifiers":["[tgg:hash-object-text-list-box-env-value-group]"], "instance_of":["si:[gdl:Value-Group]"]} + + ], + + "associations":[{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-name-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Visible-Object]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Visible-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Default-Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Default-Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Default-Creator-Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Association-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Association-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Creator-Association-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Descriptor]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:TM-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:TM-Single-Type-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:TM-Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Default-Literal-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Literal-Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Default-Literal-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Default-Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Visible-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Text-Object]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Text-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:List-Box]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Text-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Text]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Position]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Value-Group]"}]}, + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:textgrid-ui-schema]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-default-creator-topic-view]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-creator-view-binding]"},{"type":"si:[gdl:tm-construct]", "player":"si:[tgm:Hash-Object]"}]}, + {"type":"si:[gdl:topic-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:tm-value]", "player":"si:[tgg:hash-object-creator-view-binding]"}]}, + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-text-label-env]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-label-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-label-env]"}]}, + {"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-env-value-group]"},{"type":"si:[gdl:value]", "player":"si:[tgg:hash-object-text-label-env-value]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-label-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-label-env]"}]}, + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:has-hash-creator-association-view]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-has-hash-creator-association-view-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-text-label-env]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:has-hash-creator-association-view]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-has-hash-creator-association-view-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:has-hash-creator-association-view]"}]}, + + + + + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:has-hash-creator-association-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-text-list-box-env]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-list-box-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:has-hash-creator-association-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-text-list-box-env]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-text-list-box-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-text-list-box-env]"}]} + ]} \ No newline at end of file

1 0

[isidorus-cvs] r747 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 04:59:20 2011 New Revision: 747 Log: trunk: shell_scripts: adapted the script fillDB.sh for the TextGrid isidorus server and user Modified: trunk/src/shell_scripts/fillDB.sh Modified: trunk/src/shell_scripts/fillDB.sh ============================================================================== --- trunk/src/shell_scripts/fillDB.sh Wed Aug 17 04:27:45 2011 (r746) +++ trunk/src/shell_scripts/fillDB.sh Wed Aug 17 04:59:20 2011 (r747) @@ -1,9 +1,9 @@ #!/bin/bash export LANG=de_DE.UTF-8 cd /home/isidorus/.sbcl/site/isidorus/src -sbcl << END +su -l -s /bin/bash isidorus -c sbcl << END (setf sb-impl::*default-external-format* :UTF-8) (asdf:operate 'asdf:load-op 'isidorus) -(xtm-importer:setup-repository "/home/isidorus/textgrid.xtm" "/home/isidorus/data_base" :tm-id "http://textgrid.org/serviceregistry/services-tm") +(xtm-importer:setup-repository "/home/isidorus/latestDump20110711.xtm" "/home/isidorus/data_base" :tm-id "http://textgrid.org/serviceregistry/services-tm") (elephant:close-store) END

1 0

[isidorus-cvs] r746 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base environment isidorus view
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 04:27:45 2011 New Revision: 746 Log: gdl-frontend: Widgets: fixed some bugs when consuming Topic Maps data Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Wed Aug 17 03:19:14 2011 (r745) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Wed Aug 17 04:27:45 2011 (r746) @@ -27,18 +27,19 @@ mainPanel.setPixelSize(1000, 600); ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); + requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/Hash-Object", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/Environment", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Poet", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Musician", TopicIdentifierTypes.SubjectIdentifier)); - Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/test-environment", TopicIdentifierTypes.SubjectIdentifier); + //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/test-environment", TopicIdentifierTypes.SubjectIdentifier); GdlPanel.addClickHandler("unit_1_text_create_button_id", new ClickHandler() { @Override public void onClick(ClickEvent event) { Window.alert("you clicked " + ((Button)event.getSource()).getText()); } }); - gdlPanel = new GdlPanel(requestedTopicToEdit, requestedTopicsToCreate); + gdlPanel = new GdlPanel(null, requestedTopicsToCreate); mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Wed Aug 17 03:19:14 2011 (r745) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Wed Aug 17 04:27:45 2011 (r746) @@ -110,7 +110,7 @@ // returns true if the topic instance if an instance of the topic type public static boolean isInstanceOf(Topic instance, Topic type){ if(instance == null || (instance.getTypes().length() != 0 && type == null)) return false; - if(instance.getTypes().length() == 0 && type == null) return true; + if(instance.getTypes().length() == 0 && type == null) return false; // type must be always set! JsArray<Topic> types = instance.getTypes(); for(int i = 0; i != types.length(); ++i){ @@ -317,7 +317,7 @@ Topic containerRoleType = getTopicByPsi(PSIs.RoleType.gdlContainer, tm); Topic visibleObject = getTopicByPsi(PSIs.TopicType.gdlVisibleObject, tm); Topic containeeRoleType = getTopicByPsi(PSIs.RoleType.gdlContainee, tm); - + return getOtherPlayerOfBinaryAssociation(container, containerRoleType, containsAssocType, null, visibleObject, containeeRoleType); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Wed Aug 17 03:19:14 2011 (r745) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Wed Aug 17 04:27:45 2011 (r746) @@ -94,18 +94,18 @@ }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlDefaultCreatorTopicView)){ return new GdlDefaultCreatorTopicView(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlDefaultEditorTopicView)){ - if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Topic when used with " + PSIs.TopicType.gdlDefaultEditorTopicView); + if(!(receivedData instanceof Topic) && receivedData != null) throw new ExecutionException("receivedData must be of type Topic when used with " + PSIs.TopicType.gdlDefaultEditorTopicView); return new GdlDefaultEditorTopicView(tmRepresentative, (Topic)receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlSpecialCreatorTopicView)){ return new GdlSpecialCreatorTopicView(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlSpecialEditorTopicView)){ - if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Topic when used with " + PSIs.TopicType.gdlSpecialEditorTopicView); + if(!(receivedData instanceof Topic) && receivedData != null) throw new ExecutionException("receivedData must be of type Topic when used with " + PSIs.TopicType.gdlSpecialEditorTopicView); return new GdlSpecialEditorTopicView(tmRepresentative, (Topic)receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlCreatorAssociationview)){ - if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Association when used with " + PSIs.TopicType.gdlCreatorAssociationview); + if(!(receivedData instanceof Topic) && receivedData != null) throw new ExecutionException("receivedData must be of type Association when used with " + PSIs.TopicType.gdlCreatorAssociationview); return new GdlCreatorAssociationView(tmRepresentative, (Association)receivedData); }else if(TmHelper.isInstanceOf(tmRepresentative, PSIs.TopicType.gdlEditorAssociationView)){ - if(!(receivedData instanceof Topic)) throw new ExecutionException("receivedData must be of type Associaiton when used with " + PSIs.TopicType.gdlEditorAssociationView); + if(!(receivedData instanceof Topic) && receivedData != null) throw new ExecutionException("receivedData must be of type Associaiton when used with " + PSIs.TopicType.gdlEditorAssociationView); return new GdlEditorAssociationView(tmRepresentative, (Association)receivedData); }else{ String values = ""; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Wed Aug 17 03:19:14 2011 (r745) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Wed Aug 17 04:27:45 2011 (r746) @@ -23,7 +23,7 @@ // this class can be used as a callback that requests the Topic Map data // addressable by the URI isidorusUrl public class LoadSchemaCallback implements ILoadSchemaCallback{ - private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "TextGrid_GDL_Edit_Environment.jtm"); //"test.gdl.jtm"); // TODO: replace with the correct URL + private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "TextGrid_GDL_Create_HashObject.jtm"); //"test.gdl.jtm"); // TODO: replace with the correct URL private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); private Pair<String, TopicIdentifierTypes> requestedTopicToEdit = null; private RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, isidorusUrl); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Wed Aug 17 03:19:14 2011 (r745) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Wed Aug 17 04:27:45 2011 (r746) @@ -3,7 +3,6 @@ import java.util.ArrayList; import com.google.gwt.core.client.JsArray; import com.google.gwt.user.client.ui.Widget; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Name; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;

1 0

[isidorus-cvs] r745 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 03:19:14 2011 New Revision: 745 Log: trunk: shell_scripts: added a simple script for loading data into the DB Added: trunk/src/shell_scripts/fillDB.sh (contents, props changed) Added: trunk/src/shell_scripts/fillDB.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/shell_scripts/fillDB.sh Wed Aug 17 03:19:14 2011 (r745) @@ -0,0 +1,9 @@ +#!/bin/bash +export LANG=de_DE.UTF-8 +cd /home/isidorus/.sbcl/site/isidorus/src +sbcl << END +(setf sb-impl::*default-external-format* :UTF-8) +(asdf:operate 'asdf:load-op 'isidorus) +(xtm-importer:setup-repository "/home/isidorus/textgrid.xtm" "/home/isidorus/data_base" :tm-id "http://textgrid.org/serviceregistry/services-tm") +(elephant:close-store) +END

1 0

[isidorus-cvs] r744 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 02:56:52 2011 New Revision: 744 Log: trunk: shell_scripts: changed the state of the http-basic-authentication mechanism in the start script for TextGrid Modified: trunk/src/shell_scripts/startIsidorus.lisp Modified: trunk/src/shell_scripts/startIsidorus.lisp ============================================================================== --- trunk/src/shell_scripts/startIsidorus.lisp Wed Aug 17 02:49:33 2011 (r743) +++ trunk/src/shell_scripts/startIsidorus.lisp Wed Aug 17 02:56:52 2011 (r744) @@ -2,10 +2,10 @@ (asdf:operate 'asdf:load-op 'isidorus) ;;(xtm-importer:import-from-xtm "/home/isidorus/.sbcl/site/isidorus/src/unit_tests/textgrid_07.15.2011.xtm" "data_base" :tm-id "http::/isidor.us/tm-1") (setf rest-interface:*users* (list (list :uname "isidorus" :passwd "Ar8g7Pw"))) -(setf rest-interface:*use-http-authentication* 1) ;only the host page isidorus.html is protected, note: all RESTful handlers can be invoked without any authentication mechanism!!! -(setf rest-interface:*local-backup-remote-address* "143.93.190.247") -(setf rest-interface:*remote-backup-remote-address* "143.93.190.247") -(setf rest-interface:*shutdown-remote-address* "127.0.0.1") +(setf rest-interface:*use-http-authentication* 2) ;only the host page isidorus.html and the commit handlers are protected +(setf rest-interface:*local-backup-remote-address* "143.93.190.247") ;the allowed other remove peer ip +(setf rest-interface:*remote-backup-remote-address* "143.93.190.247") ;the allowed other remove peer ip +(setf rest-interface:*shutdown-remote-address* "127.0.0.1") ;the allowed other remove peer ip (rest-interface:start-json-engine "/home/isidorus/data_base" :host-name "143.93.190.176" :port 7000) (rest-interface:start-admin-server) (format t "will enter die-when-finished")

1 0

[isidorus-cvs] r743 - in trunk/src: rest_interface xml/xtm
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 02:49:33 2011 New Revision: 743 Log: trunk: xtm-exporter: fixed a bug that occurs when exporting empty stopres Modified: trunk/src/rest_interface/admin-interface.lisp trunk/src/xml/xtm/exporter.lisp Modified: trunk/src/rest_interface/admin-interface.lisp ============================================================================== --- trunk/src/rest_interface/admin-interface.lisp Wed Aug 17 02:10:46 2011 (r742) +++ trunk/src/rest_interface/admin-interface.lisp Wed Aug 17 02:49:33 2011 (r743) @@ -38,7 +38,6 @@ (when elephant:*store-controller* (xtm-exporter:export-as-xtm (concat "backup_" (make-date-string (get-universal-time)) ".xtm") - :tm-id "http://isidor.us/backup-tm" :revision 0)) (shutdown-json-engine) (shutdown-atom-engine) Modified: trunk/src/xml/xtm/exporter.lisp ============================================================================== --- trunk/src/xml/xtm/exporter.lisp Wed Aug 17 02:10:46 2011 (r742) +++ trunk/src/xml/xtm/exporter.lisp Wed Aug 17 02:49:33 2011 (r743) @@ -14,30 +14,42 @@ "gets all instances of AssociationC - which does not realize an instanceOf relationship in the db" (let ((instance-topic - (identified-construct - (elephant:get-instance-by-value 'PersistentIdC 'uri *instance-psi*))) + (get-item-by-psi *instance-psi* :revision 0)) (type-topic - (identified-construct - (elephant:get-instance-by-value 'PersistentIdC 'uri *type-psi*)))) - (loop for item in (d:get-all-associations revision) - when (and (= (length (roles item :revision revision)) 2) - (not (and (or (eq instance-topic - (instance-of (first (roles item - :revision revision)) - :revision revision)) - (eq instance-topic - (instance-of (second (roles item - :revision revision)) - :revision revision))) - (or (eq type-topic - (instance-of (first (roles item - :revision revision)) - :revision revision)) - (eq type-topic - (instance-of (second (roles item - :revision revision)) - :revision revision)))))) - collect item))) + (get-item-by-psi *type-psi* :revision 0))) + (cond ((and (not (and instance-topic type-topic)) + (elephant:get-instances-by-class 'TopicMapC)) + (error (make-condition + 'missing-reference-error + :message + (format nil "Could not resolvethe topics: ~a and ~a~%" + *instance-psi* *type-psi*)))) + ((not (and instance-topic type-topic)) + nil) + (t + (loop for item in (d:get-all-associations revision) + when (and + (= (length (roles item :revision revision)) 2) + (not + (and + (or + (eq instance-topic + (instance-of (first (roles item + :revision revision)) + :revision revision)) + (eq instance-topic + (instance-of (second (roles item + :revision revision)) + :revision revision))) + (or (eq type-topic + (instance-of (first (roles item + :revision revision)) + :revision revision)) + (eq type-topic + (instance-of (second (roles item + :revision revision)) + :revision revision)))))) + collect item))))) (defmacro with-xtm2.0 ((tm revision) &body body)

1 0

[isidorus-cvs] r742 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 02:10:46 2011 New Revision: 742 Log: trunk: shell_scrcipts: added basic-authentication to startIsidorus.lisp Modified: trunk/src/shell_scripts/startIsidorus.lisp Modified: trunk/src/shell_scripts/startIsidorus.lisp ============================================================================== --- trunk/src/shell_scripts/startIsidorus.lisp Wed Aug 17 02:04:12 2011 (r741) +++ trunk/src/shell_scripts/startIsidorus.lisp Wed Aug 17 02:10:46 2011 (r742) @@ -1,6 +1,8 @@ (setf sb-impl::*default-external-format* :utf-8) (asdf:operate 'asdf:load-op 'isidorus) ;;(xtm-importer:import-from-xtm "/home/isidorus/.sbcl/site/isidorus/src/unit_tests/textgrid_07.15.2011.xtm" "data_base" :tm-id "http::/isidor.us/tm-1") +(setf rest-interface:*users* (list (list :uname "isidorus" :passwd "Ar8g7Pw"))) +(setf rest-interface:*use-http-authentication* 1) ;only the host page isidorus.html is protected, note: all RESTful handlers can be invoked without any authentication mechanism!!! (setf rest-interface:*local-backup-remote-address* "143.93.190.247") (setf rest-interface:*remote-backup-remote-address* "143.93.190.247") (setf rest-interface:*shutdown-remote-address* "127.0.0.1")

1 0

[isidorus-cvs] r741 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 02:04:12 2011 New Revision: 741 Log: trunk: shell_scripts: adapted the startIsidorus.lisp script to the latest changes done in TextGrid Modified: trunk/src/shell_scripts/startIsidorus.lisp Modified: trunk/src/shell_scripts/startIsidorus.lisp ============================================================================== --- trunk/src/shell_scripts/startIsidorus.lisp Wed Aug 17 00:41:35 2011 (r740) +++ trunk/src/shell_scripts/startIsidorus.lisp Wed Aug 17 02:04:12 2011 (r741) @@ -1,10 +1,11 @@ (setf sb-impl::*default-external-format* :utf-8) (asdf:operate 'asdf:load-op 'isidorus) -;;(xtm-importer:import-from-xtm "/home/servreg/.sbcl/site/isidorus/src/unit_tests/textgrid_07.15.2011.xtm" "data_base" :tm-id "http::/isidor.us/tm-1") +;;(xtm-importer:import-from-xtm "/home/isidorus/.sbcl/site/isidorus/src/unit_tests/textgrid_07.15.2011.xtm" "data_base" :tm-id "http::/isidor.us/tm-1") (setf rest-interface:*local-backup-remote-address* "143.93.190.247") (setf rest-interface:*remote-backup-remote-address* "143.93.190.247") (setf rest-interface:*shutdown-remote-address* "127.0.0.1") -(rest-interface:start-json-engine "/home/servreg/data_base" :host-name "143.93.190.176" :port 7000) +(rest-interface:start-json-engine "/home/isidorus/data_base" :host-name "143.93.190.176" :port 7000) (rest-interface:start-admin-server) +(format t "will enter die-when-finished") (rest-interface:die-when-finished)

1 0

[isidorus-cvs] r740 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets
by lgiessmann＠common-lisp.net 17 Aug '11

17 Aug '11

Author: lgiessmann Date: Wed Aug 17 00:41:35 2011 New Revision: 740 Log: gdl-frontend: Widgets: GDL-Schema: changed the namespace of the topic maps' item-identifier; removed the test data from the GDL-Schema for editing instances of http://textgrid.org/serviceregistry/model/Environment Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_Environment.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_Environment.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_optional.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_Environment.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_Environment.jtm Wed Aug 17 00:03:25 2011 (r739) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_Environment.jtm Wed Aug 17 00:41:35 2011 (r740) @@ -2,13 +2,14 @@ "prefixes":{"tmcl":"http://psi.topicmaps.org/tmcl/", "tmdm":"http://psi.topicmaps.org/iso13250/model/", + "tg":"http://textgrid.org/serviceregistry/", "tgm":"http://textgrid.org/serviceregistry/model/", "tgg":"http://textgrid.org/serviceregistry/gdl/", "gdl":"http://psi.isidor.us/gdl/"}, "item_type":"topicmap", - "item_identifiers":["[tgm:services-tm]"], + "item_identifiers":["[tg:services-tm]"], "topics":[{"subject_identifiers":["[tmcl:topic-type]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[tmcl:name-type]"], "instance_of":["si:[tmcl:topic-type]"]}, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_Environment.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_Environment.jtm Wed Aug 17 00:03:25 2011 (r739) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_Environment.jtm Wed Aug 17 00:41:35 2011 (r740) @@ -2,13 +2,14 @@ "prefixes":{"tmcl":"http://psi.topicmaps.org/tmcl/", "tmdm":"http://psi.topicmaps.org/iso13250/model/", + "tg":"http://textgrid.org/serviceregistry/", "tgm":"http://textgrid.org/serviceregistry/model/", "tgg":"http://textgrid.org/serviceregistry/gdl/", "gdl":"http://psi.isidor.us/gdl/"}, "item_type":"topicmap", - "item_identifiers":["[tgm:services-tm]"], + "item_identifiers":["[tg:services-tm]"], "topics":[{"subject_identifiers":["[tmcl:topic-type]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[tmcl:name-type]"], "instance_of":["si:[tmcl:topic-type]"]}, @@ -26,7 +27,6 @@ {"subject_identifiers":["[tgm:Environment]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[tgm:environment-name-constraint]"], "instance_of":["si:[tmcl:topic-name-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, - {"subject_identifiers":["[tgm:test-environment]"], "instance_of":["si:[tgm:Environment]"]}, {"subject_identifiers":["[gdl:contains]"], "instance_of":["si:[tmcl:association-type]"]}, {"subject_identifiers":["[gdl:topic-view-binding]"], "instance_of":["si:[tmcl:association-type]"]}, @@ -95,11 +95,7 @@ {"subject_identifiers":["[tgg:environment-name-text-value-group]"], "instance_of":["si:[gdl:Value-Group]"]}, {"subject_identifiers":["[tgg:environment-delete-button]"], "instance_of":["si:[gdl:Delete-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"environment_delete_button_id"}, {"type":"si:[gdl:height]", "value":"30px"}, {"type":"si:[gdl:width]", "value":"80px"}, {"type":"si:[gdl:font-size]", "value":"12px"}]}, - {"subject_identifiers":["[tgg:environment-delete-button-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"65px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, - - {"subject_identifiers":["[tmcl:constrained]"], "instance_of":["si:[tmcl:role-type]"]}, - {"subject_identifiers":["[tmcl:constrained-statement]"], "instance_of":["si:[tmcl:association-type]"]}, - {"subject_identifiers":["[tgm:environment-name]"], "instance_of":["si:[tmcl:name-type]"]} + {"subject_identifiers":["[tgg:environment-delete-button-position]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"65px"}, {"type":"si:[gdl:left]", "value":"10px"}]} ], "associations":[{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:topic-name-constraint]"}]}, @@ -138,7 +134,5 @@ {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:environment-name-text-value-group]"},{"type":"si:[gdl:tm-construct]", "player":"si:[tgm:environment-name-constraint]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:environment-default-editor-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:environment-delete-button]"}]}, - {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:environment-delete-button-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:environment-name-text]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:environment-delete-button]"}]}, - - {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constrained]", "player":"si:[tgm:environment-name]"},{"type":"si:[tmcl:constraint]", "player":"si:[tgm:environment-name-constraint]"}]} + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:environment-delete-button-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:environment-name-text]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:environment-delete-button]"}]} ]} \ No newline at end of file Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_optional.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_optional.jtm Wed Aug 17 00:03:25 2011 (r739) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_optional.jtm Wed Aug 17 00:41:35 2011 (r740) @@ -2,11 +2,12 @@ "prefixes":{"tmcl":"http://psi.topicmaps.org/tmcl/", "tmdm":"http://psi.topicmaps.org/iso13250/model/", + "tg":"http://textgrid.org/serviceregistry/", "tgm":"http://textgrid.org/serviceregistry/model/"}, "item_type":"topicmap", - "item_identifiers":["[tgm:services-tm]"], + "item_identifiers":["[tg:services-tm]"], "topics":[{"subject_identifiers":["[tmcl:topic-type]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[tmcl:name-type]"], "instance_of":["si:[tmcl:topic-type]"]}, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Wed Aug 17 00:03:25 2011 (r739) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_TMCL_2010-05-03_required.jtm Wed Aug 17 00:41:35 2011 (r740) @@ -2,11 +2,12 @@ "prefixes":{"tmcl":"http://psi.topicmaps.org/tmcl/", "tmdm":"http://psi.topicmaps.org/iso13250/model/", + "tg":"http://textgrid.org/serviceregistry/", "tgm":"http://textgrid.org/serviceregistry/model/"}, "item_type":"topicmap", - "item_identifiers":["[tgm:services-tm]"], + "item_identifiers":["[tg:services-tm]"], "topics":[{"subject_identifiers":["[tmcl:topic-type]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[tmcl:name-type]"], "instance_of":["si:[tmcl:topic-type]"]},

1 0