[MMBASE CVS] contributions/natmm/templates/natnh/scripts skyscraper_cookie.js
Update of /var/cvs/contributions/natmm/templates/natnh/scripts In directory james.mmbase.org:/tmp/cvs-serv22333/templates/natnh/scripts Added Files: skyscraper_cookie.js Log Message: NMCMS-462 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natnh/scripts See also: http://www.mmbase.org/jira/browse/NMCMS-462 skyscraper_cookie.js is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natnh/includes header.jsp
Update of /var/cvs/contributions/natmm/templates/natnh/includes In directory james.mmbase.org:/tmp/cvs-serv22333/templates/natnh/includes Modified Files: header.jsp Log Message: NMCMS-462 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natnh/includes See also: http://www.mmbase.org/jira/browse/NMCMS-462 Index: header.jsp === RCS file: /var/cvs/contributions/natmm/templates/natnh/includes/header.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- header.jsp 4 May 2007 15:15:23 - 1.5 +++ header.jsp 8 Feb 2008 17:08:43 - 1.6 @@ -13,8 +13,37 @@ > + - + + + + + + + + + + + + + +http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0"; width="2000" height="2000" id="overlayerbanner_pop_600x600" align="middle"> + + http://www.natuurmonumenten.nl&clickTarget=_blank"; /> + + + + + + http://www.natuurmonumenten.nl&clickTarget=_blank"; menu="false" quality="high" scale="noscale" wmode="transparent" bgcolor="#ff" width="2000" height="2000" name="overlayerbanner_pop_600x600" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer"; /> + + + + + + + @@ -40,6 +69,7 @@ + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes top4_head.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes
In directory james.mmbase.org:/tmp/cvs-serv22333/templates/natmm/includes
Modified Files:
top4_head.jsp
Log Message:
NMCMS-462
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes
See also: http://www.mmbase.org/jira/browse/NMCMS-462
Index: top4_head.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/top4_head.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- top4_head.jsp 7 Aug 2006 14:44:38 - 1.11
+++ top4_head.jsp 8 Feb 2008 17:08:43 - 1.12
@@ -3,6 +3,7 @@
<%-- link rel="alternate stylesheet" type="text/css"
href="hoofdsite/themas/fontsize1.2.css" title="groot" / --%>
<%-- link rel="alternate stylesheet" type="text/css"
href="hoofdsite/themas/fontsize1.4.css" title="groter" / --%>
scripts/launchcenter.js">
+ scripts/skyscraper_cookie.js">
<%= styleSheet %>" />
:
-onLoad="" <%= (iRubriekLayout==NatMMConfig.DEMO_LAYOUT && path.equals("portal.jsp")
? "onload='StartClock()' onunload='KillClock()'" : "" )
+>
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm index.jsp home.jsp
Update of /var/cvs/contributions/natmm/templates/natmm
In directory james.mmbase.org:/tmp/cvs-serv22333/templates/natmm
Modified Files:
index.jsp home.jsp
Log Message:
NMCMS-462
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm
See also: http://www.mmbase.org/jira/browse/NMCMS-462
Index: index.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/index.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- index.jsp 28 Mar 2006 15:30:53 - 1.3
+++ index.jsp 8 Feb 2008 17:08:43 - 1.4
@@ -9,6 +9,25 @@
<[EMAIL PROTECTED] file="includes/top3_nav.jsp" %>
<[EMAIL PROTECTED] file="includes/top4_head.jsp" %>
<[EMAIL PROTECTED] file="includes/top5_breadcrumbs_and_pano.jsp" %>
+
+
+
+
+
+
+
+ http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0";
width="2000" height="2000" id="overlayerbanner_pop_600x600" align="middle">
+
+ http://www.natuurmonumenten.nl&clickTarget=_blank";
/>
+
+
+
+
+
+ http://www.natuurmonumenten.nl&clickTarget=_blank";
menu="false" quality="high" scale="noscale" wmode="transparent"
bgcolor="#ff" width="2000" height="2000" name="overlayerbanner_pop_600x600"
align="middle" allowScriptAccess="sameDomain"
type="application/x-shockwave-flash"
pluginspage="http://www.macromedia.com/go/getflashplayer"; />
+
+
+
@@ -42,6 +61,9 @@
+
+
+
<[EMAIL PROTECTED] file="includes/footer.jsp" %>
Index: home.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/home.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- home.jsp6 Jul 2007 12:45:00 - 1.8
+++ home.jsp8 Feb 2008 17:08:43 - 1.9
@@ -21,6 +21,25 @@
<% if (isNaardermeer.equals("true")) { %>
<% } %>
+
+
+
+
+
+
+
+ http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0";
width="2000" height="2000" id="overlayerbanner_pop_600x600" align="middle">
+
+ http://www.natuurmonumenten.nl&clickTarget=_blank";
/>
+
+
+
+
+
+ http://www.natuurmonumenten.nl&clickTarget=_blank";
menu="false" quality="high" scale="noscale" wmode="transparent"
bgcolor="#ff" width="2000" height="2000" name="overlayerbanner_pop_600x600"
align="middle" allowScriptAccess="sameDomain"
type="application/x-shockwave-flash"
pluginspage="http://www.macromedia.com/go/getflashplayer"; />
+
+
+
@@ -66,6 +85,9 @@
+
+
+
<[EMAIL PROTECTED] file="includes/footer.jsp" %>
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/scripts skyscraper_cookie.js
Update of /var/cvs/contributions/natmm/templates/natmm/scripts In directory james.mmbase.org:/tmp/cvs-serv22333/templates/natmm/scripts Added Files: skyscraper_cookie.js Log Message: NMCMS-462 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/scripts See also: http://www.mmbase.org/jira/browse/NMCMS-462 skyscraper_cookie.js is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natnh/flash cross.gif overlayerbanner_pop_600x600.swf
Update of /var/cvs/contributions/natmm/templates/natnh/flash In directory james.mmbase.org:/tmp/cvs-serv22333/templates/natnh/flash Added Files: cross.gif overlayerbanner_pop_600x600.swf Log Message: NMCMS-462 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natnh/flash See also: http://www.mmbase.org/jira/browse/NMCMS-462 cross.gif is new overlayerbanner_pop_600x600.swf is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/flash cross.gif overlayerbanner_pop_600x600.swf
Update of /var/cvs/contributions/natmm/templates/natmm/flash In directory james.mmbase.org:/tmp/cvs-serv22333/templates/natmm/flash Added Files: cross.gif overlayerbanner_pop_600x600.swf Log Message: NMCMS-462 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/flash See also: http://www.mmbase.org/jira/browse/NMCMS-462 cross.gif is new overlayerbanner_pop_600x600.swf is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natnh/flash - New directory
Update of /var/cvs/contributions/natmm/templates/natnh/flash In directory james.mmbase.org:/tmp/cvs-serv22302/templates/natnh/flash Log Message: Directory /var/cvs/contributions/natmm/templates/natnh/flash added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natnh/flash ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/flash - New directory
Update of /var/cvs/contributions/natmm/templates/natmm/flash In directory james.mmbase.org:/tmp/cvs-serv22302/templates/natmm/flash Log Message: Directory /var/cvs/contributions/natmm/templates/natmm/flash added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/flash ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms GroupAction.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory
james.mmbase.org:/tmp/cvs-serv20684/community/src/java/com/finalist/cmsc/community/forms
Modified Files:
GroupAction.java
Log Message:
removal of user from group works also
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
Index: GroupAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/GroupAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- GroupAction.java8 Feb 2008 13:13:28 - 1.2
+++ GroupAction.java8 Feb 2008 15:36:16 - 1.3
@@ -38,7 +38,6 @@
String id = groupForm.getName();
// get all users
- // NodeList users = SecurityUtil.getUsers(cloud);
AuthenticationService as = getAuthenticationService();
List users = as.findAuthentications();
@@ -53,7 +52,6 @@
}
// get members and remove them from users
for (String memberName : groupForm.getMembers()) {
- // Node member = cloud.getNode(memberNumber);
String label = memberName;
LabelValueBean beanMember = new
LabelValueBean(label, label);
membersList.add(beanMember);
@@ -66,19 +64,13 @@
// validate
ActionMessages errors = new ActionMessages();
- // Node groupNode = getOrCreateNode(groupForm, cloud,
- // SecurityUtil.GROUP);
if (groupForm.getAction().equalsIgnoreCase(ACTION_ADD))
{
if (id == null || id.length() < 3) {
errors.add("groupname", new
ActionMessage("error.groupname.invalid"));
saveErrors(request, errors);
return actionMapping.getInputForward();
} else {
- String name = id;
- // NodeList list =
- //
MMBaseAction.getCloudFromSession(request).getNodeManager("mmbasegroups").getList(
- // "name='" + name + "'", null, null);
- boolean exist =
aus.authorityExists(name);
+ boolean exist = aus.authorityExists(id);
if (exist) {
errors.add("groupname", new
ActionMessage("error.groupname.alreadyexists"));
saveErrors(request, errors);
@@ -86,22 +78,27 @@
}
}
- // groupNode.setStringValue("name",
groupForm.getName());
aus.createAuthority(null, id);
}
- // groupNode.commit();
- // SecurityUtil.setGroupMembers(cloud, groupNode,
- // groupForm.getMembers());
if (id != null) {
+ List current =
as.findAuthenticationsForAuthority(id);
for (String memberName :
groupForm.getMembers()) {
+ Authentication m =
as.findAuthentication(memberName);
+ if (!current.contains(m)) {
as.addAuthorityToUser(memberName, id);
+ } else {
+ current.remove(m);
+ }
+ }
+ for (Iterator iter =
current.iterator(); iter.hasNext();) {
+ Authentication user = iter.next();
+
as.removeAuthorityFromUser(user.getUserId(), id);
}
}
}
removeFromSession(request, actionForm);
return actionMapping.findForward(SUCCESS);
-
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security AuthenticationService.java AuthenticationHibernateService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
In directory
james.mmbase.org:/tmp/cvs-serv20272/community/src/java/com/finalist/cmsc/services/community/security
Modified Files:
AuthenticationService.java AuthenticationHibernateService.java
Log Message:
findAuthoritiesForAuthentication
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
Index: AuthenticationService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AuthenticationService.java 30 Jan 2008 10:00:42 - 1.3
+++ AuthenticationService.java 8 Feb 2008 15:16:34 - 1.4
@@ -107,10 +107,16 @@
Authentication findAuthentication(String userId);
/**
- * Finds an authentication object for this userId
+ * Finds all authentications
*
- * @param userId
- * @return authentication
+ * @param authority
+ * @return list authentications
+ */
+List findAuthenticationsForAuthority(String name);
+
+/**
+ * Finds all authentications
+ * @return list authentications
*/
List findAuthentications();
Index: AuthenticationHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationHibernateService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- AuthenticationHibernateService.java 8 Feb 2008 10:33:14 - 1.4
+++ AuthenticationHibernateService.java 8 Feb 2008 15:16:34 - 1.5
@@ -17,6 +17,8 @@
import org.acegisecurity.providers.encoding.MessageDigestPasswordEncoder;
import org.acegisecurity.providers.encoding.Md5PasswordEncoder;
+import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import com.finalist.cmsc.services.HibernateService;
@@ -136,19 +138,41 @@
private String encodePassword(String password, String salt) {
MessageDigestPasswordEncoder encoder = new Md5PasswordEncoder();
+// TODO Add salt to password encoder??
// return encoder.encodePassword(password, salt);
return encoder.encodePassword(password, null);
}
- @Required
- public void setAuthorityService(AuthorityService authorityService) {
- this.authorityService = authorityService;
- }
-
+ /** [EMAIL PROTECTED] */
@Transactional(readOnly = true)
public List findAuthentications() {
Criteria criteria =
getSession().createCriteria(Authentication.class);
+ return findAuthenticationListByCriteria(criteria);
+ }
+
+ /** [EMAIL PROTECTED] */
+ @Transactional(readOnly = true)
+ public List findAuthenticationsForAuthority(String
name) {
+ Criteria criteria = getSession()
+ .createCriteria(Authentication.class)
+ .createCriteria("authorities")
+ .add(Restrictions.eq("name", name));
+ return findAuthenticationListByCriteria(criteria);
+ }
+
+ @SuppressWarnings("unchecked")
+ private List findAuthenticationListByCriteria(Criteria
criteria) {
+ List result = new ArrayList();
List authenticationList = criteria.list();
- return authenticationList;
+ for (Iterator iter = authenticationList.iterator();
iter.hasNext();) {
+ Authentication authentication =
(Authentication)iter.next();
+ result.add(authentication);
+ }
+ return result;
+ }
+
+ @Required
+ public void setAuthorityService(AuthorityService authorityService) {
+ this.authorityService = authorityService;
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/core/templates loginbox.jsp
Update of /var/cvs/contributions/didactor2/src/core/templates
In directory james.mmbase.org:/tmp/cvs-serv18967
Modified Files:
loginbox.jsp
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/templates
Index: loginbox.jsp
===
RCS file: /var/cvs/contributions/didactor2/src/core/templates/loginbox.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- loginbox.jsp1 Nov 2006 10:36:10 - 1.8
+++ loginbox.jsp8 Feb 2008 14:20:42 - 1.9
@@ -1,11 +1,11 @@
-<[EMAIL PROTECTED] session="true" language="java" contentType="text/html;
charset=UTF-8" %>
-<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm" %>
-<[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di" %>
-
-
-<[EMAIL PROTECTED] file="/shared/setImports.jsp" %>
-
-
+http://java.sun.com/JSP/Page";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
+
+
+
+
@@ -23,28 +23,34 @@
function check_passwords(){
- if((document.getElementById("loginUsername").value.length == 0) &&
(document.getElementById("loginPassword").value.length == 0)) return false;
+if((document.getElementById("loginUsername").value.length == 0)
&& (document.getElementById("loginPassword").value.length == 0)) return
false;
else return true;
}
-
-
- index.jsp
-
- "
name="loginForm" onSubmit="return(check_passwords())">
+ /index.jsp
+
+
+
+${referrer}
-" />
+
-" />
-" />
+
+
-
+
+
- ">
-
-
-
+
+
+
+
+
+
+
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/templates/education/wizards/modes whichimage.jsp
Update of /var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes In directory james.mmbase.org:/tmp/cvs-serv19686 Removed Files: whichimage.jsp Log Message: cleaned See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards/modes ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/templates/education/wizards/modes educations.jsp
Update of /var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes In directory james.mmbase.org:/tmp/cvs-serv19594 Modified Files: educations.jsp Log Message: See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards/modes Index: educations.jsp === RCS file: /var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes/educations.jsp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -b -r1.18 -r1.19 --- educations.jsp 31 Jan 2008 10:24:06 - 1.18 +++ educations.jsp 8 Feb 2008 14:49:12 - 1.19 @@ -81,7 +81,7 @@ - + @@ -225,7 +225,7 @@ directions="up" searchdir="destination" type="learnobjects"> - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/templates/editwizards/data/xmlnews xmlnews.xml
Update of /var/cvs/contributions/didactor2/src/richtext/templates/editwizards/data/xmlnews In directory james.mmbase.org:/tmp/cvs-serv18097/richtext/templates/editwizards/data/xmlnews Added Files: xmlnews.xml Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/templates/editwizards/data/xmlnews xmlnews.xml is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/portal/templates/editwizards/data/xmlnews xmlnews.xml
Update of /var/cvs/contributions/didactor2/src/portal/templates/editwizards/data/xmlnews In directory james.mmbase.org:/tmp/cvs-serv18097/portal/templates/editwizards/data/xmlnews Removed Files: xmlnews.xml Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portal/templates/editwizards/data/xmlnews ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/core/templates login_plain.jsp
Update of /var/cvs/contributions/didactor2/src/core/templates
In directory james.mmbase.org:/tmp/cvs-serv18879
Modified Files:
login_plain.jsp
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/templates
Index: login_plain.jsp
===
RCS file: /var/cvs/contributions/didactor2/src/core/templates/login_plain.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- login_plain.jsp 5 Jul 2007 10:11:37 - 1.8
+++ login_plain.jsp 8 Feb 2008 14:20:00 - 1.9
@@ -1,43 +1,18 @@
-<[EMAIL PROTECTED] session="true" language="java" contentType="text/html;
charset=UTF-8"
-%><[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
-%><[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di"
-%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Didactor
-" />
-
+http://java.sun.com/JSP/Page";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
+
+
+
+
+
-
-
-
-
-
- try
- {<% //Prevent from loading /login.jsp in frame %>
- if (top.frames.length > 0)
- {
-top.location.href = document.location.href;
- }
- }
- catch(e){
- }
+ });
- " width="1" height="15" border="0" title="" alt=""
/>
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
- " width="100%" height="106" border="0"
title="Didactor logo" alt="Didactor logo" />
-
-
-true
-
-
+
+
+
+
+
-
+
- " name="content" frameborder="0">
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/core/templates/cockpit applicationbar.jsp
Update of /var/cvs/contributions/didactor2/src/core/templates/cockpit In directory james.mmbase.org:/tmp/cvs-serv18801 Modified Files: applicationbar.jsp Log Message: See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/templates/cockpit Index: applicationbar.jsp === RCS file: /var/cvs/contributions/didactor2/src/core/templates/cockpit/applicationbar.jsp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -b -r1.37 -r1.38 --- applicationbar.jsp 24 Jan 2008 15:54:59 - 1.37 +++ applicationbar.jsp 8 Feb 2008 14:19:23 - 1.38 @@ -4,12 +4,13 @@ xmlns:di="http://www.didactor.nl/ditaglib_1.0";> - - + yes + + - + /> + @@ -40,7 +41,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2 build.xml
Update of /var/cvs/contributions/didactor2 In directory james.mmbase.org:/tmp/cvs-serv18387 Modified Files: build.xml Log Message: will need newest mmbase See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2 Index: build.xml === RCS file: /var/cvs/contributions/didactor2/build.xml,v retrieving revision 1.97 retrieving revision 1.98 diff -u -b -r1.97 -r1.98 --- build.xml 4 Feb 2008 10:34:32 - 1.97 +++ build.xml 8 Feb 2008 14:03:56 - 1.98 @@ -25,8 +25,8 @@ - - http://www.mmbase.org/development/download/stable/2008-02-04/"; /> + + http://www.mmbase.org/development/download/stable/2008-02-09/"; /> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/lib kupu-i18n.jar mmbase-kupu-i18n.jar mmbase-richtext.jar
Update of /var/cvs/contributions/didactor2/src/richtext/lib In directory james.mmbase.org:/tmp/cvs-serv18097/richtext/lib Added Files: kupu-i18n.jar mmbase-kupu-i18n.jar mmbase-richtext.jar Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/lib kupu-i18n.jar is new mmbase-kupu-i18n.jar is new mmbase-richtext.jar is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/java/nl/didactor/component/richtext DidactorRichtext.java
Update of /var/cvs/contributions/didactor2/src/richtext/java/nl/didactor/component/richtext In directory james.mmbase.org:/tmp/cvs-serv18097/richtext/java/nl/didactor/component/richtext Added Files: DidactorRichtext.java Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/java/nl/didactor/component/richtext DidactorRichtext.java is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/portal/templates/editwizards/data/config/xmlnews xmlnews-posrel.xml xmlnews.xml
Update of /var/cvs/contributions/didactor2/src/portal/templates/editwizards/data/config/xmlnews In directory james.mmbase.org:/tmp/cvs-serv18097/portal/templates/editwizards/data/config/xmlnews Removed Files: xmlnews-posrel.xml xmlnews.xml Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portal/templates/editwizards/data/config/xmlnews ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/templates/editwizards/data/xmlcontent xmlcontent.xml
Update of /var/cvs/contributions/didactor2/src/richtext/templates/editwizards/data/xmlcontent In directory james.mmbase.org:/tmp/cvs-serv18097/richtext/templates/editwizards/data/xmlcontent Added Files: xmlcontent.xml Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/templates/editwizards/data/xmlcontent xmlcontent.xml is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/portal/templates/WEB-INF/classes/org/mmbase/bridge/util/xml Generator.class
Update of /var/cvs/contributions/didactor2/src/portal/templates/WEB-INF/classes/org/mmbase/bridge/util/xml In directory james.mmbase.org:/tmp/cvs-serv18097/portal/templates/WEB-INF/classes/org/mmbase/bridge/util/xml Removed Files: Generator.class Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portal/templates/WEB-INF/classes/org/mmbase/bridge/util/xml ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/config/applications DidactorRichText.xml INDEX
Update of /var/cvs/contributions/didactor2/src/richtext/config/applications In directory james.mmbase.org:/tmp/cvs-serv18097/richtext/config/applications Added Files: DidactorRichText.xml INDEX Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/config/applications DidactorRichText.xml is new INDEX is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/config/builders INDEX xmlcontent.xml xmlnews.xml
Update of /var/cvs/contributions/didactor2/src/richtext/config/builders In directory james.mmbase.org:/tmp/cvs-serv18097/richtext/config/builders Added Files: INDEX xmlcontent.xml xmlnews.xml Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/config/builders INDEX is new xmlcontent.xml is new xmlnews.xml is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/portal/lib kupu-i18n.jar mmbase-kupu-i18n.jar mmbase-richtext.jar
Update of /var/cvs/contributions/didactor2/src/portal/lib In directory james.mmbase.org:/tmp/cvs-serv18097/portal/lib Removed Files: kupu-i18n.jar mmbase-kupu-i18n.jar mmbase-richtext.jar Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portal/lib ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/portal/templates.zip mmbase.zip
Update of /var/cvs/contributions/didactor2/src/portal/templates.zip In directory james.mmbase.org:/tmp/cvs-serv18097/portal/templates.zip Removed Files: mmbase.zip Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portal/templates.zip ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/portal/config/applications/DidactorRichText/builders xmlnews.xml
Update of /var/cvs/contributions/didactor2/src/portal/config/applications/DidactorRichText/builders In directory james.mmbase.org:/tmp/cvs-serv18097/portal/config/applications/DidactorRichText/builders Removed Files: xmlnews.xml Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portal/config/applications/DidactorRichText/builders ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/portal/config/applications DidactorPortal.xml DidactorRichText.xml
Update of /var/cvs/contributions/didactor2/src/portal/config/applications In directory james.mmbase.org:/tmp/cvs-serv18097/portal/config/applications Modified Files: DidactorPortal.xml Removed Files: DidactorRichText.xml Log Message: moved 'richtext' stuff to a seperate component so that you can also use it without installing this portal See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portal/config/applications Index: DidactorPortal.xml === RCS file: /var/cvs/contributions/didactor2/src/portal/config/applications/DidactorPortal.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- DidactorPortal.xml 13 Jun 2007 15:08:56 - 1.7 +++ DidactorPortal.xml 8 Feb 2008 14:02:37 - 1.8 @@ -6,6 +6,7 @@ + @@ -29,6 +30,9 @@ + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/templates/editwizards/data/xmlcontent - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/templates/editwizards/data/xmlcontent In directory james.mmbase.org:/tmp/cvs-serv17834/xmlcontent Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/templates/editwizards/data/xmlcontent added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/templates/editwizards/data/xmlcontent ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/richtext/src/org/mmbase/richtext/processors/xml MmxfGetString.java
Update of /var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml
In directory james.mmbase.org:/tmp/cvs-serv17748
Modified Files:
MmxfGetString.java
Log Message:
it's pretty much essential that the freaking setIdAttribute works, I finally
came up with an idea to get it working, and still be compiatible with mmbase
1.8...
See also:
http://cvs.mmbase.org/viewcvs/applications/richtext/src/org/mmbase/richtext/processors/xml
Index: MmxfGetString.java
===
RCS file:
/var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml/MmxfGetString.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- MmxfGetString.java 16 Feb 2007 20:44:12 - 1.6
+++ MmxfGetString.java 8 Feb 2008 13:55:57 - 1.7
@@ -30,7 +30,7 @@
* This class implements the `get' for `mmxf' fields.
*
* @author Michiel Meeuwissen
- * @version $Id: MmxfGetString.java,v 1.6 2007/02/16 20:44:12 michiel Exp $
+ * @version $Id: MmxfGetString.java,v 1.7 2008/02/08 13:55:57 michiel Exp $
* @since MMBase-1.8
*/
@@ -52,13 +52,23 @@
throw new RuntimeException(pce.getMessage(), pce);
}
}
+
+static protected Generator getGenerator(final Cloud cloud) {
+return new Generator(getDocumentBuilder(), cloud) {
+@Override
+protected void setIdAttribute(Element object, String name) {
+object.setIdAttribute(name, true);
+}
+
+};
+}
/**
* Returns a 'objects' Document containing the node with the mmxf field
plus all idrelated objects
*/
public static Document getDocument(final Node node, final Field field) {
log.debug("Getting document for node " + node.getNumber());
-Generator generator = new Generator(getDocumentBuilder(),
node.getCloud());
+Generator generator = getGenerator(node.getCloud());
generator.setNamespaceAware(true);
generator.add(node, field);
org.mmbase.bridge.NodeList relatedNodes =
node.getRelatedNodes("object", "idrel", "destination");
@@ -110,7 +120,7 @@
return res.toString();
}
case Modes.FLAT: {
-Generator generator = new Generator(getDocumentBuilder(),
node.getCloud());
+Generator generator = getGenerator(node.getCloud());
generator.setNamespaceAware(true);
generator.add(node, field);
Document xml = generator.getDocument();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/lucene/src/org/mmbase/module/lucene Searcher.java
Update of /var/cvs/contributions/lucene/src/org/mmbase/module/lucene
In directory james.mmbase.org:/tmp/cvs-serv17092
Modified Files:
Searcher.java
Log Message:
avoid restarting mmbase
See also:
http://cvs.mmbase.org/viewcvs/contributions/lucene/src/org/mmbase/module/lucene
Index: Searcher.java
===
RCS file:
/var/cvs/contributions/lucene/src/org/mmbase/module/lucene/Searcher.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- Searcher.java 1 Feb 2008 12:40:42 - 1.45
+++ Searcher.java 8 Feb 2008 13:27:44 - 1.46
@@ -33,7 +33,7 @@
* A wrapper around Lucene's [EMAIL PROTECTED]
org.apache.lucene.search.IndexSearcher}. Every [EMAIL PROTECTED] Indexer} has
its own Searcher.
*
* @author Pierre van Rooden
- * @version $Id: Searcher.java,v 1.45 2008/02/01 12:40:42 michiel Exp $
+ * @version $Id: Searcher.java,v 1.46 2008/02/08 13:27:44 michiel Exp $
* @todo Should the StopAnalyzers be replaced by index.analyzer? Something
else?
**/
public class Searcher implements NewSearcher.Listener,
FullIndexEvents.Listener {
@@ -118,7 +118,7 @@
EventManager.getInstance().removeEventListener(this);
if (searcher != null) {
try {
-log.service("Shutting down searcher for " + index);
+log.service("Shutting down searcher for " + index.getName());
searcher.close();
searcher = null;
} catch (IOException ioe) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/lucene/src/org/mmbase/module/lucene Indexer.java
Update of /var/cvs/contributions/lucene/src/org/mmbase/module/lucene
In directory james.mmbase.org:/tmp/cvs-serv16910
Modified Files:
Indexer.java
Log Message:
simply report that as an error to lucene, and not in the log
See also:
http://cvs.mmbase.org/viewcvs/contributions/lucene/src/org/mmbase/module/lucene
Index: Indexer.java
===
RCS file:
/var/cvs/contributions/lucene/src/org/mmbase/module/lucene/Indexer.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- Indexer.java5 Feb 2008 13:45:24 - 1.54
+++ Indexer.java8 Feb 2008 13:23:25 - 1.55
@@ -34,7 +34,7 @@
*
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Indexer.java,v 1.54 2008/02/05 13:45:24 michiel Exp $
+ * @version $Id: Indexer.java,v 1.55 2008/02/08 13:23:25 michiel Exp $
**/
public class Indexer {
@@ -436,7 +436,7 @@
log.info("Full index finished at " + lastFullIndex + ". Copied
" + fullIndex + " to " + getDirectory() + " Total nr documents in index '" +
getName() + "': " + writer.docCount());
EventManager.getInstance().propagateEvent(new
FullIndexEvents.Event(getName(), FullIndexEvents.Status.IDLE,
writer.docCount()));
} else {
-log.warn((errorCount - errorCountBefore) + " errors during
full index. Will not update the index.");
+addError((errorCount - errorCountBefore) + " errors during
full index. Will not update the index.");
}
} catch (Exception e) {
addError(e.getMessage());
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community index.jsp
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory
james.mmbase.org:/tmp/cvs-serv16715/community/src/webapp/editors/community
Modified Files:
index.jsp
Log Message:
removed info button
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
Index: index.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/index.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- index.jsp 7 Feb 2008 14:35:31 - 1.7
+++ index.jsp 8 Feb 2008 13:16:34 - 1.8
@@ -57,11 +57,6 @@
${auth.userId}
-
- "/>
-
-
-
"
onclick="return confirm('')" />
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userDetails.jsp
Update of /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community In directory james.mmbase.org:/tmp/cvs-serv16644/community/src/webapp/editors/community Removed Files: userDetails.jsp Log Message: not needed See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community group.jsp
Update of /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community In directory james.mmbase.org:/tmp/cvs-serv16520/community/src/webapp/editors/community Modified Files: group.jsp Log Message: changes See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community Index: group.jsp === RCS file: /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/group.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- group.jsp 7 Feb 2008 14:35:31 - 1.2 +++ group.jsp 8 Feb 2008 13:14:46 - 1.3 @@ -25,6 +25,7 @@ + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms GroupAction.java GroupInitAction.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory
james.mmbase.org:/tmp/cvs-serv16466/community/src/java/com/finalist/cmsc/community/forms
Modified Files:
GroupAction.java GroupInitAction.java
Log Message:
changes to group
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
Index: GroupAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/GroupAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- GroupAction.java6 Feb 2008 15:10:57 - 1.1
+++ GroupAction.java8 Feb 2008 13:13:28 - 1.2
@@ -1,5 +1,9 @@
package com.finalist.cmsc.community.forms;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -8,7 +12,12 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.util.LabelValueBean;
+import com.finalist.cmsc.services.community.security.Authentication;
+import com.finalist.cmsc.services.community.security.AuthenticationService;
import com.finalist.cmsc.services.community.security.AuthorityService;
/**
@@ -16,41 +25,83 @@
*/
public class GroupAction extends AbstractCommunityAction {
- private static Log log = LogFactory.getLog(DeleteGroupAction.class);
+ private static Log log = LogFactory.getLog(GroupAction.class);
public ActionForward execute(ActionMapping actionMapping, ActionForm
actionForm, HttpServletRequest request,
HttpServletResponse httpServletResponse) throws
Exception {
if (!isCancelled(request)) {
GroupForm groupForm = (GroupForm) actionForm;
+ List membersList = new
ArrayList();
+ List usersList = new
ArrayList();
String id = groupForm.getName();
+ // get all users
+ // NodeList users = SecurityUtil.getUsers(cloud);
+ AuthenticationService as = getAuthenticationService();
+ List users = as.findAuthentications();
+
AuthorityService aus = getAuthorityService();
- if (groupForm.getAction().equalsIgnoreCase(ACTION_ADD))
{
- if (!aus.authorityExists(id)) {
- aus.createAuthority(null, id);
+ for (Iterator iter = users.iterator();
iter.hasNext();) {
+ Authentication user = iter.next();
+ String label = user.getUserId();
+ LabelValueBean bean = new LabelValueBean(label,
label);
+ usersList.add(bean);
+ }
+ // get members and remove them from users
+ for (String memberName : groupForm.getMembers()) {
+ // Node member = cloud.getNode(memberNumber);
+ String label = memberName;
+ LabelValueBean beanMember = new
LabelValueBean(label, label);
+ membersList.add(beanMember);
+ usersList.remove(beanMember);
+ }
+ request.setAttribute("membersList", membersList);
+ request.setAttribute("usersList", usersList);
+ // validate
+ ActionMessages errors = new ActionMessages();
+
+ // Node groupNode = getOrCreateNode(groupForm, cloud,
+ // SecurityUtil.GROUP);
+ if (groupForm.getAction().equalsIgnoreCase(ACTION_ADD))
{
+ if (id == null || id.length() < 3) {
+ errors.add("groupname", new
ActionMessage("error.groupname.invalid"));
+ saveErrors(request, errors);
+ return actionMapping.getInputForward();
} else {
- log.info("authority already exists");
+ String name = id;
+ // NodeList list =
+ //
MMBaseAction.getCloudFromSessio
[MMBASE CVS] contributions/didactor2/src/richtext/templates/editwizards/data/xmlnews - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/templates/editwizards/data/xmlnews In directory james.mmbase.org:/tmp/cvs-serv15515/xmlnews Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/templates/editwizards/data/xmlnews added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/templates/editwizards/data/xmlnews ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/templates/editwizards/data/config - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/templates/editwizards/data/config In directory james.mmbase.org:/tmp/cvs-serv15490/config Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/templates/editwizards/data/config added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/templates/editwizards/data/config ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/templates/editwizards/data - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/templates/editwizards/data In directory james.mmbase.org:/tmp/cvs-serv15467/data Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/templates/editwizards/data added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/templates/editwizards/data ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/templates/editwizards - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/templates/editwizards In directory james.mmbase.org:/tmp/cvs-serv15438/editwizards Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/templates/editwizards added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/templates/editwizards ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/test/com/finalist/cmsc/services/community/security AuthenticationServiceTest.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/test/com/finalist/cmsc/services/community/security
In directory
james.mmbase.org:/tmp/cvs-serv11342/community/src/test/com/finalist/cmsc/services/community/security
Modified Files:
AuthenticationServiceTest.java
Log Message:
Changes Community module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/test/com/finalist/cmsc/services/community/security
Index: AuthenticationServiceTest.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/test/com/finalist/cmsc/services/community/security/AuthenticationServiceTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AuthenticationServiceTest.java 29 Jan 2008 10:00:01 - 1.1
+++ AuthenticationServiceTest.java 8 Feb 2008 10:33:14 - 1.2
@@ -16,9 +16,9 @@
}
public void testCreateAuthentication() {
-authenticationService.createAuthentication("SomeUser", "asdf");
-Assert.isTrue(authenticationService.authenticationExists("SomeUser"));
-Assert.isTrue(authenticationService.authenticate("SomeUser", "asdf"));
+authenticationService.createAuthentication("admin", "admin2k");
+Assert.isTrue(authenticationService.authenticationExists("admin"));
+Assert.isTrue(authenticationService.authenticate("admin", "admin2k"));
}
public void testAuthenticationExists() {
Assert.isTrue(!authenticationService.authenticationExists("SomeUser"));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv11556/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
LoginPortlet.java
Log Message:
Changes Login portlet
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- LoginPortlet.java 30 Jan 2008 14:09:38 - 1.5
+++ LoginPortlet.java 8 Feb 2008 10:36:02 - 1.6
@@ -6,7 +6,7 @@
The license (Mozilla version 1.0) can be read at the MMBase site.
See http://www.MMBase.org/license
-*/
+ */
package com.finalist.cmsc.portlets;
import java.io.IOException;
@@ -14,7 +14,8 @@
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -22,29 +23,55 @@
import com.finalist.cmsc.services.community.Community;
/**
- * Login / Logout portlet
+ * Login portlet
*
- * @author Menno Menninga / Remco Bos
- * @version $Revision: 1.5 $
+ * @author Remco Bos
*/
public class LoginPortlet extends CmscPortlet {
+ private static final String ACEGI_SECURITY_FORM_USERNAME_KEY =
"j_username";
+ private static final String ACEGI_SECURITY_FORM_PASSWORD_KEY =
"j_password";
+
private static final Log log = LogFactory.getLog(LoginPortlet.class);
public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
String action = request.getParameter("action");
+
if ("login".equals(action)) {
- if (!Community.loginUser(request, response)) {
- response.setPortletMode(PortletMode.VIEW);
+ String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
+ if (userName == null) {
+ userName = "";
}
- } else if ("logout".equals(action)) {
- if (!Community.logoutUser(request, response)) {
- response.setPortletMode(PortletMode.VIEW);
+ String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
+ if (password == null) {
+ password = "";
}
+ Community.login(userName, password);
+ if (Community.isAuthenticated()) {
+ log.info(String.format("Login successful for
user %s", userName));
+ } else {
+ log.info(String.format("Login failed for user
%s", userName));
+ }
+
+ } else if ("logout".equals(action)) {
+ Community.logout();
+
+// Unknown
} else {
- response.setPortletMode(PortletMode.VIEW);
log.error(String.format("Unknown action '%s'", action));
}
}
+
+ @Override
+ protected void doView(RenderRequest request, RenderResponse response)
+ throws PortletException, IOException {
+ String template = null;
+ if (Community.isAuthenticated()) {
+ template = "login/logout.jsp";
+ } else {
+ template = "login/login.jsp";
+ }
+ doInclude("view", template, request, response);
+ }
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/config/applications login.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-login/config/applications In directory james.mmbase.org:/tmp/cvs-serv11556/portlets-login/config/applications Removed Files: login.xml Log Message: Changes Login portlet See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/config/applications ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/java/nl/didactor/component/richtext - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/java/nl/didactor/component/richtext In directory james.mmbase.org:/tmp/cvs-serv15326/richtext Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/java/nl/didactor/component/richtext added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/java/nl/didactor/component/richtext ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/java/nl/didactor/component - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/java/nl/didactor/component In directory james.mmbase.org:/tmp/cvs-serv15279/component Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/java/nl/didactor/component added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/java/nl/didactor/component ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/java/nl/didactor - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/java/nl/didactor In directory james.mmbase.org:/tmp/cvs-serv15255/didactor Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/java/nl/didactor added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/java/nl/didactor ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/java/nl - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/java/nl In directory james.mmbase.org:/tmp/cvs-serv15242/nl Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/java/nl added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/java/nl ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/config/builders - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/config/builders In directory james.mmbase.org:/tmp/cvs-serv15190/builders Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/config/builders added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/config/builders ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/config/applications/DidactorRichText - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/config/applications/DidactorRichText In directory james.mmbase.org:/tmp/cvs-serv15137/DidactorRichText Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/config/applications/DidactorRichText added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/config/applications/DidactorRichText ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/config/applications - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/config/applications In directory james.mmbase.org:/tmp/cvs-serv15107/applications Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/config/applications added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/config/applications ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/templates.zip - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/templates.zip In directory james.mmbase.org:/tmp/cvs-serv15003/templates.zip Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/templates.zip added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/templates.zip ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/templates - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/templates In directory james.mmbase.org:/tmp/cvs-serv15003/templates Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/templates added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/templates ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/lib - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/lib In directory james.mmbase.org:/tmp/cvs-serv15003/lib Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/lib added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/lib ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/config - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/config In directory james.mmbase.org:/tmp/cvs-serv15003/config Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/config added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/config ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext/java - New directory
Update of /var/cvs/contributions/didactor2/src/richtext/java In directory james.mmbase.org:/tmp/cvs-serv15003/java Log Message: Directory /var/cvs/contributions/didactor2/src/richtext/java added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/java ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/richtext - New directory
Update of /var/cvs/contributions/didactor2/src/richtext In directory james.mmbase.org:/tmp/cvs-serv14968/richtext Log Message: Directory /var/cvs/contributions/didactor2/src/richtext added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render InsertPortletTag.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render
In directory
james.mmbase.org:/tmp/cvs-serv14466/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render
Modified Files:
Tag: b1_4
InsertPortletTag.java
Log Message:
CMSC-409 var attribute of the cmsc:insert-portlet tag doesn't work
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render
See also: http://www.mmbase.org/jira/browse/CMSC-409
Index: InsertPortletTag.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render/InsertPortletTag.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- InsertPortletTag.java 17 Dec 2007 20:34:18 - 1.2
+++ InsertPortletTag.java 8 Feb 2008 12:19:51 - 1.2.2.1
@@ -17,6 +17,7 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.SimpleTagSupport;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -33,17 +34,18 @@
private static Log log = LogFactory.getLog(InsertPortletTag.class);
private String layoutid;
-
+ private String var;
public String getLayoutid() {
return layoutid;
}
-
public void setLayoutid(String layoutid) {
this.layoutid = layoutid;
}
-
+ public void setVar(String var) {
+ this.var = var;
+}
@Override
public void doTag() throws JspException, IOException {
@@ -63,8 +65,14 @@
.getStoredServletResponse(response, new
PrintWriter(storedWriter));
// let the Portlet do it's thing
portlet.writeToResponse(request, wrappedResponse);
+
+if (StringUtils.isNotEmpty(var)) {
+request.setAttribute(var, storedWriter.toString());
+}
+else {
ctx.getOut().print(storedWriter.toString());
}
+ }
catch (IOException e) {
log.error("Error in portlet");
ctx.getOut().print("Error in portlet");
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render InsertPortletTag.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render
In directory
james.mmbase.org:/tmp/cvs-serv14445/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render
Modified Files:
InsertPortletTag.java
Log Message:
CMSC-409 var attribute of the cmsc:insert-portlet tag doesn't work
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render
See also: http://www.mmbase.org/jira/browse/CMSC-409
Index: InsertPortletTag.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render/InsertPortletTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- InsertPortletTag.java 17 Dec 2007 20:34:18 - 1.2
+++ InsertPortletTag.java 8 Feb 2008 12:19:45 - 1.3
@@ -17,6 +17,7 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.SimpleTagSupport;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -33,7 +34,7 @@
private static Log log = LogFactory.getLog(InsertPortletTag.class);
private String layoutid;
-
+ private String var;
public String getLayoutid() {
return layoutid;
@@ -43,7 +44,9 @@
public void setLayoutid(String layoutid) {
this.layoutid = layoutid;
}
-
+ public void setVar(String var) {
+ this.var = var;
+}
@Override
public void doTag() throws JspException, IOException {
@@ -63,8 +66,14 @@
.getStoredServletResponse(response, new
PrintWriter(storedWriter));
// let the Portlet do it's thing
portlet.writeToResponse(request, wrappedResponse);
+
+if (StringUtils.isNotEmpty(var)) {
+request.setAttribute(var, storedWriter.toString());
+}
+else {
ctx.getOut().print(storedWriter.toString());
}
+}
catch (IOException e) {
log.error("Error in portlet");
ctx.getOut().print("Error in portlet");
@@ -78,4 +87,5 @@
throw new JspException("Couldn't find screen tag");
}
}
+
}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login logout.jsp login.jsp
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login In directory james.mmbase.org:/tmp/cvs-serv11556/portlets-login/src/webapp/WEB-INF/templates/view/login Modified Files: login.jsp Added Files: logout.jsp Log Message: Changes Login portlet See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login logout.jsp is new Index: login.jsp === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/login.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- login.jsp 30 Jan 2008 14:09:38 - 1.3 +++ login.jsp 8 Feb 2008 10:36:02 - 1.4 @@ -1,70 +1,27 @@ -<[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp" %> -<%-- +<[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp"%> -LOGIN RESULTS HERE + ---%> - - - - "> - - - - - - - - - - - - - - - - - "/> - - - - - -<%-- +" + target="_parent" + method="post"> -LOGIN HERE - ---%> - <%%> - - "> - - - - - - - - + + + + - - - - - - - + + + - - "/> + + + " /> - - - - <%%> - - \ No newline at end of file + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/resources/com/finalist/cmsc/portlets LoginPortlet_nl.properties LoginPortlet.properties
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-login/resources/com/finalist/cmsc/portlets In directory james.mmbase.org:/tmp/cvs-serv11556/portlets-login/resources/com/finalist/cmsc/portlets Modified Files: LoginPortlet_nl.properties LoginPortlet.properties Log Message: Changes Login portlet See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/resources/com/finalist/cmsc/portlets Index: LoginPortlet_nl.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-login/resources/com/finalist/cmsc/portlets/LoginPortlet_nl.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- LoginPortlet_nl.properties 19 Nov 2007 09:15:20 - 1.1 +++ LoginPortlet_nl.properties 8 Feb 2008 10:36:02 - 1.2 @@ -1,9 +1,16 @@ javax.portlet.title=LoginPortlet javax.portlet.short-title=LoginPortlet -javax.portlet.keywords=login,jaas +javax.portlet.keywords=login,aanmelden + +edit_defaults.title=Login +edit_defaults.name=E-mail +edit_defaults.password=Wachtwoord +edit_defaults.submit=Aanmelden + +view.title=Aanmelden +view.login=Aanmelden +view.logout=Afmelden +view.username=E-mail adres: +view.password=Wachtwoord: +view.submit=Aanmelden -view.user=Gebruikersnaam: -view.pass=Wachtwoord: -view.login=Login -view.logout=Logout -view.welcome=Welkom \ No newline at end of file Index: LoginPortlet.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-login/resources/com/finalist/cmsc/portlets/LoginPortlet.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- LoginPortlet.properties 19 Nov 2007 09:15:20 - 1.1 +++ LoginPortlet.properties 8 Feb 2008 10:36:02 - 1.2 @@ -1,9 +1,18 @@ javax.portlet.title=LoginPortlet javax.portlet.short-title=LoginPortlet -javax.portlet.keywords=login,jaas +javax.portlet.keywords=login -view.user=Username: -view.pass=Password: -view.submit=Login +edit_defaults.title=Login +edit_defaults.name=Email +edit_defaults.password=Password +edit_defaults.submit=Login + +view.title=Login +view.login=Login view.logout=Logout -view.welcome=Welcome \ No newline at end of file +view.username=Email +view.password=Password +view.submit=Login +view.logged_in_as=You're currently logged in as + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community CommunityServiceImpl.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community
In directory
james.mmbase.org:/tmp/cvs-serv11342/community/src/java/com/finalist/cmsc/services/community
Modified Files:
CommunityServiceImpl.java
Log Message:
Changes Community module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community
Index: CommunityServiceImpl.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/CommunityServiceImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- CommunityServiceImpl.java 30 Jan 2008 14:07:39 - 1.7
+++ CommunityServiceImpl.java 8 Feb 2008 10:33:14 - 1.8
@@ -9,22 +9,24 @@
*/
package com.finalist.cmsc.services.community;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
import javax.servlet.ServletConfig;
import org.acegisecurity.Authentication;
import org.acegisecurity.AuthenticationException;
import org.acegisecurity.AuthenticationManager;
+import org.acegisecurity.GrantedAuthority;
import org.acegisecurity.context.SecurityContext;
import org.acegisecurity.context.SecurityContextHolder;
import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.userdetails.User;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowire;
+import org.springframework.beans.factory.annotation.Required;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -38,10 +40,6 @@
*/
public class CommunityServiceImpl extends CommunityService {
- public static final String ACEGI_SECURITY_FORM_USERNAME_KEY =
"j_username";
- public static final String ACEGI_SECURITY_FORM_PASSWORD_KEY =
"j_password";
- public static final String ACEGI_SECURITY_LAST_USERNAME_KEY =
"ACEGI_SECURITY_LAST_USERNAME";
-
private static Log log = LogFactory.getLog(CommunityServiceImpl.class);
private AuthenticationManager authenticationManager;
@@ -49,41 +47,73 @@
@Override
protected void init(ServletConfig config, Properties properties) throws
Exception {
+ /* Some Spring magic. Sets the AuthenticationManager and
PreferenceService */
ApplicationContext ac =
WebApplicationContextUtils.getWebApplicationContext(config.getServletContext());
ac.getAutowireCapableBeanFactory().autowireBeanProperties(this,
Autowire.BY_NAME.value(), false);
}
- public boolean loginUser(ActionRequest request, ActionResponse
response) {
-String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
-String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
-
-if (userName == null) {
-userName = "";
-}
-if (password == null) {
-password = "";
-}
+ @Override
+ public void login(String userName, String password) {
UsernamePasswordAuthenticationToken authRequest = new
UsernamePasswordAuthenticationToken(userName, password);
-// Place the last username attempted into PortletSession for views
-
request.getPortletSession().setAttribute(ACEGI_SECURITY_LAST_USERNAME_KEY,
userName);
-
-boolean loginSuccesfull = false;
try {
Authentication authentication =
authenticationManager.authenticate(authRequest);
-loginSuccesfull = authentication.isAuthenticated();
+
SecurityContextHolder.getContext().setAuthentication(authentication);
} catch (AuthenticationException ae) {
-log.info("Authentication attempt failed for user " + userName);
+ SecurityContextHolder.clearContext();
+ log.info(String.format("Authentication attempt failed for user
%s", userName), ae);
}
-return loginSuccesfull;
}
+ @Override
+ public void logout() {
+ SecurityContextHolder.clearContext();
+}
-public boolean logoutUser(ActionRequest request, ActionResponse response) {
-SecurityContext securityContext = SecurityContextHolder.getContext();
-Authentication authentication = securityContext.getAuthentication();
-authentication.setAuthenticated(false);
+ @Override
+ public boolean isAuthenticated() {
+ SecurityContext context = SecurityContextHolder.getContext();
+ Authentication authentication = context.getAuthentication();
+return (authentication != null) && authentication.isAuthenticated();
+}
+
+
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login project.xml README.txt
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-login In directory james.mmbase.org:/tmp/cvs-serv11556/portlets-login Modified Files: project.xml README.txt Log Message: Changes Login portlet See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login Index: project.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-login/project.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- project.xml 30 Jan 2008 14:09:38 - 1.2 +++ project.xml 8 Feb 2008 10:36:02 - 1.3 @@ -14,14 +14,6 @@ jar - - - acegisecurity - acegi-security - 1.0.6 - jar - - Index: README.txt === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-login/README.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- README.txt 19 Nov 2007 09:15:20 - 1.1 +++ README.txt 8 Feb 2008 10:36:02 - 1.2 @@ -1,2 +1,3 @@ DESCRIPTION: -The login portlet, needs Jaas. \ No newline at end of file + Login portlet + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java spring-community.properties log4j.properties
Update of /var/cvs/contributions/CMSContainer_Modules/community/src/java In directory james.mmbase.org:/tmp/cvs-serv11342/community/src/java Removed Files: spring-community.properties log4j.properties Log Message: Changes Community module See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF portlet-login.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv11556/portlets-login/src/webapp/WEB-INF Modified Files: portlet-login.xml Log Message: Changes Login portlet See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF Index: portlet-login.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/portlet-login.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- portlet-login.xml 26 Nov 2007 11:42:56 - 1.2 +++ portlet-login.xml 8 Feb 2008 10:36:02 - 1.3 @@ -3,17 +3,17 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd";> - a login portlet, with Jaas + LoginPortlet loginportlet - Login Portlet + LoginPortlet com.finalist.cmsc.portlets.LoginPortlet template.edit_defaults -login/login.jsp +login.jsp - template.help -login/Login.jsp +template.view +login/login.jsp text/html @@ -26,9 +26,9 @@ nl com.finalist.cmsc.portlets.LoginPortlet - Login Portlet - Login - login,jaas + LoginPortlet + LoginPortlet + login \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/resources spring-community.properties
Update of /var/cvs/contributions/CMSContainer_Modules/community/resources In directory james.mmbase.org:/tmp/cvs-serv11342/community/resources Added Files: spring-community.properties Log Message: Changes Community module See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/resources spring-community.properties is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/config/applications/login/builders login.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-login/config/applications/login/builders In directory james.mmbase.org:/tmp/cvs-serv11556/portlets-login/config/applications/login/builders Removed Files: login.xml Log Message: Changes Login portlet See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/config/applications/login/builders ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/WEB-INF spring-security.xml spring-community.xml
Update of /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv11342/community/src/webapp/WEB-INF Modified Files: spring-community.xml Added Files: spring-security.xml Log Message: Changes Community module See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF spring-security.xml is new Index: spring-community.xml === RCS file: /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF/spring-community.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- spring-community.xml31 Jan 2008 12:44:13 - 1.4 +++ spring-community.xml8 Feb 2008 10:33:13 - 1.5 @@ -18,16 +18,16 @@ - + + @@ -57,69 +57,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON -PATTERN_TYPE_APACHE_ANT -/**=httpSessionIntegrationFilter - - - - - - - @@ -128,4 +65,5 @@ + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community project.xml
Update of
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
In directory
james.mmbase.org:/tmp/cvs-serv12293/demo.cmscontainer.org/war-community
Modified Files:
project.xml
Log Message:
changed indentation
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
Index: project.xml
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- project.xml 8 Feb 2008 10:43:44 - 1.5
+++ project.xml 8 Feb 2008 10:52:47 - 1.6
@@ -50,6 +50,8 @@
${cmscmodules.version}
mmbase-module
+
+
finalist
cmsc-portlets-login
@@ -57,10 +59,7 @@
mmbase-module
-
-
-
-
+
asm
asm
@@ -152,7 +151,7 @@
-
+
springframework
spring
@@ -181,7 +180,7 @@
-
+
acegisecurity
acegi-security
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community project.xml
Update of
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
In directory
james.mmbase.org:/tmp/cvs-serv11934/demo.cmscontainer.org/war-community
Modified Files:
project.xml
Log Message:
Changes Community Module for demo war
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
Index: project.xml
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- project.xml 17 Jan 2008 09:14:46 - 1.4
+++ project.xml 8 Feb 2008 10:43:44 - 1.5
@@ -50,7 +50,6 @@
${cmscmodules.version}
mmbase-module
-
finalist
cmsc-portlets-login
@@ -59,21 +58,7 @@
-
- finalist
- cmsc-portlets-newsletter
- ${cmscportlets.version}
- mmbase-module
-
-
-
-finalist
-cmsc-portlets-jforum
-${cmscportlets.version}
-mmbase-module
-
-
-
+
@@ -85,230 +70,130 @@
${war.bundle}
-
-
- cglib
- cglib
- 2.1_3
- jar
-
- ${war.bundle}
-
-
-
- commons-dbcp
- commons-dbcp
- 1.2.2
+ antlr
+ antlr
+ 2.7.6
jar
${war.bundle}
-
- commons-pool
- commons-pool
- 1.3
+ cglib
+ cglib
+ 2.1.3
jar
${war.bundle}
-
dom4j
dom4j
- 1.5
+ 1.6.1
jar
${war.bundle}
-
- ejb-persistence
+ hibernate
ejb3-persistence
- 3.1beta4
+ 3.0
jar
${war.bundle}
-
hibernate
hibernate
- 3.1
+ 3.2.5.GA
jar
${war.bundle}
-
hibernate
- hibernate-annotations
- 3.1beta7
- jar
-
- ${war.bundle}
-
-
-
-
- javax.transaction
- jta
- 1.0.1B
- jar
-
- ${war.bundle}
-
-
-
-
- lucene
- lucene
- 1.4.3
- jar
-
- ${war.bundle}
-
-
-
-
- springframework
- spring
- 1.2.7
- jar
-
- ${war.bundle}
-
-
-
-
- springframework
- spring-aop
- 1.2.7
- jar
-
- ${war.bundle}
-
-
-
-
- springframework
- spring-beans
- 1.2.7
- jar
-
- ${war.bundle}
-
-
-
-
- springframework
- spring-context
- 1.2.7
- jar
-
- ${war.bundle}
-
-
-
-
- springframework
- spring-core
- 1.2.7
+ hibernate-entitymanager
+ 3.3.1.GA
jar
${war.bundle}
-
- springframework
- spring-dao
- 1.2.7
- jar
-
-
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF web.xml
Update of /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv11934/demo.cmscontainer.org/war-community/src/webapp/WEB-INF Modified Files: web.xml Log Message: Changes Community Module for demo war See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF Index: web.xml === RCS file: /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- web.xml 17 Jan 2008 08:07:40 - 1.2 +++ web.xml 8 Feb 2008 10:43:44 - 1.3 @@ -7,17 +7,11 @@ CMS Container implementation CMS Container implementation - - contextConfigLocation - classpath:applicationContext.xml - - - - org.springframework.web.context.ContextLoaderListener - + @@ -88,6 +82,29 @@ false + + + contextConfigLocation + /WEB-INF/spring-community.xml + + + + org.springframework.web.context.ContextLoaderListener + + + + SecurityFilterChainProxy + org.acegisecurity.util.FilterToBeanProxy + +targetClass +org.acegisecurity.util.FilterChainProxy + + + + SecurityFilterChainProxy + /* + + Filter catch all requests. DisableUrlSession Filter @@ -125,13 +142,7 @@ - - hibernateFilter - - org.springframework.orm.hibernate3.support.OpenSessionInViewFilter - - - + DisableUrlSessionFilter ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/config services.properties
Update of /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/config In directory james.mmbase.org:/tmp/cvs-serv11934/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/config Modified Files: services.properties Log Message: Changes Community Module for demo war See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/config Index: services.properties === RCS file: /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/config/services.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- services.properties 10 Dec 2007 09:21:29 - 1.1 +++ services.properties 8 Feb 2008 10:43:44 - 1.2 @@ -36,9 +36,8 @@ com.finalist.cmsc.services.publish.PublishService = com.finalist.cmsc.services.publish.DummyPublishService #com.finalist.cmsc.services.community.CommunityService = com.finalist.cmsc.services.community.DummyCommunityService -com.finalist.cmsc.services.community.CommunityService = com.finalist.cmsc.services.community.CommunityServiceMysqlImpl +com.finalist.cmsc.services.community.CommunityService = com.finalist.cmsc.services.community.CommunityServiceImpl #com.finalist.cmsc.services.community.NewsletterCommunicationService = com.finalist.cmsc.services.community.DummyNewsletterCommunicationService -com.finalist.cmsc.services.community.NewsletterCommunicationService = com.finalist.cmsc.services.community.NewsletterCommunicationServiceMysqlImpl #com.finalist.cmsc.services.sitemanagement.SiteManagementAdminService = com.finalist.cmsc.services.sitemanagement.WorkflowSiteManagementAdminService #com.finalist.cmsc.services.workflow.WorkflowService = com.finalist.cmsc.services.workflow.WorkflowServiceMMBaseImpl ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF context.xml
Update of /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF In directory james.mmbase.org:/tmp/cvs-serv11934/demo.cmscontainer.org/war-community/src/webapp/META-INF Modified Files: context.xml Log Message: Changes Community Module for demo war See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF Index: context.xml === RCS file: /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- context.xml 16 Jan 2008 12:18:18 - 1.5 +++ context.xml 8 Feb 2008 10:43:44 - 1.6 @@ -34,17 +34,17 @@ driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://localhost:3306/cmsc?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useServerPrepStmts=false" /> - + url="jdbc:mysql://localhost:3306/community?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useServerPrepStmts=false" />
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/classes jaas.config applicationContext.xml
Update of /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/classes In directory james.mmbase.org:/tmp/cvs-serv11934/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/classes Removed Files: jaas.config applicationContext.xml Log Message: Changes Community Module for demo war See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/classes ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org project.properties
Update of /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org In directory james.mmbase.org:/tmp/cvs-serv11934/demo.cmscontainer.org Modified Files: project.properties Log Message: Changes Community Module for demo war See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/project.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- project.properties 16 Jan 2008 15:44:02 - 1.6 +++ project.properties 8 Feb 2008 10:43:44 - 1.7 @@ -1,5 +1,5 @@ # BUILD ALL WARs. iow Don't build maven-base project. -maven.multiproject.excludes=maven-base/project.xml +#maven.multiproject.excludes=maven-base/project.xml # BUILD staging and live wars #maven.multiproject.includes=war-live/project.xml,war-staging/project.xml,war/project.xml @@ -8,4 +8,4 @@ #maven.multiproject.includes=war-single/project.xml,war/project.xml # BUILD community (simple) war -#maven.multiproject.includes=war-community/project.xml,war/project.xml +maven.multiproject.includes=war-community/project.xml,war/project.xml ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/module/corebuilders TypeDef.java
Update of /var/cvs/src/org/mmbase/module/corebuilders
In directory james.mmbase.org:/tmp/cvs-serv11832
Modified Files:
TypeDef.java
Log Message:
it's a mystery to me, why they did not simply made the substring method
conveniently useable
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/corebuilders
Index: TypeDef.java
===
RCS file: /var/cvs/src/org/mmbase/module/corebuilders/TypeDef.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- TypeDef.java8 Feb 2008 09:03:48 - 1.75
+++ TypeDef.java8 Feb 2008 10:40:20 - 1.76
@@ -32,7 +32,7 @@
*
* @author Daniel Ockeloen
* @author Pierre van Rooden
- * @version $Id: TypeDef.java,v 1.75 2008/02/08 09:03:48 michiel Exp $
+ * @version $Id: TypeDef.java,v 1.76 2008/02/08 10:40:20 michiel Exp $
*/
public class TypeDef extends MMObjectBuilder {
@@ -135,7 +135,10 @@
}
// Quick fix around MMB-1590. Perhaps it should be solved more
genericly, closer to the
// storage layer.
-node.setValue("description",
node.getStringValue("description").substring(0,
getField("description").getMaxLength()));
+String desc = node.getStringValue("description");
+if (desc.length() > getField("description").getMaxLength()) {
+node.setValue("description", desc.substring(0,
getField("description").getMaxLength()));
+}
// try if the builder was already in TypeDef for some reason
// this can happen when another thread was here first
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/module/corebuilders TypeDef.java
Update of /var/cvs/src/org/mmbase/module/corebuilders
In directory james.mmbase.org:/tmp/cvs-serv11777
Modified Files:
Tag: MMBase-1_8
TypeDef.java
Log Message:
it's a mystery to me, why they did not simply made the substring method
conveniently useable
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/corebuilders
Index: TypeDef.java
===
RCS file: /var/cvs/src/org/mmbase/module/corebuilders/TypeDef.java,v
retrieving revision 1.68.2.3
retrieving revision 1.68.2.4
diff -u -b -r1.68.2.3 -r1.68.2.4
--- TypeDef.java8 Feb 2008 09:01:11 - 1.68.2.3
+++ TypeDef.java8 Feb 2008 10:39:28 - 1.68.2.4
@@ -32,7 +32,7 @@
*
* @author Daniel Ockeloen
* @author Pierre van Rooden
- * @version $Id: TypeDef.java,v 1.68.2.3 2008/02/08 09:01:11 michiel Exp $
+ * @version $Id: TypeDef.java,v 1.68.2.4 2008/02/08 10:39:28 michiel Exp $
*/
public class TypeDef extends MMObjectBuilder {
@@ -135,7 +135,10 @@
} catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
}
-node.setValue("description",
node.getStringValue("description").substring(0,
getField("description").getMaxLength()));
+String desc = node.getStringValue("description");
+if (desc.length() > getField("description").getMaxLength()) {
+node.setValue("description", desc.substring(0,
getField("description").getMaxLength()));
+}
// try if the builder was already in TypeDef for some reason
// this can happen when another thread was here first
int result = getIntValue(node.getStringValue("name"));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security AuthenticationHibernateService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
In directory
james.mmbase.org:/tmp/cvs-serv11342/community/src/java/com/finalist/cmsc/services/community/security
Modified Files:
AuthenticationHibernateService.java
Log Message:
Changes Community module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
Index: AuthenticationHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationHibernateService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AuthenticationHibernateService.java 30 Jan 2008 10:00:42 - 1.3
+++ AuthenticationHibernateService.java 8 Feb 2008 10:33:14 - 1.4
@@ -89,7 +89,7 @@
@Transactional(readOnly = true)
public boolean authenticate(String userId, String password) {
Authentication authentication =
findAuthenticationByUserId(userId);
- return authentication.getPassword().equals(password);
+ return
authentication.getPassword().equals(encodePassword(password, userId));
}
/** [EMAIL PROTECTED] */
@@ -136,7 +136,8 @@
private String encodePassword(String password, String salt) {
MessageDigestPasswordEncoder encoder = new Md5PasswordEncoder();
- return encoder.encodePassword(password, salt);
+// return encoder.encodePassword(password, salt);
+ return encoder.encodePassword(password, null);
}
@Required
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/test spring-community.xml
Update of /var/cvs/contributions/CMSContainer_Modules/community/src/test In directory james.mmbase.org:/tmp/cvs-serv11342/community/src/test Added Files: spring-community.xml Log Message: Changes Community module See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/test spring-community.xml is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community DummyCommunityService.java CommunityService.java Community.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community
In directory
james.mmbase.org:/tmp/cvs-serv11290/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community
Modified Files:
DummyCommunityService.java CommunityService.java
Community.java
Log Message:
Changes Community service
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community
Index: DummyCommunityService.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community/DummyCommunityService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- DummyCommunityService.java 30 Jan 2008 14:06:47 - 1.8
+++ DummyCommunityService.java 8 Feb 2008 10:30:33 - 1.9
@@ -3,38 +3,23 @@
import java.util.List;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
/**
* DummyCommunityService, this is a CMSc service class.
* This class contains dummy methods that stand in the real uses service class.
*
- * @author menno menninga
+ * @author menno menninga / Remco Bos
*/
public class DummyCommunityService extends CommunityService {
- public boolean loginUser(ActionRequest request, ActionResponse response) {
- return false;
- }
-
- public boolean logoutUser(ActionRequest request, ActionResponse response) {
- return false;
- }
-
- public Map>> getPreferences(String module,
String userId, String key, String value){
- return (null);
- }
-
- public void createPreference(String module, String userId, String key,
List values){
-
- }
-
- public void removePreferences(String module, String userId, String key){
-
- }
-
- public Map> getUserProperty(String userName){
- return (null);
- }
+ @Override public void login(String userName, String password) {}
+ @Override public void logout() {}
+ @Override public boolean isAuthenticated() { return false; }
+ @Override public String getAuthenticatedUser() { return null; }
+ @Override public List getAuthorities() { return null; }
+ @Override public boolean hasAuthority(String authority) { return false;
}
+
+ @Override public Map>>
getPreferences(String module, String userId, String key, String value) { return
null; }
+ @Override public void createPreference(String module, String userId,
String key, List values) {}
+ @Override public void removePreferences(String module, String userId,
String key) {}
+ @Override public Map>
getUserProperty(String userName) { return null; }
}
Index: CommunityService.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community/CommunityService.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- CommunityService.java 30 Jan 2008 14:06:47 - 1.9
+++ CommunityService.java 8 Feb 2008 10:30:33 - 1.10
@@ -3,9 +3,6 @@
import java.util.List;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import com.finalist.cmsc.services.Service;
/**
@@ -17,9 +14,17 @@
*/
public abstract class CommunityService extends Service {
- public abstract boolean loginUser(ActionRequest request, ActionResponse
response);
+ public abstract void login(String userName, String password);
+
+ public abstract void logout();
+
+ public abstract boolean isAuthenticated();
- public abstract boolean logoutUser(ActionRequest request, ActionResponse
response);
+ public abstract String getAuthenticatedUser();
+
+ public abstract List getAuthorities();
+
+ public abstract boolean hasAuthority(String authority);
public abstract Map>> getPreferences(String
module, String userId, String key, String value);
@@ -28,4 +33,5 @@
public abstract void removePreferences(String module, String userId, String
key);
public abstract Map> getUserProperty(String
userName);
+
}
Index: Community.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community/Community.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Community.java 30 Jan 2008 14:06:47 - 1.8
+++ Community.java 8 Feb 2008 10:30:33 - 1.9
@@ -3,9 +3,6 @@
import java.util.List;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import com.finalist.cmsc.services.ServiceManager;
import com.finalist.cmsc.services.community.Com
[MMBASE CVS] applications/richtext/config/applications/RichText/builders content.xml
Update of /var/cvs/applications/richtext/config/applications/RichText/builders In directory james.mmbase.org:/tmp/cvs-serv10005 Modified Files: content.xml Log Message: made readonly fields explicitely readonly See also: http://cvs.mmbase.org/viewcvs/applications/richtext/config/applications/RichText/builders Index: content.xml === RCS file: /var/cvs/applications/richtext/config/applications/RichText/builders/content.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- content.xml 24 Nov 2006 15:11:54 - 1.7 +++ content.xml 8 Feb 2008 09:31:39 - 1.8 @@ -35,13 +35,11 @@ 1 - http://www.mmbase.org/xmlns/datatypes";> + http://www.mmbase.org/xmlns/datatypes";> + - -STRING - @@ -55,10 +53,9 @@ SubTitel Subtitolo - http://www.mmbase.org/xmlns/datatypes"; /> - -STRING - + http://www.mmbase.org/xmlns/datatypes";> + + @@ -72,10 +69,9 @@ Intro Enkonduko - http://www.mmbase.org/xmlns/datatypes"; /> - -STRING - + http://www.mmbase.org/xmlns/datatypes";> + + @@ -89,10 +85,9 @@ Tekst Teksto - http://www.mmbase.org/xmlns/datatypes"; /> - -XML - + http://www.mmbase.org/xmlns/datatypes";> + + @@ -126,7 +121,7 @@ - + Last modified by Laatst veranderd door @@ -136,12 +131,11 @@ Laatste veranderaar Lasta ??an??into - http://www.mmbase.org/xmlns/datatypes"; /> - -STRING - + http://www.mmbase.org/xmlns/datatypes";> + + - + Last modified on Laatst veranderd op @@ -153,7 +147,7 @@ http://www.mmbase.org/xmlns/datatypes"; /> - + Created by Gecre??erd door @@ -164,12 +158,11 @@ Cre??erder Kreinto - http://www.mmbase.org/xmlns/datatypes"; /> - -STRING - + http://www.mmbase.org/xmlns/datatypes";> + + - + Created on Gecre??eerd op ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/module/corebuilders TypeDef.java
Update of /var/cvs/src/org/mmbase/module/corebuilders
In directory james.mmbase.org:/tmp/cvs-serv9529
Modified Files:
TypeDef.java
Log Message:
MMB-1590
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/corebuilders
See also: http://www.mmbase.org/jira/browse/MMB-1590
Index: TypeDef.java
===
RCS file: /var/cvs/src/org/mmbase/module/corebuilders/TypeDef.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- TypeDef.java8 Mar 2007 19:25:07 - 1.74
+++ TypeDef.java8 Feb 2008 09:03:48 - 1.75
@@ -32,7 +32,7 @@
*
* @author Daniel Ockeloen
* @author Pierre van Rooden
- * @version $Id: TypeDef.java,v 1.74 2007/03/08 19:25:07 michiel Exp $
+ * @version $Id: TypeDef.java,v 1.75 2008/02/08 09:03:48 michiel Exp $
*/
public class TypeDef extends MMObjectBuilder {
@@ -133,6 +133,10 @@
} catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
}
+// Quick fix around MMB-1590. Perhaps it should be solved more
genericly, closer to the
+// storage layer.
+node.setValue("description",
node.getStringValue("description").substring(0,
getField("description").getMaxLength()));
+
// try if the builder was already in TypeDef for some reason
// this can happen when another thread was here first
int result = getIntValue(node.getStringValue("name"));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/module/corebuilders TypeDef.java
Update of /var/cvs/src/org/mmbase/module/corebuilders
In directory james.mmbase.org:/tmp/cvs-serv9461
Modified Files:
Tag: MMBase-1_8
TypeDef.java
Log Message:
MMB-1590
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/corebuilders
See also: http://www.mmbase.org/jira/browse/MMB-1590
Index: TypeDef.java
===
RCS file: /var/cvs/src/org/mmbase/module/corebuilders/TypeDef.java,v
retrieving revision 1.68.2.2
retrieving revision 1.68.2.3
diff -u -b -r1.68.2.2 -r1.68.2.3
--- TypeDef.java8 Mar 2007 19:23:02 - 1.68.2.2
+++ TypeDef.java8 Feb 2008 09:01:11 - 1.68.2.3
@@ -32,7 +32,7 @@
*
* @author Daniel Ockeloen
* @author Pierre van Rooden
- * @version $Id: TypeDef.java,v 1.68.2.2 2007/03/08 19:23:02 michiel Exp $
+ * @version $Id: TypeDef.java,v 1.68.2.3 2008/02/08 09:01:11 michiel Exp $
*/
public class TypeDef extends MMObjectBuilder {
@@ -135,6 +135,7 @@
} catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
}
+node.setValue("description",
node.getStringValue("description").substring(0,
getField("description").getMaxLength()));
// try if the builder was already in TypeDef for some reason
// this can happen when another thread was here first
int result = getIntValue(node.getStringValue("name"));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-googlemap/src/webapp/WEB-INF/templates/help google_map.jsp
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-googlemap/src/webapp/WEB-INF/templates/help In directory james.mmbase.org:/tmp/cvs-serv9115/portlets-googlemap/src/webapp/WEB-INF/templates/help Modified Files: google_map.jsp Log Message: CMSC-607 (help_defaults -> help See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-googlemap/src/webapp/WEB-INF/templates/help See also: http://www.mmbase.org/jira/browse/CMSC-607 Index: google_map.jsp === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-googlemap/src/webapp/WEB-INF/templates/help/google_map.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- google_map.jsp 11 Oct 2007 09:07:48 - 1.1 +++ google_map.jsp 8 Feb 2008 08:51:16 - 1.2 @@ -1,8 +1,8 @@ <[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp"%> - + - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-banner/resources/com/finalist/portlets/banner BannerPortlet.properties
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-banner/resources/com/finalist/portlets/banner In directory james.mmbase.org:/tmp/cvs-serv9115/portlets-banner/resources/com/finalist/portlets/banner Modified Files: BannerPortlet.properties Log Message: CMSC-607 (help_defaults -> help See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-banner/resources/com/finalist/portlets/banner See also: http://www.mmbase.org/jira/browse/CMSC-607 Index: BannerPortlet.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-banner/resources/com/finalist/portlets/banner/BannerPortlet.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- BannerPortlet.properties7 Mar 2007 19:36:44 - 1.1 +++ BannerPortlet.properties8 Feb 2008 08:51:16 - 1.2 @@ -20,12 +20,12 @@ edit_defaults.save=Save -help_defaults.title=Banner portlet -help_defaults.intro=Een Banner portlet kan een advertentie tonen die verwijst naar de website van de adverteerder. Als een gebruiker op de banner portlet klikt dan wordt deze klik geregistreerd en de website van de adverteerder wordt getoond. De advertentie zelf kan of een afbeelding of een Flash animatie zijn. Als een banner een vooraf gesteld aantal klikken heeft behaald dan wordt de banner niet meer getoond. Een redacteur is verantwoordelijk om een nieuwe banner te plaatsen. -help_defaults.contentelement=Bij dit onderdeel selecteert u de gewenste banner die getoond moet worden. -help_defaults.view=Hierbij geeft u aan welk stramien u wilt gebruiken voor het tonen van het geselecteerde element. Let hierbij op dat u alleen een stramien kiest die op die plek binnen de pagina van toepassing is. -help_defaults.uselifecycle=Met deze optie kunt u aangeven of u ook elementen wilt tonen die buiten de verloopdatum vallen. -help_defaults.reset=Als deze optie geselecteerd is dan wordt de teller die het aantal klikken bijhoud op 0 gezet. Indien de banner niet meer getoond werd omdat het maximum aantal klikken was behaald dan zal de banner opnieuw getoond worden totdat opnieuw het maximum aantal klikken is bereikt. +help.title=Banner portlet +help.intro=Een Banner portlet kan een advertentie tonen die verwijst naar de website van de adverteerder. Als een gebruiker op de banner portlet klikt dan wordt deze klik geregistreerd en de website van de adverteerder wordt getoond. De advertentie zelf kan of een afbeelding of een Flash animatie zijn. Als een banner een vooraf gesteld aantal klikken heeft behaald dan wordt de banner niet meer getoond. Een redacteur is verantwoordelijk om een nieuwe banner te plaatsen. +help.contentelement=Bij dit onderdeel selecteert u de gewenste banner die getoond moet worden. +help.view=Hierbij geeft u aan welk stramien u wilt gebruiken voor het tonen van het geselecteerde element. Let hierbij op dat u alleen een stramien kiest die op die plek binnen de pagina van toepassing is. +help.uselifecycle=Met deze optie kunt u aangeven of u ook elementen wilt tonen die buiten de verloopdatum vallen. +help.reset=Als deze optie geselecteerd is dan wordt de teller die het aantal klikken bijhoud op 0 gezet. Indien de banner niet meer getoond werd omdat het maximum aantal klikken was behaald dan zal de banner opnieuw getoond worden totdat opnieuw het maximum aantal klikken is bereikt. edit_defaults.title=Selecteer een rubriek @@ -87,21 +87,21 @@ edit_defaults.save=Opslaan -help_defaults.title=ContentChannel portlet -help_defaults.intro=Een ContentChannel portlet kan een reeks van elementen naar keuze tonen. De elementen uit opgegeven locatie worden in deze portlet weergegeven. Afhankelijk van de locatie van de portlet binnen de pagina, kunnen er "content-type" restricties zijn opgelegd. Zo kan zijn dat een ContentChannel portlet alleen elementen mag tonen van een bepaald type (bijvoorbeeld nieuws-artikels). -help_defaults.channel=Bij dit onderdeel selecteert u het gewenste kanaal waaruit bepaalde elementen moeten worden getoond. -help_defaults.view=Hierbij geeft u aan welk stramien u wilt gebruiken voor het tonen van het geselecteerde element. Let hierbij op dat u alleen een stramien kiest die op die plek binnen de pagina van toepassing is. -help_defaults.viewtype=U kunt hier aangeven hoe de afzonderlijke elementen wilt tonen. Als een lijst met:alleen de intro tekstenvolledige tekstenvolledige tekst indien er maar 1 element aanwezig is -help_defaults.uselifecycle=Met deze optie kan u aangeven of u ook elementen wilt tonen die buiten de verloopdatum vallen. -help_defaults.orderby=U kunt hier aangeven op welk veld u wilt sorteren. -help_defaults.direction=Hiermee kunt u aangeven in welke richting u wilt sorteren. Aflopen (Z t/m A, 9 t/m 0) of oplopend (A t/m Z, 0 t/m 9). -help_defaults.maxelements=Bij dit onderdeel kunt u a
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-banner/src/webapp/WEB-INF/templates/help Banner.jsp
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/WEB-INF/templates/help In directory james.mmbase.org:/tmp/cvs-serv9115/portlets-banner/src/webapp/WEB-INF/templates/help Modified Files: Banner.jsp Log Message: CMSC-607 (help_defaults -> help See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/WEB-INF/templates/help See also: http://www.mmbase.org/jira/browse/CMSC-607 Index: Banner.jsp === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/WEB-INF/templates/help/Banner.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- Banner.jsp 7 Mar 2007 19:36:48 - 1.1 +++ Banner.jsp 8 Feb 2008 08:51:16 - 1.2 @@ -1,31 +1,31 @@ <[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp"%> - + - + : - + : - + : - + : - + <%-- <[EMAIL PROTECTED] file="/WEB-INF/templates/help/general.jsp" %> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-googlemap/resources/com/finalist/portlets/googlemap GoogleMapPortlet.properties GoogleMapPortlet_nl.properties GoogleMapPortlet_zh.properties
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-googlemap/resources/com/finalist/portlets/googlemap In directory james.mmbase.org:/tmp/cvs-serv9115/portlets-googlemap/resources/com/finalist/portlets/googlemap Modified Files: GoogleMapPortlet.properties GoogleMapPortlet_nl.properties GoogleMapPortlet_zh.properties Log Message: CMSC-607 (help_defaults -> help See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-googlemap/resources/com/finalist/portlets/googlemap See also: http://www.mmbase.org/jira/browse/CMSC-607 Index: GoogleMapPortlet.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-googlemap/resources/com/finalist/portlets/googlemap/GoogleMapPortlet.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- GoogleMapPortlet.properties 31 Oct 2007 12:41:13 - 1.4 +++ GoogleMapPortlet.properties 8 Feb 2008 08:51:16 - 1.5 @@ -3,5 +3,5 @@ edit_defaults.address=Address edit_defaults.info=Info edit_defaults.key=Key -help_defaults.title=Google Map Portlet -help_defaults.intro=Google Map Portlet allows you to show a Google Map in your website. +help.title=Google Map Portlet +help.intro=Google Map Portlet allows you to show a Google Map in your website. Index: GoogleMapPortlet_nl.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-googlemap/resources/com/finalist/portlets/googlemap/GoogleMapPortlet_nl.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- GoogleMapPortlet_nl.properties 12 Oct 2007 10:09:42 - 1.4 +++ GoogleMapPortlet_nl.properties 8 Feb 2008 08:51:16 - 1.5 @@ -3,5 +3,5 @@ edit_defaults.address=Adres edit_defaults.info=Info edit_defaults.key=Key -help_defaults.title=Google Map Portlet -help_defaults.intro=Google Map Portlet kan een Google Map in de site weergeven \ No newline at end of file +help.title=Google Map Portlet +help.intro=Google Map Portlet kan een Google Map in de site weergeven \ No newline at end of file Index: GoogleMapPortlet_zh.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-googlemap/resources/com/finalist/portlets/googlemap/GoogleMapPortlet_zh.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- GoogleMapPortlet_zh.properties 9 Nov 2007 08:34:04 - 1.1 +++ GoogleMapPortlet_zh.properties 8 Feb 2008 08:51:16 - 1.2 @@ -3,5 +3,5 @@ edit_defaults.address=?? edit_defaults.info=?? edit_defaults.key=? -help_defaults.title=Google??Portlet -help_defaults.intro=Google??PortletCMSC?. +help.title=Google??Portlet +help.intro=Google??PortletCMSC?. ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-banner/src/webapp/WEB-INF/templates/help Banner.jsp
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/WEB-INF/templates/help In directory james.mmbase.org:/tmp/cvs-serv9052/portlets-banner/src/webapp/WEB-INF/templates/help Modified Files: Tag: b1_4 Banner.jsp Log Message: CMSC-607 (help_defaults -> help See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/WEB-INF/templates/help See also: http://www.mmbase.org/jira/browse/CMSC-607 Index: Banner.jsp === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/WEB-INF/templates/help/Banner.jsp,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -b -r1.1 -r1.1.6.1 --- Banner.jsp 7 Mar 2007 19:36:48 - 1.1 +++ Banner.jsp 8 Feb 2008 08:51:09 - 1.1.6.1 @@ -1,31 +1,31 @@ <[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp"%> - + - + : - + : - + : - + : - + <%-- <[EMAIL PROTECTED] file="/WEB-INF/templates/help/general.jsp" %> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-googlemap/src/webapp/WEB-INF/templates/help google_map.jsp
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-googlemap/src/webapp/WEB-INF/templates/help In directory james.mmbase.org:/tmp/cvs-serv9052/portlets-googlemap/src/webapp/WEB-INF/templates/help Modified Files: Tag: b1_4 google_map.jsp Log Message: CMSC-607 (help_defaults -> help See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-googlemap/src/webapp/WEB-INF/templates/help See also: http://www.mmbase.org/jira/browse/CMSC-607 Index: google_map.jsp === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-googlemap/src/webapp/WEB-INF/templates/help/google_map.jsp,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -b -r1.1 -r1.1.4.1 --- google_map.jsp 11 Oct 2007 09:07:48 - 1.1 +++ google_map.jsp 8 Feb 2008 08:51:08 - 1.1.4.1 @@ -1,8 +1,8 @@ <[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp"%> - + - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-banner/resources/com/finalist/portlets/banner BannerPortlet.properties
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-banner/resources/com/finalist/portlets/banner In directory james.mmbase.org:/tmp/cvs-serv9052/portlets-banner/resources/com/finalist/portlets/banner Modified Files: Tag: b1_4 BannerPortlet.properties Log Message: CMSC-607 (help_defaults -> help See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-banner/resources/com/finalist/portlets/banner See also: http://www.mmbase.org/jira/browse/CMSC-607 Index: BannerPortlet.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-banner/resources/com/finalist/portlets/banner/BannerPortlet.properties,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -b -r1.1 -r1.1.6.1 --- BannerPortlet.properties7 Mar 2007 19:36:44 - 1.1 +++ BannerPortlet.properties8 Feb 2008 08:51:09 - 1.1.6.1 @@ -20,12 +20,12 @@ edit_defaults.save=Save -help_defaults.title=Banner portlet -help_defaults.intro=Een Banner portlet kan een advertentie tonen die verwijst naar de website van de adverteerder. Als een gebruiker op de banner portlet klikt dan wordt deze klik geregistreerd en de website van de adverteerder wordt getoond. De advertentie zelf kan of een afbeelding of een Flash animatie zijn. Als een banner een vooraf gesteld aantal klikken heeft behaald dan wordt de banner niet meer getoond. Een redacteur is verantwoordelijk om een nieuwe banner te plaatsen. -help_defaults.contentelement=Bij dit onderdeel selecteert u de gewenste banner die getoond moet worden. -help_defaults.view=Hierbij geeft u aan welk stramien u wilt gebruiken voor het tonen van het geselecteerde element. Let hierbij op dat u alleen een stramien kiest die op die plek binnen de pagina van toepassing is. -help_defaults.uselifecycle=Met deze optie kunt u aangeven of u ook elementen wilt tonen die buiten de verloopdatum vallen. -help_defaults.reset=Als deze optie geselecteerd is dan wordt de teller die het aantal klikken bijhoud op 0 gezet. Indien de banner niet meer getoond werd omdat het maximum aantal klikken was behaald dan zal de banner opnieuw getoond worden totdat opnieuw het maximum aantal klikken is bereikt. +help.title=Banner portlet +help.intro=Een Banner portlet kan een advertentie tonen die verwijst naar de website van de adverteerder. Als een gebruiker op de banner portlet klikt dan wordt deze klik geregistreerd en de website van de adverteerder wordt getoond. De advertentie zelf kan of een afbeelding of een Flash animatie zijn. Als een banner een vooraf gesteld aantal klikken heeft behaald dan wordt de banner niet meer getoond. Een redacteur is verantwoordelijk om een nieuwe banner te plaatsen. +help.contentelement=Bij dit onderdeel selecteert u de gewenste banner die getoond moet worden. +help.view=Hierbij geeft u aan welk stramien u wilt gebruiken voor het tonen van het geselecteerde element. Let hierbij op dat u alleen een stramien kiest die op die plek binnen de pagina van toepassing is. +help.uselifecycle=Met deze optie kunt u aangeven of u ook elementen wilt tonen die buiten de verloopdatum vallen. +help.reset=Als deze optie geselecteerd is dan wordt de teller die het aantal klikken bijhoud op 0 gezet. Indien de banner niet meer getoond werd omdat het maximum aantal klikken was behaald dan zal de banner opnieuw getoond worden totdat opnieuw het maximum aantal klikken is bereikt. edit_defaults.title=Selecteer een rubriek @@ -87,21 +87,21 @@ edit_defaults.save=Opslaan -help_defaults.title=ContentChannel portlet -help_defaults.intro=Een ContentChannel portlet kan een reeks van elementen naar keuze tonen. De elementen uit opgegeven locatie worden in deze portlet weergegeven. Afhankelijk van de locatie van de portlet binnen de pagina, kunnen er "content-type" restricties zijn opgelegd. Zo kan zijn dat een ContentChannel portlet alleen elementen mag tonen van een bepaald type (bijvoorbeeld nieuws-artikels). -help_defaults.channel=Bij dit onderdeel selecteert u het gewenste kanaal waaruit bepaalde elementen moeten worden getoond. -help_defaults.view=Hierbij geeft u aan welk stramien u wilt gebruiken voor het tonen van het geselecteerde element. Let hierbij op dat u alleen een stramien kiest die op die plek binnen de pagina van toepassing is. -help_defaults.viewtype=U kunt hier aangeven hoe de afzonderlijke elementen wilt tonen. Als een lijst met:alleen de intro tekstenvolledige tekstenvolledige tekst indien er maar 1 element aanwezig is -help_defaults.uselifecycle=Met deze optie kan u aangeven of u ook elementen wilt tonen die buiten de verloopdatum vallen. -help_defaults.orderby=U kunt hier aangeven op welk veld u wilt sorteren. -help_defaults.direction=Hiermee kunt u aangeven in welke richting u wilt sorteren. Aflopen (Z t/m A, 9 t/m 0) of oplopend (A t/m Z, 0 t/m 9). -help_defaults.maxelement
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-googlemap/resources/com/finalist/portlets/googlemap GoogleMapPortlet_nl.properties GoogleMapPortlet.properties GoogleMapPortlet_zh.properties
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-googlemap/resources/com/finalist/portlets/googlemap In directory james.mmbase.org:/tmp/cvs-serv9052/portlets-googlemap/resources/com/finalist/portlets/googlemap Modified Files: Tag: b1_4 GoogleMapPortlet_nl.properties GoogleMapPortlet.properties GoogleMapPortlet_zh.properties Log Message: CMSC-607 (help_defaults -> help See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-googlemap/resources/com/finalist/portlets/googlemap See also: http://www.mmbase.org/jira/browse/CMSC-607 Index: GoogleMapPortlet_nl.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-googlemap/resources/com/finalist/portlets/googlemap/GoogleMapPortlet_nl.properties,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -b -r1.4 -r1.4.4.1 --- GoogleMapPortlet_nl.properties 12 Oct 2007 10:09:42 - 1.4 +++ GoogleMapPortlet_nl.properties 8 Feb 2008 08:51:08 - 1.4.4.1 @@ -3,5 +3,5 @@ edit_defaults.address=Adres edit_defaults.info=Info edit_defaults.key=Key -help_defaults.title=Google Map Portlet -help_defaults.intro=Google Map Portlet kan een Google Map in de site weergeven \ No newline at end of file +help.title=Google Map Portlet +help.intro=Google Map Portlet kan een Google Map in de site weergeven \ No newline at end of file Index: GoogleMapPortlet.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-googlemap/resources/com/finalist/portlets/googlemap/GoogleMapPortlet.properties,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -b -r1.4 -r1.4.2.1 --- GoogleMapPortlet.properties 31 Oct 2007 12:41:13 - 1.4 +++ GoogleMapPortlet.properties 8 Feb 2008 08:51:08 - 1.4.2.1 @@ -3,5 +3,5 @@ edit_defaults.address=Address edit_defaults.info=Info edit_defaults.key=Key -help_defaults.title=Google Map Portlet -help_defaults.intro=Google Map Portlet allows you to show a Google Map in your website. +help.title=Google Map Portlet +help.intro=Google Map Portlet allows you to show a Google Map in your website. Index: GoogleMapPortlet_zh.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-googlemap/resources/com/finalist/portlets/googlemap/GoogleMapPortlet_zh.properties,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -b -r1.1 -r1.1.2.1 --- GoogleMapPortlet_zh.properties 9 Nov 2007 08:34:04 - 1.1 +++ GoogleMapPortlet_zh.properties 8 Feb 2008 08:51:08 - 1.1.2.1 @@ -3,5 +3,5 @@ edit_defaults.address=?? edit_defaults.info=?? edit_defaults.key=? -help_defaults.title=Google??Portlet -help_defaults.intro=Google??PortletCMSC?. +help.title=Google??Portlet +help.intro=Google??PortletCMSC?. ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
