Menu
▾
▴
cobricks-cvscommit — Information about commits to the CVS repository
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
(11) |
Mar
(106) |
Apr
(146) |
May
(79) |
Jun
(233) |
Jul
(218) |
Aug
(160) |
Sep
(155) |
Oct
(80) |
Nov
(176) |
Dec
(115) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(77) |
Feb
(106) |
Mar
(10) |
Apr
(54) |
May
(29) |
Jun
(29) |
Jul
(65) |
Aug
(80) |
Sep
|
Oct
(42) |
Nov
(45) |
Dec
(33) |
| 2006 |
Jan
(49) |
Feb
(52) |
Mar
(8) |
Apr
(3) |
May
(108) |
Jun
(43) |
Jul
(13) |
Aug
(1) |
Sep
(58) |
Oct
(66) |
Nov
(70) |
Dec
(115) |
| 2007 |
Jan
(26) |
Feb
(3) |
Mar
(17) |
Apr
(1) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(10) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Wolfgang W. <wo...@us...> - 2006-12-08 07:27:52
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5233/src/de/tum/cobricks/user Modified Files: LdapUserHandlerMyTUM.java Log Message: Index: LdapUserHandlerMyTUM.java =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/user/LdapUserHandlerMyTUM.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- LdapUserHandlerMyTUM.java 7 Dec 2006 16:25:40 -0000 1.3 +++ LdapUserHandlerMyTUM.java 8 Dec 2006 07:27:46 -0000 1.4 @@ -151,8 +151,8 @@ catch (Exception e) { logger.error(LogUtil.ex("Failed in getUserAttrs("+userlogin+")", e)); + return null; } - return null; } @@ -238,7 +238,11 @@ // CN not found with search filter => no Mitarbeiter } - catch (Exception e) { logger.debug("Exception while searching DirContext"); } + catch (Exception e) + { + logger.debug("Exception while searching DirContext"); + return false; + } return true; } @@ -272,8 +276,11 @@ logger.debug("CN= " + myCN); } } - catch (Exception e) { - logger.error(LogUtil.ex("failed", e)); + catch (Exception e) + { + logger.error(LogUtil.ex("MyTUM: retrieving CN failed: ", e)); + logger.warn("MyTUM, userlogin =" + userlogin); + return false; } // New context to authenticate user @@ -301,12 +308,13 @@ catch (AuthenticationException au) { logger.debug("Userauthentication failed "+au.getMessage()); + logger.warn("MyTUM, auth. failed, userlogin =" + userlogin); return false; } } catch (Exception u) { - logger.debug("Userauthentication failed "+u.getMessage()); + logger.error("MyTUM: exception in user authentication "+u.getMessage()); return false; } |
|
From: Michael K. <ko...@us...> - 2006-12-07 16:25:45
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22211 Modified Files: LdapUserHandlerMyTUM.java Log Message: Index: LdapUserHandlerMyTUM.java =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/user/LdapUserHandlerMyTUM.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- LdapUserHandlerMyTUM.java 6 Oct 2006 15:26:50 -0000 1.2 +++ LdapUserHandlerMyTUM.java 7 Dec 2006 16:25:40 -0000 1.3 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 Cobricks Group. All rights reserved. + * Copyright (c) 2004-2006 Cobricks Group. All rights reserved. * * This file is part of a free software package; you can redistribute * it and/or modify it under the terms of the Cobricks Software Licence; @@ -186,7 +186,7 @@ logger.debug("userlogin =" + userlogin); - if (! checkCredentials (userlogin, credentials.toString())) + if (!checkCredentials(userlogin, credentials.toString())) return false; // User is authenticated, check status (Mitarbeiter Informatik or not) @@ -243,15 +243,17 @@ return true; } - private boolean checkCredentials (String userlogin, String credentials) + private boolean checkCredentials(String userlogin, String credentials) { + if (credentials == null || + credentials.length()<1) return false; + // check authentication - try - { - String userbase = coreManager.getProperty("user.domain."+domain - +".ldap.rootdn"); + try { + String userbase = coreManager. + getProperty("user.domain."+domain+".ldap.rootdn"); - String filter ="(authlogin="+userlogin+")"; + String filter ="(authlogin="+userlogin+")"; String[] returnAttribut = {"cn"}; // Set up the search controls @@ -262,25 +264,29 @@ // Invoke search method to retrieve CN (needed for authentication) try { - NamingEnumeration answer = dirContext.search(userbase, filter, ctls); - - while ( answer.hasMore()) - { - SearchResult sr = (SearchResult)answer.next(); + NamingEnumeration answer = + dirContext.search(userbase, filter, ctls); + while (answer.hasMore()) { + SearchResult sr = (SearchResult)answer.next(); myCN = sr.getName(); logger.debug("CN= " + myCN); } } - catch (Exception e) {} + catch (Exception e) { + logger.error(LogUtil.ex("failed", e)); + } // New context to authenticate user try { Hashtable env = new Hashtable(); - env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); + env.put(Context.INITIAL_CONTEXT_FACTORY, + "com.sun.jndi.ldap.LdapCtxFactory"); - String providerurl = coreManager.getProperty("user.domain."+domain+".ldap.providerurl"); + String providerurl = + coreManager.getProperty("user.domain."+domain + +".ldap.providerurl"); env.put(Context.PROVIDER_URL, providerurl); String bindDnUser=myCN+","+userbase; @@ -294,13 +300,13 @@ } catch (AuthenticationException au) { - logger.debug("Userauthentication failed "+au.getMessage()); + logger.debug("Userauthentication failed "+au.getMessage()); return false; } } catch (Exception u) { - logger.debug("Userauthentication failed "+u.getMessage()); + logger.debug("Userauthentication failed "+u.getMessage()); return false; } |
|
From: Michael K. <ko...@us...> - 2006-12-07 15:56:55
|
Update of /cvsroot/cobricks/drehscheibe-in/web/ADMIN In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10778/ADMIN Removed Files: index.html.en noaccess.html.en pagefooter.html pageheader.html style.css Log Message: --- pagefooter.html DELETED --- --- index.html.en DELETED --- --- pageheader.html DELETED --- --- style.css DELETED --- --- noaccess.html.en DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-12-07 15:56:47
|
Update of /cvsroot/cobricks/drehscheibe-in/web/ADMIN/images In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10778/ADMIN/images Removed Files: cobricks2-logo.png Log Message: --- cobricks2-logo.png DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-12-07 15:42:11
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5191 Modified Files: index.html.en pageheader.html Added Files: sendemail.html.en Log Message: Index: index.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/index.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.en 17 Nov 2006 13:40:07 -0000 1.1 +++ index.html.en 7 Dec 2006 15:42:01 -0000 1.2 @@ -1,5 +1,5 @@ -#parse ( "$contextPath/ADMIN/pageheader.html" ) +$portalPresenter.parse("/ADMIN/pageheader.html",$portalRequest) <p> <em><a href="$contextPath/ADMIN/index.html">Admin</a></em> @@ -42,7 +42,7 @@ <h2>Components</h2> -<p>The following components have been found on the platform: +<p>The following components have been found on the platform (click on component name to configure / administrate component): </p> <ul> @@ -52,4 +52,14 @@ #end </ul> -#parse ( "$contextPath/ADMIN/pagefooter.html" ) +<h2>Communication</h2> + +<p>Using the following form you can address all registered users (or a +subset of them) that have provided an email address. + +<ul> +<li><a href="$contextPath/ADMIN/sendemail.html">Send email to users</a> +</ul> + + +$portalPresenter.parse("/ADMIN/pagefooter.html",$portalRequest) --- NEW FILE: sendemail.html.en --- #parse ( "$contextPath/ADMIN/pageheader.html" ) <p> <em><a href="$contextPath/ADMIN/index.html">Admin</a></em> <h1>Send email to users</h1> #if ("$!sendit" == "true") #if ("$!from"=="") <div class="error">You did not specify a from address! No emails have been sent.</div> #else #if ("$!simulate"!="false") <p><div class="info">Do not send emails (just simulating).</div></p> #else <p><div class="info">Sending emails.</div></p> #end #if ("$!doit"=="Send email to users with access role ") <div class="info">Sending emails to users with access role $role:<br></div> #set ($result = $userPresenter.getAccessRoleUsers("$!role")) #foreach ($uid in $result) #set ($u = $userManager.getUser($uid)) #set ($email = "") #set ($email = $!u.getEmail()) #if ("$!email"!="") #if ("$!simulate"!="false") #set ($emailres = "") #set ( $emailres = $portalPresenter.sendXXXEmail("$email","$!subject", "$!content", "$!from") ) #end <div class="success">Email has been sent to $email</div> #end #end #elseif ("$!doit"=="Send email to users with interest ") <div class="info">Sending emails to users with interest $category:<br></div> #set ( $listNames = ["interest.categories"] ) #set ( $listConditions = ["1"] ) #set ( $listValues = ["$!category"] ) #set ($orFlag = false) #set ($sortBy = "2") #set ($result = $userPresenter.searchUsers($!listNames, $!listConditions, $!listValues, $!orFlag, $!sortBy, -1, "user")) <p>result: $result</p> #foreach ($u in $result) #set ($email = "") #set ($email = $!u.getEmail()) #if ("$!email"!="") #if ("$!simulate"!="false") #set ($emailres = "") #set ( $emailres = $portalPresenter.sendXXXEmail("$email","$!subject", "$!content", "$!from") ) #end <div class="success">Email has been sent to $email</div> #end #end #elseif ("$!doit"=="Send email to all users") #set ( $listNames = ["auserlogin"] ) #set ( $listConditions = ["1"] ) #set ( $listValues = [""] ) #set ($orFlag = false) #set ($sortBy = "2") #set ($result = $userPresenter.searchUsers($!listNames, $!listConditions, $!listValues, $!orFlag, $!sortBy, -1, "user")) <p>result: $result</p> #foreach ($u in $result) #set ($email = "") #set ($email = $!u.getEmail()) #if ("$!email"!="") #if ("$!simulate"!="false") #set ($emailres = "") #set ( $emailres = $portalPresenter.sendXXXEmail("$email","$!subject", "$!content", "$!from") ) #end <div class="success">Email has been sent to $email</div> #end #end #end #end #end <p>To send an email to all corresponding authors or all users of this platform, please fill in the following form.</p> <form action="sendemail.html" method="post"> >From address (email address the message is sent from):<br> <input type="text" name="from" size="70" value="$!from"> <p> <p> Subject:<br> <input type="text" name="subject" size="70" value="$!subject"> <p> Text:<br> <textarea name="content" rows="15" cols="70"> $!content </textarea> <input type="hidden" name="sendit" value="true"/> <p> Just simulate (do not send emails) <select name="simulate"> <option value="true">yes</option> <option value="false">no (send emails)</option> </select> <p> <input type="submit" name="doit" value="Send email to users with interest "> <select name="category" size="1"> $itemPresenter.getCategoryOptions("community","en") </select> </p> <p> <input type="submit" name="doit" value="Send email to users with access role "> <select name="role" size="1"> #foreach( $i in $userManager.getAccessControl().getAccessRoles() ) <option value="$i.getId()">$i.getName()</option> #end </select> </p> <p> <input type="submit" name="doit" value="Send email to all users"> </p> </form> #parse ( "$contextPath/ADMIN/pagefooter.html" ) Index: pageheader.html =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/pageheader.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- pageheader.html 17 Nov 2006 13:40:07 -0000 1.4 +++ pageheader.html 7 Dec 2006 15:42:01 -0000 1.5 @@ -1,7 +1,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> -<title>www.in.tum.de/ADMIN</title> +<title>www.fgcscw.gi-ev.de/ADMIN</title> <base href="$portalRequest.getBaseUrl()"> <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE"> <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> |
|
From: Michael K. <ko...@us...> - 2006-12-07 15:42:11
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.category In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5191/org.cobricks.category Modified Files: index.html.en Log Message: Index: index.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.category/index.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.en 7 Dec 2006 13:13:46 -0000 1.1 +++ index.html.en 7 Dec 2006 15:42:02 -0000 1.2 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/ADMIN/pageheader.html",$portalRequest) +$portalPresenter.parse("/ADMIN/pageheader.html",$portalRequest) <em><a href="$contextPath/ADMIN/index.html">Admin</a> - <a href="$contextPath/ADMIN/org.cobricks.category/index.html">Category Component</a></em> @@ -14,9 +14,9 @@ #end <ul> -<li><a href="/ADMIN/org.cobricks.category/search.html">Search/List categories</a> +<li><a href="$contextPath/ADMIN/org.cobricks.category/search.html">Search/List categories</a> <p> -<li><a href="/ADMIN/org.cobricks.category/ontology.html">Show category ontology</a> +<li><a href="$contextPath/ADMIN/org.cobricks.category/ontology.html">Show category ontology</a> </ul> -$portalPresenter.parse("$contextPath/ADMIN/pagefooter.html",$portalRequest) +$portalPresenter.parse("/ADMIN/pagefooter.html",$portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-12-07 15:42:08
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.discussion In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5191/org.cobricks.discussion Modified Files: index.html.en Log Message: Index: index.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.discussion/index.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.en 7 Dec 2006 14:53:47 -0000 1.1 +++ index.html.en 7 Dec 2006 15:42:02 -0000 1.2 @@ -1,14 +1,13 @@ -#parse ( "/ADMIN/pageheader.html" ) +$portalPresenter.parse("/ADMIN/pageheader.html",$portalRequest) +<p> <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.discussion/index.html">Discussion Component</a></em> - <h1>Discussion Component</h1> <h3>Version: $discussionManager.getComponentVersion()</h3> -#parse ( "/ADMIN/pagefooter.html" ) - +$portalPresenter.parse("/ADMIN/pagefooter.html",$portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-12-07 15:42:08
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5191/org.cobricks.user Modified Files: index.html.en Log Message: Index: index.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.user/index.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.en 7 Dec 2006 12:57:37 -0000 1.1 +++ index.html.en 7 Dec 2006 15:42:02 -0000 1.2 @@ -1,8 +1,9 @@ -#parse ( "$contextPath/ADMIN/pageheader.html" ) +$portalPresenter.parse("/ADMIN/pageheader.html",$portalRequest) -<em><a href="/ADMIN/index.html">Admin</a> - -<a href="/ADMIN/org.cobricks.user/index.html">User Component</a></em> +<p> +<em><a href="$contextPath/ADMIN/index.html">Admin</a> - +<a href="$contextPath/ADMIN/org.cobricks.user/index.html">User Component</a></em> <h1>User Component</h1> @@ -16,15 +17,15 @@ The following admin actions are available for the user component: <p> <ul> -<li><a href="/ADMIN/org.cobricks.user/search.html">Search for registered users</a> (and edit or +<li><a href="$contextPath/ADMIN/org.cobricks.user/search.html">Search for registered users</a> (and edit or delete the accounts) <p> -<li><a href="/ADMIN/org.cobricks.user/create.html">Directly (without email notification) create a +<li><a href="$contextPath/ADMIN/org.cobricks.user/create.html">Directly (without email notification) create a new user</a> <p> -<li><a href="/ADMIN/org.cobricks.user/role.html">Edit user roles (and access permissions)</a> +<li><a href="$contextPath/ADMIN/org.cobricks.user/role.html">Edit user roles (and access permissions)</a> <p> -<li><a href="/ADMIN/org.cobricks.user/ontology.html">Show user ontology</a> +<li><a href="$contextPath/ADMIN/org.cobricks.user/ontology.html">Show user ontology</a> </ul> -#parse ( "$contextPath/ADMIN/pagefooter.html" ) +$portalPresenter.parse("/ADMIN/pagefooter.html",$portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-12-07 14:56:46
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.message In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19682 Added Files: index.html.en Removed Files: index.html Log Message: --- index.html DELETED --- --- NEW FILE: index.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.message/index.html">Message Component</a></em> <h1>Message Component</h1> #parse ( "/ADMIN/pagefooter.html" ) |
|
From: Michael K. <ko...@us...> - 2006-12-07 14:53:56
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.discussion In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18904 Added Files: index.html.en Removed Files: index.html Log Message: --- index.html DELETED --- --- NEW FILE: index.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.discussion/index.html">Discussion Component</a></em> <h1>Discussion Component</h1> <h3>Version: $discussionManager.getComponentVersion()</h3> #parse ( "/ADMIN/pagefooter.html" ) |
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.core In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18729 Added Files: comm-send.html.en comm.html.en db.html.en index.html.en properties.html.en scheduler.html.en Removed Files: comm-send.html comm.html db.html index.html properties.html scheduler.html Log Message: --- index.html DELETED --- --- db.html DELETED --- --- comm-send.html DELETED --- --- scheduler.html DELETED --- --- NEW FILE: properties.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.core/index.html">Core Component</a> - <a href="/ADMIN/org.cobricks.core/properties.html">Properties</a></em> <h1>Properties</h1> <p>The Cobricks plattform was started with the following set of properties. The properties were loaded from the directory "${coreManager.getProperty("configdir")}" (and its sub directories).</p> <p><table border="0"> #foreach( $i in $corePresenter.getSortedPropertyNames() ) <tr><td><em>$i</em></td><td> </td><td>$coreManager.getProperty($i)</td></tr> #end </table></p> #parse ( "/ADMIN/pagefooter.html" ) --- NEW FILE: index.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.core/index.html">Core Component</a></em> <h1>Core Component</h1> <h3><a href="properties.html">Properties</a></h3> <h3><a href="db.html">Database Access</a></h3> <p>Database Version: $coreManager.getDBAccess().getDBInfo()<br> Database URI: ${coreManager.getProperty("db.jdbc.uri")}</p> <h3><a href="scheduler.html">Scheduler</a></h3> <h3><a href="comm.html">Component Communication</a></h3> #parse ( "/ADMIN/pagefooter.html" ) --- properties.html DELETED --- --- NEW FILE: db.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.core/index.html">Core Component</a> - <a href="/ADMIN/org.cobricks.core/db.html">Database Access</a></em> <h1>Database Access</h1> <ul> <li>Database Version: $coreManager.getDBAccess().getDBInfo() <p> <li>db.jdbc.class = $!coreManager.getProperty("db.jdbc.class") <li>db.jdbc.driver = $!coreManager.getProperty("db.jdbc.driver") <li>db.jdbc.uri = $!coreManager.getProperty("db.jdbc.uri") <li>db.jdbc.user = $!coreManager.getProperty("db.jdbc.user") </ul> <p> <p>TBD: show schema ... #set ( $cmd = "$!cmd" ) #if ($cmd == "dbquerydoit") <p><b>Results of query "$sqlquery":</b><br> #foreach ($row in $coreManager.getDBAccess().sqlQuery($sqlquery)) $corePresenter.formatDBRow($row)<br> #end #end #if ($cmd == "dbupdatedoit") <p><b>Performing update "$sqlquery"</b><br> $coreManager.getDBAccess().sqlExecute($sqlquery) #end <p> <form action="db.html" method="GET"> <input type="hidden" name="cmd" value="dbquerydoit"> Database Query:<br> <textarea rows="3" cols="80" wrap="soft" name="sqlquery"> </textarea><br> <input type="submit" name="submit" value="Perform Query"> </form> <p> <form action="db.html" method="GET"> <input type="hidden" name="cmd" value="dbupdatedoit"> Database Update:<br> <textarea rows="3" cols="80" wrap="soft" name="sqlquery"> </textarea><br> <input type="submit" name="submit" value="Perform Update"> </form> #parse ( "/ADMIN/pagefooter.html" ) --- NEW FILE: scheduler.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.core/index.html">Core Component</a> - <a href="/ADMIN/org.cobricks.core/scheduler.html">Scheduler</a></em> <h1>Scheduler</h1> TBD #parse ( "/ADMIN/pagefooter.html" ) --- NEW FILE: comm.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.core/index.html">Core Component</a> - <a href="/ADMIN/org.cobricks.core/comm.html">Component Communication</a></em> <h1>Component Communication</h1> #if ( $returnCode == 1000 ) <font color="green">Component event published.</font> #end #foreach ( $d in $coreManager.getEventSubscriptionDomains() ) <h4>$d</h4> <ul> #foreach ( $s in $coreManager.getEventSubscriptions($d) ) <li>$s.getAction(), $s.getSourceCompId(), $s.getListener().getClass().getName() #end </ul> #end #parse ( "/ADMIN/pagefooter.html" ) --- comm.html DELETED --- --- NEW FILE: comm-send.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.core/index.html">Core Component</a> - <a href="/ADMIN/org.cobricks.core/comm.html">Component Communication</a> - <a href="/ADMIN/org.cobricks.core/comm-send.html">Send Event</a></em> <h1>Publish Component Event</h1> <form action="/CORE" method="post"> <input type="hidden" name="cmd" value="publishevent"> <input type="hidden" name="cmd.success" value="/ADMIN/org.cobricks.core/comm.html"> <input type="hidden" name="cmd.error" value="/ADMIN/org.cobricks.core/comm-send.html"> <table border="0"> <tr><td>Domain</td><td><input name="domain" size="20"></td></tr> <tr><td>Action</td><td><input name="action" size="20"></td></tr> <tr><td>UserId</td><td><input name="userid" size="10"></td></tr> <tr><td>ObjectId</td><td><input name="objectid" size="10"></td></tr> <tr><td>ObjectType</td><td> <select name="objecttype"> <option value="0">none <option value="1">USER <option value="2">ITEM <option value="4">CATEGORY <option value="8">CONTEXT </select></td></tr> <tr><td>SourceCompId</td><td><input name="sourcecompid" size="10"></td></tr> </table> <input type="submit" class="submit" value="Publish Event"> </form> <p> #parse ( "/ADMIN/pagefooter.html" ) |
|
From: Michael K. <ko...@us...> - 2006-12-07 13:15:29
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.context In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12309 Added Files: index.html.en ontology.html.en Removed Files: index.html ontology.html Log Message: --- index.html DELETED --- --- NEW FILE: ontology.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.context/index.html">Context Component</a> - <a href="/ADMIN/org.cobricks.context/ontology.html">Ontology</a></em> <h1>Context Ontology</h1> #foreach ( $o in $contextManager.getOntology().getClasses() ) <p><h3><b>$o.getName()</b> #set ( $tmp = $!corePresenter.getOntologyClassParentName($o) ) #if ( $tmp != "" ) ($tmp) #end </h3> #set ( $tmp = "$!o.getJavaClassName()" ) #if ( $tmp != "" ) JavaClass: $tmp<br> #end #set ( $tmp = "$!o.getType()" ) #if ( $tmp != "" ) Type: $tmp<br> #end #foreach ( $l in $o.getDescriptionLangs() ) Description ($l): $o.getDescription($l)<br> #end <br><table border="1"> #foreach ( $an in $o.getAttributeNames() ) #set ( $a = $o.getAttribute($an) ) <tr><td>$!a.getName()</td><td>$!a.getType()</td><td>$!a.getDefault()</td><td>$!a.getContextClassName()</td></tr> #end </table> #end #parse ( "/ADMIN/pagefooter.html" ) --- ontology.html DELETED --- --- NEW FILE: index.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.context/index.html">Context Component</a></em> <h1>Context Component</h1> <ul> <li><a href="ontology.html">Show context ontology</a> </ul> #parse ( "/ADMIN/pagefooter.html" ) |
|
From: Michael K. <ko...@us...> - 2006-12-07 13:13:50
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.category In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11874 Added Files: create.html.en create_start.html.en index.html.en ontology.html.en search.html.en show.html.en update.html.en update_start.html.en Removed Files: create.html create_start.html index.html ontology.html search.html show.html update.html update_start.html Log Message: --- NEW FILE: create_start.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.category/index.html">Category Component</a></em> <h1>Create Category</h1> #if ( $returnCode > 1999 ) <font color="red">Failed Creating Category Object.</font><p> #end <form action="/ADMIN/org.cobricks.category/create.html" method="post"> #if(!$categoryclass) #set($categoryclass = "category") #end <table cellspacing="10"> <tr valign="top"> <td><b>Category class</b></td> <td colspan="2">$categoryPresenter.printDropDown("categoryclass", $categoryclass, "categoryclass", false)</td> </tr> <tr valign="top"> <td><b>Languages</b></td> <td>$categoryPresenter.printDropDown("_languages", $lang, "language", true)</td> <td>(multiple selection possible)</td> </tr> </table> <p> <input type="submit" value="Create Category"/> </form> #parse ( "/ADMIN/pagefooter.html" ) --- search.html DELETED --- --- NEW FILE: ontology.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.category/index.html">Category Component</a> - <a href="/ADMIN/org.cobricks.category/ontology.html">Ontology</a></em> <h1>Category Ontology</h1> #foreach ( $o in $categoryManager.getOntology().getClasses() ) <p><h3><b>$o.getName()</b> #set ( $tmp = $!corePresenter.getOntologyClassParentName($o) ) #if ( $tmp != "" ) ($tmp) #end </h3> #set ( $tmp = "$!o.getJavaClassName()" ) #if ( $tmp != "" ) JavaClass: $tmp<br> #end #set ( $tmp = "$!o.getType()" ) #if ( $tmp != "" ) Type: $tmp<br> #end #foreach ( $l in $o.getDescriptionLangs() ) Description ($l): $o.getDescription($l)<br> #end <br><table border="1"> #foreach ( $an in $o.getAttributeNames() ) #set ( $a = $o.getAttribute($an) ) <tr><td>$!a.getName()</td><td>$!a.getType()</td><td>$!a.getDefault()</td><td>$!a.getContextClassName()</td></tr> #end </table> #end #parse ( "/ADMIN/pagefooter.html" ) --- NEW FILE: update.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.category/index.html">Category Component</a></em> <h1>Update Category</h1> #if ( $returnCode > 1999 ) <font color="red">Failed Updating Category Object.</font><p> #end <form action="$contextPath/CATEGORY" method="post"> <input type="hidden" name="catid" value="$catid"> <input type="hidden" name="cmd" value="update"> <input type="hidden" name="cmd.success" value="/ADMIN/org.cobricks.category/index.html"> <input type="hidden" name="cmd.error" value="/ADMIN/org.cobricks.category/update.html"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <hr/> #set($category = $!categoryPresenter.getCategory($catid)) ##set($categoryclass = $category.getCategoryClass()) #set($selectedLangs = $portalRequest.getRequestParameterValues("_languages")) #if(!$selectedLangs) #set($selectedLangs = [$lang]) #end <form action="$contextPath/CATEGORY" method="get"> #foreach($lg in $selectedLangs) <input type="hidden" name="_languages" value="${lg}"/> #end <p> <h2>Change attributes:</h2> <!--table cellspacing="10"> <tr valign="top"> <td><b>Category class</b></td> <td>$categoryPresenter.$categoryPresenter.printDropDown("categoryclass", $categoryclass, "categoryclass", false)</td> <td>Description for category class "$categoryclass": $categoryPresenter.printDescription($categoryclass, null, $lang)</td> </tr> <!--tr valign="top"> <td><b>Item ID</b></td> <td>$itemPresenter.printAttrInput("$!itemclass", "itemid", "$!lang", $itemid, 1, 15, true)</td> <td>$itemPresenter.printDescription("$!itemclass", "itemid", "$!lang")</td> </tr> </table> <!--table cellspacing="10"> #set($CURRENT_ATTR = "title") $portalPresenter.parse("attribute_fields.html", $portalRequest) #set($CURRENT_ATTR = "content") $portalPresenter.parse("attribute_fields.html", $portalRequest)> </table--> </p> <input type="hidden" name="globalid" value="$categoryPresenter.printAttribute($category.getAttribute("globalid"), '$!lang')"/> <input type="hidden" name="updater" value="${userId}"/> <input type="hidden" name="updatetime" value="$categoryPresenter.getCurrentDateTime('$!lang')"/> <input type="hidden" name="creator" value="$categoryPresenter.printAttribute($category.getAttribute("creator"), '$!lang')"/> <input type="hidden" name="creationtime" value="$categoryPresenter.printAttribute($category.getAttribute("creationtime"), '$!lang')"/> <!-- TBD --><input type="hidden" name="_lang" value="${lang}"/> #if(!($categoryclass == "")) #set($attrs = $categoryPresenter.getAttributeNames($categoryclass)) #set($attrs = $categoryPresenter.removeUnchangedAttributes($attrs)) #if(!$attrs.isEmpty()) <hr/> <p> <h3>Further Attributes:</h3> <table cellspacing="10"> #foreach($attr in $attrs) #if($categoryPresenter.isMultiLang($categoryclass, $attr)) #foreach($lg in $selectedLangs) <tr valign="top"> <td><b>$attr</b> (in language <b>$categoryPresenter.getLanguageName($lg)</b>) <br/>$categoryPresenter.printDescription($categoryclass, $attr, $lg)</td> <td>$categoryPresenter.printAttrInput("$!categoryclass", "${attr}_${lg}", "$!lang")</td> </tr> #end #else <tr valign="top"> <td><b>$attr</b> <br/>$categoryPresenter.printDescription("$!categoryclass", "$!attr", "$!lang")</td> <td>$categoryPresenter.printAttrInput("$!categoryclass", "$!attr", "$!lang")</td> </tr> #end #end </table> </p> #end #end #parse ( "/ADMIN/pagefooter.html" ) --- NEW FILE: create.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.category/index.html">Category Component</a></em> <script> function writeValues2FormField(fieldname){ var field = eval('document.myForm.'+fieldname); var values = new Array(); var field_right = eval('document.myForm.'+fieldname+'_right'); for(var i=0; i<field_right.length;i++){ if(field_right.options[i].value == 'dummy_element') continue; values = values.concat(field_right.options[i].value); } field.value = values.join(','); } function moveElements2Left(fieldname){ var field_left = eval('document.myForm.'+fieldname+'_left'); var field_right = eval('document.myForm.'+fieldname+'_right'); //loop over all elements of the right side for(var i=0; i<field_left.length;i++){ if(field_left.options[i].value == 'dummy_element') continue; if(field_left.options[i].selected){ //add this element to the left side var l = field_right.length; field_right.options[l] = new Option(); field_right.options[l].text = field_right.options[l-1].text; field_right.options[l].value = field_right.options[l-1].value; field_right.options[l-1].text = field_left.options[i].text; field_right.options[l-1].value = field_left.options[i].value; // remove this element from the left side var l = field_left.length-1; for(var j = i;j<l;j++){ field_left.options[j].text = field_left.options[j+1].text; field_left.options[j].value = field_left.options[j+1].value; } field_left.options[l] = null; } } for(var i=0; i<field_left.length;i++) field_left.options[i].selected = false; writeValues2FormField(fieldname); } function moveElements2Right(fieldname){ var field_right = eval('document.myForm.'+fieldname+'_right'); var field_left = eval('document.myForm.'+fieldname+'_left'); //loop over all elements of the left side for(var i=0; i<field_right.length;i++){ if(field_right.options[i].value == 'dummy_element') continue; if(field_right.options[i].selected){ //add this element to the right side var l = field_left.length; field_left.options[l] = new Option(); field_left.options[l].text = field_left.options[l-1].text; field_left.options[l].value = field_left.options[l-1].value; field_left.options[l-1].text = field_right.options[i].text; field_left.options[l-1].value = field_right.options[i].value; // remove this element from the right side var l = field_right.length-1; for(var j = i;j<l;j++){ field_right.options[j].text = field_right.options[j+1].text; field_right.options[j].value = field_right.options[j+1].value; } field_right.options[l] = null; } } for(var i=0; i<field_right.length;i++) field_right.options[i].selected = false; writeValues2FormField(fieldname); } </script> <h1>Create Category</h1> #if($categoryclass) <h2>Selected category class is "$categoryclass" ($!categoryPresenter.printDescription($categoryclass, null, $lang)).</h2> #else #set($categoryclass = "category") <h2>No category class was selected, set default class "category".</h2> #end #set($selectedLangs = $portalRequest.getRequestParameterValues("_languages")) #if(!$selectedLangs) #set($selectedLangs = [$lang]) #end #set ($langs = "") #foreach($lg in $selectedLangs) $lg #if($langs == "") #set ($langs = "${lg}") #else #set ($langs = "${langs},${lg}") #end #end #if ( $returnCode > 1999 ) <font color="red">Failed Creating Category Object.</font><p> #end <form action="$contextPath/CATEGORY" method="post" name="myForm"> <input type="hidden" name="categoryclass" value="$!categoryclass"/> <input type="hidden" name="cmd" value="create"> <input type="hidden" name="cmd.success" value="/ADMIN/org.cobricks.category/index.html"> <input type="hidden" name="cmd.error" value="/ADMIN/org.cobricks.category/create.html"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="lang" value="$!langs"> <!--table cellspacing="10"> #foreach($lg in $selectedLangs) <tr valign="top"> <td><table> <tr><td><b>Title</b></td> <td>(in language <b>$categoryPresenter.getLanguageName("$!lg")</b>)</td></tr> <tr><td colspan="2">$categoryPresenter.printDescription("$!categoryclass", "title", "$!lg")</td></tr> </table></td> <td>$categoryPresenter.printAttrInput("$categoryclass", "title_${lg}", "$!lang", null, 1, 50, false)</td> </tr> #end--> #if(!($categoryclass == "")) #set($attrs = $categoryPresenter.getAttributeNames($categoryclass)) #set($attrs = $categoryPresenter.removeUnchangedAttributes($attrs)) ##set($itemAttrs = $categoryPresenter.getAttributeNames("category")) ##set($attrs = $categoryPresenter.removeDuplicates($attrs, $itemAttrs)) #if(!$attrs.isEmpty()) <hr/> <p> <table cellspacing="10"> #foreach($attr in $attrs) #if($categoryPresenter.isMultiLang($categoryclass, $attr)) #foreach($lg in $selectedLangs) <tr valign="top"> <td><b>$attr</b> (in language <b>$categoryPresenter.getLanguageName("$!lg")</b>) <br/>$categoryPresenter.printDescription($categoryclass, $attr, $lg)</td> <td>$categoryPresenter.printAttrInput("$!categoryclass", "${attr}_${lg}", "$!lang")</td> </tr> #end #else <tr valign="top"> <td><b>$attr</b> <br/>$categoryPresenter.printDescription("$!categoryclass", "$!attr", "$!lang")</td> <td>$categoryPresenter.printAttrInput("$!categoryclass", "$!attr", "$!lang")</td> </tr> #end #end </table> </p> #end #end <hr/> <p> Attributes:<br> <input name="aname1" size="30" value="$!aname1"> = <input name="avalue1" size="30" value="$!avalue1"><br> <input name="aname2" size="30" value="$!aname2"> = <input name="avalue2" size="30" value="$!avalue2"><br> <input name="aname3" size="30" value="$!aname3"> = <input name="avalue3" size="30" value="$!avalue3"><br> <input name="aname4" size="30" value="$!aname4"> = <input name="avalue4" size="30" value="$!avalue4"><br> <input name="aname5" size="30" value="$!aname5"> = <input name="avalue5" size="30" value="$!avalue5"><br> <p> <input type="submit" class="submit" value="Create Category"/> </form> #parse ( "/ADMIN/pagefooter.html" ) --- show.html DELETED --- --- update_start.html DELETED --- --- NEW FILE: index.html.en --- $portalPresenter.parse("$contextPath/ADMIN/pageheader.html",$portalRequest) <em><a href="$contextPath/ADMIN/index.html">Admin</a> - <a href="$contextPath/ADMIN/org.cobricks.category/index.html">Category Component</a></em> <h1>Category Component</h1> #if ( $returnCode == 1011 ) <div class="success">Successfully created category object.</div><p> #end #if ( $returnCode == 1013 ) <div class="success">Successfully updated category object.</div><p> #end <ul> <li><a href="/ADMIN/org.cobricks.category/search.html">Search/List categories</a> <p> <li><a href="/ADMIN/org.cobricks.category/ontology.html">Show category ontology</a> </ul> $portalPresenter.parse("$contextPath/ADMIN/pagefooter.html",$portalRequest) --- NEW FILE: search.html.en --- $portalPresenter.parse("$contextPath/ADMIN/pageheader.html",$portalRequest) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.category/index.html">Category Component</a></em> <h1>Category Component - Search Category</h1> <script> function showCategory(){ var i = document.getElementsByName('cid'); for(var n = 0;n<i.length;n++){ if(i[n].checked){ window.location = '/category/show.html?catid='+i[n].value; return false; } } } </script> <form action="$contextPath/CATEGORY" method="post"> <input type="hidden" name="cmd" value="delete"/> <input type="hidden" name="cmd.success" value="$contextPath/ADMIN/org.cobricks.category/index.html"> <input type="hidden" name="cmd.error" value="$contextPath/ADMIN/org.cobricks.category/index.html"> #set ( $categoryclass = "$!categoryclass" ) #set ( $parentid = "$!parentid" ) #set ( $catid = "$!catid") #set ( $title = "$!title") List categories for: categoryclass = "$!categoryclass", parentid = "$!parentid", title = "$!title" <p> <table width="100%"> <tr bgcolor="#dfdfdf"> <td>Delete? </td> <td> <b>CategoryClass</b> </td> <td> <b>Title</b> </td> <td> <b>Parent</b> </td> <!--td> <b>Interessted Users</b> </td--> </tr> #foreach( $i in $categoryPresenter.getCategories($!categoryclass, $!parentid, $!title) ) <tr bgcolor="#dfdfdf"> <td><input type="checkbox" name="cid" value="$i.getId()"> </td> <td> <!--a href="show.html?catid=$i.getId()">$!i.getCategoryClass()</a--> $!i.getCategoryClass() </td> <td> <a href="update_start.html?catid=$i.getId()">$!i.getTitle()</a> </td><td> #set ( $category = false ) #set ( $category = $categoryManager.getCategory($i.getParentId()) ) #if ( $category ) $category.getTitle() #end </td> <!-- <td> #if ( $!i.getCategoryClass() == "community" ) <a href="community.html?catid=$i.getId()">show</a> #else <a href="interessted_user.html?catid=$i.getId()">show</a> #end </td> --> </tr> #end <tr><td colspan=6><input type="submit" class="submit" value="Delete Selected Categories"></td></tr> </table> </form> <h3>Search Categories</h3> <form action="index.html" method="get"> <table border="0"> <tr><td>categoryclass</td><td><select name="categoryclass" size="3" multiple="true"> #foreach( $i in $categoryPresenter.getCategoryClassNames() ) <option value="$i">$i #end </select> </td></tr> <tr><td>Parent</td><td> #set ( $tmps = "$!parentid" ) <select name="parentid" size="1"> <option value="0">++++ no parent +++++ #foreach( $i in $categoryPresenter.getCategories("","", "") ) #set ( $cid = $i.getId() ) <option value="$cid">$i.getTitle("en") #end <tr><td>Title</td><td><input type="text "name="title" size="10"></td></tr> </select></td></tr> <tr><td colspan="2"><input type="submit" class="submit" value="Search"></td></tr> </table> </form> <ul> <li><a href="$contextPath/ADMIN/org.cobricks.category/create_start.html">Create New Category</a> </ul> <ul> <li><a href="#" onClick="return showCategory()">Show Category Details</a> </ul> $portalPresenter.parse("$contextPath/ADMIN/pagefooter.html",$portalRequest) --- NEW FILE: show.html.en --- #parse ( "pageheader.html" ) <em><a href="index.html">Category Component</a> - <a href="create.html">Create Category</a></em> <h1>Show Category</h1> <!--- load category ---> #set($category = $!categoryPresenter.getCategory($catid)) #set($categoryclass = $category.getCategoryClass()) <form action="$contextPath/CATEGORY" method="post"> <input type="hidden" name="catid" value="$catid"> <input type="hidden" name="cmd" value="show"> <input type="hidden" name="cmd.success" value="$contextPath/category/index.html"> <input type="hidden" name="cmd.error" value="$contextPath/category/show.html"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> #if(!($categoryclass == "")) #set($attrs = $categoryPresenter.getAttributeNames($categoryclass)) ##set($attrs = $categoryPresenter.removeUnchangedAttributes($attrs)) #if(!$attrs.isEmpty()) <hr/> <p> <h3>Category Details:</h3> <table cellspacing="10"> #foreach($attr in $attrs) <tr valign="top"> <td><b>$attr</b> #if ($attr == "title") <b>$!category.getTitle()</b> #elseif ($attr == "parent") <b>$!categoryManager.getCategory($category.getParentId()).getTitle()</b> #elseif ($attr == "members" || $attr == "managers") <b>$categoryPresenter.showUserNames($!category.getAttribute($attr))</b> #elseif ($attr == "updater") <b>$!categoryPresenter.showUserNames($!category.getAttribute("updaterid"))</b> #elseif ($attr == "creator") <b>$!categoryPresenter.showUserNames($!category.getAttribute("creatorid"))</b> #else <b>$!category.getAttribute($attr)</b> #end #end </table> </p> #end #end <hr/> </form> #parse ( "pagefooter.html" ) --- NEW FILE: update_start.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.category/index.html">Category Component</a></em> <script> function writeValues2FormField(fieldname){ var field = eval('document.myForm.'+fieldname); var values = new Array(); var field_right = eval('document.myForm.'+fieldname+'_right'); for(var i=0; i<field_right.length;i++){ if (field_right.options[i].value == 'dummy_element') continue; values = values.concat(field_right.options[i].value); } field.value = values.join(','); } function moveElements2Left(fieldname) { var field_left = eval('document.myForm.'+fieldname+'_left'); var field_right = eval('document.myForm.'+fieldname+'_right'); //loop over all elements of the right side for(var i=0; i<field_left.length;i++){ if(field_left.options[i].value == 'dummy_element') continue; if(field_left.options[i].selected) { //add this element to the left side var l = field_right.length; field_right.options[l] = new Option(); field_right.options[l].text = field_right.options[l-1].text; field_right.options[l].value = field_right.options[l-1].value; field_right.options[l-1].text = field_left.options[i].text; field_right.options[l-1].value = field_left.options[i].value; // remove this element from the left side var l = field_left.length-1; for(var j = i;j<l;j++) { field_left.options[j].text = field_left.options[j+1].text; field_left.options[j].value = field_left.options[j+1].value; } field_left.options[l] = null; } } for(var i=0; i<field_left.length;i++) field_left.options[i].selected = false; writeValues2FormField(fieldname); } function moveElements2Right(fieldname) { var field_right = eval('document.myForm.'+fieldname+'_right'); var field_left = eval('document.myForm.'+fieldname+'_left'); //loop over all elements of the left side for(var i=0; i<field_right.length;i++) { if(field_right.options[i].value == 'dummy_element') continue; if(field_right.options[i].selected) { // add this element to the right side var l = field_left.length; field_left.options[l] = new Option(); field_left.options[l].text = field_left.options[l-1].text; field_left.options[l].value = field_left.options[l-1].value; field_left.options[l-1].text = field_right.options[i].text; field_left.options[l-1].value = field_right.options[i].value; // remove this element from the right side var l = field_right.length-1; for(var j = i;j<l;j++){ field_right.options[j].text = field_right.options[j+1].text; field_right.options[j].value = field_right.options[j+1].value; } field_right.options[l] = null; } } for(var i=0; i<field_right.length;i++) field_right.options[i].selected = false; writeValues2FormField(fieldname); } </script> <h1>Cobricks-2 - Category Details and Update</h1> <p> <!--- load category ---> #set($category = $!categoryPresenter.getCategory($catid)) #set($categoryclass = $category.getCategoryClass()) #set($selectedLangs = $portalRequest.getRequestParameterValues("_languages")) #if("$!selectedLangs"=="") #set($selectedLangs = $category.getUsedLanguages()) #end #if("$!selectedLangs" == "en") #set($selectedLangs = [ "en" ]) #end #if("$!selectedLangs" == "de") #set($selectedLangs = [ "de" ]) #end #if("$!selectedLangs" == "") #set($selectedLangs = [ "en" ]) #end #set ($langs = "") Update for languages: #foreach($lg in $selectedLangs) #if("$langs" == "") $lg #set ($langs = "${lg}") #else , $lg #set ($langs = "${langs},${lg}") #end #end <br>(for these languages the multilingual attributes are displayed) <p> <form action="/ADMIN/org.cobricks.category/update_start.html" method="get"> <input type="hidden" name="categoryclass" value="$!categoryclass"/> <input type="hidden" name="catid" value="$catid"> <h2>Enter all languages in which you would like to perform updates:</h2> <table cellspacing="10"> <!--tr valign="top"> <td><b>Item ID</b></td> <td><input name="itemid" type="text" size="15"/></td> <td>(must be a number)</td--> </tr> <tr valign="top"> <td><b>Languages</b></td> <td>$categoryPresenter.printDropDown("_languages", $langs, "language", true)</td> <td>(multiple selection possible)</td> </tr> </table> <input type="submit" value="Reload"/> </form> <hr/> <form action="$contextPath/CATEGORY" method="post" name="myForm"> <input type="hidden" name="catid" value="$catid"> <input type="hidden" name="cmd" value="update"> <input type="hidden" name="cmd.success" value="/ADMIN/org.cobricks.category/index.html"> <input type="hidden" name="cmd.error" value="/ADMIN/org.cobricks.category/update.html"> <input type="hidden" name="categoryclass" value="$!categoryclass"/> <input type="hidden" name="lang" value="$!langs"> #if(!($categoryclass == "")) #set($attrs = $categoryPresenter.getAttributeNames($categoryclass)) #set($attrs = $categoryPresenter.removeUnchangedAttributes($attrs)) ##set($itemAttrs = $categoryPresenter.getAttributeNames("category")) ##set($attrs = $categoryPresenter.removeDuplicates($attrs, $itemAttrs)) #if(!$attrs.isEmpty()) <p> <table cellspacing="10"> #foreach($attr in $attrs) #set ($field_value = "") #if($categoryPresenter.isMultiLang($categoryclass, $attr)) #foreach($lg in $selectedLangs) #set ($field_value = $category.getAttribute($attr,$lg) ) <tr valign="top"> <td><b>$attr</b> (in language <b>$categoryPresenter.getLanguageName($lg)</b>) <br/>$categoryPresenter.printDescription($categoryclass, $attr, $lg)</td> <td>$categoryPresenter.printAttrInput($categoryclass, "${attr}_${lg}", $lang, $field_value)</td> </tr> #end #else #set ($field_value = $category.getAttribute($attr) ) <tr valign="top"> <td><b>$attr</b> <br/>$categoryPresenter.printDescription($categoryclass, $attr, $lang)</td> <td>$categoryPresenter.printAttrInput($categoryclass, $attr, $lang, $field_value) - "$!attr","$!field_value"</td> </tr> #end #end </table> </p> #end #end <hr/> <p> <b>Additional attributes:</b><br> #set ($attrs = $!categoryPresenter.getAdditionalAttributes($!catid) ) <table> #set ($count = 1) #foreach($aname in $attrs) #set ($field_value = $category.getAttribute($aname) ) <tr> <td>$aname</td> <td>$categoryPresenter.printAttrInput($categoryclass, $aname, "", $field_value)</td> </tr> #end </table> <br/> <input type="submit" value="Update Category"/> </form> #parse ( "/ADMIN/pagefooter.html" ) --- update.html DELETED --- --- create.html DELETED --- --- index.html DELETED --- --- ontology.html DELETED --- --- create_start.html DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-12-07 13:09:38
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10101 Modified Files: index.html.en Log Message: Index: index.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.portal/index.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.en 17 Nov 2006 13:40:08 -0000 1.1 +++ index.html.en 7 Dec 2006 13:09:35 -0000 1.2 @@ -1,8 +1,8 @@ -$portalPresenter.parse("$contextPath/ADMIN/pageheader.html", $portalRequest) +$portalPresenter.parse("/ADMIN/pageheader.html",$portalRequest) -<em><a href="/ADMIN/index.html">Admin</a> - -<a href="/ADMIN/org.cobricks.portal/index.html">Portal Component</a></em> +<em><a href="$contextPath/ADMIN/index.html">Admin</a> - +<a href="$contextPath/ADMIN/org.cobricks.portal/index.html">Portal Component</a></em> <h1>Portal Component</h1> @@ -21,18 +21,18 @@ <ul> <li>Creating new portal objects <ul> -<li><a href="create.html">Create new HTML page</a> -<li><a href="createwiki.html">Create new Wiki page</a> -<li><a href="createbin">Create new binary object</a> -<li><a href="createfolder.html">Create new Portal Folder (directory)</a> +<li><a href="$contextPath/ADMIN/org.cobricks.portal/create.html">Create new HTML page</a> +<li><a href="$contextPath/ADMIN/org.cobricks.portal/createwiki.html">Create new Wiki page</a> +<li><a href="$contextPath/ADMIN/org.cobricks.portal/createbin.html">Create new binary object</a> +<li><a href="$contextPath/ADMIN/org.cobricks.portal/createfolder.html">Create new Portal Folder (directory)</a> </ul> <p> <li>Listing/Browsing Portal Objects <ul> -<li><a href="browse.html">List and browse Portal Folders</a> -<li><a href="list.html">List HTML pages</a> -<li><a href="listwiki.html">List Wiki pages</a> -<li><a href="listbin.html">List binary objects</a> +<li><a href="$contextPath/ADMIN/org.cobricks.portal/browse.html">List and browse Portal Folders</a> +<li><a href="$contextPath/ADMIN/org.cobricks.portal/list.html">List HTML pages</a> +<li><a href="$contextPath/ADMIN/org.cobricks.portal/listwiki.html">List Wiki pages</a> +<li><a href="$contextPath/ADMIN/org.cobricks.portal/listbin.html">List binary objects</a> </ul> </ul> @@ -109,4 +109,5 @@ #end </table> -$portalPresenter.parse("$contextPath/ADMIN/pagefooter.html", $portalRequest) + +$portalPresenter.parse("/ADMIN/pagefooter.html", $portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-12-07 13:07:11
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.item In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8926 Modified Files: index.html.en Log Message: Index: index.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.item/index.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.en 17 Nov 2006 13:40:08 -0000 1.1 +++ index.html.en 7 Dec 2006 13:07:01 -0000 1.2 @@ -1,19 +1,20 @@ -#parse ( "$contextPath/ADMIN/pageheader.html" ) +$portalPresenter.parse("/ADMIN/pageheader.html",$portalRequest) -<em><a href="/ADMIN/index.html">Admin</a> - -<a href="/ADMIN/org.cobricks.item/index.html">Item Component</a></em> +<em><a href="$contextPath/ADMIN/index.html">Admin</a> - +<a href="$contextPath/ADMIN/org.cobricks.item/index.html">Item Component</a></em> <h1>Item Component</h1> The following admin actions are available for the item component: <ul> -<li><a href="itemsearch.html">Search and edit items</a> +<li><a href="$contextPath/itemsearch.html">Search and edit items</a> <p> -<li><a href="itemcreate.html">Create item</a> +<li><a href="$contextPath/itemcreate.html">Create item</a> <p> -<li><a href="ontology.html">Show item ontology</a> +<li><a href="$contextPath/ontology.html">Show item ontology</a> </ul> -#parse ( "$contextPath/ADMIN/pagefooter.html" ) + +$portalPresenter.parse("/ADMIN/pagefooter.html",$portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-12-07 13:04:01
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.item In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7692 Added Files: ontology.html.en Removed Files: cal-day.html cal-month.html cal-week.html ontology.html Log Message: --- NEW FILE: ontology.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.item/index.html">Item Component</a></em> <h1>Item Ontology</h1> #foreach ( $o in $itemManager.getOntology().getClasses() ) <p><h3><b>$o.getName()</b> #set ( $tmp = $!corePresenter.getOntologyClassParentName($o) ) #if ( $tmp != "" ) ($tmp) #end </h3> #set ( $tmp = "$!o.getJavaClassName()" ) #if ( $tmp != "" ) JavaClass: $tmp<br> #end #set ( $tmp = "$!o.getType()" ) #if ( $tmp != "" ) Type: $tmp<br> #end #foreach ( $l in $o.getDescriptionLangs() ) Description ($l): $o.getDescription($l)<br> #end <table border="1"> #foreach ( $an in $o.getAttributeNames() ) #set ( $a = $o.getAttribute($an) ) <tr><td>$!a.getName()</td><td>$!a.getType()</td><td>$!a.getDefault()</td><td>$!a.getContextClassName()</td></tr> #end </table> #end #parse ( "/ADMIN/pagefooter.html" ) --- cal-day.html DELETED --- --- cal-month.html DELETED --- --- cal-week.html DELETED --- --- ontology.html DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-12-07 13:00:03
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6247 Modified Files: edit.html.en Log Message: Index: edit.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.portal/edit.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- edit.html.en 17 Nov 2006 13:40:08 -0000 1.1 +++ edit.html.en 7 Dec 2006 12:59:58 -0000 1.2 @@ -58,7 +58,7 @@ Title ($lg): <input type="text" name="title_$lg" size="60" value="$!title"><br/> Content ($lg):<br> <textarea name="content_$lg" rows="15" cols="70" wrap="off"> -$!content +$portalPresenter.escapeHTML("$!content") </textarea><br> Upload content from file: <input type="file" name="_file$lg"><br/> </td></tr></table> @@ -75,7 +75,7 @@ Title ($lg): <input type="text" name="title_$lg" size="45" value="$!title"><br/> Content ($lg):<br> <textarea name="content_$lg" rows="15" cols="70"> -$!content +$portalPresenter.escapeHTML("$!content") </textarea><br> Upload content from file: <input type="file" name="_file$lg"><br/> </td></tr></table> |
|
From: Michael K. <ko...@us...> - 2006-12-07 12:57:41
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5365 Added Files: create.html.en index.html.en ontology.html.en search.html.en Removed Files: create.html index.html ontology.html search.html Log Message: --- search.html DELETED --- --- NEW FILE: create.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.user/index.html">User Component</a></em> <h1>Create User</h1> #if ( $returnCode == 1000 ) <font color="green">Successfully created new user.</font> #end #if ( $returnCode == 2000 ) <font color="red">Failed creating user - No passwords specified or passwords do not match.</font> #end #if ( $returnCode == 2001 ) <font color="red">Failed creating user.</font> #end <p>Using this form you can create a new user account. The user is not notified about the new account automatically - this has to be done manually.</p> <p>Please enter the following basic attributes for the new user.<p> <form action="/USER" method="post"> <input type="hidden" name="cmd" value="registeradmin"/> <input type="hidden" name="cmd.success" value="/ADMIN/org.cobricks.user/create.html"/> <input type="hidden" name="cmd.error" value="/ADMIN/org.cobricks.user/create.html"/> <table border="0"> <tr><td>Login:</td><td><input name="userlogin" size="30"></td></tr> <tr><td>First Name:</td><td><input name="firstname" size="30"></td></tr> <tr><td>Last Name:</td><td><input name="lastname" size="30"></td></tr> <tr><td>Email:</td><td><input name="email" size="30"></td></tr> <tr><td> </td></tr> <tr><td>Password:</td><td><input name="password" type="password" size="30"></td></tr> <tr><td>Retype Password:</td><td><input name="password2" type="password" size="30"></td></tr> <tr><td>Userclass:</td><td><input name="userclass" size="40" value="universityuser"></td></tr> </table><br> <input type="submit" value="Create User"> </form> #parse ( "/ADMIN/pagefooter.html" ) --- NEW FILE: search.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.user/index.html">User Component</a> - <a href="/ADMIN/org.cobricks.user/search.html">Search User</a></em> <h1>Search User</h1> <form action="search.html" method="get"> <INPUT TYPE="hidden" NAME="cmd" VALUE="search" /> <input type="hidden" name="more_attrs" value="email" /> <input type="hidden" name="cmd.success" value="/ADMIN/org.cobricks.user/search.html" /> <input type="hidden" name="cmd.error" value="/ADMIN/org.cobricks.user/search.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()" /> #set ( $tmp = "$!auserlogin$!firstname$!lastname$!email" ) #if ( $tmp.length() < 1 ) #set ($attrsInit = false) It is not possible to search for all users (no search criteria).<br> Please specify a search criterium. #else #set ($attrsInit = true) Search for users with search criteria <table> <tr> #set ( $tmp = "$!auserlogin" ) #if ($tmp.length() > 0) <TD>Loginname: #if ($compare_func_auserlogin == "2") like '$!auserlogin' #else is equal '$!auserlogin' #end </td> #end #set ( $tmp = "$!firstname" ) #if ($tmp.length() > 0) <td>Vorname: #if ($compare_func_firstname == "2") like '$!firstname' #else is equal '$!firstname' #end </td> #end </tr> <tr> #set ( $tmp = "$!lastname" ) #if ($tmp.length() > 0) <td>Nachname: #if ($compare_func_lastname == "2") like '$!lastname' #else is equal '$!lastname' #end </td> #end </tr> <tr> #set ( $tmp = "$!email" ) #if ($tmp.length() > 0) <td>E-Mail: #if ($compare_func_email == "2") like '$!email' #else is equal '$!email' #end </td> #end </tr> </table> #set ($localCount = 0) #set ( $login = "$!auserlogin" ) #set ( $fname = "$!firstname" ) #set ( $lname = "$!lastname" ) #set ( $mail = "$!email" ) #set ( $loginCond = "$!compare_func_auserlogin" ) #set ( $fnameCond = "$!compare_func_firstname" ) #set ( $lnameCond = "$!compare_func_lastname" ) #set ( $mailCond = "$!compare_func_email" ) #set ( $listNames = ["auserlogin", "firstname", "lastname", "email"] ) #set ( $listConditions = [$loginCond, $fnameCond, $lnameCond, $mailCond] ) #set ( $listValues = [$login, $fname, $lname, $mail] ) #set ($orFlag = false) #if ("$!SearchLogik" == "or") #set ($orFlag = true) #end #set ($sortBy = "$!sort") #set ($result = $userPresenter.searchUsers($!listNames, $!listConditions, $!listValues, $!orFlag, $!sortBy, -1, "")) #if ($result) #if ($attrsInit == true) <p> has returned $result.size() results. </p> #end #else <p> <div class="info">The search for users has no results</div> Please, try to change one or more search criteria. </p> #end #end <table width="100%"> <tr bgcolor="#dfdfdf"> <td> <b>Id</b> </td> <td> <b>Login</b> </td> <td> <b>Name</b> </td> <td> <b>Email</b> </td> </tr> #set( $number = 0 ) #foreach ($i in $result) #set ($uId = $i.getUserId()) <tr bgcolor = "#dfdfdf"> <td> $uId </td> <td> #set ($imageuri = $i.getAttribute("basic.personal.imageuri")) #if ("$!imageuri"!="") <img src="$imageuri" width="16"> #end <a href="/user/user.html?auserlogin=$i.getUserLogin()"> $i.getUserLogin()</a> </td> <td> $i.getName() </td> <td> #if ($!i.getAttribute("basic.contact.online.email")) $!i.getAttribute("basic.contact.online.email") #else #if ($!i.getAttribute("basic.contact-work.online.email")) $!i.getAttribute("basic.contact-work.online.email") #else $!i.getAttribute("basic.contact-priv.online.email") #end #end </td> <td> <a href="/ADMIN/org.cobricks.user/user.html?auserlogin=$i.getUserLogin()">edit</a> - <a href="/user/user.html?auserlogin=$i.getUserLogin()">edit app</a> </td> </tr> #end </table> <p>Please enter search criteria into the form below. <br> It is possible to enter several values in comma-separated form into one field.</p> <table border="0"> <tr><TD>Login Name:</TD> <td><input name="auserlogin" size=20 value="$!auserlogin"></td> <td>$portalPresenter.printSelect("compare_func_auserlogin","is equal,like","1,2","$!compare_func_auserlogin") </td></tr> <tr> <td>Firstname:</TD><TD><input name="firstname" size=20 value="$!firstname"></td> <td>$portalPresenter.printSelect("compare_func_firstname","is equal,like","1,2","$!compare_func_firstname") </td></tr> <tr> <td>Lastname:</TD><TD><input name="lastname" size=20 value="$!lastname"></td> <td>$portalPresenter.printSelect("compare_func_lastname","is equal,like","1,2","$!compare_func_lastname") </td></tr> <tr> <td>Email:</TD><TD><input name="email" size=20 value="$!email"></td> <td>$portalPresenter.printSelect("compare_func_email","is equal,like","1,2","$!compare_func_email") </td></tr> <tr> <td>order by:</td> <td>$portalPresenter.printSelect("sort","login name,lastname,firstname,email","1,2,3,5","$!sort") </td> <td width="100"></td> </tr> </table> <TABLE BORDER="0"> <tr><td> <input type="radio" name="SearchLogik" value="or"> OR </td><td> <input type="radio" name="SearchLogik" value="and" checked> AND </td><td> </td> </tr> </table> <p><input type="submit" value="Search"></p> </form> #parse ( "/ADMIN/pagefooter.html" ) --- NEW FILE: index.html.en --- #parse ( "$contextPath/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.user/index.html">User Component</a></em> <h1>User Component</h1> #if ( $returnCode == 1000 ) <p><div class="success">Successfully created new user.</div></p> #end #if ( $returnCode == 1050 ) <p><div class="success">Successfully deleted user.</div></p> #end The following admin actions are available for the user component: <p> <ul> <li><a href="/ADMIN/org.cobricks.user/search.html">Search for registered users</a> (and edit or delete the accounts) <p> <li><a href="/ADMIN/org.cobricks.user/create.html">Directly (without email notification) create a new user</a> <p> <li><a href="/ADMIN/org.cobricks.user/role.html">Edit user roles (and access permissions)</a> <p> <li><a href="/ADMIN/org.cobricks.user/ontology.html">Show user ontology</a> </ul> #parse ( "$contextPath/ADMIN/pagefooter.html" ) --- NEW FILE: ontology.html.en --- #parse ( "/ADMIN/pageheader.html" ) <em><a href="/ADMIN/index.html">Admin</a> - <a href="/ADMIN/org.cobricks.user/index.html">User Component</a> - <a href="/ADMIN/org.cobricks.user/ontology.html">Ontology</a></em> <h1>User Ontology</h1> #foreach ( $o in $userManager.getOntology().getClasses() ) <p><h3><b>$o.getName()</b> #set ( $tmp = $!corePresenter.getOntologyClassParentName($o) ) #if ( $tmp != "" ) ($tmp) #end </h3> #set ( $tmp = "$!o.getJavaClassName()" ) #if ( $tmp != "" ) JavaClass: $tmp<br> #end #set ( $tmp = "$!o.getType()" ) #if ( $tmp != "" ) Type: $tmp<br> #end #foreach ( $l in $o.getDescriptionLangs() ) Description ($l): $o.getDescription($l)<br> #end <br><table border="1"> #foreach ( $an in $o.getAttributeNames() ) #set ( $a = $o.getAttribute($an) ) <tr><td>$!a.getName()</td><td>$!a.getType()</td><td>$!a.getDefault()</td><td>$!a.getContextClassName()</td></tr> #end </table> #end #parse ( "/ADMIN/pagefooter.html" ) --- create.html DELETED --- --- index.html DELETED --- --- ontology.html DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-12-07 11:55:06
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6825 Modified Files: changelog.txt Log Message: Index: changelog.txt =================================================================== RCS file: /cvsroot/cobricks/cobricks2/changelog.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- changelog.txt 24 Nov 2006 08:05:56 -0000 1.12 +++ changelog.txt 7 Dec 2006 11:54:59 -0000 1.13 @@ -1,4 +1,13 @@ -Cobricks2 v0.38 +Cobricks2 v0.90 + +- added and debugged various functions for making Cobricks + ready for the first large life platform usage + +- deleted all liberty alliance code +- deleted agent component + +- added support for per item access control adaption + (attributes roleread, roleupdate) - added file extension swf to mime type heuristics in PortalObject |
|
From: Michael K. <ko...@us...> - 2006-12-07 11:54:47
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6800 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- build.xml 7 Dec 2006 06:05:58 -0000 1.59 +++ build.xml 7 Dec 2006 11:54:44 -0000 1.60 @@ -21,15 +21,18 @@ <property name="catalina.home" value=""/> <property name="catalina.version" value="5.5"/> <property name="axis.home" value=""/> + <property name="dist.home" value="${basedir}/dist"/> -<property name="distbin" value="${basedir}/dist/cobricks2-v0.37"/> -<property name="distsrc" value="${basedir}/dist/cobricks2-v0.37-src"/> +<property name="distbin" value="${basedir}/dist/cobricks2-v0.90"/> +<property name="distsrc" value="${basedir}/dist/cobricks2-v0.90-src"/> <property name="docs.home" value="${basedir}/docs"/> <property name="src.home" value="${basedir}/src"/> -<property name="conf.home" value="${basedir}/conf"/> -<property name="web.home" value="${basedir}/web"/> -<property name="weblib.home" value="${basedir}/web/WEB-INF/lib"/> + <property name="webappname" value="ROOT"/> +<property name="web.home" value="${basedir}/web"/> + +<property name="weblib.home" value="${web.home}/WEB-INF/lib"/> +<property name="conf.home" value="${web.home}/WEB-INF/conf"/> <property name="catalina.serverport" value="8005"/> <property name="catalina.httpport" value="8080"/> @@ -295,6 +298,12 @@ <include name="navigation.html.en" /> </jar> + <!-- Create JAR file for ADMIN webspace only --> + <jar destfile="${dist.home}/webappADMIN.jar" + basedir="${build.home}/webapps/${webappname}"> + <include name="ADMIN/**" /> + </jar> + </target> <target name="distsrc" depends="" @@ -784,14 +793,14 @@ <target name="doit" depends="compile"> <java fork="yes" classname="org.cobricks.util.doIt" classpathref="exec.classpath"> - <arg line="-c conf"/> + <arg line="-c ${web.home}/WEB-INF/conf"/> </java> </target> <target name="addrole" depends="compile"> <java fork="yes" classname="org.cobricks.util.assignUserRole" classpathref="exec.classpath"> - <arg line="-c conf -u kochm -r admin"/> + <arg line="-c ${web.home}/WEB-INF/conf -u kochm -r admin"/> </java> </target> |
|
From: Michael K. <ko...@us...> - 2006-12-07 11:53:51
|
Update of /cvsroot/cobricks/cobricks2/web/WEB-INF/conf In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6357/conf Log Message: Directory /cvsroot/cobricks/cobricks2/web/WEB-INF/conf added to the repository |
|
From: Michael K. <ko...@us...> - 2006-12-07 11:51:00
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5029/org/cobricks/portal Modified Files: PortalCache.java PortalFolder.java PortalServlet.java Log Message: Index: PortalFolder.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalFolder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- PortalFolder.java 22 Aug 2005 13:52:07 -0000 1.3 +++ PortalFolder.java 7 Dec 2006 11:50:54 -0000 1.4 @@ -51,4 +51,12 @@ super.setAttribute("path", path); } + public boolean isSubPathOf(String path) + { + String lpath = (String)super.getAttribute("path"); + if (lpath.startsWith(path)) + return true; + return false; + } + } Index: PortalCache.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalCache.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- PortalCache.java 6 Dec 2006 09:41:30 -0000 1.2 +++ PortalCache.java 7 Dec 2006 11:50:54 -0000 1.3 @@ -34,7 +34,8 @@ Map itemidCache = null; boolean active = true; - + + static boolean incleanup = false; /** * @@ -78,17 +79,17 @@ // page objects cache garbage collection int cacheSize = pathCache.size(); - if (cacheSize % 10 == 0) - logger.info("Portal objects cache size is "+cacheSize); - if (cacheSize > 500) { + if ((cacheSize > 1000) && (incleanup==false)) { + incleanup = true; logger.info("Portal objects cache size is bigger than limit (" +cacheSize+")"); - int toDelete = cacheSize - 300; + int toDelete = cacheSize - 800; Iterator iter = pathCache.keySet().iterator(); for (int i=0; i<toDelete; i++) { Object key2 = iter.next(); pathCache.remove(key2); } + incleanup = false; logger.info("Portal objects cache reduced to "+pathCache.size() +" entries"); } Index: PortalServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServlet.java,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- PortalServlet.java 6 Dec 2006 09:41:30 -0000 1.51 +++ PortalServlet.java 7 Dec 2006 11:50:54 -0000 1.52 @@ -39,9 +39,6 @@ import org.cobricks.core.util.LogUtil; import org.cobricks.user.User; import org.cobricks.user.UserHandler; -import org.cobricks.user.liberty.idff.LAIdffArgs; -import org.cobricks.user.liberty.idff.LAIdffBridge; -import org.cobricks.user.liberty.idff.IdentityProvider; /** * This class implements functionality for the Cobricks-2 portal, i.e. @@ -243,31 +240,7 @@ logger.info("performLogout()"); HttpSession session = request.getSession(true); - - // begin - Liberty Alliance Single Sign On - - // delete all SPSessions for the user, otherwise there are problems - // if the user logs in again via the same SP - /* - LAIdffBridge bridge = LAIdffBridge.getSingleInstance(); - IdentityProvider idp = (IdentityProvider) - bridge.getCurrentIDP(portalRequest); - // if idp is null, then no active session exists via IDP - if (idp != null) { - String userID = (String)session.getAttribute("login.userlogin"); - String providerID = idp.getName(); - LAIdffArgs args = new LAIdffArgs(); - args.setUserID(userID); - args.setProviderID(providerID); - args.setRequest(request); - args.setResponse(response); - logger.debug("calling bridge.removeProviderSessions() with args:" - + args); - bridge.removeProviderSessions(args); - } - */ - // end - Liberty Alliance Single Sign On - + // everything went well ... sessionHandler.setSession(session); session.setAttribute("login.userlogin", "anonymous"); |
|
From: Michael K. <ko...@us...> - 2006-12-07 11:51:00
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/util/migration In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5029/org/cobricks/util/migration Modified Files: ItemMigration.java Log Message: Index: ItemMigration.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/util/migration/ItemMigration.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ItemMigration.java 6 Dec 2006 09:41:30 -0000 1.14 +++ ItemMigration.java 7 Dec 2006 11:50:55 -0000 1.15 @@ -84,8 +84,12 @@ logger.info(">>>>>>>>>>> Starting emptying item tables <<<<<<<<<<<"); Set itemids = new HashSet(); List res = toDBAccess. + sqlQuery("select * from item"); + /* + List res = toDBAccess. sqlQuery("select * from item where not " +"(itemclass like 'portal%')"); + */ Iterator i = res.iterator(); while (i.hasNext()) { Map m = (Map)i.next(); @@ -93,8 +97,11 @@ } res = null; + toDBAccess.sqlExecute("DELETE FROM item"); + /* toDBAccess.sqlExecute("DELETE FROM item where not " +"(itemclass like 'portal%')"); + */ i = itemids.iterator(); while (i.hasNext()) { Integer id = (Integer)i.next(); |
|
From: Michael K. <ko...@us...> - 2006-12-07 11:51:00
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5029/org/cobricks/item Modified Files: ItemManager.java ItemManagerImpl.java ItemPresenter.java Log Message: Index: ItemManager.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemManager.java,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- ItemManager.java 24 Nov 2006 08:05:56 -0000 1.33 +++ ItemManager.java 7 Dec 2006 11:50:50 -0000 1.34 @@ -294,7 +294,7 @@ boolean sortasc, boolean noexpired, List itemclasses, List categories, - int maxrows) + int creatorid, int maxrows) throws CobricksException; /** Index: ItemPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemPresenter.java,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- ItemPresenter.java 6 Dec 2006 09:41:30 -0000 1.58 +++ ItemPresenter.java 7 Dec 2006 11:50:51 -0000 1.59 @@ -1425,7 +1425,17 @@ public List searchItemsByTime(String aname, String sort, String valuelow, String valuehigh, List itemclasses, List categories, - int maxrows) + int maxrows) + { + return searchItemsByTime(aname, sort, valuelow, valuehigh, + itemclasses, categories, null, + maxrows); + } + + public List searchItemsByTime(String aname, String sort, + String valuelow, String valuehigh, + List itemclasses, List categories, + String creatorid, int maxrows) { boolean sortasc = true; if (sort.equals("desc")) @@ -1478,13 +1488,18 @@ } } + int tmpi = 0; + try { + tmpi = Integer.parseInt(creatorid); + } catch (Exception e) { } + List result = null; try { result = itemManager. searchItemsByTimestamp(aname, avaluelow, avaluehigh, sortasc, noexpired, itemclasses, categories, - maxrows); + tmpi, maxrows); } catch (Exception e) { logger.error(LogUtil.ex("failed", e)); } @@ -1937,7 +1952,7 @@ searchItemsByTimestamp("creationtime", 0 , now, false, true, temp, null, - 7); + 0, 7); } catch (Exception e) { logger.error(LogUtil.ex("failed", e)); } @@ -1962,7 +1977,8 @@ long end = cal.getTimeInMillis(); results= itemManager. searchItemsByTimestamp(aname, begin, end, - true, true, itemclasses, null, maxrows); + true, true, itemclasses, null, + 0, maxrows); } catch(Exception e) { logger.error("PRINT VALUE ITEMS: ERROR"); } @@ -2001,7 +2017,8 @@ try { results= itemManager. searchItemsByTimestamp(aname,begin,end, - true,false,itemclassList,null,maxrows); + true,false,itemclassList,null, + 0, maxrows); } catch(Exception e) { logger.error("SEARCHERROR"); } @@ -2034,8 +2051,9 @@ } try { results= itemManager. - searchItemsByTimestamp(aname,begin,end, - true,false,itemclasses,null,maxrows); + searchItemsByTimestamp(aname, begin, end, + true, false, itemclasses, null, + 0, maxrows); } catch(Exception e) { logger.error("SEARCHERROR"); } Index: ItemManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemManagerImpl.java,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- ItemManagerImpl.java 6 Dec 2006 09:41:29 -0000 1.78 +++ ItemManagerImpl.java 7 Dec 2006 11:50:51 -0000 1.79 @@ -2405,21 +2405,21 @@ /** - * @see org.cobricks.item.ItemManager#searchItemsByTimestamp(java.lang.String,long,boolean,boolean,java.util.List,java.util.List) + * @see org.cobricks.item.ItemManager#searchItemsByTimestamp(java.lang.String,long,boolean,boolean,java.util.List,java.util.List,int,int) */ public List searchItemsByTimestamp(String aname, long avaluelow, long avaluehigh, boolean sortasc, boolean noexpired, List itemclasses, List categories, - int maxrows) + int creatorid, int maxrows) throws CobricksException { // result caching for some seconds to boost performance if (itemclasses == null) itemclasses = new ArrayList(); if (categories == null) categories = new ArrayList(); String cachekey = aname+sortasc+itemclasses.toString() - +categories.toString()+maxrows; + +categories.toString()+creatorid+","+maxrows; Date tmpd = (Date)searchItemsByTimestampCacheTime.get(cachekey); if (tmpd!=null) { long now = (new Date()).getTime(); @@ -2432,11 +2432,28 @@ if (aname != null && !aname.equals("")) sql.append(", " + aname); if (categories!=null && categories.size()>0) { - sql.append(" from item, item_attrscategory where " - +"item.itemid = item_attrscategory.itemid " - +"and item_attrscategory.aname = 'categories' "); + if (creatorid > 0) { + sql.append(" from item, item_attrscategory, " + +"item_attrsuser where " + +"item.itemid = item_attrscategory.itemid " + +"and item_attrscategory.aname = 'categories' " + +"and item.itemid = item_attrsuser.itemid " + +"and item_attrsuser.aname = 'creator' " + +"and item_attrsuser.auserid = "+creatorid+" "); + } else { + sql.append(" from item, item_attrscategory where " + +"item.itemid = item_attrscategory.itemid " + +"and item_attrscategory.aname = 'categories' "); + } } else { - sql.append(" from item where itemid > 0 "); + if (creatorid > 0) { + sql.append(" from item, item_attrsuser where " + +"item.itemid = item_attrsuser.itemid " + +"and item_attrsuser.aname = 'creator' " + +"and item_attrsuser.auserid = "+creatorid+" "); + } else { + sql.append(" from item where item.itemid > 0 "); + } } if (avaluelow > 0) { sql.append(" and "); |
|
From: Michael K. <ko...@us...> - 2006-12-07 11:51:00
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/message In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5029/org/cobricks/message Modified Files: Message.java MessageManagerImpl.java Log Message: Index: MessageManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/message/MessageManagerImpl.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- MessageManagerImpl.java 13 Nov 2006 10:04:46 -0000 1.11 +++ MessageManagerImpl.java 7 Dec 2006 11:50:54 -0000 1.12 @@ -45,6 +45,7 @@ import org.cobricks.core.db.DBAccessImpl; import org.cobricks.core.util.LogUtil; import org.cobricks.core.util.ResourceUtil; +import org.cobricks.item.Item; import org.cobricks.portal.PortalManager; import org.cobricks.user.User; import org.cobricks.user.UserManager; @@ -571,7 +572,8 @@ } else { // check in config dir - String configdir = coreManager.getProperty("configdir"); + String configdir = + coreManager.getProperty("configdir"); File file = new File(configdir+File.separator +"org.cobricks.message"+File.separator +"templates"+File.separator+tname); @@ -675,8 +677,8 @@ Message message = new Message(); message.setSenderId(event.getUserId()); message.setSendDate(new Date()); - message.setSubject("notification "+event.getDomain() - +"/"+event.getAction()); + String subject = "notification "+event.getDomain() + +"/"+event.getAction(); String templateName = subscr.getTemplateName(); String templ = getTemplate(templateName); @@ -690,11 +692,16 @@ velocityContext.put("obj", o); Velocity.evaluate(velocityContext, sw, "message template", templ); + // different subject for email + if (o instanceof Item) { + subject = "[Item] "+((Item)o).getTitle(); + } } catch (Exception e) { logger.warn(LogUtil.ex("failed parsing template", e)); } templ = sw.toString(); + message.setSubject(subject); message.setContent(templ); // deliver message to channel Index: Message.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/message/Message.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Message.java 29 Nov 2005 07:15:41 -0000 1.5 +++ Message.java 7 Dec 2006 11:50:54 -0000 1.6 @@ -17,7 +17,7 @@ import java.util.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import org.cobricks.user.User; import org.cobricks.user.UserManager; |
