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: Alexander G. <gaf...@us...> - 2006-01-31 19:57:38
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19881/src/org/cobricks/portal Modified Files: PortalRequest.java Log Message: getLinkAbbviations added Index: PortalRequest.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalRequest.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- PortalRequest.java 5 Aug 2005 11:25:49 -0000 1.14 +++ PortalRequest.java 31 Jan 2006 19:57:22 -0000 1.15 @@ -14,6 +14,7 @@ import java.io.*; import java.util.*; + import javax.servlet.*; import javax.servlet.http.*; @@ -21,6 +22,7 @@ import org.apache.velocity.VelocityContext; import org.cobricks.core.util.LogUtil; +import org.cobricks.portal.wiki.Utility; /** @@ -439,4 +441,13 @@ return request.getParameter(aname); } + /** + * Get the link abbreviations which are stored in the file "properties.txt" + * in "org.cobricks.portal" + * @return Map with the link abbreviations and the whole link. + */ + public Map getLinkAbbreviations() { + return Utility.getLinkAbbreviations(); + } + } |
|
From: Alexander G. <gaf...@us...> - 2006-01-31 19:50:32
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17273/src/org/cobricks/portal Modified Files: properties.txt Log Message: Link abbreviations added Index: properties.txt =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/properties.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- properties.txt 18 Jan 2006 22:06:17 -0000 1.10 +++ properties.txt 31 Jan 2006 19:50:23 -0000 1.11 @@ -69,4 +69,10 @@ #pageheader and pagefooter for Wiki pages portal.pageheaderwiki=$portalPresenter.parse("$contextPath/pageheaderwiki.html", $portalRequest) -portal.pagefooterwiki=$portalPresenter.parse("$contextPath/pagefooterwiki.html", $portalRequest) \ No newline at end of file +portal.pagefooterwiki=$portalPresenter.parse("$contextPath/pagefooterwiki.html", $portalRequest) + +# +portal.linkabbreviations=wikipedia;google + +wikipedia=www.wikipedia.de +google=www.google.de \ No newline at end of file |
|
From: Alexander G. <gaf...@us...> - 2006-01-26 12:39:07
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21355/src/org/cobricks/portal Modified Files: PortalServlet.java Log Message: Comments deleted Index: PortalServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServlet.java,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- PortalServlet.java 16 Jan 2006 09:23:58 -0000 1.41 +++ PortalServlet.java 26 Jan 2006 12:38:55 -0000 1.42 @@ -328,7 +328,6 @@ attrs.put("fullcontext", fullcontext); } - //TODO AGA: Erweiterung //If the page should be versiond String createwikipage = prequest.getRequestParameter("createwikipage"); createwikipage = (createwikipage == null) ? "" : createwikipage; @@ -337,7 +336,6 @@ } else { attrs.put("createwikipage", "false"); } - //ENDE try { int itemid = @@ -480,7 +478,6 @@ } try { - //TODO AGA Should be created a new content version String newContentVersion = prequest. getRequestParameter("newContentVersion"); @@ -488,12 +485,9 @@ newContentVersion; if(newContentVersion.equals("true")) { attrs.put("newContentVersion", "true"); - logger.info("AGA updatePage: new Wiki Version"); } else { attrs.put("newContentVersion", "false"); - logger.info("AGA updatePage: no new Wiki Version"); } - //ENDE portalManager.updatePage(itemid, attrs, portalUser.getUser()); String hostname = request.getRemoteHost(); |
|
From: Michael K. <ko...@us...> - 2006-01-24 07:15:51
|
Update of /cvsroot/cobricks/cobricks2/web/portal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17079/portal Modified Files: createwiki.html.en Log Message: Index: createwiki.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/portal/createwiki.html.en,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- createwiki.html.en 18 Jan 2006 16:31:53 -0000 1.2 +++ createwiki.html.en 24 Jan 2006 07:15:42 -0000 1.3 @@ -31,12 +31,12 @@ Path: <select name="ppath"> #foreach ($p in $portalManager.getPortalFolderPaths()) -<option value="$p">$p +$portalPresenter.printOption("$p", "$p", "$!ppath") #end </select> <a href="createfolder.html">Create New Folder</a> <p> Page Name (with ".html" or similar extensions):<br> -<input name="pname" size="50"> +<input name="pname" size="50" value="$!pname"> <p> Language: <select name="plang"> $portalPresenter.printLanguageOptions("") @@ -44,7 +44,7 @@ <p> Title:<br> -<input name="title" size="60"> +<input name="title" size="60" value="$!title"> <p> |
|
From: Michael K. <ko...@us...> - 2006-01-24 07:15:50
|
Update of /cvsroot/cobricks/cobricks2/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17079 Modified Files: notfound.html.en Log Message: Index: notfound.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/notfound.html.en,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- notfound.html.en 22 Aug 2005 13:54:29 -0000 1.3 +++ notfound.html.en 24 Jan 2006 07:15:42 -0000 1.4 @@ -12,8 +12,22 @@ <p>The original request was for the following URI: "$portalRequest.getHttpRequestURI()"</p> +#if ($!userLogin != "anonymous") + +<p>If you were trying to create a new Wiki page, then confirm this by +pressing this button to change to the page edit dialog. + +<form action="/portal/createwiki.html" method="post"> +<input type="hidden" name="ppath" value="$portalRequest.getPagePath()"> +<input type="hidden" name="pname" value="$portalRequest.getPageName()"> +<input type="hidden" name="title" value="$portalRequest.getPageName()"> +<input type="submit" value="Create Wiki page"> +</form> + +#end + <p>You might want to try the following (working) entry points to -the user interface: +the Cobricks default user interface: <ul> <li> <a href="$contextPath/index.html">Homepage</a> <li> <a href="$contextPath/admin.html">Admin Homepage</a> |
|
From: Michael K. <ko...@us...> - 2006-01-24 07:15:50
|
Update of /cvsroot/cobricks/cobricks2/web/item In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17079/item Modified Files: itemlist.html.en Log Message: Index: itemlist.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/item/itemlist.html.en,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- itemlist.html.en 3 Jan 2006 09:37:39 -0000 1.2 +++ itemlist.html.en 24 Jan 2006 07:15:42 -0000 1.3 @@ -21,7 +21,8 @@ <p> <ul> #foreach ($i in $itemManager.searchItems($itemPresenter.constructSearchXPath($portalRequest))) -<li>$!i.getId(): $!i.getTitle() +<li>$!i.getId(): $!i.getTitle() +- <a href="item.html?itemid=$i.getId()">show</a> #set ( $accedit = $userPresenter.checkPermission($userId, "item", "update", $i) ) #set ( $accdel = $userPresenter.checkPermission($userId, "item", "delete", $i) ) #if ( "$!accedit" == "true" ) |
|
From: Michael K. <ko...@us...> - 2006-01-24 06:52:20
|
Update of /cvsroot/cobricks/cobricks2/web/user In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9933 Modified Files: role-edit.html Log Message: Index: role-edit.html =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/role-edit.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- role-edit.html 6 Jan 2005 16:01:40 -0000 1.4 +++ role-edit.html 24 Jan 2006 06:52:13 -0000 1.5 @@ -54,8 +54,12 @@ #set ( $authadduser = $userPresenter.checkPermission($userId, "userrole", "adduser", "roleid=$roleid") ) #set ( $authremoveuser = $userPresenter.checkPermission($userId, "userrole", "removeuser", "roleid=$roleid") ) -Update Permission: $authupdate <p> +#if ("$!authupdate" != "true") +<div class="error">You do not have the permission to update this user +role!</div> +<p> +#end <form action="/USER" method="post"> <input type="hidden" name="cmd" value="updaterole"/> @@ -117,12 +121,12 @@ <select name="perms" multiple="true" size="5"> #foreach( $i in $userPresenter.getAccessPermissions($roleid) ) -<option value="$i.getId()" selected="true">$i.getDomain() - $i.getAction() +<option value="$i.getId()">$i.getDomain() - $i.getAction() $i.getAttrsAsString() #end </select> #if ( $authupdate == "true" ) <br>Deselect permissions for deleting the permission.<br> -<input type="submit" class="submit" name="subcmd" value="Delete (deselected) Permissions"/> +<input type="submit" class="submit" name="subcmd" value="Delete selected Permissions"/> <p> Domain <select name="permdomain" size="1"> #foreach( $i in $userManager.getAccessControl().getDomains() ) @@ -138,7 +142,7 @@ <select name="roleusers" multiple="true" size="5"> #foreach( $i in $userPresenter.getAccessRoleUsers($roleid) ) #set ($user = $userManager.getUser($i) ) -<option value="$i" selected="true"> +<option value="$i"> #if ($role.isUserDelegate($i)) + #end @@ -147,12 +151,12 @@ </select> #if ( $authremoveuser == "true" ) <br>Deselect users for unassigning them from the role.<br> -<input type="submit" class="submit" name="subcmd" value="Update User Assignments"/> +<input type="submit" class="submit" name="subcmd" value="Delete selected Users"/> #end #if ( $authadduser == "true" ) <p> -User Login <input name="userlogin" size="30"> +User Login <input name="userlogin" size="30"><br> <input type="checkbox" name="delegate" value="true"> delegate<br> <input type="submit" class="submit" name="subcmd" value="Add User"/> #end |
|
From: Michael K. <ko...@us...> - 2006-01-24 06:50:48
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9744 Modified Files: AccessControl.java AccessPermission.java UserManagerImpl.java UserPresenter.java UserServlet.java Log Message: added support for public access roles, debugged/extended access permission support Index: UserPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserPresenter.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- UserPresenter.java 20 Dec 2005 18:10:24 -0000 1.30 +++ UserPresenter.java 24 Jan 2006 06:50:40 -0000 1.31 @@ -102,7 +102,7 @@ String action, String attrs) { logger.info("checkPermission(" + userid + "," + domain + "," + action - + "," + attrs + ")"); + + "," + attrs + ")"); // now parse the arguments try { @@ -205,6 +205,7 @@ **/ public List getAccessPermissions(String tmps) { + try { int roleid = 0; try { @@ -213,6 +214,10 @@ } return userManager.getAccessControl().getAccessPermissions(roleid); + } catch (Exception e) { + logger.info(LogUtil.ex("failed ...", e)); + } + return null; } @@ -221,7 +226,6 @@ */ public List getAccessRoleUsers(String tmps) { - logger.info("mit STRING aufgerufen"); int roleid = 0; try { roleid = Integer.parseInt(tmps); @@ -236,7 +240,6 @@ public List getAccessRoleUsers(int roleid) { - logger.info("mit INT aufgerufen"); AccessControl ac = userManager.getAccessControl(); return ac.getAccessRoleUsers(roleid); } @@ -248,13 +251,12 @@ public List getAccessRolesByUser(String tmps) { int userid = 0; - try { userid = Integer.parseInt(tmps); } catch (Exception e) { } - - return userManager.getAccessControl().getAccessRolesByUser(userid); + return userManager.getAccessControl(). + getAccessRolesByUser(userid); } Index: UserServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserServlet.java,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- UserServlet.java 22 Nov 2005 07:42:27 -0000 1.39 +++ UserServlet.java 24 Jan 2006 06:50:40 -0000 1.40 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2005 Cobricks Group. All rights reserved. + * Copyright (c) 2003-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; @@ -1284,51 +1284,29 @@ accessControl.setAccessRoleParents(roleid, parents); } catch (Exception e) { prequest.setReturnCode(2100); - return "error"; } prequest.setReturnCode(1001); - } else if (subcmd.equals("Update Permissions")) { + } else if (subcmd.equals("Delete selected Permissions")) { if (!userManager.getAccessControl().checkPermission(portalUser .getUserId(), "userrole", "update", null)) { prequest.setReturnCode(2000); - return "noaccess"; } String perms[] = prequest.getRequestParameterValues("perms"); - Collection permissions = accessControl.getAccessPermissions(roleid); - if (perms != null) { + logger.info("!!!"+perms); for (int i = 0; i < perms.length; i++) { try { int tmpInt = Integer.parseInt(perms[i]); - permissions.remove(new Integer(tmpInt)); - } catch (Exception e) { - } - } - } - - // the remaining perms should be deleted ... - if (permissions.size() > 0) { - logger.info("delete permissions " + permissions.toString()); - - Iterator iter = permissions.iterator(); - - while (iter.hasNext()) { - try { - AccessPermission perm = (AccessPermission)iter.next(); - accessControl.removeAccessPermission(roleid, - perm.getId()); + accessControl. + removeAccessPermission(roleid, tmpInt); } catch (Exception e) { - prequest.setReturnCode(2100); - - return "error"; } } - prequest.setReturnCode(1002); } else { prequest.setReturnCode(1000); @@ -1338,48 +1316,23 @@ if (!userManager.getAccessControl().checkPermission(portalUser .getUserId(), "userrole", "update", null)) { prequest.setReturnCode(2000); - return "noaccess"; } + accessControl.resetCache(); return "editperm"; - } else if (subcmd.equals("Update User Assignments")) { - String roleusers[] = prequest.getRequestParameterValues( - "roleusers"); - Collection users = accessControl.getAccessRoleUsers(roleid); - + } else if (subcmd.equals("Unassign selected Users")) { + String roleusers[] = prequest. + getRequestParameterValues("roleusers"); if (roleusers != null) { for (int i = 0; i < roleusers.length; i++) { try { int tmpInt = Integer.parseInt(roleusers[i]); - users.remove(new Integer(tmpInt)); + accessControl.removeUser(roleid, tmpInt); } catch (Exception e) { } } - } - - // the remaining perms should be deleted ... - if (users.size() > 0) { - logger.info("delete users " + users.toString()); - Iterator iter = users.iterator(); - while (iter.hasNext()) { - Integer userId = (Integer)iter.next(); - Map attrsmap = new HashMap(); - attrsmap.put("roleid", new Integer("roleid")); - attrsmap.put("userid", userId); - - if (!userManager.getAccessControl().checkPermission(portalUser - .getUserId(), "userrole", "removeuser", - attrsmap)) { - prequest.setReturnCode(2000); - - return "noaccess"; - } - - accessControl.removeUser(roleid, userId.intValue()); - } - prequest.setReturnCode(1004); } else { prequest.setReturnCode(1000); @@ -1411,19 +1364,22 @@ : false); } else { prequest.setReturnCode(2005); + accessControl.resetCache(); return "success"; } prequest.setReturnCode(1005); } + accessControl.resetCache(); return "success"; } + /** * */ - public String performAddPermission(PortalRequest prequest, PrintWriter out) + public String performAddPermission(PortalRequest prequest, PrintWriter out) { logger.info("perfomAddPermission"); @@ -1465,7 +1421,8 @@ try { AccessControl accessControl = userManager.getAccessControl(); accessControl.addAccessPermission(roleid, permdomain, permaction, - attrs); + attrs); + accessControl.resetCache(); } catch (Exception e) { prequest.setReturnCode(2100); @@ -1477,6 +1434,7 @@ return "success"; } + /** * */ @@ -1502,7 +1460,9 @@ } try { - userManager.getAccessControl().deleteAccessRole(roleid); + AccessControl accessControl = userManager.getAccessControl(); + accessControl.deleteAccessRole(roleid); + accessControl.resetCache(); } catch (Exception e) { prequest.setReturnCode(2100); Index: AccessControl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/AccessControl.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- AccessControl.java 21 Oct 2005 15:56:46 -0000 1.6 +++ AccessControl.java 24 Jan 2006 06:50:40 -0000 1.7 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2005 Cobricks Group. All rights reserved. + * Copyright (c) 2003-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; @@ -12,9 +12,16 @@ package org.cobricks.user; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import org.cobricks.core.db.DBAccess; import org.cobricks.core.util.LogUtil; @@ -37,7 +44,8 @@ Map accessHandlers = null; Map accessRoleCache; // roleid - AccessRole objects - + Map userAccessRoleCache; // userid - List(AccessRole) + Map userAccessPermissionCache; // userid - List(AccessPermission) /** * @@ -49,6 +57,8 @@ accessHandlers = new HashMap(); accessRoleCache = new HashMap(); loadAccessRoles(); + userAccessRoleCache = new HashMap(); + userAccessPermissionCache = new HashMap(); } @@ -165,9 +175,14 @@ { logger.info("getAccessPermissionsByUser("+userid+")"); + List result = (List) + userAccessPermissionCache.get(new Integer(userid)); + if (result != null) return result; + + result = new ArrayList(); + List roles = getAccessRolesByUser(userid); - List result = new ArrayList(); Iterator i = roles.iterator(); while (i.hasNext()) { AccessRole role = (AccessRole)i.next(); @@ -177,6 +192,7 @@ } } + userAccessPermissionCache.put(new Integer(userid), result); return result; } @@ -299,17 +315,40 @@ fields.add("roleid"); fields.add("domain"); fields.add("action"); - List tmplist = dbAccess.sqlSelect("user_roleperm", conditions, fields); + List fields2 = new ArrayList(); + fields2.add("permid"); + fields2.add("aname"); + fields2.add("avalue"); + List tmplist = dbAccess. + sqlSelect("user_roleperm", conditions, fields); List result = new ArrayList(); Iterator i = tmplist.iterator(); while (i.hasNext()) { Map tmpmap = (Map)i.next(); AccessPermission accessPermission = new AccessPermission(tmpmap); + Map conditions2 = new HashMap(); + conditions2.put("permid", new Integer(accessPermission.getId())); + List tmplist2 = dbAccess. + sqlSelect("user_rolepermattrs", conditions2, fields2); + if (tmplist2 != null && tmplist2.size()>0) { + Map updateAttrs = new HashMap(); + Iterator i2 = tmplist2.iterator(); + while (i2.hasNext()) { + Map m = (Map)i2.next(); + String aname = (String)m.get("aname"); + String avalue = (String)m.get("avalue"); + updateAttrs.put(aname, avalue); + } + accessPermission.update(updateAttrs); + } result.add(accessPermission); } return result; } + /** + * + */ public int addAccessPermission(int roleid, String domain, String action, Map attrs) throws Exception @@ -409,7 +448,12 @@ public List getAccessRolesByUser(int userid) { logger.info("getAccessRolesByUser("+userid+")"); - List result = new ArrayList(); + + List result = (List) + userAccessRoleCache.get(new Integer(userid)); + if (result != null) return result; + + result = new ArrayList(); // first get user specific roles List fields = new ArrayList(); @@ -427,10 +471,40 @@ result.add(role); } - // tbd // then add login roles - // and finally the public roles + if (userid > 0) { + fields = new ArrayList(); + fields.add("roleid"); + fields.add("roletype"); + conditions = new HashMap(); + conditions.put("roletype", new Integer(10)); + sqlResults = + dbAccess.sqlSelect("user_role", conditions, fields); + i = sqlResults.iterator(); + while (i.hasNext()) { + Map map = (Map)i.next(); + AccessRole role = + getRoleFromCache(((Integer)map.get("roleid")).intValue()); + result.add(role); + } + } + // and finally the public roles + fields = new ArrayList(); + fields.add("roleid"); + fields.add("roletype"); + conditions = new HashMap(); + conditions.put("roletype", new Integer(20)); + sqlResults = + dbAccess.sqlSelect("user_role", conditions, fields); + i = sqlResults.iterator(); + while (i.hasNext()) { + Map map = (Map)i.next(); + AccessRole role = + getRoleFromCache(((Integer)map.get("roleid")).intValue()); + result.add(role); + } + return result; } @@ -511,4 +585,16 @@ return handler.getDomainActionAttributes(action); } + + /** + * + */ + public void resetCache() + { + accessRoleCache = new HashMap(); + loadAccessRoles(); + userAccessRoleCache = new HashMap(); + userAccessPermissionCache = new HashMap(); + } + } Index: UserManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserManagerImpl.java,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- UserManagerImpl.java 20 Dec 2005 18:10:24 -0000 1.54 +++ UserManagerImpl.java 24 Jan 2006 06:50:40 -0000 1.55 @@ -528,7 +528,7 @@ { AttributeDescriptor attributeDescriptor = null; - //set attribute for user in cache + // set attribute for user in cache User currentUser = getUser(userid); Set attribute = new HashSet(); attribute = (Set)currentUser.getAttributes().get(attrname); @@ -1898,6 +1898,10 @@ public void resetCache() { userObjects = new HashMap(); + userLoginCache = new HashMap(); + userHandlerClassCache = new HashMap(); + // access control cache + accessControl.resetCache(); } Index: AccessPermission.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/AccessPermission.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- AccessPermission.java 20 Dec 2005 18:10:24 -0000 1.4 +++ AccessPermission.java 24 Jan 2006 06:50:40 -0000 1.5 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 Cobricks Group. All rights reserved. + * Copyright (c) 2004-2006 Cobricks Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted under the terms of the Cobricks Software @@ -13,6 +13,7 @@ package org.cobricks.user; import java.util.Iterator; +import java.util.HashMap; import java.util.Map; import org.apache.log4j.Logger; @@ -79,6 +80,8 @@ o = attrs.get("action"); if (o!=null) this.action = (String)o; + if (this.attrs == null) + this.attrs = new HashMap(); Iterator i = attrs.keySet().iterator(); while (i.hasNext()) { String key = (String)i.next(); @@ -131,17 +134,47 @@ } + /** + * + */ + public String getAttrsAsString() + { + StringBuffer sb = new StringBuffer(""); + if (attrs!=null && attrs.size()>0) { + sb.append("("); + Iterator i = attrs.keySet().iterator(); + while (i.hasNext()) { + String key = (String)i.next(); + sb.append(key); + sb.append("="); + sb.append(attrs.get(key)); + if (i.hasNext()) sb.append(","); + } + sb.append(")"); + } + return sb.toString(); + } + + + /** + * + */ public int compareTo(Object o) { return domain.compareTo(((AccessPermission)o).getDomain()); } + + /** + * Check if the Permission covers the requested access + */ public boolean contains(User user, String dom, String ac, Map objattrs) { // wrong domain if (!this.domain.equals(dom)) return false; // wrong action - if (!(this.action.equals(ac) || this.action.equals("*"))) return false; + if (!(this.action.equals(ac) || this.action.equals("*"))) + return false; // domain and action match - now we have to compare the // restricting attributes ... |
|
From: Michael K. <ko...@us...> - 2006-01-23 16:06:42
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/context In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28010 Modified Files: ContextManager.java ContextManagerImpl.java ContextServlet.java Log Message: added component events for context actions Index: ContextServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/context/ContextServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ContextServlet.java 26 Feb 2004 08:12:54 -0000 1.2 +++ ContextServlet.java 23 Jan 2006 16:06:33 -0000 1.3 @@ -145,6 +145,8 @@ */ public String performDelete(PortalRequest prequest, PrintWriter out) { + PortalUser portalUser = prequest.getPortalUser(); + String[] sarr = prequest.getRequestParameterValues("cid"); if (sarr == null) return "success"; @@ -152,7 +154,8 @@ for (int i=0; i<sarr.length; i++) { try { int cid = Integer.parseInt(sarr[i]); - contextManager.deleteContext(cid); + contextManager. + deleteContext(cid, portalUser.getUser().getId()); } catch (Exception e) { logger.error(LogUtil.exception("", e)); } Index: ContextManager.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/context/ContextManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ContextManager.java 10 Aug 2005 13:35:33 -0000 1.2 +++ ContextManager.java 23 Jan 2006 16:06:33 -0000 1.3 @@ -43,7 +43,7 @@ throws Exception; public void setContextDestinationIds(int cid, Set destinationids) throws Exception; - public void deleteContext(int cid) + public void deleteContext(int cid, int userid) throws Exception; // external resources Index: ContextManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/context/ContextManagerImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ContextManagerImpl.java 29 Nov 2005 07:18:38 -0000 1.4 +++ ContextManagerImpl.java 23 Jan 2006 16:06:33 -0000 1.5 @@ -20,6 +20,8 @@ import org.cobricks.core.ComponentManagerAdaptor; import org.cobricks.core.ComponentManagerInterface; import org.cobricks.core.ComponentDirectory; +import org.cobricks.core.ComponentEvent; +import org.cobricks.core.ComponentEventImpl; import org.cobricks.core.CoreManager; import org.cobricks.core.Ontology; import org.cobricks.core.OntologyClass; @@ -237,7 +239,8 @@ */ public int createContext(String classname, int sourceid, Map cattrs, User creator) - throws Exception { + throws Exception + { OntologyClass oc = ontology.getClass(classname); if (oc == null) return 0; // tbd: exception? @@ -295,6 +298,16 @@ } setContextObjectInCache(context); + + // and finally send a component event + ComponentEvent event = + new ComponentEventImpl("org.cobricks.context", + "context", "create"); + event.setObjectId(cid); + if (creator != null) + event.setUserId(creator.getId()); + this.publishEvent(event); + return cid; } @@ -324,7 +337,18 @@ * */ public void deleteContext(int cid) - throws Exception { + throws Exception + { + deleteContext(cid, -1); + } + + + /** + * + */ + public void deleteContext(int cid, int userid) + throws Exception + { // first delete the destination ids Map attrs = new HashMap(); attrs.put("cid", new Integer(cid)); @@ -333,6 +357,14 @@ dbAccess.sqlDelete("context_attr", attrs); // and finally delete the main data dbAccess.sqlDelete("context", cid); + + // and finally send a component event + ComponentEvent event = + new ComponentEventImpl("org.cobricks.context", + "context", "delete"); + event.setObjectId(cid); + event.setUserId(userid); + this.publishEvent(event); } |
|
From: Michael K. <ko...@us...> - 2006-01-23 15:14:23
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7245 Modified Files: ItemServlet.java Log Message: corrected bug in creating annotations/ratings Index: ItemServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemServlet.java,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- ItemServlet.java 16 Jan 2006 20:43:24 -0000 1.39 +++ ItemServlet.java 23 Jan 2006 15:14:11 -0000 1.40 @@ -250,14 +250,17 @@ String annTitle = prequest.getRequestParameter("_annTitle"); if (annTitle != null && annTitle.length()>0) { String lang = prequest.getRequestParameter("_lang"); - if (lang == null | lang.length()<1) + if (lang == null || lang.length()<1) lang = itemManager.getDefaultLanguage(); String annContent = prequest.getRequestParameter("_annContent"); int rating = 0; String ratingstring = prequest.getRequestParameter("_annRating"); - rating = Integer.parseInt(ratingstring); + logger.info("!!! parsing rating string:>"+ratingstring+"<"); + try { + rating = Integer.parseInt(ratingstring); + } catch (Exception e) { } ItemAnnotation ia = new ItemAnnotation(it.getId(), portalUser.getUserId(), lang, annTitle, annContent, rating); @@ -490,7 +493,9 @@ String content = prequest.getRequestParameter("content"); int rating = 0; String ratingstring = prequest.getRequestParameter("rating"); - rating = Integer.parseInt(ratingstring); + try { + rating = Integer.parseInt(ratingstring); + } catch (Exception e) { } ItemAnnotation ia = new ItemAnnotation(itemid, portalUser.getUserId(), lang, |
|
From: Michael K. <ko...@us...> - 2006-01-23 15:13:47
|
Update of /cvsroot/cobricks/cobricks2/web/item In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6990 Modified Files: item.html.en itemcreate.html.en Log Message: corrected bug in creating and updating annotations/ratings Index: itemcreate.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/item/itemcreate.html.en,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- itemcreate.html.en 22 Aug 2005 13:54:29 -0000 1.2 +++ itemcreate.html.en 23 Jan 2006 15:13:39 -0000 1.3 @@ -176,9 +176,9 @@ <h2>Add Annotation</h2> <table> <tr><td>Title:</td><td><input type="text" size="30" name="_annTitle" value="$!_annTitle"></td></tr> - <tr><td>Content:</td><td><input type="text" size="60" name="content" value="$!_annContent"></td></tr> + <tr><td>Content:</td><td><input type="text" size="60" name="_annContent" value="$!_annContent"></td></tr> <tr><td>Rating:</td><td> - $portalPresenter.printSelect("rating", "0,1,2,3,4,5", "$!rating") + $portalPresenter.printSelect("_annRating", "0,1,2,3,4,5", "0,1,2,3,4,5", "$!rating") </td></tr> </table> </p> Index: item.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/item/item.html.en,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- item.html.en 10 Aug 2005 16:37:40 -0000 1.2 +++ item.html.en 23 Jan 2006 15:13:39 -0000 1.3 @@ -209,7 +209,7 @@ <tr><td>Title:</td><td><input type="text" size="30" name="title"></td></tr> <tr><td>Content:</td><td><input type="text" size="60" name="content"></td></tr> <tr><td>Rating:</td><td> - $portalPresenter.printSelect("rating", "0,1,2,3,4,5", "$!rating") + $portalPresenter.printSelect("rating", "0,1,2,3,4,5", "0,1,2,3,4,5", "$!rating") </td></tr> </table> <input type="submit" value="Add Annotation"/> |
|
From: Alexander G. <gaf...@us...> - 2006-01-18 22:06:47
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/wiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6500/src/org/cobricks/portal/wiki Modified Files: Utility.java Log Message: pageheaderwiki and pagefooterwiki added Index: Utility.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/wiki/Utility.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Utility.java 16 Jan 2006 09:23:28 -0000 1.1 +++ Utility.java 18 Jan 2006 22:06:37 -0000 1.2 @@ -14,6 +14,10 @@ import java.util.Map; import java.util.HashMap; +import java.util.Properties; + +import org.cobricks.core.CoreManager; +import org.cobricks.core.util.PropertiesUtil; /** * Makes some functionality available to parse the wiki pages. It translate @@ -72,6 +76,9 @@ //delete this token private static String[] deleteToken = null; + + //Read porperties from property file + private static Properties properties = new Properties(); /** * Initialize the lists with the strings to search in the parse Sting. */ @@ -135,6 +142,9 @@ searchToken = searchTokenTmp; searchTokenWholeLine = searchTokenWholeLineTmp; + + //Initialize the properties + loadProperties(); } /** @@ -187,6 +197,17 @@ */ tmpParse = insertNowikiElements(tmpParse); + + //Insert the pageheader and pagefooter + String pageheaderwiki = properties.getProperty("portal.pageheaderwiki"); + String pagefooterwiki = properties.getProperty("portal.pagefooterwiki"); + + if((pageheaderwiki != null) && (!pageheaderwiki.equals(""))) + tmpParse = pageheaderwiki + ENDOFLINE + tmpParse; + + if((pagefooterwiki != null) && (!pagefooterwiki.equals(""))) + tmpParse = tmpParse + pagefooterwiki + ENDOFLINE; + return tmpParse; } @@ -273,11 +294,13 @@ tmpStringBuffer = tmpStringBuffer.replace( endPosition, endPosition+ENDOFLINE.length(), - (String)exchangeTokenMap.get(tmpEndToken)); + (String)exchangeTokenMap.get(tmpEndToken) + + ENDOFLINE); } else { tmpStringBuffer = tmpStringBuffer.insert( tmpStringBuffer.length(), - (String)exchangeTokenMap.get(tmpEndToken)); + (String)exchangeTokenMap.get(tmpEndToken)+ + ENDOFLINE); } } @@ -809,4 +832,12 @@ return tmp.toString(); } + + /** + * Load the porperties from the property file in 'org.cobrcks.portal'. + */ + private static void loadProperties() { + PropertiesUtil.loadPropertiesResource("org.cobricks.portal", + "properties.txt", properties, new CoreManager()); + } } |
|
From: Alexander G. <gaf...@us...> - 2006-01-18 22:06:26
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6420/src/org/cobricks/portal Modified Files: properties.txt Log Message: pageheaderwiki and pagefooterwiki added Index: properties.txt =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/properties.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- properties.txt 4 Jan 2005 07:27:10 -0000 1.9 +++ properties.txt 18 Jan 2006 22:06:17 -0000 1.10 @@ -66,3 +66,7 @@ #portal.presenter.timestyle=medium portal.presenter.datestyle=dd.MM.yyyy portal.presenter.timestyle=HH:mm + +#pageheader and pagefooter for Wiki pages +portal.pageheaderwiki=$portalPresenter.parse("$contextPath/pageheaderwiki.html", $portalRequest) +portal.pagefooterwiki=$portalPresenter.parse("$contextPath/pagefooterwiki.html", $portalRequest) \ No newline at end of file |
|
From: Alexander G. <gaf...@us...> - 2006-01-18 18:23:52
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23199/src/org/cobricks/portal Modified Files: PortalManagerImpl.java Log Message: Versioned attribute added Index: PortalManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManagerImpl.java,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- PortalManagerImpl.java 18 Jan 2006 16:22:43 -0000 1.71 +++ PortalManagerImpl.java 18 Jan 2006 18:23:44 -0000 1.72 @@ -53,6 +53,9 @@ import org.cobricks.core.ComponentManagerAdaptor; import org.cobricks.core.ComponentManagerInterface; import org.cobricks.core.ComponentPresenterInterface; +import org.cobricks.core.Ontology; +import org.cobricks.core.OntologyClass; +import org.cobricks.core.OntologyClassAttr; import org.cobricks.core.db.DBAccess; import org.cobricks.core.util.DateUtil; import org.cobricks.core.util.LogUtil; @@ -391,9 +394,19 @@ String pageLanguage = null; String itemclass = null; + + Ontology ontology = null; + OntologyClass ontologyClass = null; + OntologyClassAttr ontologyAttr = null; + try { itemclass = (String)page.getAttribute("itemclass"); + //Check if the content is versioend + ontology = itemManager.getOntology(); + ontologyClass= ontology.getClass(itemclass); + ontologyAttr = ontologyClass.getAttribute("content"); + //Get verseionid of page versionid = Integer.valueOf( portalRequest.getRequestParameter("versionid")); @@ -414,8 +427,7 @@ Map pc = null; - - if(itemclass != null && itemclass.equals("wikipage")) { + if((ontologyAttr != null) && ontologyAttr.isVersioned()) { pc = new HashMap(); String content = null; if (versionid != null) { |
|
From: Alexander G. <gaf...@us...> - 2006-01-18 18:22:55
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23009/src/org/cobricks/core Modified Files: Ontology.java OntologyClassAttr.java Log Message: Versioned attribute added Index: Ontology.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/Ontology.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Ontology.java 3 Jan 2006 09:35:20 -0000 1.6 +++ Ontology.java 18 Jan 2006 18:22:46 -0000 1.7 @@ -255,6 +255,8 @@ String isRequired = ((Element) n).getAttribute("required"); String isMultiLanguage = ((Element) n).getAttribute("multilanguage"); + String isVersioned = ((Element) n).getAttribute("versioned"); + OntologyClassAttr oca = new OntologyClassAttr(name, type, currentClass); // Look for things that are not obligatory to define @@ -264,7 +266,10 @@ } if (isMultiLanguage != null && isMultiLanguage.equals("true")) { oca.setIsMultiLanguage(true); - } + } + if (isVersioned != null && isVersioned.equals("true")) { + oca.setIsVersioned(true); + } currentClass.addAttribute(oca); currentClassAttr = oca; Node child = n.getFirstChild(); Index: OntologyClassAttr.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/OntologyClassAttr.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- OntologyClassAttr.java 22 Aug 2005 13:52:06 -0000 1.7 +++ OntologyClassAttr.java 18 Jan 2006 18:22:46 -0000 1.8 @@ -45,6 +45,7 @@ protected Map descriptions; protected OntologyDataType ontologyDataType; protected boolean multiLanguage; + protected boolean versioned; /** @@ -60,6 +61,7 @@ this.descriptions = new HashMap(); this.required = false; this.multiLanguage = false; + this.versioned = false; this.defaultValue = null; } @@ -177,5 +179,22 @@ { multiLanguage = b; } + + /** + * Is this attribute versioned? + * @return true if the attribute is versioned, false otherwise + */ + public boolean isVersioned() + { + return versioned; + } + /** + * Sets if this attribute is versioned + * @param b True in case it is a versioned attribute, false otherwise + */ + public void setIsVersioned(boolean b) + { + versioned = b; + } } |
|
From: Alexander G. <gaf...@us...> - 2006-01-18 16:33:09
|
Update of /cvsroot/cobricks/cobricks2/web/portal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4852/web/portal Added Files: wikipage-template.html Log Message: Wiki functionality added --- NEW FILE: wikipage-template.html --- <!-- include page header --> $portalPresenter.parse("$contextPath/pageheaderwiki.html", $portalRequest) CONTENT <!-- include page footer --> $portalPresenter.parse("$contextPath/pagefooterwiki.html", $portalRequest) |
|
From: Alexander G. <gaf...@us...> - 2006-01-18 16:32:05
|
Update of /cvsroot/cobricks/cobricks2/web/portal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4463/web/portal Modified Files: createwiki.html.en Log Message: Include in textarea added Index: createwiki.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/portal/createwiki.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- createwiki.html.en 16 Jan 2006 09:26:54 -0000 1.1 +++ createwiki.html.en 18 Jan 2006 16:31:53 -0000 1.2 @@ -49,11 +49,7 @@ <p> <textarea name="content" rows="15" cols="75"> -$portalPresenter.parse("\$contextPath/pageheaderwiki.html", \$portalRequest) - -CONTENT - -$portalPresenter.parse("\$contextPath/pagefooterwiki.html", \$portalRequest) +#include("/portal/wikipage-template.html") </textarea><br> You may also upload a file for the content:<br> <input type="file" name="_file"> |
|
From: Alexander G. <gaf...@us...> - 2006-01-18 16:31:22
|
Update of /cvsroot/cobricks/cobricks2/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4100/web Added Files: pageheaderwiki.jsp Log Message: Wiki functionality added --- NEW FILE: pageheaderwiki.jsp --- <html> <%@ page language="java" session="true" import="org.cobricks.core.*,org.cobricks.user.*,org.cobricks.item.*,org.cobricks.context.*,org.cobricks.category.*,org.cobricks.message.*,org.cobricks.portal.*" %> <%! CoreManager coreManager = null; %> <%! UserManager userManager = null; %> <%! ItemManager itemManager = null; %> <%! ContextManager contextManager = null; %> <%! CategoryManager categoryManager = null; %> <%! MessageManager messageManager = null; %> <jsp:useBean id="jspHelper" class="org.cobricks.portal.JspHelper" scope="application"> <% jspHelper.init(config); %> </jsp:useBean> <% coreManager = jspHelper.getCoreManager(); %> <% userManager = (UserManager)jspHelper.getManager("userManager"); %> <% itemManager = (ItemManager)jspHelper.getManager("itemManager"); %> <% categoryManager = (CategoryManager)jspHelper.getManager("categoryManager"); %> <% contextManager = (ContextManager)jspHelper.getManager("contextManager"); %> <% messageManager = (MessageManager)jspHelper.getManager("messageManager"); %> <head> <title>Cobricks-2 JSP Test Page</title> <link rel="stylesheet" type="text/css" href="/style.css"> <link rel="shortcut icon" href="http://www.cobricks.de/c2.png" type="image/png"> </head> <body bgcolor="#ffffff" topmargin="1" leftmargin="3" marginwidth="3" marginheight="1"> <table border="0" width="100%" cellpadding="4" cellspacing="0"> <tr bgcolor="#dfdfdf"> <td rowspan="2" align="left" valign="bottom" width="160"> <br> <a href="http://www.cobricks.org/"> <img border="0" src="/images/cobricks2-logo.png" alt="Cobricks-2"></a> </td> <td colspan="2" align="right" valign="top"> <a href="/index.html">Home</a> | <a href="/ADMIN/index.html">Admin</a> | <a href="/info.html">Help</a> <br><div style="margin:2px;">$portalPresenter.printLang($portalRequest)</div> </td> </tr> <tr bgcolor="#dfdfdf"> <td align="left" valign="bottom" width="95%"> <font size="+1"> <a href="/index.html">HOME</a> | <a href="/user/index.html">USER</a> | <a href="/item/index.html">ITEM</a> | <a href="/category/index.html">CATEGORY</a> | <a href="/context/index.html">CONTEXT</a> | <a href="/message/index.html">MESSAGE</a> | <a href="/portal/index.html">PORTAL</a> </font> </td> </tr> </table> <table border="0" width="100%" cellpadding="4" cellspacing="4"> <tr> <td width="160" valign="top" bgcolor="#ffffff"> <!-- navigation column --> <table width="158" height="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="156" valign="top"> <table width="155" border="0" cellpadding="1" cellspacing="0"> <tr><td> <br> <div class="box"><div class="header"><div class="title"> Search</div></div> <div class="body"><div class="content last"> <span class="boxNavHeadline"> <div> <form action="/search.html" method="post"> <input type="text" name="t" size="'+w+'" title="Please enter the search term in this field"><br> <table border="0"><tr><td valign="middle"> <select name="m" title="Please select the search domain from this list"> <option value="item" selected>Items</option> <option value="user">Users</option> </select> </td><td valign="middle"> <input type="submit" class="submit" value="Ok" title="Start Search"> </td></tr> </table> </form> <p> <img src="/images/arrow.png"><a href="/search.html">Extended Search</a> </div> </span> </div></div> <p> </p> <div class="box"><div class="header"><div class="title"> Login</div></div> <div class="body2"><div class="content last"> <span class="boxNavHeadline"> <div> You are registered as<br> "<b>$!userLogin</b>" <p> <a href="/user/user.html?auserlogin=$!userLogin"><img src="/images/arrow.png" width="10" height="9" border="0">Your Profile</a><br> <a href="/PORTAL?cmd=logout"><img src="/images/arrow.png" width="10" height="9" border="0">Logout</a> </div> </span> </div></div> </td></tr> </table> </td></tr> </table> <!-- end of navigation column --> </td> <td> </td> <td valign="top" width="95%"> |
|
From: Alexander G. <gaf...@us...> - 2006-01-18 16:31:01
|
Update of /cvsroot/cobricks/cobricks2/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3960/web Added Files: pagefooterwiki.jsp Log Message: Wiki functionality added --- NEW FILE: pagefooterwiki.jsp --- </td> <td valign="top" width="100" class="right"> <br> <div class="box"> <div class="header"> <div class="title"> News </div> </div> <div class="body"> <div class="content notlast"> <span class="boxNavHeadline"> <img alt="" width="16" height="16" src="/images/item_icon.gif"> <a href="">Mitteilungs-Titel</a> </span> <div class="boxDetails">12.1.2004</div> </div> <div class="content notlast"> <span class="boxNavHeadline"> <img alt="" width="16" height="16" src="/images/item_icon.gif"> <a href="">Mitteilungs-Titel</a> </span> <div class="boxDetails">12.1.2004</div> </div> </div> </div> <br> <div class="box"> <div class="header"> <div class="title"> New Users </div> </div> <div class="body"> <div class="content notlast"> <span class="boxNavHeadline"> <img alt="" width="16" height="16" src="/images/item_icon.gif"> <a href="">Userid</a> </span> <div class="content notlast"> <span class="boxNavHeadline"> <img alt="" width="16" height="16" src="/images/item_icon.gif"> <a href="">Userid</a> </span> <div class="content last"> <span class="boxNavHeadline"> <img alt="" width="16" height="16" src="/images/item_icon.gif"> <a href="">Userid</a> </span> </div> </div> </div> </td> </tr> </table> <div align="right"><a href="">Impressum</a> | <a href="">About</a></div> #end </body> </html> |
|
From: Alexander G. <gaf...@us...> - 2006-01-18 16:30:42
|
Update of /cvsroot/cobricks/cobricks2/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3885/web Modified Files: pagefooterwiki.html Log Message: Wiki functionality added Index: pagefooterwiki.html =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/pagefooterwiki.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pagefooterwiki.html 16 Jan 2006 09:24:34 -0000 1.1 +++ pagefooterwiki.html 18 Jan 2006 16:30:34 -0000 1.2 @@ -6,6 +6,8 @@ <a href="$contextPath/portal/edit.html?itemid=$!pitemid&plang=$!pageLang">Edit Page</a> - +<a +href="$contextPath/portal/historywiki.html?itemid=$!pitemid">History</a> - #end <a href="$portalPresenter.getPrintLink($portalRequest)"> <font color="#808080"><img border="0" src="$contextPath/images/print_icon.gif"> |
|
From: Alexander G. <gaf...@us...> - 2006-01-18 16:22:54
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv928/src/org/cobricks/portal Modified Files: PortalManagerImpl.java Log Message: Wiki functionality added Index: PortalManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManagerImpl.java,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- PortalManagerImpl.java 16 Jan 2006 09:23:57 -0000 1.70 +++ PortalManagerImpl.java 18 Jan 2006 16:22:43 -0000 1.71 @@ -393,7 +393,7 @@ String itemclass = null; try { itemclass = (String)page.getAttribute("itemclass"); - + //Get verseionid of page versionid = Integer.valueOf( portalRequest.getRequestParameter("versionid")); @@ -414,20 +414,23 @@ Map pc = null; + if(itemclass != null && itemclass.equals("wikipage")) { pc = new HashMap(); String content = null; if (versionid != null) { content = itemManager.getContentVersion( - page.getLocalId(), lang, versionid.intValue()); + page.getLocalId(), pageLanguage, versionid.intValue()); if(content == null) { + pageLanguage = defaultLanguage; content = itemManager.getContentVersion( page.getLocalId(), defaultLanguage, versionid.intValue()); } } else { content = this.getHighestContentVersion( - page.getLocalId(), lang); + page.getLocalId(), pageLanguage); if(content == null) { + pageLanguage = defaultLanguage; content = this.getHighestContentVersion( page.getLocalId(), defaultLanguage); } @@ -436,13 +439,6 @@ //Parse the wiki-content content = Utility.parse(content); -// content = content+"<br>"; -// content = Utility.insertEditLink(page.getLocalId(), -// content, content.length()); -// content = content+"<br>"; -// content = Utility.insertHistoryLink(page.getLocalId(), lang, -// content, content.length()); -// content = Utility.deleteToken(content); pc.put(pageLanguage, content); } |
|
From: Michael K. <ko...@us...> - 2006-01-16 20:59:45
|
Update of /cvsroot/cobricks/cobricks2/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5268 Modified Files: pageheader.html Added Files: robots.txt Removed Files: pagefooterwiki.jsp pageheaderwiki.jsp Log Message: --- pagefooterwiki.jsp DELETED --- Index: pageheader.html =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/pageheader.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- pageheader.html 3 Jan 2006 09:32:32 -0000 1.15 +++ pageheader.html 16 Jan 2006 20:59:37 -0000 1.16 @@ -3,6 +3,11 @@ <meta http-equiv="Content-Type" content="text/html"> <meta name="Author" content="mic...@co..."> $portalPresenter.printHeader($portalRequest) +<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE"> +<META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> +<meta http-equiv="expires" content="0"> +<META NAME="GOOGLEBOT" CONTENT="NOARCHIVE"> +<META NAME="ROBOTS" CONTENT="NONE"> <link rel="stylesheet" type="text/css" href="$contextPath/style.css"> <link rel="shortcut icon" href="http://www.cobricks.de/c2.png" type="image/png"> </head> --- pageheaderwiki.jsp DELETED --- --- NEW FILE: robots.txt --- # block all access for robots User-agent: * Disallow: / |
|
From: Michael K. <ko...@us...> - 2006-01-16 20:59:45
|
Update of /cvsroot/cobricks/cobricks2/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5268/WEB-INF Modified Files: web.xml Log Message: Index: web.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/WEB-INF/web.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- web.xml 3 Jan 2006 09:37:39 -0000 1.11 +++ web.xml 16 Jan 2006 20:59:37 -0000 1.12 @@ -91,7 +91,7 @@ </servlet-mapping> <servlet-mapping> <servlet-name>default</servlet-name> - <url-pattern>*.pdf</url-pattern> + <url-pattern>*.zip</url-pattern> </servlet-mapping> <servlet-mapping> |
|
From: Michael K. <ko...@us...> - 2006-01-16 20:55:52
|
Update of /cvsroot/cobricks/cobricks2/web/WEB-INF/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4502 Added Files: junit.jar Log Message: --- NEW FILE: junit.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Michael K. <ko...@us...> - 2006-01-16 20:43:32
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item/sqlsearch In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1396/sqlsearch Modified Files: Lexer.java parser.cup parser.java scanner.flex Log Message: Index: scanner.flex =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/sqlsearch/scanner.flex,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- scanner.flex 18 Feb 2005 20:54:56 -0000 1.1 +++ scanner.flex 16 Jan 2006 20:43:24 -0000 1.2 @@ -158,7 +158,6 @@ } catch (Exception e) { - System.out.println("Exception during scanning process: " + e); }; } Index: parser.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/sqlsearch/parser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- parser.java 18 Feb 2005 20:54:56 -0000 1.1 +++ parser.java 16 Jan 2006 20:43:24 -0000 1.2 @@ -263,7 +263,6 @@ } void print(String message) { - System.err.println(message); } /** Method with the actual generated action code. */ Index: parser.cup =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/sqlsearch/parser.cup,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- parser.cup 18 Feb 2005 20:54:56 -0000 1.1 +++ parser.cup 16 Jan 2006 20:43:24 -0000 1.2 @@ -29,7 +29,7 @@ action code {: - void print(String message) { System.err.println(message); } + void print(String message) { } :} /* ------------Declaration of Terminals and Non Terminals Section----------- */ Index: Lexer.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/sqlsearch/Lexer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Lexer.java 18 Feb 2005 20:54:56 -0000 1.1 +++ Lexer.java 16 Jan 2006 20:43:24 -0000 1.2 @@ -897,8 +897,6 @@ return symbol(sym.DATETIME, d); } catch (Exception e) { - System.out.println("Exception during scanning process: " + - e); } ; |
