Changeset 4036 for cats/ISOcat
- Timestamp:
- 11/18/13 12:19:32 (11 years ago)
- Location:
- cats/ISOcat/trunk
- Files:
-
- 1 added
- 14 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
cats/ISOcat/trunk/mod-ISOcat-access-data/access/recommenders.acc
r2686 r4036 1 <accessor debug=" false">2 <name>ISOcat.access.data. dm.rule-types</name>3 <descr>Get the rule types.</descr>1 <accessor debug="true"> 2 <name>ISOcat.access.data.recommenders</name> 3 <descr>Get the list of recommenders.</descr> 4 4 <idoc> 5 5 <instr> 6 6 <type>isocat.sloot.dbx</type> 7 <operator>ffcpl:/dbx/rule-types.xml</operator> 8 <debug> 9 <b>f</b> 10 </debug> 7 <operator>ffcpl:/dbx/recommenders.xml</operator> 8 <debug>var:accessor-debug</debug> 11 9 <target>this:response</target> 12 10 </instr> … … 14 12 <exception> 15 13 <debug/> 16 <trace>ffcpl:/trace/dm.r ule-types.exception.xml</trace>14 <trace>ffcpl:/trace/dm.recommenders.exception.xml</trace> 17 15 <throw/> 18 16 </exception> 19 17 <response> 20 <debug>ffcpl:/trace/dm.r ule-types.response.xml</debug>18 <debug>ffcpl:/trace/dm.recommenders.response.xml</debug> 21 19 <mime>application/xml</mime> 22 20 </response> -
cats/ISOcat/trunk/mod-ISOcat-access-data/module.xml
r3925 r4036 257 257 <to>active:sloot.accessor+operand@ffcpl:/access/group_recommendation.acc$1</to> 258 258 </rewrite> 259 260 <!-- recommenders --> 261 <rewrite> 262 <match>active:ISOcat.access.data.recommenders</match> 263 <to>active:sloot.accessor+operand@ffcpl:/access/recommenders.acc</to> 264 </rewrite> 259 265 260 266 <!-- owner --> -
cats/ISOcat/trunk/mod-ISOcat-access-system/config/set.acc
r2397 r4036 83 83 <xsl:value-of select="shib_token"/> 84 84 </token> 85 <header> 86 <xsl:value-of select="shib_header"/> 87 </header> 85 88 </shibboleth> 86 89 </xsl:if> -
cats/ISOcat/trunk/mod-ISOcat-access-system/config/shibboleth.acc
r2397 r4036 15 15 , 16 16 <token>{string($config//shibboleth/token)}</token> 17 , 18 <header>{string($config//shibboleth/header)}</header> 17 19 ) else () 18 20 } -
cats/ISOcat/trunk/mod-ISOcat-access-system/etc/ISOcatConfig.xml
r2397 r4036 32 32 <token/> 33 33 --> 34 <header>oid-eduPersonPrincipalName mace-eduPersonPrincipalName eduPersonPrincipalName oid-eduPersonTargetedID mace-eduPersonTargetedID eduPersonTargetedID</header> 34 35 </shibboleth> 35 36 </authentication> -
cats/ISOcat/trunk/mod-ISOcat-control-access/control/credentials.js
r3973 r4036 38 38 } 39 39 40 // try Shibboleth EPPN authentication 41 if ((shib == null) && (req.argumentExists("oid-eduPersonPrincipalName"))) { 42 var auth = req.getArgument("oid-eduPersonPrincipalName"); 43 auth = auth.replace("data:text/plain,",""); 44 //java.lang.System.out.println("DBG:credentials.js:principal["+auth+"]"); 45 if (auth != "") { 46 shib = auth; 40 // try Shibboleth authentication fallback chain 41 var shibHeaders = ""; 42 var shreq = context.createSubRequest(); 43 shreq.setURI("active:ISOcat.manage.system.config.shibboleth"); 44 shreq.setAspectClass(DOMXDAAspect); 45 shres = context.issueSubRequest(shreq); 46 if (shres != null) { 47 java.lang.System.out.println("DBG:credentials.js:shib headers["+shres.getAspects()+"]"); 48 if (shres.hasAspect(DOMXDAAspect)) { 49 shres = shres.getAspect(DOMXDAAspect); 50 java.lang.System.out.println("DBG:credentials.js:XDA["+shres+"]"); 51 if (shres != null) { 52 shres = shres.getXDA(); 53 if (shres.isTrue("/nvp/header")) { 54 shres = shres.getText("/nvp/header",true); 55 java.lang.System.out.println("DBG:credentials.js:shib headers["+shres+"]"); 56 if (shres != "") { 57 shibHeaders = shres; 58 } 59 } 60 } 47 61 } 48 62 } 49 if ((shib == null) && (req.argumentExists("mace-eduPersonPrincipalName"))) { 50 var auth = req.getArgument("mace-eduPersonPrincipalName"); 51 auth = auth.replace("data:text/plain,",""); 52 //java.lang.System.out.println("DBG:credentials.js:principal["+auth+"]"); 53 if (auth != "") { 54 shib = auth; 55 } 56 } 57 if ((shib == null) && (req.argumentExists("eduPersonPrincipalName"))) { 58 var auth = req.getArgument("eduPersonPrincipalName"); 59 auth = auth.replace("data:text/plain,",""); 60 //java.lang.System.out.println("DBG:credentials.js:principal["+auth+"]"); 61 if (auth != "") { 62 shib = auth; 63 } 64 } 65 66 // if no principal yet, try Shibboleth EPTID authentication 67 if ((shib == null) && (req.argumentExists("oid-eduPersonTargetedID"))) { 68 var auth = req.getArgument("oid-eduPersonTargetedID"); 69 auth = auth.replace("data:text/plain,",""); 70 //java.lang.System.out.println("DBG:credentials.js:principal["+auth+"]"); 71 if (auth != "") { 72 shib = auth; 73 } 74 } 75 if ((shib == null) && (req.argumentExists("mace-eduPersonTargetedID"))) { 76 var auth = req.getArgument("mace-eduPersonTargetedID"); 77 auth = auth.replace("data:text/plain,",""); 78 //java.lang.System.out.println("DBG:credentials.js:principal["+auth+"]"); 79 if (auth != "") { 80 shib = auth; 81 } 82 } 83 if ((shib == null) && (req.argumentExists("eduPersonTargetedID"))) { 84 var auth = req.getArgument("eduPersonTargetedID"); 85 auth = auth.replace("data:text/plain,",""); 86 //java.lang.System.out.println("DBG:credentials.js:principal["+auth+"]"); 87 if (auth != "") { 88 shib = auth; 63 java.lang.System.out.println("DBG:credentials.js:shib headers["+shibHeaders+"]"); 64 shibHeaders = shibHeaders.split(" "); 65 for (i in shibHeaders) { 66 if ((req.argumentExists(shibHeaders[i]))) { 67 var auth = req.getArgument(shibHeaders[i]); 68 auth = auth.replace("data:text/plain,",""); 69 java.lang.System.out.println("DBG:credentials.js:principal["+shibHeaders[i]+"]["+auth+"]"); 70 if (auth != "") { 71 shib = auth; 72 break; 73 } 89 74 } 90 75 } -
cats/ISOcat/trunk/mod-ISOcat-interface-gi/index.acc
r3447 r4036 19 19 <link rel="shortcut icon" href="{$props//site}interface/JSXAPPS/ISOcat/images/favicon.ico"/> 20 20 <link rel="icon" href="{$props//site}interface/JSXAPPS/ISOcat/images/favicon.gif" type="image/gif"/> 21 < !--<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9"/>-->21 <meta http-equiv="X-UA-Compatible" content="IE=9"/> 22 22 </head> 23 23 <body BGCOLOR="#9898a5" SCROLL="no" 24 24 style="position:absolute;width:100%;height:100%;left:0px;top:0px;padding:0px;margin:0px;border:0px;overflow:hidden;"> 25 25 <div id="jsxmain" style="position:absolute;left:0px;top:0px;width:100%;height:100%;"> 26 <script type="text/javascript" src="{$props//static}gi/3_9_2-r11 11/JSX/js/JSX30.js"26 <script type="text/javascript" src="{$props//static}gi/3_9_2-r1199/JSX/js/JSX30.js" 27 27 jsxapppath="{$props//site}interface/JSXAPPS/ISOcat/" 28 28 jsxlt="true" -
cats/ISOcat/trunk/mod-ISOcat-interface-rest/etc/XRLLinks.xml
r3447 r4036 115 115 </link> 116 116 117 <!-- which groups have recommendations --> 118 <link> 119 <ext>/info/recommenders</ext> 120 <int>active:ISOcat.manage.dm.recommenders</int> 121 </link> 122 117 123 <!-- session service interface --> 118 124 <link> -
cats/ISOcat/trunk/mod-ISOcat-manage-dm/module.xml
r2029 r4036 119 119 <to>active:ISOcat.access.data.user.workspace.schema</to> 120 120 </rewrite> 121 <rewrite> 122 <match>active:ISOcat.manage.dm.recommenders</match> 123 <to>active:ISOcat.access.data.recommenders</to> 124 </rewrite> 121 125 <!-- open up the file system --> 122 126 <this> -
cats/ISOcat/trunk/mod-ISOcat-manage-system/module.xml
r2029 r4036 117 117 <to>active:ISOcat.access.system.config.authentication</to> 118 118 </rule> 119 <rule> 120 <match>active:ISOcat.manage.system.config.shibboleth</match> 121 <to>active:ISOcat.access.system.config.shibboleth</to> 122 </rule> 119 123 </rewrite> 120 124 <mapping> -
cats/ISOcat/trunk/mod-ISOcat-manage-system/plugin/configure.xsl
r2520 r4036 196 196 </tr> 197 197 <tr> 198 <td>Shibboleth header fallback chain</td> 199 <td> 200 <input name="shib_header" value="{authentication/shibboleth/header}" style="width:95%;"/> 201 </td> 202 <td>(leave blank for disabled Shibboleth authentication)</td> 203 </tr> 204 <tr> 198 205 <td colspan="2" align="right"> 199 206 <input type="submit" value="save"/> -
cats/ISOcat/trunk/mod-ISOcat-site/site/2013-SR/meeting/index.html
r4017 r4036 190 190 <td>15:30</td> 191 191 <td>discussion & conclusion - looking forward</td> 192 <td> tbc</td>192 <td>Sebastian Drude</td> 193 193 </tr> 194 194 </table> -
cats/ISOcat/trunk/mod-ISOcat-site/site/index_files/news.html
r3925 r4036 813 813 class=shape> 814 814 <p class=MsoNormal><span lang=en-US style='font-family:Verdana;font-weight: 815 bold;language:en-US'>2013-11- ??</span></p>816 <p class=MsoNormal><span lang=en-US style='font-family:Verdana;language:en-US'>The 3 ???revision provides the following functionality:</span></p>815 bold;language:en-US'>2013-11-18</span></p> 816 <p class=MsoNormal><span lang=en-US style='font-family:Verdana;language:en-US'>The 3 revision provides the following functionality:</span></p> 817 817 <p class=MsoNormal style='margin-left:54.0pt;text-indent:-18.0pt'><span 818 818 style='direction:ltr;unicode-bidi:embed;font-family:"Times New Roman"; … … 822 822 en-US'>version 1.3.1 of the DCIF schema</span></a><span lang=en-US 823 823 style='font-family:Verdana;language:en-US'> fixes the pattern to prevent empty strings, i.e., it now just requires a non-whitespace first character</span></p> 824 <p class=MsoNormal style='margin-left:54.0pt;text-indent:-18.0pt'><span 825 style='direction:ltr;unicode-bidi:embed;font-family:"Times New Roman"; 826 font-size:10.0pt;language:x-none;color:black'>â</span><span style='width: 827 12.75pt'> </span><span lang=en-US style='font-family:Verdana;language: 828 en-US'>Shibboleth header fallback chain can now be configured</span></p> 829 <p class=MsoNormal style='margin-left:54.0pt;text-indent:-18.0pt'><span 830 style='direction:ltr;unicode-bidi:embed;font-family:"Times New Roman"; 831 font-size:10.0pt;language:x-none;color:black'>â</span><span style='width: 832 12.75pt'> </span><span lang=en-US style='font-family:Verdana;language: 833 en-US'>updated to General Interface 3.9.2. r1199 to fix support of IE 11</span></p> 824 834 <p class=MsoNormal><span lang=en-US style='font-family:Verdana;font-weight: 825 835 bold;language:en-US'> </span></p> -
cats/ISOcat/trunk/mod-ISOcat-site/site/index_files/relpubs.html
r2724 r4036 852 852 font-size:10.0pt;language:en-US;color:black'>1.</span><span style='width: 853 853 27.0pt'> </span><span lang=en-US style='font-family:Verdana;language: 854 en-US'>M. Durco, M.A. Windhouwer, Semantic Mapping in CLARIN Component Metadata. In E. Garoufallou and J. Greenberg (eds.), </span><a 855 href="http://www.springer.com/computer/database+management+%26+information+retrieval/book/978-3-319-03436-2"><span 856 lang=en-US style='font-family:Verdana;font-style:italic;text-decoration:underline; 857 language:en-US'>Metadata and Semantics Research</span></a><span lang=en-US 858 style='font-family:Verdana;language:en-US'> (</span><a 859 href="http://mtsr2013.teithe.gr/"><span lang=en-US style='font-family:Verdana; 860 text-decoration:underline;language:en-US'>MTSR 2013</span></a><span 861 lang=en-US style='font-family:Verdana;language:en-US'>), CCIS Vol. 390, Springer, Thessaloniki, Greece, November 20-22, 2013.</span></p> 862 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 863 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 864 font-size:10.0pt;language:en-US;color:black'>2.</span><span style='width: 865 27.0pt'> </span><span lang=en-US style='font-family:Verdana;language: 854 866 en-US'>G. Francopoulo (ed.), </span><a 855 867 href="http://www.iste.co.uk/index.php?f=a&ACTION=View&id=566"><span … … 859 871 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 860 872 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 861 font-size:10.0pt;language:en-US;color:black'> 2.</span><span style='width:873 font-size:10.0pt;language:en-US;color:black'>3.</span><span style='width: 862 874 27.0pt'> </span><span lang=en-US style='font-family:Verdana;language: 863 875 en-US'>I. Schuurman, M.A. Windhouwer. </span><a … … 880 892 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 881 893 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 882 font-size:10.0pt;language:en-US;color:black'> 3.</span><span style='width:894 font-size:10.0pt;language:en-US;color:black'>4.</span><span style='width: 883 895 27.0pt'> </span><span lang=en-US style='font-family:Verdana;language: 884 896 en-US'>M.A. Windhouwer. </span><a … … 895 907 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 896 908 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 897 font-size:10.0pt;language:en-US;color:black'> 4.</span><span style='width:909 font-size:10.0pt;language:en-US;color:black'>5.</span><span style='width: 898 910 27.0pt'> </span><span lang=en-US style='font-family:Verdana;language: 899 911 en-US'>O. Crasborn, M.A. Windhouwer. ISOcat data categories for signed language resources. In E. Efthimiou, G. Kouroupetroglou and S. Fotinea (eds.), </span><a … … 904 916 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 905 917 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 906 font-size:10.0pt;language:en-US;color:black'> 5.</span><span style='width:918 font-size:10.0pt;language:en-US;color:black'>6.</span><span style='width: 907 919 27.0pt'> </span><span lang=en-US style='font-family:Verdana;language: 908 920 en-US'>C. Zinn, C. Hoppermann and T. Trippel. </span><a … … 917 929 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 918 930 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 919 font-size:10.0pt;language:en-US;color:black'> 6.</span><span style='width:931 font-size:10.0pt;language:en-US;color:black'>7.</span><span style='width: 920 932 27.0pt'> </span><span lang=en-US style='font-family:Verdana;language: 921 933 en-US'>M.A. Windhouwer. </span><a … … 931 943 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 932 944 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 933 font-size:10.0pt;language:en-US;color:black'> 7.</span><span style='width:945 font-size:10.0pt;language:en-US;color:black'>8.</span><span style='width: 934 946 27.0pt'> </span><span lang=en-US style='font-family:Verdana;language: 935 947 en-US'>I. Schuurman, M.A. Windhouwer. Explicit Semantics for Enriched Documents. What Do ISOcat, RELcat and SCHEMAcat Have To Offer? In the proceedings of the 2nd </span><span … … 945 957 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 946 958 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 947 font-size:10.0pt;language:en-US;color:black'> 8.</span><span style='width:959 font-size:10.0pt;language:en-US;color:black'>9.</span><span style='width: 948 960 27.0pt'> </span><span lang=en-US style='font-family:Verdana;language: 949 961 en-US'>M.A. Windhouwer. </span><a … … 957 969 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 958 970 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 959 font-size:10.0pt;language:en-US;color:black'> 9.</span><span style='width:960 27.0pt'> </span><span lang=en-US style='font-family:Verdana;language:961 en-US'>M. Kemps-Snijders, M.A. Windhouwer, S.E. Wright. </span><a971 font-size:10.0pt;language:en-US;color:black'>10.</span><span 972 style='width:27.0pt'> </span><span lang=en-US style='font-family:Verdana; 973 language:en-US'>M. Kemps-Snijders, M.A. Windhouwer, S.E. Wright. </span><a 962 974 href="http://www.clarin.nl/system/files/Use%20of%20ISOcat%20within%20CMDI.pdf"><span 963 975 lang=en-US style='font-family:Verdana;color:black;text-decoration:none; … … 969 981 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 970 982 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 971 font-size:10.0pt;language:en-US;color:black'>1 0.</span><span972 style='width:2 7.0pt'> </span><span lang=en-US style='font-family:Verdana;983 font-size:10.0pt;language:en-US;color:black'>11.</span><span 984 style='width:21.75pt'> </span><span lang=en-US style='font-family:Verdana; 973 985 language:en-US'>Daan Broeder. </span><a 974 986 href="$site$2010-TKE/presentations/CMDI-ISOCat.ppt"><span lang=en-US … … 984 996 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 985 997 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 986 font-size:10.0pt;language:en-US;color:black'>1 1.</span><span998 font-size:10.0pt;language:en-US;color:black'>12.</span><span 987 999 style='width:21.75pt'> </span><span lang=en-US style='font-family:Verdana; 988 1000 language:en-US'>Gil Francopoulo. </span><a … … 1000 1012 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 1001 1013 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 1002 font-size:10.0pt;language:en-US;color:black'>1 2.</span><span1014 font-size:10.0pt;language:en-US;color:black'>13.</span><span 1003 1015 style='width:21.75pt'> </span><span lang=en-US style='font-family:Verdana; 1004 1016 language:en-US'>Guadalupe Aguado, John McCrae. </span><a … … 1015 1027 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 1016 1028 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 1017 font-size:10.0pt;language:en-US;color:black'>1 3.</span><span1029 font-size:10.0pt;language:en-US;color:black'>14.</span><span 1018 1030 style='width:21.75pt'> </span><span lang=en-US style='font-family:Verdana; 1019 1031 language:en-US'>M. Kemps-Snijders, M.A. Windhouwer, S.E. Wright. </span><a … … 1027 1039 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 1028 1040 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 1029 font-size:10.0pt;language:en-US;color:black'>1 4.</span><span1041 font-size:10.0pt;language:en-US;color:black'>15.</span><span 1030 1042 style='width:21.75pt'> </span><span lang=en-US style='font-family:Verdana; 1031 1043 language:en-US'>Daan Broeder, Marc Kemps-Snijders, Dieter Van Uytvanck, Menzo Windhouwer, Peter Withers, Peter Wittenburg and Claus Zinn. </span><a … … 1043 1055 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 1044 1056 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 1045 font-size:10.0pt;language:en-US;color:black'>1 5.</span><span1057 font-size:10.0pt;language:en-US;color:black'>16.</span><span 1046 1058 style='width:21.75pt'> </span><span lang=en-US style='font-family:Verdana; 1047 1059 language:en-US'>Agnieszka Patejuk, Adam Przepiórkowski. ISOcat </span><a … … 1059 1071 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 1060 1072 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 1061 font-size:10.0pt;language:en-US;color:black'>1 6.</span><span1073 font-size:10.0pt;language:en-US;color:black'>17.</span><span 1062 1074 style='width:21.75pt'> </span><span lang=en-US style='font-family:Verdana; 1063 1075 language:en-US'>Christian Chiarcos. </span><a … … 1075 1087 <p class=MsoNormal style='margin-left:36.0pt;text-indent:-36.0pt;margin-bottom: 1076 1088 5.0pt'><span style='direction:ltr;unicode-bidi:embed;font-family:Verdana; 1077 font-size:10.0pt;language:en-US;color:black'>1 7.</span><span1089 font-size:10.0pt;language:en-US;color:black'>18.</span><span 1078 1090 style='width:21.75pt'> </span><span lang=en-US style='font-family:Verdana; 1079 1091 language:en-US'>Gil Francopoulo, Thierry Declerck, Virach Sornlertlamvanich, Eric de la Clergerie, Monica Monachini. </span><a
Note: See TracChangeset
for help on using the changeset viewer.