date:20080327

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao NewsLetterStatisticCAO.java

2008-03-27 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao
In directory 
james.mmbase.org:/tmp/cvs-serv25264/portlets-newsletter/src/java/com/finalist/newsletter/cao

Added Files:
NewsLetterStatisticCAO.java 
Log Message:
CMSC-725 builder and some test code.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao
See also: http://www.mmbase.org/jira/browse/CMSC-725


NewsLetterStatisticCAO.java is new

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/test MMBaseBaseTest.java

2008-03-27 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test
In directory james.mmbase.org:/tmp/cvs-serv25264/portlets-newsletter/src/test

Removed Files:
MMBaseBaseTest.java 
Log Message:
CMSC-725 builder and some test code.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test
See also: http://www.mmbase.org/jira/browse/CMSC-725


___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterSubscriptionUtil.java

2008-03-27 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory 
james.mmbase.org:/tmp/cvs-serv25264/portlets-newsletter/src/java/com/finalist/newsletter/util

Modified Files:
NewsletterSubscriptionUtil.java 
Log Message:
CMSC-725 builder and some test code.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-725


___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter NewsletterContentPortlet.java

2008-03-27 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
In directory 
james.mmbase.org:/tmp/cvs-serv25264/portlets-newsletter/src/java/com/finalist/portlets/newsletter

Modified Files:
NewsletterContentPortlet.java 
Log Message:
CMSC-725 builder and some test code.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-725


Index: NewsletterContentPortlet.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterContentPortlet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterContentPortlet.java   28 Jan 2008 21:15:31 -  1.14
+++ NewsletterContentPortlet.java   28 Mar 2008 05:13:33 -  1.15
@@ -49,6 +49,7 @@
   duplicateHandlers.add(NewsletterContentPortlet.DUPLICATE_HANDLING_SHOW); 
 
}
 
+
private String determineDisplayType(RenderRequest request) {
   String displayType = (String) request.getAttribute(KEY_DISPLAYTYPE);
   if (displayType == null) {
@@ -65,6 +66,7 @@
 
@Override
protected void doView(RenderRequest request, RenderResponse res) throws 
PortletException, java.io.IOException {
+   
   PortletPreferences preferences = request.getPreferences();
   PortletSession session = request.getPortletSession(true);
   String template = 
preferences.getValue(PortalConstants.CMSC_PORTLET_VIEW_TEMPLATE, null);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain - New directory

2008-03-27 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain
In directory 
james.mmbase.org:/tmp/cvs-serv25137/portlets-newsletter/src/java/com/finalist/newsletter/domain

Log Message:
Directory 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain
 added to the repository



See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter - New directory

2008-03-27 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter
In directory 
james.mmbase.org:/tmp/cvs-serv25044/portlets-newsletter/src/test/com/finalist/newsletter

Log Message:
Directory 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter
 added to the repository



See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist - New directory

2008-03-27 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist
In directory 
james.mmbase.org:/tmp/cvs-serv25019/portlets-newsletter/src/test/com/finalist

Log Message:
Directory 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist
 added to the repository



See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com - New directory

2008-03-27 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com
In directory 
james.mmbase.org:/tmp/cvs-serv25004/portlets-newsletter/src/test/com

Log Message:
Directory 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com 
added to the repository



See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl - New directory

2008-03-27 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory 
james.mmbase.org:/tmp/cvs-serv24002/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl

Log Message:
Directory 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
 added to the repository



See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] all/maven-site maven.xml

2008-03-27 Thread Nico Klasens

Update of /var/cvs/all/maven-site
In directory james.mmbase.org:/tmp/cvs-serv17561/maven-site

Added Files:
maven.xml 
Log Message:
multiproject plugin changed the file to generate the projects overview page. 
Created a small hack to get our overview working again



See also: http://cvs.mmbase.org/viewcvs/all/maven-site


maven.xml is new

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] all/maven-site/templates projects-overview.jelly navigation-aggregate.xml navigation-independent.xml dependency-convergence-report.xml

2008-03-27 Thread Nico Klasens

Update of /var/cvs/all/maven-site/templates
In directory james.mmbase.org:/tmp/cvs-serv17561/maven-site/templates

Modified Files:
navigation-aggregate.xml navigation-independent.xml 
dependency-convergence-report.xml 
Added Files:
projects-overview.jelly 
Log Message:
multiproject plugin changed the file to generate the projects overview page. 
Created a small hack to get our overview working again



See also: http://cvs.mmbase.org/viewcvs/all/maven-site/templates


projects-overview.jelly is new



Index: navigation-aggregate.xml
===
RCS file: /var/cvs/all/maven-site/templates/navigation-aggregate.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- navigation-aggregate.xml4 May 2007 13:41:29 -   1.1
+++ navigation-aggregate.xml27 Mar 2008 23:27:06 -  1.2
@@ -1,4 +1,4 @@
-
+

[MMBASE CVS] contributions/didactor2/src/education/templates/education/learnblocks subnavigation.jspx

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/education/templates/education/learnblocks
In directory james.mmbase.org:/tmp/cvs-serv17324/learnblocks

Modified Files:
subnavigation.jspx 
Log Message:
bugfix


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/learnblocks


Index: subnavigation.jspx
===
RCS file: 
/var/cvs/contributions/didactor2/src/education/templates/education/learnblocks/subnavigation.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- subnavigation.jspx  24 Jan 2008 11:13:41 -  1.1
+++ subnavigation.jspx  27 Mar 2008 23:13:19 -  1.2
@@ -20,7 +20,7 @@
 
   
   
-  
+  
   
   
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/config/applications DidactorPortalPages.xml

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/portalpages/config/applications
In directory james.mmbase.org:/tmp/cvs-serv16668/config/applications

Modified Files:
DidactorPortalPages.xml 
Log Message:
idrels


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/config/applications


Index: DidactorPortalPages.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/config/applications/DidactorPortalPages.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- DidactorPortalPages.xml 27 Mar 2008 11:29:12 -  1.8
+++ DidactorPortalPages.xml 27 Mar 2008 22:40:20 -  1.9
@@ -1,10 +1,11 @@
 
 http://www.mmbase.org/dtd/application_1_1.dtd";>
-
+
   
 
 
 
+
   
 
   
@@ -43,6 +44,14 @@
   
   
   
+
+  
+  
+  
+  
+  
+  
+  
 
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/email/src/org/mmbase/applications/email SendMail.java

2008-03-27 Thread Nico Klasens

Update of /var/cvs/applications/email/src/org/mmbase/applications/email
In directory 
james.mmbase.org:/tmp/cvs-serv14268/applications/email/src/org/mmbase/applications/email

Modified Files:
SendMail.java 
Log Message:
Did not compile with 1.9. Hope this will do it for both?


See also: 
http://cvs.mmbase.org/viewcvs/applications/email/src/org/mmbase/applications/email


Index: SendMail.java
===
RCS file: 
/var/cvs/applications/email/src/org/mmbase/applications/email/SendMail.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- SendMail.java   26 Mar 2008 14:11:01 -  1.42
+++ SendMail.java   27 Mar 2008 22:01:28 -  1.43
@@ -30,7 +30,7 @@
  * @author Daniel Ockeloen
  * @author Johannes Verelst <[EMAIL PROTECTED]>
  * @since  MMBase-1.6
- * @version $Id: SendMail.java,v 1.42 2008/03/26 14:11:01 michiel Exp $
+ * @version $Id: SendMail.java,v 1.43 2008/03/27 22:01:28 nklasens Exp $
  */
 public class SendMail extends AbstractSendMail {
 private static final Logger log = 
Logging.getLoggerInstance(SendMail.class);
@@ -314,10 +314,12 @@
 prop.put("mail.smtp.connectiontimeout", "1");
 prop.put("mail.smtp.timeout", "1");
 
-for (Iterator i = 
getInitParameters().entrySet().iterator(); i.hasNext();) {
-Map.Entry entry = i.next();
-if (entry.getKey().startsWith("mail.")) {
-prop.put(entry.getKey(), entry.getValue());
+Map parameters = getInitParameters();
+for (Iterator i = parameters.entrySet().iterator(); 
i.hasNext();) {
+Map.Entry entry = (Map.Entry) i.next();
+String key = (String) entry.getKey();
+if (key.startsWith("mail.")) {
+prop.put(key, entry.getValue());
 }
 }
 StringBuilder buf = new StringBuilder(smtpHost);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] all/maven-base maven.xml

2008-03-27 Thread Nico Klasens

Update of /var/cvs/all/maven-base
In directory james.mmbase.org:/tmp/cvs-serv9757/maven-base

Modified Files:
maven.xml 
Log Message:
only do docbook generation when directory is present


See also: http://cvs.mmbase.org/viewcvs/all/maven-base


Index: maven.xml
===
RCS file: /var/cvs/all/maven-base/maven.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- maven.xml   25 Mar 2008 21:03:08 -  1.11
+++ maven.xml   27 Mar 2008 20:53:38 -  1.12
@@ -176,7 +176,9 @@
   
 
 
+
 
+
 
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/core/java/nl/didactor/security Authentication.java

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/security
In directory james.mmbase.org:/tmp/cvs-serv5992

Modified Files:
Authentication.java 
Log Message:
debugging, made method=http working


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/security


Index: Authentication.java
===
RCS file: 
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/security/Authentication.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- Authentication.java 20 Mar 2008 19:56:34 -  1.34
+++ Authentication.java 27 Mar 2008 17:39:34 -  1.35
@@ -108,7 +108,7 @@
  * @since Didactor-2.3
  */
 protected void logout(HttpServletRequest request, HttpServletResponse 
response) {
-log.debug("Processing didactor logout");
+log.debug("Processing didactor logout because ", new Exception());
 HttpSession session = request == null ? null : 
request.getSession(false);
 if (session != null) {
 String loginComponent = 
(String)session.getAttribute("didactor-logincomponent");
@@ -244,7 +244,16 @@
 }
 }
 
-log.debug("Apparently not logged in yet, try to do that now");
+log.debug("Apparently not logged in yet, try to do that now: " + 
application);
+
+
+if ("name/password".equals(application)) {
+log.debug("Found 'name/password' application. Decorating request 
with name/password.");
+request.setAttribute("username", loginInfo.get("username"));
+request.setAttribute("password", loginInfo.get("password"));
+application = "login";
+}
+
 // Apparently not, so we ask the components if they can process the 
login,
 // maybe there was a post to the current page?
 for (AuthenticationComponent ac : securityComponents) {
@@ -284,11 +293,6 @@
 return new UserContext("anonymous", "anonymous", Rank.ANONYMOUS, 
"asis");
 }
 
-if ("name/password".equals(application)) {
-request.setAttribute("username", loginInfo.get("username"));
-request.setAttribute("password", loginInfo.get("password"));
-application = "login";
-}
 
 assert  application.equals("login") : "Unknown security application " 
+ application;
 
@@ -321,9 +325,10 @@
 }
 // how about the paramters already present. This seems to 
be too simple. Escaping?
 String redirect = 
response.encodeRedirectURL(referUrl.toString());
+log.debug("Redirecting to " + redirect);
 response.sendRedirect(redirect);
 } catch (Exception e) {
-throw new SecurityException("Can't redirect to login 
page(" + loginPage + ")", e);
+throw new SecurityException("Can't redirect to login 
page(" + loginPage + ") because " + e.getClass() + ":" + e.getMessage(), e);
 }
 return null;
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/core/metainf/tags/di/core html.tagx

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/core/metainf/tags/di/core
In directory james.mmbase.org:/tmp/cvs-serv5930

Modified Files:
html.tagx 
Log Message:
validateUser functionality here too


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/metainf/tags/di/core


Index: html.tagx
===
RCS file: 
/var/cvs/contributions/didactor2/src/core/metainf/tags/di/core/html.tagx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- html.tagx   20 Mar 2008 16:45:06 -  1.15
+++ html.tagx   27 Mar 2008 17:38:46 -  1.16
@@ -33,6 +33,15 @@
   language="${requestScope.language}" expires="${expires}">
 
   http://www.w3.org/1999/xhtml";>
+
+
+  
+
+
+  ${request.servletPath}
+
+  
+  
 
 
   
@@ -96,6 +105,8 @@
   
   
 
+  
+
   
 
   
___
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

2008-03-27 Thread avleeuwen

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community
In directory 
james.mmbase.org:/tmp/cvs-serv5627/community/src/java/com/finalist/cmsc/services/community

Modified Files:
  Tag: b1_4
CommunityServiceImpl.java 
Log Message:
CMSC-830 - possibility to send under different name and email than the default 
mailer


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community
See also: http://www.mmbase.org/jira/browse/CMSC-830


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.2.5
retrieving revision 1.7.2.6
diff -u -b -r1.7.2.5 -r1.7.2.6
--- CommunityServiceImpl.java   27 Mar 2008 15:32:56 -  1.7.2.5
+++ CommunityServiceImpl.java   27 Mar 2008 17:21:19 -  1.7.2.6
@@ -176,7 +176,7 @@
 
/** [EMAIL PROTECTED] */
@Override
-   boolean sendPassword(String email, String emailSubject, String emailBody) {
+   boolean sendPassword(String email, String senderName, String senderEmail, 
String emailSubject, String emailBody) {
   boolean authenticationFound = false;
 
   if (StringUtils.isEmpty(email)) {
@@ -215,7 +215,7 @@
   }
 
   if (authenticationFound) {
- EmailUtil.send(name, email, emailSubject, body.toString());
+ EmailUtil.send(null, name, email, senderName, senderEmail, 
emailSubject, body.toString());
   }
 
   return authenticationFound;
___
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 CommunityService.java Community.java DummyCommunityService.java

2008-03-27 Thread avleeuwen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community
In directory 
james.mmbase.org:/tmp/cvs-serv5610/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community

Modified Files:
  Tag: b1_4
CommunityService.java Community.java 
DummyCommunityService.java 
Log Message:
CMSC-830 - possibility to send under different name and email than the default 
mailer


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community
See also: http://www.mmbase.org/jira/browse/CMSC-830


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.2.3
retrieving revision 1.9.2.4
diff -u -b -r1.9.2.3 -r1.9.2.4
--- CommunityService.java   27 Mar 2008 15:32:47 -  1.9.2.3
+++ CommunityService.java   27 Mar 2008 17:21:13 -  1.9.2.4
@@ -39,7 +39,7 @@
/**
 * Do not use.
 *
-* @see Community#sendPassword(String, String, String)
+* @see Community#sendPassword(String, String, String, String, String)
 */
-   abstract boolean sendPassword(String username, String emailSubject, String 
emailBody);
+   abstract boolean sendPassword(String username, String senderName, String 
senderEmail, String emailSubject, String emailBody);
 }


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.2.3
retrieving revision 1.8.2.4
diff -u -b -r1.8.2.3 -r1.8.2.4
--- Community.java  27 Mar 2008 15:32:47 -  1.8.2.3
+++ Community.java  27 Mar 2008 17:21:13 -  1.8.2.4
@@ -74,6 +74,10 @@
 *
 * @param username
 *   The username to search for a password.
+* @param senderName
+*   Name used as email sender
+* @param senderEmail
+*   Email used as email sender
 * @param emailSubject
 *   The email subject
 * @param emailBody
@@ -84,8 +88,8 @@
 * @deprecated Don't use this method, this functionality should be
 * implemented somewhere else.
 */
-   public static boolean sendPassword(String username, String emailSubject, 
String emailBody) {
-  return communityService.sendPassword(username, emailSubject, emailBody);
+   public static boolean sendPassword(String username, String senderName, 
String senderEmail, String emailSubject, String emailBody) {
+  return communityService.sendPassword(username, senderName, senderEmail, 
emailSubject, emailBody);
}
 
 }


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.2.3
retrieving revision 1.8.2.4
diff -u -b -r1.8.2.3 -r1.8.2.4
--- DummyCommunityService.java  27 Mar 2008 15:32:47 -  1.8.2.3
+++ DummyCommunityService.java  27 Mar 2008 17:21:13 -  1.8.2.4
@@ -23,5 +23,5 @@
@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; }
-   @Override boolean sendPassword(String email, String emailSubject, String 
emailBody) { return true; }
+   @Override boolean sendPassword(String email, String senderName, String 
senderEmail, String emailSubject, String emailBody) { return true; }
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/core/lib mmbase-email.jar

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/core/lib
In directory james.mmbase.org:/tmp/cvs-serv4483

Modified Files:
mmbase-email.jar 
Log Message:
updated to newer version


See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/lib


Index: mmbase-email.jar
===
RCS file: /var/cvs/contributions/didactor2/src/core/lib/mmbase-email.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvsJNi11o and /tmp/cvsMoTQs5 differ
___
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

2008-03-27 Thread avleeuwen

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community
In directory 
james.mmbase.org:/tmp/cvs-serv3955/community/src/java/com/finalist/cmsc/services/community

Modified Files:
  Tag: b1_4
CommunityServiceImpl.java 
Log Message:
CMSC-830 - *added* some functionality to send the password, but at the same 
time *removed* it from the portlet because it doesn't belong there.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community
See also: http://www.mmbase.org/jira/browse/CMSC-830


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.2.4
retrieving revision 1.7.2.5
diff -u -b -r1.7.2.4 -r1.7.2.5
--- CommunityServiceImpl.java   26 Mar 2008 09:44:08 -  1.7.2.4
+++ CommunityServiceImpl.java   27 Mar 2008 15:32:56 -  1.7.2.5
@@ -9,7 +9,6 @@
  */
 package com.finalist.cmsc.services.community;
 
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -175,33 +174,51 @@
   return null;
}
 
+   /** [EMAIL PROTECTED] */
@Override
-   public boolean sendPassword(String email, String emailText, String 
emailHeader) {
+   boolean sendPassword(String email, String emailSubject, String emailBody) {
+  boolean authenticationFound = false;
+
   if (StringUtils.isEmpty(email)) {
  throw new IllegalArgumentException("Username not found.");
   }
-  if (StringUtils.isEmpty(emailText)) {
- emailText = "Email text is missing";
+  if (StringUtils.isEmpty(emailSubject)) {
+ emailSubject = "";
   }
-  if (StringUtils.isEmpty(emailHeader)) {
- emailHeader = "Email header is missing";
+  if (StringUtils.isEmpty(emailBody)) {
+ emailBody = "";
   }
-  Person person = new Person();
-  person.setEmail(email);
-  List persons = personService.getPersons(person);
-  List authList = new ArrayList();
-  StringBuilder body = new StringBuilder();
-
-  for (Person person2 : persons) {
- Authentication auth = 
authenticationService.getAuthenticationById(person2.getAuthenticationId());
- authList.add(auth);
- String name = NameUtil.getFullName(person2.getFirstName(), 
person2.getInfix(), person2.getLastName());
- body.append(name + "\n" + auth.getUserId() + "\n" + 
auth.getPassword() + "\n\n");
-  }
-  String finalBody = MessageFormat.format(emailText, body.toString());
-  String name = NameUtil.getFullName(person.getFirstName(), 
person.getInfix(), person.getLastName());
-  EmailUtil.send(name, email, emailHeader, finalBody);
-  return true;
+
+  String name = "";
+  StringBuilder body = new StringBuilder(emailBody);
+
+  Person example = new Person();
+  example.setEmail(email);
+  // Retrieve a list of persons that match this example
+  List persons = personService.getPersons(example);
+
+  for (Person person : persons) {
+ Authentication authentication = 
authenticationService.getAuthenticationById(person.getAuthenticationId());
+
+ if (authentication != null) {
+if ("".equals(name)) {
+   name = NameUtil.getFullName(person.getFirstName(), 
person.getInfix(), person.getLastName());
+}
+
+body.append("\n---\n");
+body.append("Gebruikersnaam: ").append(authentication.getUserId());
+body.append("\n");
+body.append("Wachtwoord: 
").append(authentication.getPassword());
+
+authenticationFound = true;
+ }
+  }
+
+  if (authenticationFound) {
+ EmailUtil.send(name, email, emailSubject, body.toString());
+  }
+
+  return authenticationFound;
}
 
/**
___
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

2008-03-27 Thread avleeuwen

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
In directory 
james.mmbase.org:/tmp/cvs-serv3955/community/src/java/com/finalist/cmsc/services/community/security

Modified Files:
  Tag: b1_4
AuthenticationHibernateService.java 
Log Message:
CMSC-830 - *added* some functionality to send the password, but at the same 
time *removed* it from the portlet because it doesn't belong there.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
See also: http://www.mmbase.org/jira/browse/CMSC-830


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.2.4
retrieving revision 1.3.2.5
diff -u -b -r1.3.2.4 -r1.3.2.5
--- AuthenticationHibernateService.java 27 Mar 2008 15:06:35 -  1.3.2.4
+++ AuthenticationHibernateService.java 27 Mar 2008 15:32:56 -  1.3.2.5
@@ -175,6 +175,7 @@
}
 
/** [EMAIL PROTECTED] */
+   @Transactional(readOnly = true)
public Authentication getAuthenticationById(Long authenticationId) {
   return (Authentication) getSession().get(Authentication.class, 
authenticationId);
}
___
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 CommunityService.java Community.java DummyCommunityService.java

2008-03-27 Thread avleeuwen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community
In directory 
james.mmbase.org:/tmp/cvs-serv3937/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community

Modified Files:
  Tag: b1_4
CommunityService.java Community.java 
DummyCommunityService.java 
Log Message:
CMSC-830 - *added* some functionality to send the password, but at the same 
time *removed* it from the portlet because it doesn't belong there.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community
See also: http://www.mmbase.org/jira/browse/CMSC-830


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.2.2
retrieving revision 1.9.2.3
diff -u -b -r1.9.2.2 -r1.9.2.3
--- CommunityService.java   21 Mar 2008 16:46:18 -  1.9.2.2
+++ CommunityService.java   27 Mar 2008 15:32:47 -  1.9.2.3
@@ -36,6 +36,10 @@
 
public abstract Map> getUserProperty(String 
userName);
 
-   public abstract boolean sendPassword(String username, String emailText, 
String emailHeader);
-
+   /**
+* Do not use.
+*
+* @see Community#sendPassword(String, String, String)
+*/
+   abstract boolean sendPassword(String username, String emailSubject, String 
emailBody);
 }


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.2.2
retrieving revision 1.8.2.3
diff -u -b -r1.8.2.2 -r1.8.2.3
--- Community.java  21 Mar 2008 16:46:18 -  1.8.2.2
+++ Community.java  27 Mar 2008 15:32:47 -  1.8.2.3
@@ -6,18 +6,16 @@
 import com.finalist.cmsc.services.ServiceManager;
 
 /**
- * Community, this is a CMSc service class.
- * This class is the abstract service class that wil be implemented
- * by the "CommunityServiceMysqlImpl".
- * In this class comes the request from a portlet or module and will be
- * redirected to the "CommunityServiceMysqlImpl".
+ * Community, this is a CMSc service class. This class is the abstract service
+ * class that wil be implemented by the "CommunityServiceMysqlImpl". In this
+ * class comes the request from a portlet or module and will be redirected to
+ * the "CommunityServiceMysqlImpl".
  *
  * @author menno menninga
  */
 public class Community {
 
-   private final static CommunityService communityService =
-  (CommunityService) ServiceManager.getService(CommunityService.class);
+   private final static CommunityService communityService = (CommunityService) 
ServiceManager.getService(CommunityService.class);
 
public static void login(String userName, String password) {
   communityService.login(userName, password);
@@ -47,24 +45,47 @@
   return communityService.getPreferenceValues(module, userId, key);
}
 
-   public static Map>> getPreferences(String 
module, String userId, String key, String value){
+   public static Map>> getPreferences(String 
module, String userId, String key, String value) {
   return communityService.getPreferences(module, userId, key, value);
}
 
-   public static void createPreference(String module, String userId, String 
key, List values){
+   public static void createPreference(String module, String userId, String 
key, List values) {
   communityService.createPreference(module, userId, key, values);
}
 
-   public static void removePreferences(String module, String userId, String 
key){
+   public static void removePreferences(String module, String userId, String 
key) {
   communityService.removePreferences(module, userId, key);
}
 
-   public static Map> getUserProperty(String 
userName){
+   public static Map> getUserProperty(String 
userName) {
   return communityService.getUserProperty(userName);
}
 
-   public static boolean sendPassword(String username, String emailText, 
String emailHeader) {
-  return communityService.sendPassword(username, emailText, emailHeader);
+   /**
+* DO NOT USE THIS METHOD. Really, DO NOT USE THIS METHOD.
+* 
+* 
+* The passwords should normally be stored in an encrypted form which makes
+* this method useless. For 4en5mei.nl the passwords are stored in plain 
text
+* and we moved this method here instead of creating a dependency hell on 
the
+* login-portlet. This is so we can remove this functionality easily and
+* trade it for a way to reset a password rather than email the
+* account data.
+*
+* @param username
+*   The username to search for a password.
+* @param emailSubject
+*   The email subject
+* @param emailBo

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login login.jsp send_password.jsp

2008-03-27 Thread avleeuwen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login
In directory 
james.mmbase.org:/tmp/cvs-serv3878/portlets-login/src/webapp/WEB-INF/templates/view/login

Modified Files:
  Tag: b1_4
login.jsp 
Removed Files:
  Tag: b1_4
send_password.jsp 
Log Message:
CMSC-830 - *added* some functionality to send the password, but at the same 
time *removed* it from the portlet because it doesn't belong there.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login
See also: http://www.mmbase.org/jira/browse/CMSC-830


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.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- login.jsp   25 Mar 2008 14:55:53 -  1.3.2.3
+++ login.jsp   27 Mar 2008 15:32:39 -  1.3.2.4
@@ -29,13 +29,6 @@
   " />
 
   
-  
-
-
-  
-  
-
-  
 
 
 


___
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

2008-03-27 Thread avleeuwen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory 
james.mmbase.org:/tmp/cvs-serv3878/portlets-login/src/java/com/finalist/cmsc/portlets

Modified Files:
  Tag: b1_4
LoginPortlet.java 
Log Message:
CMSC-830 - *added* some functionality to send the password, but at the same 
time *removed* it from the portlet because it doesn't belong there.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-830


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.2.6
retrieving revision 1.5.2.7
diff -u -b -r1.5.2.6 -r1.5.2.7
--- LoginPortlet.java   25 Mar 2008 15:17:43 -  1.5.2.6
+++ LoginPortlet.java   27 Mar 2008 15:32:40 -  1.5.2.7
@@ -14,7 +14,6 @@
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletException;
-import javax.portlet.PortletPreferences;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
@@ -22,7 +21,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.finalist.cmsc.portalImpl.PortalConstants;
 import com.finalist.cmsc.services.community.Community;
 
 /**
@@ -31,18 +29,20 @@
  * @author Remco Bos
  */
 public class LoginPortlet extends CmscPortlet {
+   protected static final String ACTION_PARAMETER = "action";
 
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);
 
+   @Override
public void processView(ActionRequest request, ActionResponse response) 
throws PortletException, IOException {
-   String action = request.getParameter("action");
+  String action = request.getParameter(ACTION_PARAMETER);
if ("login".equals(action)) {
String userName = 
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
String password = 
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
+
if (!StringUtils.isBlank(userName) && 
!StringUtils.isBlank(password)) {
Community.login(userName, password);
}
@@ -53,19 +53,9 @@
log.info(String.format("Login failed for user 
%s", userName));
response.setRenderParameter("errormessage", 
"login.failed");
}
-
} else if ("logout".equals(action)) {
Community.logout();
-   } else if ("send_password".equals(action)) {
-String username = request.getParameter("username");
-if (!StringUtils.isBlank(username)) {
-   //Get email text and email header from portlet properties and 
use it for sending an email
-   String emailText = 
request.getPreferences().getValue("email.text", "Your account details 
associated with the given email address.\n");
-   String emailHeader = 
request.getPreferences().getValue("email.header", "Account details");
-   Community.sendPassword(username, emailText, emailHeader);
-}
-   }
-   else {
+  } else {
// Unknown
log.error(String.format("Unknown action '%s'", action));
}
@@ -85,11 +75,8 @@
template = "login/logout.jsp";
} else {
template = "login/login.jsp";
-   String action = request.getParameter("action");
-   if (!StringUtils.isBlank(action) && 
"send_password".equals(action)) {
-   template = "login/send_password.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/src/webapp/WEB-INF/templates/edit_defaults/login login.jsp

2008-03-27 Thread avleeuwen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login
In directory 
james.mmbase.org:/tmp/cvs-serv3878/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login

Modified Files:
  Tag: b1_4
login.jsp 
Log Message:
CMSC-830 - *added* some functionality to send the password, but at the same 
time *removed* it from the portlet because it doesn't belong there.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login
See also: http://www.mmbase.org/jira/browse/CMSC-830


Index: login.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login/login.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- login.jsp   25 Feb 2008 16:25:52 -  1.1.2.1
+++ login.jsp   27 Mar 2008 15:32:39 -  1.1.2.2
@@ -3,9 +3,15 @@
 
 
 
-" target="_parent">
+" 
+  target="_parent"
+>
 
 
+   

   :
   
@@ -13,26 +19,10 @@
 

 
- 
-  
-   
-   
-  :
-  
- 
- 
-  
-   
-   
-  :
-  
- 
-
-   
-
  
   

+   


" class="button" />
@@ -40,4 +30,3 @@

 
 
-
___
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

2008-03-27 Thread avleeuwen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/resources/com/finalist/cmsc/portlets
In directory 
james.mmbase.org:/tmp/cvs-serv3878/portlets-login/resources/com/finalist/cmsc/portlets

Modified Files:
  Tag: b1_4
LoginPortlet_nl.properties LoginPortlet.properties 
Log Message:
CMSC-830 - *added* some functionality to send the password, but at the same 
time *removed* it from the portlet because it doesn't belong there.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/resources/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-830


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.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- LoginPortlet_nl.properties  14 Mar 2008 12:50:31 -  1.1.2.3
+++ LoginPortlet_nl.properties  27 Mar 2008 15:32:40 -  1.1.2.4
@@ -3,9 +3,8 @@
 javax.portlet.keywords=login,aanmelden
 
 edit_defaults.title=Login
-edit_defaults.name=E-mail
-edit_defaults.password=Wachtwoord
-edit_defaults.submit=Aanmelden
+edit_defaults.view=Template
+edit_defaults.save=Opslaan
 
 view.title=Aanmelden
 view.login=Aanmelden
@@ -16,7 +15,3 @@
 view.logged_in_as=U bent nu ingelogd als
 
 login.failed=Aanmelden gefaald
-
-view.send_password=Wachtwoord vergeten?
-view.send_password.username=E-mail adres
-view.send_password.submit=Versturen
\ 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.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- LoginPortlet.properties 3 Mar 2008 08:43:48 -   1.1.2.2
+++ LoginPortlet.properties 27 Mar 2008 15:32:40 -  1.1.2.3
@@ -3,8 +3,6 @@
 javax.portlet.keywords=login
 
 edit_defaults.title=Login
-edit_defaults.name=Email
-edit_defaults.password=Password
 edit_defaults.submit=Login
 
 view.title=Login
@@ -16,7 +14,3 @@
 view.logged_in_as=You're currently logged in as
 
 login.failed=Login failed
-
-view.send_password=Forgot your password?
-view.send_password.username=Email
-view.send_password.submit=Send
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/templates/portalpages/backoffice add_portalpages.jsp

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice
In directory james.mmbase.org:/tmp/cvs-serv3569

Modified Files:
add_portalpages.jsp 
Log Message:
added explicit searchdir, because some idiots originally defined the relation 
both ways


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice


Index: add_portalpages.jsp
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice/add_portalpages.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- add_portalpages.jsp 27 Mar 2008 12:22:16 -  1.10
+++ add_portalpages.jsp 27 Mar 2008 15:13:10 -  1.11
@@ -48,7 +48,7 @@
   
 
 
-  
+  
 
 
   http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/config/builders/portalpages simplexmlcontents.xml

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/portalpages/config/builders/portalpages
In directory james.mmbase.org:/tmp/cvs-serv3501

Modified Files:
simplexmlcontents.xml 
Log Message:
made title required


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/config/builders/portalpages


Index: simplexmlcontents.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/config/builders/portalpages/simplexmlcontents.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- simplexmlcontents.xml   27 Mar 2008 11:18:21 -  1.1
+++ simplexmlcontents.xml   27 Mar 2008 15:10:55 -  1.2
@@ -13,9 +13,14 @@
 
   
 
+  
+Title
+Titel
+  
   1
   http://www.mmbase.org/xmlns/datatypes"; >
-
+
+
 
   
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/templates/editwizards/data/config/portalpages portalpagesnodes.xml

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/portalpages/templates/editwizards/data/config/portalpages
In directory james.mmbase.org:/tmp/cvs-serv3443

Modified Files:
portalpagesnodes.xml 
Log Message:
made rich content editable


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/templates/editwizards/data/config/portalpages


Index: portalpagesnodes.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/editwizards/data/config/portalpages/portalpagesnodes.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- portalpagesnodes.xml27 Mar 2008 11:07:34 -  1.10
+++ portalpagesnodes.xml27 Mar 2008 15:09:39 -  1.11
@@ -5,8 +5,9 @@
 
   
 
-
-
+
+
+
 
   
 
@@ -46,6 +47,30 @@
   
 
 
+
+  Rich Content
+  
+
+  
+  
+Search Content
+
+  titel bevat
+  title
+
+  
+  
+
+  
+
+  
+  
+
+  {sum(//[EMAIL PROTECTED]'posrel' and 
@lastitem='true']/[EMAIL PROTECTED]'pos'])+{$pos}}
+
+  
+
+
 
   Bijbehorende map
   
___
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

2008-03-27 Thread avleeuwen

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
In directory 
james.mmbase.org:/tmp/cvs-serv3348/community/src/java/com/finalist/cmsc/services/community/security

Modified Files:
  Tag: b1_4
AuthenticationHibernateService.java 
Log Message:
CMSC-830 - implement getAuthenticationById() method


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
See also: http://www.mmbase.org/jira/browse/CMSC-830


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.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- AuthenticationHibernateService.java 25 Mar 2008 18:46:27 -  1.3.2.3
+++ AuthenticationHibernateService.java 27 Mar 2008 15:06:35 -  1.3.2.4
@@ -34,7 +34,7 @@
authentication.setUserId(userId);
authentication.setPassword(encodePassword(password, userId));
authentication.setEnabled(true);
-   Long id = (Long)getSession().save(authentication);
+  Long id = (Long) getSession().save(authentication);
getSession().flush();
authentication.setId(id);
return authentication;
@@ -154,8 +154,7 @@
/** [EMAIL PROTECTED] */
@Transactional(readOnly = true)
public List findAuthenticationsForAuthority(String 
name) {
-   Criteria criteria = 
getSession().createCriteria(Authentication.class).createCriteria("authorities").add(
-   Restrictions.eq("name", name));
+  Criteria criteria = 
getSession().createCriteria(Authentication.class).createCriteria("authorities").add(Restrictions.eq("name",
 name));
return findAuthenticationListByCriteria(criteria);
}
 
@@ -175,9 +174,8 @@
this.authorityService = authorityService;
}
 
-   public Authentication getAuthenticationById(
- Long authenticationId) {
-  // TODO Auto-generated method stub
-  return null;
+   /** [EMAIL PROTECTED] */
+   public Authentication getAuthenticationById(Long authenticationId) {
+  return (Authentication) getSession().get(Authentication.class, 
authenticationId);
}
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/education/templates/education/wizards code.jsp tree_top_menu.jsp

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/education/templates/education/wizards
In directory james.mmbase.org:/tmp/cvs-serv3148

Modified Files:
code.jsp tree_top_menu.jsp 
Log Message:
changed default mode to 'educations' because I think there is better chance 
that you may actually see this


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards


Index: code.jsp
===
RCS file: 
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/code.jsp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- code.jsp13 Mar 2008 09:37:52 -  1.112
+++ code.jsp27 Mar 2008 14:58:10 -  1.113
@@ -4,7 +4,7 @@
   xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
   
 
-  components
+  educations
   
  
   


Index: tree_top_menu.jsp
===
RCS file: 
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/tree_top_menu.jsp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- tree_top_menu.jsp   7 Mar 2008 17:39:38 -   1.49
+++ tree_top_menu.jsp   27 Mar 2008 14:58:10 -  1.50
@@ -17,7 +17,7 @@
 }
   
 
-  components
+  educations
 
   
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/core/config/builders/didactor_core people.xml

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/core/config/builders/didactor_core
In directory james.mmbase.org:/tmp/cvs-serv2957

Modified Files:
people.xml 
Log Message:
disabled as default status is a bit silly


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/config/builders/didactor_core


Index: people.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/core/config/builders/didactor_core/people.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- people.xml  14 Mar 2008 16:44:59 -  1.15
+++ people.xml  27 Mar 2008 14:47:26 -  1.16
@@ -432,7 +432,7 @@
   
 
   http://www.mmbase.org/xmlns/datatypes";>
-
+
 
   
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/core/templates/content index.jspx

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/core/templates/content
In directory james.mmbase.org:/tmp/cvs-serv2021

Modified Files:
index.jspx 
Log Message:
make sure there is always a surrounding tag


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/templates/content


Index: index.jspx
===
RCS file: 
/var/cvs/contributions/didactor2/src/core/templates/content/index.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- index.jspx  20 Mar 2008 17:17:03 -  1.4
+++ index.jspx  27 Mar 2008 14:10:06 -  1.5
@@ -3,6 +3,7 @@
   xmlns: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";>
+

[MMBASE CVS] contributions/didactor2/src/core/metainf/tags/di/core head.tagx

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/core/metainf/tags/di/core
In directory james.mmbase.org:/tmp/cvs-serv1237

Modified Files:
head.tagx 
Log Message:
details


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/metainf/tags/di/core


Index: head.tagx
===
RCS file: 
/var/cvs/contributions/didactor2/src/core/metainf/tags/di/core/head.tagx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- head.tagx   20 Mar 2008 14:37:50 -  1.11
+++ head.tagx   27 Mar 2008 13:26:46 -  1.12
@@ -4,8 +4,7 @@
 xmlns:jsp="http://java.sun.com/JSP/Page";
 xmlns:di="http://www.didactor.nl/ditaglib_1.0";
 version="2.0">
-  
+  
   
 
 
@@ -24,9 +23,14 @@
   
   
 
-
+
 
-  addEventHandler(window, "load", focusFirstForm);
+  
+
+addEventHandler(window, "load", function() { 
focusFirstForm(); keepalive("${_}"); });
+  
 
 
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/core/config/applications Resources.xml

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/core/config/applications
In directory james.mmbase.org:/tmp/cvs-serv1165/config/applications

Modified Files:
Resources.xml 
Log Message:
removed jumpers


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/config/applications


Index: Resources.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/core/config/applications/Resources.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Resources.xml   15 Nov 2006 15:34:05 -  1.3
+++ Resources.xml   27 Mar 2008 13:26:19 -  1.4
@@ -17,7 +17,6 @@
 mmevents
 audiotapes
 videotapes
-jumpers
   
 
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/core/config/builders INDEX

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/core/config/builders
In directory james.mmbase.org:/tmp/cvs-serv1165/config/builders

Modified Files:
INDEX 
Log Message:
removed jumpers


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/config/builders


Index: INDEX
===
RCS file: /var/cvs/contributions/didactor2/src/core/config/builders/INDEX,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- INDEX   10 Jan 2008 15:57:45 -  1.1
+++ INDEX   27 Mar 2008 13:26:19 -  1.2
@@ -3,7 +3,6 @@
 ./resources/attachments.xml
 ./resources/urls.xml
 ./resources/posrel.xml
-./jumpers/jumpers.xml
 ./didactor_core/authrel.xml
 ./didactor_core/classes.xml
 ./didactor_core/classrel.xml
@@ -12,12 +11,12 @@
 ./didactor_core/educations.xml
 ./didactor_core/fields.xml
 ./didactor_core/news.xml
-./didactor_core/people.xml
-./didactor_core/providers.xml
 ./didactor_core/rolerel.xml
+./didactor_core/providers.xml
 ./didactor_core/roles.xml
 ./didactor_core/workgroups.xml
 ./didactor_core/disallowedusernames.xml
+./didactor_core/people.xml
 ./didactor_component/components.xml
 ./didactor_component/settingrel.xml
 ./didactor_component/settings.xml
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders page.xml

2008-03-27 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders
In directory 
james.mmbase.org:/tmp/cvs-serv909/language-redirect/config/applications/sitemanagement/builders

Modified Files:
page.xml 
Log Message:
CMSC-837 - Page.xml builder uses incorrect language settings for  in 
Language Redirect.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders
See also: http://www.mmbase.org/jira/browse/CMSC-837


Index: page.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders/page.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- page.xml27 Mar 2008 12:45:55 -  1.4
+++ page.xml27 Mar 2008 13:13:28 -  1.5
@@ -393,9 +393,7 @@



-   path
-   path
-   è·¯å¾
+   path
STRING


@@ -418,9 +416,7 @@



-   oldpath
-   oldpath
-   åè·¯å¾
+   oldpath
STRING


___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders page.xml

2008-03-27 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders
In directory 
james.mmbase.org:/tmp/cvs-serv895/language-redirect/config/applications/sitemanagement/builders

Modified Files:
  Tag: b1_4
page.xml 
Log Message:
CMSC-837 - Page.xml builder uses incorrect language settings for  in 
Language Redirect.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders
See also: http://www.mmbase.org/jira/browse/CMSC-837


Index: page.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders/page.xml,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- page.xml27 Mar 2008 12:46:01 -  1.3.2.1
+++ page.xml27 Mar 2008 13:13:22 -  1.3.2.2
@@ -393,9 +393,7 @@



-   path
-   path
-   è·¯å¾
+   path
STRING


@@ -418,9 +416,7 @@



-   oldpath
-   oldpath
-   åè·¯å¾
+   oldpath
STRING


___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders page.xml

2008-03-27 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders
In directory 
james.mmbase.org:/tmp/cvs-serv447/language-redirect/config/applications/sitemanagement/builders

Modified Files:
  Tag: b1_4
page.xml 
Log Message:
CMSC-592 -  wrong translation of Dutch! Please ask Dutch people to do this!


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders
See also: http://www.mmbase.org/jira/browse/CMSC-592


Index: page.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders/page.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- page.xml23 Nov 2007 15:23:12 -  1.3
+++ page.xml27 Mar 2008 12:46:01 -  1.3.2.1
@@ -394,7 +394,7 @@


path
-   weg
+   path
è·¯å¾
STRING

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders page.xml

2008-03-27 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders
In directory 
james.mmbase.org:/tmp/cvs-serv431/language-redirect/config/applications/sitemanagement/builders

Modified Files:
page.xml 
Log Message:
CMSC-592 -  wrong translation of Dutch! Please ask Dutch people to do this!


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders
See also: http://www.mmbase.org/jira/browse/CMSC-592


Index: page.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/config/applications/sitemanagement/builders/page.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- page.xml23 Nov 2007 15:23:12 -  1.3
+++ page.xml27 Mar 2008 12:45:55 -  1.4
@@ -394,7 +394,7 @@


path
-   weg
+   path
è·¯å¾
STRING

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/templates/portalpages/backoffice add_portalpages.jsp

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice
In directory james.mmbase.org:/tmp/cvs-serv32605

Modified Files:
add_portalpages.jsp 
Log Message:
little point in default no show


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice


Index: add_portalpages.jsp
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice/add_portalpages.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- add_portalpages.jsp 27 Mar 2008 11:08:08 -  1.9
+++ add_portalpages.jsp 27 Mar 2008 12:22:16 -  1.10
@@ -36,7 +36,7 @@
 Portal Pagina's 
   
   
-  
+  
 http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets ContentChannelPortlet_nl.properties

2008-03-27 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets
In directory 
james.mmbase.org:/tmp/cvs-serv31797/cmsc/portlets/resources/com/finalist/cmsc/portlets

Modified Files:
ContentChannelPortlet_nl.properties 
Log Message:
CMSC-289 - Corrected Dutch Language.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-289


Index: ContentChannelPortlet_nl.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets/ContentChannelPortlet_nl.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ContentChannelPortlet_nl.properties 20 Mar 2008 03:22:09 -  1.7
+++ ContentChannelPortlet_nl.properties 27 Mar 2008 11:30:39 -  1.8
@@ -2,7 +2,7 @@
 javax.portlet.short-title=ContentChannelPortlet
 javax.portlet.keywords=ContentChannel
 
-edit_defaults.portletset=De Montages van Portlet
+edit_defaults.portletset=Portlet instellingen
 edit_defaults.define=Definitie
 edit_defaults.title=Selecteer een rubriek
 edit_defaults.channel=Rubriek
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/config/applications DidactorPortalPages.xml

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/portalpages/config/applications
In directory james.mmbase.org:/tmp/cvs-serv31745

Modified Files:
DidactorPortalPages.xml 
Log Message:
this drives me crazy


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/config/applications


Index: DidactorPortalPages.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/config/applications/DidactorPortalPages.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- DidactorPortalPages.xml 27 Mar 2008 10:26:00 -  1.7
+++ DidactorPortalPages.xml 27 Mar 2008 11:29:12 -  1.8
@@ -35,7 +35,7 @@
   
 
   
-  
+
   
   
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search SearchServiceMMBaseImpl.java

2008-03-27 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search
In directory 
james.mmbase.org:/tmp/cvs-serv31663/cmsc/search/src/java/com/finalist/cmsc/services/search

Modified Files:
SearchServiceMMBaseImpl.java 
Log Message:
CMSC-836 - SearchService incorrectly searches for contentchannel positions


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search
See also: http://www.mmbase.org/jira/browse/CMSC-836


Index: SearchServiceMMBaseImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/SearchServiceMMBaseImpl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- SearchServiceMMBaseImpl.java14 Mar 2008 12:52:30 -  1.23
+++ SearchServiceMMBaseImpl.java27 Mar 2008 11:27:32 -  1.24
@@ -178,6 +178,7 @@
  int end = maxElements == null || maxElements.length() == 0 ? -1 : 
Integer.valueOf(maxElements);
 
  if (start > 0 || end > 0) {
+if (start <= 0) start = 1;
 List contenttypes = 
SiteManagement.getContentTypes(String.valueOf(portlet.getId()));
 
 String contentchannel = portlet.getParameterValue(CONTENTCHANNEL);
@@ -196,7 +197,7 @@
 Node channel = cloud.getNode(contentchannel);
 
 NodeList l = RepositoryUtil.getLinkedElements(channel, 
contenttypes, orderby, direction, useLifecycleBool,
-  archive, start, end, -1, -1, -1);
+  archive, start - 1, end, -1, -1, -1);
 for (Iterator iterator = l.iterator(); iterator.hasNext();) {
Node node = iterator.next();
if (node.getNumber() == content.getNumber()) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search SearchServiceMMBaseImpl.java

2008-03-27 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search
In directory 
james.mmbase.org:/tmp/cvs-serv31563/cmsc/search/src/java/com/finalist/cmsc/services/search

Modified Files:
  Tag: b1_4
SearchServiceMMBaseImpl.java 
Log Message:
CMSC-836 - SearchService incorrectly searches for contentchannel positions


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search
See also: http://www.mmbase.org/jira/browse/CMSC-836


Index: SearchServiceMMBaseImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/SearchServiceMMBaseImpl.java,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -b -r1.22.2.1 -r1.22.2.2
--- SearchServiceMMBaseImpl.java10 Mar 2008 09:25:14 -  1.22.2.1
+++ SearchServiceMMBaseImpl.java27 Mar 2008 11:22:23 -  1.22.2.2
@@ -178,6 +178,7 @@
  int end = maxElements == null || maxElements.length() == 0 ? -1 : 
Integer.valueOf(maxElements);
 
  if (start > 0 || end > 0) {
+if (start <= 0) start = 1;
 List contenttypes = 
SiteManagement.getContentTypes(String.valueOf(portlet.getId()));
 
 String contentchannel = portlet.getParameterValue(CONTENTCHANNEL);
@@ -196,7 +197,7 @@
 Node channel = cloud.getNode(contentchannel);
 
 NodeList l = RepositoryUtil.getLinkedElements(channel, 
contenttypes, orderby, direction, useLifecycleBool,
-  archive, start, end, -1, -1, -1);
+  archive, start - 1, end, -1, -1, -1);
 for (Iterator iterator = l.iterator(); iterator.hasNext();) {
Node node = iterator.next();
if (node.getNumber() == content.getNumber()) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/config/builders INDEX

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/portalpages/config/builders
In directory james.mmbase.org:/tmp/cvs-serv31476

Modified Files:
INDEX 
Log Message:
rich text, cleaning


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/config/builders


Index: INDEX
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/config/builders/INDEX,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- INDEX   17 Jan 2008 12:18:26 -  1.1
+++ INDEX   27 Mar 2008 11:18:37 -  1.2
@@ -2,3 +2,4 @@
 ./portalpages/portalpagescontainers.xml
 ./portalpages/portalpagesnodes.xml
 ./portalpages/simplecontents.xml
+./portalpages/simplexmlcontents.xml
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/config/builders/portalpages simplexmlcontents.xml navigationnodes.xml portalpagesnodes.xml

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/portalpages/config/builders/portalpages
In directory james.mmbase.org:/tmp/cvs-serv31450/portalpages

Modified Files:
navigationnodes.xml portalpagesnodes.xml 
Added Files:
simplexmlcontents.xml 
Log Message:
rich text, cleaning


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/config/builders/portalpages


simplexmlcontents.xml is new



Index: navigationnodes.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/config/builders/portalpages/navigationnodes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- navigationnodes.xml 17 Jan 2008 15:58:37 -  1.4
+++ navigationnodes.xml 27 Mar 2008 11:18:21 -  1.5
@@ -54,6 +54,8 @@
   
 
 
+
+
 
   
 Order Number
@@ -64,7 +66,9 @@
   6
 
   
-  http://www.mmbase.org/xmlns/datatypes"; base="integer" />
+  http://www.mmbase.org/xmlns/datatypes"; base="integer">
+
+  
 
 
  


Index: portalpagesnodes.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/config/builders/portalpages/portalpagesnodes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- portalpagesnodes.xml17 Jan 2008 15:58:37 -  1.2
+++ portalpagesnodes.xml27 Mar 2008 11:18:21 -  1.3
@@ -14,4 +14,8 @@
   
 Portal Page Node
   
+  
+/portalpages/frontoffice/
+  
+
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/config/components INDEX portalpages.xml

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/portalpages/config/components
In directory james.mmbase.org:/tmp/cvs-serv31402

Added Files:
INDEX portalpages.xml 
Log Message:
added a setting to define what kinds of content objects you find acceptabie


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/config/components


INDEX is new



portalpages.xml is new

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/simplexmlcontents index.jsp

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/simplexmlcontents
In directory james.mmbase.org:/tmp/cvs-serv31330/simplexmlcontents

Added Files:
index.jsp 
Log Message:



See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/simplexmlcontents


index.jsp is new

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/portalpagesnodes index.jsp

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/portalpagesnodes
In directory james.mmbase.org:/tmp/cvs-serv31330/portalpagesnodes

Added Files:
index.jsp 
Log Message:



See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/portalpagesnodes


index.jsp is new

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/simplexmlcontents - New directory

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/simplexmlcontents
In directory james.mmbase.org:/tmp/cvs-serv31247/simplexmlcontents

Log Message:
Directory 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/simplexmlcontents
 added to the repository



See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/simplexmlcontents
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/templates/portalpages/backoffice add_portalpages.jsp related_portalpagesnodes.jsp

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice
In directory james.mmbase.org:/tmp/cvs-serv31061

Modified Files:
add_portalpages.jsp related_portalpagesnodes.jsp 
Log Message:
support for rich-test


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice


Index: add_portalpages.jsp
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice/add_portalpages.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- add_portalpages.jsp 14 Mar 2008 17:08:54 -  1.8
+++ add_portalpages.jsp 27 Mar 2008 11:08:08 -  1.9
@@ -8,6 +8,9 @@
   
 
 
+
+
+
 false
 
   true
@@ -60,6 +63,7 @@
   
   
 
   
@@ -68,7 +72,13 @@
 nieuwe 
map
   
 
+
+ 
+ 
+   
+ 
 
   
@@ -77,6 +87,34 @@
 nieuwe 
content
   
 
+ 
+ 
+
+
+   
+ 
+   /editwizards/data
+   config/portalpages/simplexmlcontents
+   ${di:setting('richtext', 'link_nodetypes')}
+   ${locale.language}
+   new
+   nieuwe content
+ 
+   
+ 
+ 
+   
+ UNKNONWN ${_}
+   
+ 
+   
+ 
 
 
   ..${status.last ? '.' : ' 
'}


Index: related_portalpagesnodes.jsp
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice/related_portalpagesnodes.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- related_portalpagesnodes.jsp13 Mar 2008 17:34:33 -  1.6
+++ related_portalpagesnodes.jsp27 Mar 2008 11:08:08 -  1.7
@@ -5,8 +5,12 @@
   xmlns:c="http://java.sun.com/jsp/jstl/core";
   xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
   
+  
   
-  
+  
+
 
 
   
+  
+
+  
+/editwizards/data
+config/portalpages/simplexmlcontents
+${di:setting('richtext', 
'link_nodetypes')}
+${locale.language}
+
+  
+
+  
+
+  
 
   
-  
+
+  
+  
 
   
 config/portalpages/simplecontents
-
   
-
+  
+
+  
+
+  
+
+  
+/editwizards/data
+config/portalpages/simplexmlcontents
+${di:setting('richtext', 
'link_nodetypes')}
+${locale.language}
+
   
 
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/templates/editwizards/data/config/portalpages simplexmlcontents.xml leafmapportalpagesnodes-origin.xml leafportalpagesnodes-origin.xml leafportalp

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/portalpages/templates/editwizards/data/config/portalpages
In directory james.mmbase.org:/tmp/cvs-serv30978

Modified Files:
leafmapportalpagesnodes-origin.xml 
leafportalpagesnodes-origin.xml leafportalpagesnodes.xml 
newportalpagesnodes.xml newsimplecontents.xml 
portalpagesnodes.xml rootportalpagesnodes.xml 
Added Files:
simplexmlcontents.xml 
Log Message:



See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/templates/editwizards/data/config/portalpages


simplexmlcontents.xml is new



Index: leafmapportalpagesnodes-origin.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/editwizards/data/config/portalpages/leafmapportalpagesnodes-origin.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- leafmapportalpagesnodes-origin.xml  11 Apr 2006 10:23:40 -  1.1
+++ leafmapportalpagesnodes-origin.xml  27 Mar 2008 11:07:34 -  1.2
@@ -17,45 +17,19 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 Naam
 Name
 
-
-Naam
-
-
-Map zichtbaar maken
-Map zichtbaar maken
-  
-
-
-Tekst
-
-
-Positie
-
+
+
+
+
 
   Content
   
   
-
-  Content Titel
-  
-
+
 

   


Index: leafportalpagesnodes-origin.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/editwizards/data/config/portalpages/leafportalpagesnodes-origin.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- leafportalpagesnodes-origin.xml 11 Apr 2006 10:23:40 -  1.1
+++ leafportalpagesnodes-origin.xml 27 Mar 2008 11:07:34 -  1.2
@@ -15,37 +15,14 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 Naam
 Name
-
-
-Naam
-
-
-Map zichtbaar maken
-Map zichtbaar maken
-  
-
-
-Tekst
-
-
-Positie
-
+
+
+
+
 
   Content
   


Index: leafportalpagesnodes.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/editwizards/data/config/portalpages/leafportalpagesnodes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- leafportalpagesnodes.xml11 Apr 2006 10:23:40 -  1.1
+++ leafportalpagesnodes.xml27 Mar 2008 11:07:34 -  1.2
@@ -10,45 +10,20 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 Naam
 Name
 
-
-Naam
-
-
-Map zichtbaar maken
-Map zichtbaar maken
-  
-
-
-Tekst
-
-
-Positie
-
+
+
+
+
 
   Content
   
   
-
-  Content Titel
-  
-
+
 

   
@@ -69,6 +44,7 @@

  
 
+
 
 Alineas invoeren
 Enter paragraphs


Index: newportalpagesnodes.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/editwizards/data/config/portalpages/newportalpagesnodes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- newportalpagesnodes.xml 10 Feb 2006 14:54:06 -  1.3
+++ newportalpagesnodes.xml 27 Mar 2008 11:07:34 -  1.4
@@ -15,18 +15,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 


Index: newsimplecontents.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/editwizards/data/config/portalpages/newsimplecontents.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- newsimplecontents.xml   14 Sep 2006 08:42:38 -  1.4
+++ newsimplecontents.xml   27 Mar 2008 11:07:34 -  1.5
@@ -15,44 +15,18 @@
  
 
 
-
-

[MMBASE CVS] applications/email/config/modules sendmail.xml

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/applications/email/config/modules
In directory james.mmbase.org:/tmp/cvs-serv30667

Modified Files:
sendmail.xml 
Log Message:
typo


See also: http://cvs.mmbase.org/viewcvs/applications/email/config/modules


Index: sendmail.xml
===
RCS file: /var/cvs/applications/email/config/modules/sendmail.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- sendmail.xml21 Mar 2008 14:51:45 -  1.11
+++ sendmail.xml27 Mar 2008 10:48:24 -  1.12
@@ -32,7 +32,7 @@
 
http://java.sun.com/products/javamail/javadocs/com/sun/mail/smtp/package-summary.html
 -->
 1
-1
+1
 
 
 email
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/config/applications DidactorPortalPages.xml

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/portalpages/config/applications
In directory james.mmbase.org:/tmp/cvs-serv30321

Modified Files:
DidactorPortalPages.xml 
Log Message:
WTF WTF WTF


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/config/applications


Index: DidactorPortalPages.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/config/applications/DidactorPortalPages.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- DidactorPortalPages.xml 6 Feb 2006 16:51:54 -   1.6
+++ DidactorPortalPages.xml 27 Mar 2008 10:26:00 -  1.7
@@ -1,6 +1,6 @@
-???
+
 http://www.mmbase.org/dtd/application_1_1.dtd";>
-
+
 
 
 
@@ -12,6 +12,7 @@
 portalpagesnodes
 portalpagescontainers
 simplecontents
+simplexmlcontents
 images
 insrel
 posrel
@@ -20,14 +21,19 @@
 
 
 
+
+  
 
+
 
 
 
 
 
-
-
+   

+
+  
+
 
 
  
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/portalpagesnodes - New directory

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/portalpagesnodes
In directory james.mmbase.org:/tmp/cvs-serv30226/portalpagesnodes

Log Message:
Directory 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/portalpagesnodes
 added to the repository



See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/portalpagesnodes
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/config/components - New directory

2008-03-27 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/portalpages/config/components
In directory james.mmbase.org:/tmp/cvs-serv30135/components

Log Message:
Directory /var/cvs/contributions/didactor2/src/portalpages/config/components 
added to the repository



See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/config/components
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/portalpages/templates/portalpages/frontoffice tree.jspx

2008-03-27 Thread Michiel Meeuwissen

Update of 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice
In directory james.mmbase.org:/tmp/cvs-serv29678

Modified Files:
tree.jspx 
Log Message:
using css is very good, but please put it in a css which can be overriden etc..


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice


Index: tree.jspx
===
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/frontoffice/tree.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tree.jspx   20 Mar 2008 17:28:45 -  1.1
+++ tree.jspx   27 Mar 2008 09:59:19 -  1.2
@@ -32,11 +32,11 @@
   
+   title="" alt="" />
   
 
+   >
   
 
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/landing_page_layout itemHeader.jsp

2008-03-27 Thread wrosdorff

Update of 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/landing_page_layout
In directory 
james.mmbase.org:/tmp/cvs-serv29533/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/landing_page_layout

Modified Files:
  Tag: b1_4
itemHeader.jsp 
Log Message:
use elementIndex on request


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/landing_page_layout


Index: itemHeader.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/news/landing_page_layout/Attic/itemHeader.jsp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- itemHeader.jsp  18 Mar 2008 15:32:42 -  1.1.2.2
+++ itemHeader.jsp  27 Mar 2008 09:50:01 -  1.1.2.3
@@ -1 +1 @@
- 
\ No newline at end of file
+
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Templates/single/maven-base project.properties

2008-03-27 Thread jkoster

Update of /var/cvs/contributions/CMSContainer_Templates/single/maven-base
In directory james.mmbase.org:/tmp/cvs-serv29464/single/maven-base

Modified Files:
  Tag: b1_4
project.properties 
Log Message:
Update Templates b1_4 to latest stable.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Templates/single/maven-base


Index: project.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Templates/single/maven-base/project.properties,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- project.properties  20 Sep 2007 19:31:58 -  1.2
+++ project.properties  27 Mar 2008 09:48:01 -  1.2.2.1
@@ -5,12 +5,12 @@
 #   See http://www.MMBase.org/license
 #
 
-application.version=1.3.2
+application.version=1.4.3
 
-cmsc.version=1.3.2
-cmscportlets.version=1.3.2
-cmscmodules.version=1.3.2
-mmbase.version=1.8.5-20070919
+cmsc.version=1.4.3
+cmscportlets.version=1.4.3
+cmscmodules.version=1.4.3
+mmbase.version=1.8.6-20080222
 
 # maven build does not yet generate a rmmci. Did not create one by hand
 mmbasermmci.version=1.8.2-20061020
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Templates/double/maven-base project.properties

2008-03-27 Thread jkoster

Update of /var/cvs/contributions/CMSContainer_Templates/double/maven-base
In directory james.mmbase.org:/tmp/cvs-serv29464/double/maven-base

Modified Files:
  Tag: b1_4
project.properties 
Log Message:
Update Templates b1_4 to latest stable.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Templates/double/maven-base


Index: project.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Templates/double/maven-base/project.properties,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- project.properties  14 Nov 2007 15:04:54 -  1.3
+++ project.properties  27 Mar 2008 09:48:01 -  1.3.2.1
@@ -5,12 +5,12 @@
 #   See http://www.MMBase.org/license
 #
 
-application.version=1.3.4
+application.version=1.4.3
 
-cmsc.version=1.3.4
-cmscportlets.version=1.3.4
-cmscmodules.version=1.3.4
-mmbase.version=1.8.5-20070919
+cmsc.version=1.4.3
+cmscportlets.version=1.4.3
+cmscmodules.version=1.4.3
+mmbase.version=1.8.6-20080222
 
 # maven build does not yet generate a rmmci. Did not create one by hand
 mmbasermmci.version=1.8.2-20061020
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates list.jsp

2008-03-27 Thread wrosdorff

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates
In directory 
james.mmbase.org:/tmp/cvs-serv29370/cmsc/portlets/src/webapp/WEB-INF/templates

Modified Files:
  Tag: b1_4
list.jsp 
Log Message:
revert


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates


Index: list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/list.jsp,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- list.jsp27 Mar 2008 08:46:56 -  1.4.2.1
+++ list.jsp27 Mar 2008 09:43:50 -  1.4.2.2
@@ -52,9 +52,7 @@



-   
-   
-   
+   



___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates list.jsp

2008-03-27 Thread wrosdorff

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates
In directory 
james.mmbase.org:/tmp/cvs-serv28407/cmsc/portlets/src/webapp/WEB-INF/templates

Modified Files:
  Tag: b1_4
list.jsp 
Log Message:
allows for numbered columns


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates


Index: list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/list.jsp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- list.jsp10 Dec 2007 14:11:07 -  1.4
+++ list.jsp27 Mar 2008 08:46:56 -  1.4.2.1
@@ -52,7 +52,9 @@



-   
+   
+   
+   



___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

64 matches

Mail list logo