[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF struts-repository.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv4889/webapp/WEB-INF Modified Files: struts-repository.xml Log Message: CMSC-681 Asset Maintenance code refacted See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF See also: http://www.mmbase.org/jira/browse/CMSC-681 Index: struts-repository.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -u -b -r1.30 -r1.31 --- struts-repository.xml 16 Dec 2008 10:50:36 - 1.30 +++ struts-repository.xml 6 Jan 2009 07:59:42 - 1.31 @@ -23,7 +23,6 @@ form-bean name=RepositoryPasteForm type=com.finalist.cmsc.repository.forms.PasteForm / form-bean name=AssetUploadForm type=com.finalist.cmsc.repository.forms.AssetUploadForm / - form-bean name=ImageUploadForm type=com.finalist.cmsc.repository.forms.ImageUploadForm / /form-beans !-- == Global Exceptions Definitions === -- @@ -243,14 +242,22 @@ unknown=false validate=true forward name=success path=/editors/resources/imageupload.jsp redirect=true / /action + action path=/editors/repository/AttachmentDeleteAction type=com.finalist.cmsc.repository.forms.AttachmentDeleteAction + unknown=false validate=true + forward name=success path=/editors/resources/attachmentupload.jsp redirect=true / + /action action path=/editors/repository/AssetMassDeleteAction type=com.finalist.cmsc.repository.forms.AssetMassDeleteAction unknown=false validate=false forward name=success path=/editors/repository/Asset.do redirect=true / /action action path=/editors/repository/ImageUploadAction type=com.finalist.cmsc.repository.forms.ImageUploadAction - name=ImageUploadForm unknown=false validate=true + name=AssetUploadForm unknown=false validate=true forward name=success path=/editors/resources/imageupload.jsp redirect=true / /action + action path=/editors/repository/AttachmentUploadAction type=com.finalist.cmsc.repository.forms.AttachmentUploadAction + name=AssetUploadForm unknown=false validate=true + forward name=success path=/editors/resources/attachmentupload.jsp redirect=true / + /action action path=/editors/recyclebin/RestoreAssetAction type=com.finalist.cmsc.recyclebin.forms.RestoreAssetAction unknown=false validate=false forward name=restore path=/editors/recyclebin/restore.jsp redirect=false / ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms AttachmentInitAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
In directory
james.mmbase.org:/tmp/cvs-serv4889/java/com/finalist/cmsc/resources/forms
Modified Files:
AttachmentInitAction.java
Log Message:
CMSC-681 Asset Maintenance code refacted
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: AttachmentInitAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/AttachmentInitAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- AttachmentInitAction.java 10 May 2008 16:31:23 - 1.4
+++ AttachmentInitAction.java 6 Jan 2009 07:59:41 - 1.5
@@ -11,14 +11,19 @@
public class AttachmentInitAction extends SearchInitAction {
+ private static final String CREATION = creation;
+ private static final String CHANNELID = channelid;
+
@Override
public ActionForward execute(ActionMapping actionMapping, ActionForm
actionForm,
HttpServletRequest httpServletRequest, HttpServletResponse
httpServletResponse) throws Exception {
AttachmentForm searchForm = (AttachmentForm) actionForm;
+ String channelid = (String)
httpServletRequest.getSession().getAttribute(CREATION);
if (StringUtils.isEmpty(searchForm.getOrder())) {
searchForm.setOrder(title);
}
+ httpServletRequest.setAttribute(CHANNELID, channelid);
return super.execute(actionMapping, actionForm, httpServletRequest,
httpServletResponse);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Please confirm your message
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/blocks create_context.jspx delete_node.jspx contexts.jspx groups.jspx users.jspx
Update of /var/cvs/applications/cloudcontext/blocks
In directory james.mmbase.org:/tmp/cvs-serv9827
Modified Files:
contexts.jspx groups.jspx users.jspx
Added Files:
create_context.jspx delete_node.jspx
Log Message:
See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/blocks
create_context.jspx is new
delete_node.jspx is new
Index: contexts.jspx
===
RCS file: /var/cvs/applications/cloudcontext/blocks/contexts.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- contexts.jspx 5 Jan 2009 12:57:43 - 1.4
+++ contexts.jspx 6 Jan 2009 09:22:37 - 1.5
@@ -22,7 +22,9 @@
p class=action
mm:maycreate type=$nodetype
- mm:link page=create_context
+ mm:link
+ referids=nodetype
+ page=create_context
a href=${_}img
src=${mm:link('/mmbase/style/images/create.png')} alt=+ title=create
user //a
/mm:link
/mm:maycreate
Index: groups.jspx
===
RCS file: /var/cvs/applications/cloudcontext/blocks/groups.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- groups.jspx 5 Jan 2009 16:35:39 - 1.5
+++ groups.jspx 6 Jan 2009 09:22:37 - 1.6
@@ -76,7 +76,6 @@
/mm:link
/th
/mm:fieldlist
-thfmt:message key=rank //th
th
mm:link referids=search
mm:compare referid=orderby value=number
@@ -97,25 +96,32 @@
mm:sortorder field=$orderby direction=$directions /
mm:listnodes id=group varStatus=status
tr id=object${_node} class=${status.index % 2 eq 0 ? 'even' :
'odd'}
- td
-mm:present referid=extrauserlink
- mm:include referids=user page=$extrauserlink
notfound=skip/
-/mm:present
- /td
mm:fieldlist type=list
tdmm:fieldinfo type=guivalue //td
/mm:fieldlist
td class=commands
mm:maywrite
mm:link referids=gr...@node page=group
-a
onclick=document.getElementById('object${_node}').className = 'active';
- href=${_}
+a href=${_}
fmt:message key=update /
img src=${mm:link('/mmbase/style/images/edit.png')}
alt= title= /
/a
/mm:link
/mm:maywrite
+mm:maydelete
+ mm:link
+ process=true
+ referids=gr...@delete page=groups
+a
+class=confirm post
+href=${_}
+ fmt:message key=delete /
+ img src=${mm:link('/mmbase/style/images/delete.png')}
+ alt= title= /
+/a
+ /mm:link
+/mm:maydelete
/td
/tr
/mm:listnodes
Index: users.jspx
===
RCS file: /var/cvs/applications/cloudcontext/blocks/users.jspx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- users.jspx 5 Jan 2009 12:57:43 - 1.7
+++ users.jspx 6 Jan 2009 09:22:37 - 1.8
@@ -121,11 +121,10 @@
td class=commands
mm:maywrite
mm:link referids=u...@node page=user
-a
onclick=document.getElementById('object${_node}').className = 'active';
- href=${_}
+a href=${_}
fmt:message key=update /
img src=${mm:link('/mmbase/style/images/edit.png')}
- alt= title= /
+ alt=edit title= /
/a
/mm:link
/mm:maywrite
@@ -133,12 +132,12 @@
mm:compare value=ADMIN_INT inverse=true
mm:maydelete
mm:import id=promptreallydeleteusers/mm:import
- mm:link referids=user page=delete_user
-a onclick=confirm.js
+ mm:link referids=u...@delete page=users process=true
+a class=confirm post
href=${_}
fmt:message key=delete /
img src=${mm:link('/mmbase/style/images/delete.png')}
- alt= title= /
+ alt=X title= /
/a
/mm:link
/mm:maydelete
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/config/components cloudcontext.xml
Update of /var/cvs/applications/cloudcontext/config/components In directory james.mmbase.org:/tmp/cvs-serv9936 Modified Files: cloudcontext.xml Log Message: See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/config/components Index: cloudcontext.xml === RCS file: /var/cvs/applications/cloudcontext/config/components/cloudcontext.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- cloudcontext.xml5 Jan 2009 17:01:43 - 1.11 +++ cloudcontext.xml6 Jan 2009 09:23:04 - 1.12 @@ -26,8 +26,12 @@ param name=offset type=java.lang.Integer / param name=orderby type=java.lang.String / param name=directions type=java.lang.String / + param name=search type=java.lang.String / param regex=_.* / /body +process jsp=delete_node.jspx + param name=delete / +/process /block @@ -40,7 +44,6 @@ body jsp=user.jspx param name=node / /body - /block block name=create_user mimetype=text/html @@ -52,6 +55,7 @@ body jsp=create_user.jspx / /block + block name=groups classification=mmbase.cloudsecurity:20 mimetype=text/html @@ -65,6 +69,9 @@ param name=directions / param regex=_.* / /body +process jsp=delete_node.jspx + param name=delete / +/process /block @@ -118,6 +125,17 @@ /block + block name=create_context mimetype=text/html +title xml:lang=nlCre??eer context/title +title xml:lang=enCreate Context/title +xi:include href=cloudcontext_style.head.xml / +xi:include href=http://www.mmbase.org/components/validation.head.xml; / +xi:include href=http://www.mmbase.org/components/widgets.head.xml; / +body jsp=create_context.jspx + param name=nodetype / +/body + /block + block name=actions classification=mmbase.cloudsecurity:40 mimetype=text/html ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/blocks actions.jspx contexts.jspx groups.jspx users.jspx
Update of /var/cvs/applications/cloudcontext/blocks
In directory james.mmbase.org:/tmp/cvs-serv14428
Modified Files:
actions.jspx contexts.jspx groups.jspx users.jspx
Log Message:
See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/blocks
Index: actions.jspx
===
RCS file: /var/cvs/applications/cloudcontext/blocks/actions.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- actions.jspx5 Jan 2009 17:01:43 - 1.1
+++ actions.jspx6 Jan 2009 10:10:13 - 1.2
@@ -23,10 +23,10 @@
/mm:form
- mm:import id=orderbynumber/mm:import
- mm:import id=directionsdown/mm:import
+ mm:import externid=orderby from=requestnumber/mm:import
+ mm:import externid=directions from=requestDOWN/mm:import
mm:import externid=search /
- table summary=Users
+ table summary=Actions
mm:listnodescontainer type=$nodetype
@@ -97,8 +97,9 @@
/mm:fieldlist
td class=commands
mm:maywrite
- mm:link referids=gr...@node page=action
-a
onclick=document.getElementById('object${_node}').className = 'active';
+ mm:link referids=gr...@node
+ page=action
+a
href=${_}
fmt:message key=update /
img src=${mm:link('/mmbase/style/images/edit.png')}
Index: contexts.jspx
===
RCS file: /var/cvs/applications/cloudcontext/blocks/contexts.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- contexts.jspx 6 Jan 2009 09:22:37 - 1.5
+++ contexts.jspx 6 Jan 2009 10:10:13 - 1.6
@@ -82,7 +82,7 @@
tr
mm:fieldlist nodetype=$nodetype fields=$fields
th
-mm:link
+mm:link referids=tab
mm:param name=orderbymm:fieldinfo type=name //mm:param
mm:fieldinfo type=name
mm:compare referid2=orderby
@@ -104,7 +104,8 @@
/th
/mm:fieldlist
th
- mm:link referids=search
+ mm:link
+ referids=search,tab
mm:compare referid=orderby value=number
mm:write referid=directions
mm:compare value=UP
@@ -128,16 +129,26 @@
/mm:fieldlist
td class=commands
mm:maywrite
- mm:link referids=_n...@node
+ mm:link
+ referids=_n...@node
page=context
-a
onclick=document.getElementById('object${_node}').className = 'active';
- href=${_}
+a href=${_}
fmt:message key=update /
img src=${mm:link('/mmbase/style/images/edit.png')}
alt= title= /
/a
/mm:link
/mm:maywrite
+mm:maydelete
+ mm:link referids=_n...@delete page=contexts process=true
+a class=confirm post
+ href=${_}
+ fmt:message key=delete /
+ img src=${mm:link('/mmbase/style/images/delete.png')}
+ alt=X title= /
+/a
+ /mm:link
+/mm:maydelete
/td
/tr
/mm:listnodes
Index: groups.jspx
===
RCS file: /var/cvs/applications/cloudcontext/blocks/groups.jspx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- groups.jspx 6 Jan 2009 09:22:37 - 1.6
+++ groups.jspx 6 Jan 2009 10:10:13 - 1.7
@@ -33,8 +33,8 @@
/mm:form
- mm:import id=orderbynumber/mm:import
- mm:import id=directionsdown/mm:import
+ mm:import externid=orderbynumber/mm:import
+ mm:import externid=directionsdown/mm:import
mm:import externid=search /
table summary=Users
Index: users.jspx
===
RCS file: /var/cvs/applications/cloudcontext/blocks/users.jspx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- users.jspx 6 Jan 2009 09:22:37 - 1.8
+++ users.jspx 6 Jan 2009 10:10:13 - 1.9
@@ -38,8 +38,8 @@
/mm:form
- mm:import id=orderbynumber/mm:import
- mm:import id=directionsdown/mm:import
+ mm:import externid=orderbynumber/mm:import
+ mm:import externid=directionsDOWN/mm:import
mm:import externid=search /
table summary=Users
@@ -52,6 +52,7 @@
/mm:fieldlist
/mm:present
+
mm:size id=totalsize write=false /
mm:offset value=$offset /
@@ -104,7 +105,9 @@
/mm:link
/th
/tr
+
mm:sortorder field=$orderby direction=$directions /
+
mm:listnodes id=user varStatus=status
tr
[MMBASE CVS] applications/cloudcontext/blocks create_group.jspx create_group.jsp
Update of /var/cvs/applications/cloudcontext/blocks In directory james.mmbase.org:/tmp/cvs-serv14603 Added Files: create_group.jspx Removed Files: create_group.jsp Log Message: See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/blocks create_group.jspx is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository contentsearch.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv16156
Modified Files:
contentsearch.jsp
Log Message:
CMSC-681 Asset Maintenance an error happens when backing in Link existing
content
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: contentsearch.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- contentsearch.jsp 26 Dec 2008 11:20:45 - 1.8
+++ contentsearch.jsp 6 Jan 2009 10:28:05 - 1.9
@@ -28,7 +28,7 @@
mm:import externid=results jspvar=nodeList vartype=List /
mm:import externid=offset jspvar=offset vartype=Integer0/mm:import
mm:import externid=resultCount jspvar=resultCount
vartype=Integer0/mm:import
-
+c:set var=returnurl value=${fn:replace(returnurl,'amp;','')}/
mm:cloud jspvar=cloud loginpage=../../editors/login.jsp
div class=tabs
c:if test=${param.index eq 'yes'}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/config/components cloudcontext.xml
Update of /var/cvs/applications/cloudcontext/config/components In directory james.mmbase.org:/tmp/cvs-serv23790 Modified Files: cloudcontext.xml Log Message: renamed the 'mmbase/cloudsecurity' classificaiton to mmbase/security, which results in a bit nicer urls See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/config/components Index: cloudcontext.xml === RCS file: /var/cvs/applications/cloudcontext/config/components/cloudcontext.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- cloudcontext.xml6 Jan 2009 09:23:04 - 1.12 +++ cloudcontext.xml6 Jan 2009 11:40:24 - 1.13 @@ -17,7 +17,7 @@ bundle name=org.mmbase.security.implementation.cloudcontext.editorresources.texts / block name=users mimetype=text/html - classification=mmbase.edit:200 mmbase.cloudsecurity:10 + classification=mmbase.edit:200 mmbase.security:10 title xml:lang=nlGebruikers/title title xml:lang=enUsers/title description xml:lang=enGeneric security editor/description @@ -57,7 +57,7 @@ block name=groups - classification=mmbase.cloudsecurity:20 + classification=mmbase.security:20 mimetype=text/html title xml:lang=nlGroepen/title title xml:lang=enGroups/title @@ -99,7 +99,7 @@ block name=contexts - classification=mmbase.cloudsecurity:30 + classification=mmbase.security:30 mimetype=text/html title xml:lang=nlContexten/title title xml:lang=enContexts/title @@ -137,13 +137,19 @@ /block block name=actions - classification=mmbase.cloudsecurity:40 + classification=mmbase.security:40 mimetype=text/html title xml:lang=nlActies/title title xml:lang=enActions/title description xml:lang=enGeneric security editor/description xi:include href=cloudcontext_style.head.xml / -body jsp=actions.jspx / +body jsp=actions.jspx + param name=offset type=java.lang.Integer / + param name=orderby type=java.lang.String / + param name=directions type=java.lang.String / + param name=search type=java.lang.String / + param regex=_.* / +/body /block block name=action mimetype=text/html @@ -158,7 +164,7 @@ /block block name=help - classification=mmbase.cloudsecurity:0 + classification=mmbase.security:0 mimetype=text/html title xml:lang=nlHelp/title title xml:lang=enHelp/title ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext BasicContextProvider.java BasicUserProvider.java
Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext
In directory
james.mmbase.org:/tmp/cvs-serv24037/src/org/mmbase/security/implementation/cloudcontext
Modified Files:
BasicContextProvider.java BasicUserProvider.java
Log Message:
The encoding property is actually not needed, because pleonastic. The processor
or the password field suffices to define it.
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext
Index: BasicContextProvider.java
===
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- BasicContextProvider.java 5 Jan 2009 16:35:39 - 1.8
+++ BasicContextProvider.java 6 Jan 2009 11:42:10 - 1.9
@@ -35,7 +35,7 @@
* This is a basic implemention of {...@link ContextProvider} that implements
all the methods in a default way.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicContextProvider.java,v 1.8 2009/01/05 16:35:39 michiel
Exp $
+ * @version $Id: BasicContextProvider.java,v 1.9 2009/01/06 11:42:10 michiel
Exp $
* @since MMBase-1.9.1
*/
public class BasicContextProvider implements ContextProvider {
@@ -444,10 +444,8 @@
if (groupsAndUsers.contains(userNode)) return true;
}
-IteratorMMObjectNode iter = groupsAndUsers.iterator();
-// now checking if this user is in one of these groups.
-while (iter.hasNext()) {
-MMObjectNode group = iter.next();
+
+for (MMObjectNode group : groupsAndUsers) {
if (! (group.getBuilder() instanceof Groups)) continue;
if (log.isTraceEnabled()) {
log.trace(checking group + group);
Index: BasicUserProvider.java
===
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BasicUserProvider.java 23 Dec 2008 17:30:42 - 1.1
+++ BasicUserProvider.java 6 Jan 2009 11:42:10 - 1.2
@@ -14,6 +14,7 @@
import java.util.*;
import org.mmbase.util.transformers.*;
import org.mmbase.module.core.*;
+import org.mmbase.datatypes.DataType;
import org.mmbase.core.CoreField;
import org.mmbase.security.SecurityException;
import org.mmbase.security.Rank;
@@ -27,14 +28,13 @@
* This is a basic implemention of {...@link Provider} that implements all the
methods in a default way.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicUserProvider.java,v 1.1 2008/12/23 17:30:42 michiel Exp $
+ * @version $Id: BasicUserProvider.java,v 1.2 2009/01/06 11:42:10 michiel Exp $
* @since MMBase-1.9.1
*/
public abstract class BasicUserProvider implements UserProvider {
private static final Logger log =
Logging.getLoggerInstance(BasicUserProvider.class);
-private static final CharTransformer md5 = new MD5();
protected String statusField = Users.FIELD_STATUS;
protected String userNameField = Users.FIELD_USERNAME;
@@ -112,7 +112,7 @@
if (log.isDebugEnabled()) {
log.debug(username: ' + userName + ' found in node # +
user.getNumber() + -- PASSWORDS NOT EQUAL ( + encodedPassword + != +
dbPassword + ));
}
-return null;
+throw new SecurityException(password for ' + userName + '
incorrect);
}
}
@@ -278,7 +278,8 @@
public String encode(String e) {
-return md5.transform(e);
+org.mmbase.bridge.Field field =
getUserBuilder().getField(getPasswordField());
+return
org.mmbase.util.Casting.toString(field.getDataType().getProcessor(DataType.PROCESS_SET).process(null,
field, e));
}
public MMObjectBuilder getUserBuilder() {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources urlinfo.jsp urlsearch.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv1558/cmsc/contentrepository/src/webapp/editors/resources
Modified Files:
Tag: b1_4
urlinfo.jsp urlsearch.jsp
Log Message:
CMSC-1190 - Error in URL info screen in content explorer; was not properly
fixed, this should do it. Made code similar to upstream code.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1190
Index: urlinfo.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlinfo.jsp,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -b -r1.6.2.1 -r1.6.2.2
--- urlinfo.jsp 16 Dec 2008 13:00:20 - 1.6.2.1
+++ urlinfo.jsp 6 Jan 2009 13:10:45 - 1.6.2.2
@@ -41,10 +41,10 @@
c:when test=${empty isValidUrl}
fmt:message
key=urlsearch.validurl.unknown /
/c:when
-c:when test=${!isValidUrl}
+c:when test=${isValidUrl eq false}
fmt:message
key=urlsearch.validurl.invalid /
/c:when
-c:when test=${isValidUrl}
+c:when test=${isValidUrl eq true}
fmt:message
key=urlsearch.validurl.valid /
/c:when
c:otherwise
Index: urlsearch.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -b -r1.7.2.2 -r1.7.2.3
--- urlsearch.jsp 3 Jan 2009 18:00:45 - 1.7.2.2
+++ urlsearch.jsp 6 Jan 2009 13:10:46 - 1.7.2.3
@@ -98,10 +98,10 @@
c:when test=${empty isValidUrl}
fmt:message
key=urlsearch.validurl.unknown /
/c:when
-c:when test=${isValidUrl eq 0}
+c:when test=${isValidUrl eq false}
fmt:message
key=urlsearch.validurl.invalid /
/c:when
-c:when test=${isValidUrl eq 1}
+c:when test=${isValidUrl eq true}
fmt:message
key=urlsearch.validurl.valid /
/c:when
c:otherwise
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Returned mail: see transcript for details
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext Authenticate.java BasicUserProvider.java UserProvider.java
Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext
In directory
james.mmbase.org:/tmp/cvs-serv11446/src/org/mmbase/security/implementation/cloudcontext
Modified Files:
Authenticate.java BasicUserProvider.java UserProvider.java
Log Message:
MMB-1757
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext
See also: http://www.mmbase.org/jira/browse/MMB-1757
Index: Authenticate.java
===
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/Authenticate.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- Authenticate.java 23 Dec 2008 17:30:42 - 1.30
+++ Authenticate.java 6 Jan 2009 14:38:21 - 1.31
@@ -31,11 +31,12 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Authenticate.java,v 1.30 2008/12/23 17:30:42 michiel Exp $
+ * @version $Id: Authenticate.java,v 1.31 2009/01/06 14:38:21 michiel Exp $
*/
public class Authenticate extends Authentication {
private static final Logger log =
Logging.getLoggerInstance(Authenticate.class);
+
protected static final String ADMINS_PROPS = admins.properties;
private int extraAdminsUniqueNumber;
@@ -112,10 +113,23 @@
/**
* {...@inheritdoc}
+ *
+ table
+ captionPassword comparison strategies/caption
+ trthclient provided/ththdatabase/ththapplication to
use/ththcomments/thtr
+ trtdplain/tdthencoded/tdtdname/password/tdtdthis is the
default and most
+ sensible case/td/tr
+
trtdencoded/tdthencoded/tdtdname/encodedpassword/tdtdThe
'allowEnoded' property must be true for this to work./td/tr
+
+ trtdplain/tdthplain/tdtdname/password/tdtdthis is the
default if the password
+ set-processor is empty./td/tr
+
+
trtdencoded/tdthplain/tdtdname/encodedpassword/tdtd/td/tr
+ /table
*/
-@Override public UserContext login(String s, MapString, ? map, Object
aobj[]) throws SecurityException {
+@Override public UserContext login(String type, MapString, ? map, Object
aobj[]) throws SecurityException {
if (log.isTraceEnabled()) {
-log.trace(login-module: ' + s + ');
+log.trace(login-module: ' + type + ');
}
MMObjectNode node = null;
UserProvider users = getUserProvider();
@@ -125,16 +139,16 @@
throw new SecurityException(msg);
}
allowEncodedPassword =
org.mmbase.util.Casting.toBoolean(users.getUserBuilder().getInitParameter(allowencodedpassword));
-if (anonymous.equals(s)) {
+if (anonymous.equals(type)) {
node = users.getAnonymousUser();
if (node == null) {
if (! warnedNoAnonymousUser) {
log.warn(No user node for anonymous found);
warnedNoAnonymousUser = true;
}
-return new LocalAdmin(anonymous, s,
Rank.getRank(anonymous));
+return new LocalAdmin(anonymous, type,
Rank.getRank(anonymous));
}
-} else if (name/password.equals(s)) {
+} else if (name/password.equals(type)) {
String userName = (String)map.get(username);
String password = (String)map.get(password);
if(userName == null || password == null) {
@@ -143,16 +157,16 @@
if (extraAdmins.containsKey(userName)) {
if(extraAdmins.get(userName).equals(password)) {
log.service(Logged in an 'extra' admin ' + userName +
'. (from admins.properties));
-User user = new LocalAdmin(userName, s);
+User user = new LocalAdmin(userName, type);
loggedInExtraAdmins.put(userName, user);
return user;
}
}
-node = users.getUser(userName, password, true);
+node = users.getUser(userName, password, false);
if (node != null ! users.isValid(node)) {
throw new SecurityException(Logged in an invalid user);
}
-} else if (allowEncodedPassword name/encodedpassword.equals(s)) {
+} else if (allowEncodedPassword
name/encodedpassword.equals(type)) {
String userName = (String)map.get(username);
String password = (String)map.get(encodedpassword);
if(userName == null || password == null) {
@@ -161,25 +175,25 @@
if (extraAdmins.containsKey(userName)) {
if(users.encode((String)
extraAdmins.get(userName)).equals(password)) {
log.service(Logged in an 'extra' admin ' + userName +
'. (from admins.properties));
-User user = new LocalAdmin(userName, s);
+
[MMBASE CVS] config/functions utils.xml
Update of /var/cvs/config/functions In directory james.mmbase.org:/tmp/cvs-serv13315 Modified Files: utils.xml Log Message: added a function to make the function sets available to EL See also: http://cvs.mmbase.org/viewcvs/config/functions Index: utils.xml === RCS file: /var/cvs/config/functions/utils.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- utils.xml 22 Jul 2008 11:54:58 - 1.11 +++ utils.xml 6 Jan 2009 14:55:16 - 1.12 @@ -75,4 +75,10 @@ param name=repository type=String / /function + function name=functionsets +typeclass/type +classorg.mmbase.util.functions.FunctionSets/class +methodgetFunctionSets/method + /function + /functionset ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] config/components core.xml
Update of /var/cvs/config/components In directory james.mmbase.org:/tmp/cvs-serv13419 Modified Files: core.xml Log Message: added an admin page to show the available function sets See also: http://cvs.mmbase.org/viewcvs/config/components Index: core.xml === RCS file: /var/cvs/config/components/core.xml,v retrieving revision 1.60 retrieving revision 1.61 diff -u -b -r1.60 -r1.61 --- core.xml24 Dec 2008 11:00:54 - 1.60 +++ core.xml6 Jan 2009 14:55:35 - 1.61 @@ -111,6 +111,14 @@ body jsp=jobs.jspx / /block + block name=functions + classification=mmbase.tools + mimetype=text/html +title xml:lang=enFunctions/title +title xml:lang=nlFuncties/title +body jsp=functions.jspx / + /block + block name=datatypes classification=mmbase.tools mmbase.examples mimetype=text/html ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/components/core functions.jspx
Update of /var/cvs/html/mmbase/components/core In directory james.mmbase.org:/tmp/cvs-serv13514 Added Files: functions.jspx Log Message: added an admin page to show the available function sets See also: http://cvs.mmbase.org/viewcvs/html/mmbase/components/core functions.jspx is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/functions FunctionSet.java FunctionSets.java Functions.java
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv16037
Modified Files:
FunctionSet.java FunctionSets.java Functions.java
Log Message:
details only.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions
Index: FunctionSet.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/FunctionSet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- FunctionSet.java14 Oct 2006 14:35:39 - 1.9
+++ FunctionSet.java6 Jan 2009 15:16:49 - 1.10
@@ -15,12 +15,12 @@
* @seeFunctionSets
* @author Daniel Ockeloen
* @author Michiel Meeuwissen
- * @version $Id: FunctionSet.java,v 1.9 2006/10/14 14:35:39 nklasens Exp $
+ * @version $Id: FunctionSet.java,v 1.10 2009/01/06 15:16:49 michiel Exp $
* @since MMBase-1.8
*/
public class FunctionSet extends FunctionProvider {
-private String name;
+private final String name;
private String description;
public FunctionSet(String name, String description) {
Index: FunctionSets.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/FunctionSets.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- FunctionSets.java 4 Sep 2008 05:56:23 - 1.34
+++ FunctionSets.java 6 Jan 2009 15:16:49 - 1.35
@@ -13,6 +13,7 @@
import org.mmbase.util.logging.Logging;
import org.mmbase.util.xml.DocumentReader;
import org.mmbase.util.*;
+import org.mmbase.util.xml.XMLWriter;
import java.io.*;
import java.util.*;
@@ -36,7 +37,7 @@
* @author Danieuml;l Ockeloen
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: FunctionSets.java,v 1.34 2008/09/04 05:56:23 michiel Exp $
+ * @version $Id: FunctionSets.java,v 1.35 2009/01/06 15:16:49 michiel Exp $
*/
public class FunctionSets {
@@ -48,7 +49,7 @@
private static final Logger log =
Logging.getLoggerInstance(FunctionSets.class);
-private static final MapString, FunctionSet functionSets = new
HashMapString, FunctionSet();
+private static final MapString, FunctionSet functionSets = new
TreeMapString, FunctionSet();
static {
org.mmbase.util.xml.EntityResolver.registerPublicID(PUBLIC_ID_FUNCTIONSET_1_0,
DTD_FUNCTIONSET_1_0, FunctionSets.class);
@@ -148,7 +149,7 @@
watcher.add(setResource);
decodeFunctionSet(watcher.getResourceLoader(),
setResource, setName);
} catch (Throwable t) {
-log.error(t.getMessage());
+log.error(t.getClass() + + t.getMessage(), t);
}
}
}
@@ -241,10 +242,14 @@
Function prev = functionSet.addFunction(fun);
if (prev != null ! (prev.equals(fun))) {
log.warn(Replaced + prev + with + fun + in
function set + functionSet);
+} else {
+log.service(Found + fun);
}
} catch (Exception e) {
log.error(e.getMessage(), e);
}
+} else {
+log.warn(No function name specified on +
XMLWriter.write(element));
}
}
}
Index: Functions.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/Functions.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- Functions.java 20 Aug 2008 21:12:29 - 1.19
+++ Functions.java 6 Jan 2009 15:16:49 - 1.20
@@ -25,7 +25,7 @@
* @author Pierre van Rooden
* @author Daniel Ockeloen
* @author Michiel Meeuwissen
- * @version $Id: Functions.java,v 1.19 2008/08/20 21:12:29 michiel Exp $
+ * @version $Id: Functions.java,v 1.20 2009/01/06 15:16:49 michiel Exp $
*/
public class Functions {
@@ -63,7 +63,8 @@
patterns = true;
} else {
if (patterns) throw new
IllegalArgumentException(PatternParameter's must be last in the definition);
-list.add(firstPattern, d); firstPattern++;
+list.add(firstPattern, d);
+firstPattern++;
}
}
return list;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/framework/basic State.java
Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv18464/basic
Modified Files:
State.java
Log Message:
that obviously was a bug, we try to avoid the locale == null, but then forgot
to set it.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic
Index: State.java
===
RCS file: /var/cvs/src/org/mmbase/framework/basic/State.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- State.java 5 Jan 2009 18:53:23 - 1.11
+++ State.java 6 Jan 2009 15:37:26 - 1.12
@@ -25,7 +25,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: State.java,v 1.11 2009/01/05 18:53:23 michiel Exp $
+ * @version $Id: State.java,v 1.12 2009/01/06 15:37:26 michiel Exp $
* @since MMBase-1.9
*/
public class State {
@@ -161,10 +161,13 @@
String b = getBlock().getComponent().getBundle();
if (b != null) {
Locale locale = (Locale)
request.getAttribute(javax.servlet.jsp.jstl.fmt.locale.request);
-if (locale == null)
org.mmbase.module.core.MMBase.getMMBase().getLocale();
+if (locale == null) {
+locale = org.mmbase.module.core.MMBase.getMMBase().getLocale();
+}
originalLocalizationContext =
request.getAttribute(Config.FMT_LOCALIZATION_CONTEXT + .request);
+ResourceBundle bundle = ResourceBundle.getBundle(b, locale);
request.setAttribute(Config.FMT_LOCALIZATION_CONTEXT + .request,
- new
LocalizationContext(ResourceBundle.getBundle(b, locale), Locale.getDefault()));
+ new LocalizationContext(bundle,
Locale.getDefault()));
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/components/core blobs.jspx
Update of /var/cvs/html/mmbase/components/core
In directory james.mmbase.org:/tmp/cvs-serv25075
Modified Files:
blobs.jspx
Log Message:
See also: http://cvs.mmbase.org/viewcvs/html/mmbase/components/core
Index: blobs.jspx
===
RCS file: /var/cvs/html/mmbase/components/core/blobs.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- blobs.jspx 9 Aug 2008 11:29:47 - 1.5
+++ blobs.jspx 6 Jan 2009 17:00:43 - 1.6
@@ -10,7 +10,7 @@
mm:cloud rank=administrator
jsp:output omit-xml-declaration=true /
div
- class=mm_c c_core b_blobs ${requestScope.className}
+ class=mm_c c_core b_blobs
${requestScope['org.mmbase.componentClassName']}
id=${requestScope['org.mmbase.componentId']}
mm:import externid=convertnow /
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/components/core functions.jspx
Update of /var/cvs/html/mmbase/components/core
In directory james.mmbase.org:/tmp/cvs-serv25114
Modified Files:
functions.jspx
Log Message:
showing some descriptions too
See also: http://cvs.mmbase.org/viewcvs/html/mmbase/components/core
Index: functions.jspx
===
RCS file: /var/cvs/html/mmbase/components/core/functions.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- functions.jspx 6 Jan 2009 14:55:57 - 1.1
+++ functions.jspx 6 Jan 2009 17:00:54 - 1.2
@@ -16,10 +16,13 @@
ul
c:forEach items=${functionsets} var=entry
li
-${entry.key}
+p${entry.key}: mm:write value=${entry.value.description} //p
ul
c:forEach items=${entry.value.functions} var=fun
-limm:escape${fun}/mm:escape/li
+li
+ mm:escape${fun}/mm:escape
+ pmm:write value=${fun.description} //p
+/li
/c:forEach
/ul
/li
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/components/core request.jspx
Update of /var/cvs/html/mmbase/components/core In directory james.mmbase.org:/tmp/cvs-serv25183/core Modified Files: request.jspx Log Message: removed unused import See also: http://cvs.mmbase.org/viewcvs/html/mmbase/components/core Index: request.jspx === RCS file: /var/cvs/html/mmbase/components/core/request.jspx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- request.jspx24 Dec 2008 17:16:25 - 1.2 +++ request.jspx6 Jan 2009 17:01:27 - 1.3 @@ -6,7 +6,6 @@ xmlns:fn=http://java.sun.com/jsp/jstl/functions; xmlns:mm=http://www.mmbase.org/mmbase-taglib-2.0; - jsp:directive.page import=org.mmbase.storage.implementation.database.* / mm:cloud jsp:output omit-xml-declaration=true / div ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext/config/components blocktypes.xml
Update of /var/cvs/applications/cloudcontext/config/components In directory james.mmbase.org:/tmp/cvs-serv25293/config/components Modified Files: blocktypes.xml Log Message: renamed the 'mmbase/cloudsecurity' classificaiton to mmbase/security, which results in a bit nicer urls See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/config/components Index: blocktypes.xml === RCS file: /var/cvs/applications/cloudcontext/config/components/blocktypes.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- blocktypes.xml 25 Mar 2008 09:21:28 - 1.1 +++ blocktypes.xml 6 Jan 2009 17:07:41 - 1.2 @@ -5,7 +5,7 @@ xsi:schemaLocation=http://www.mmbase.org/xmlns/blocktypes http://www.mmbase.org/xmlns/blocktypes.xsd; - blocktype name=mmbase.cloudsecurity weight=50 + blocktype name=mmbase.security weight=50 title xml:lang=nlVeiligheid/title title xml:lang=enSecurity/title /blocktype ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Women hate men with small equipment
If you are unable to see the message below, click here to view. Thank you for your interest in Aha A Creative AgencyYou are receiving this e-mail because you have subscribed to product updates.If you want to unsubscribe from Aha A Creative Agency Newsletter, please visit subscription center and provide your address in the Unsubscribe field. Copyright (C) 2008, Aha A Creative Agency6115 Park South Dr Charlotte, NC 28210 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans CreateRelationsForSecondaryContent.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans
In directory
james.mmbase.org:/tmp/cvs-serv11716/maintenance/src/java/com/finalist/cmsc/maintenance/beans
Modified Files:
CreateRelationsForSecondaryContent.java
Log Message:
CMSC-1206 Asset: enhance the create-relations-asset-channel.jsp script to
find a good channel
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans
See also: http://www.mmbase.org/jira/browse/CMSC-1206
Index: CreateRelationsForSecondaryContent.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans/CreateRelationsForSecondaryContent.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- CreateRelationsForSecondaryContent.java 30 Dec 2008 02:25:55 -
1.11
+++ CreateRelationsForSecondaryContent.java 7 Jan 2009 03:35:54 -
1.12
@@ -16,7 +16,7 @@
import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.services.versioning.Versioning;
import com.finalist.cmsc.services.versioning.VersioningException;
-
+import javax.servlet.jsp.PageContext;
public class CreateRelationsForSecondaryContent {
@@ -34,11 +34,13 @@
private Cloud cloud;
private Integer parentNumber;
private String type ;
+ public PageContext ctx ;
/** MMbase logging system */
private static final Logger log =
Logging.getLoggerInstance(CreateRelationsForSecondaryContent.class.getName());
- public CreateRelationsForSecondaryContent(Cloud cloud) {
+ public CreateRelationsForSecondaryContent(Cloud cloud,PageContext
pageContext) {
this.cloud = cloud;
+ ctx = pageContext;
}
public String execute(Integer parentNumber,String type) throws Exception {
@@ -64,6 +66,7 @@
NodeList assets = query.getList();
log.info(Assets - Found total Assets: + assets.size());
+ ctx.setAttribute(totalCount, assets.size());
int counter = 0;
for (int i = 0; i assets.size(); i++) {
@@ -76,17 +79,13 @@
Node channel = getRelatedChannel(asset);
if(channel == null) {
- log.info(Assets - begin to add relation from +
asset.getNumber()+ to channel +root.getNumber()+ Asset elements.);
relation = RelationUtil.createRelation(asset, root,
CREATIONREL);
}
else {
- log.info(Assets - begin to add relation from +
asset.getNumber()+ to channel +channel.getNumber()+ Asset elements.);
relation = RelationUtil.createRelation(asset, channel,
CREATIONREL);
- log.info(Assets - added relations to Asset element.+
asset.getNumber());
}
}
else {
- log.info(Assets - begin to add relation from +
asset.getNumber()+ to channel +root.getNumber()+ Asset elements.);
relation = RelationUtil.createRelation(asset, root,
CREATIONREL);
}
@@ -107,6 +106,7 @@
Publish.publish(relation);
}*/
}
+ ctx.setAttribute(addedRelationCount, counter);
log.info(Assets - Added relations to + counter + Asset elements.);
return success;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance create-relations-asset-channel.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance
In directory
james.mmbase.org:/tmp/cvs-serv11716/maintenance/src/webapp/editors/maintenance
Modified Files:
create-relations-asset-channel.jsp
Log Message:
CMSC-1206 Asset: enhance the create-relations-asset-channel.jsp script to
find a good channel
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance
See also: http://www.mmbase.org/jira/browse/CMSC-1206
Index: create-relations-asset-channel.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/create-relations-asset-channel.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- create-relations-asset-channel.jsp 26 Dec 2008 09:36:04 - 1.3
+++ create-relations-asset-channel.jsp 7 Jan 2009 03:35:54 - 1.4
@@ -35,11 +35,13 @@
c:if test=${param.type == 'root'}
mm:write referid=number jspvar=number vartype=Integer
% if(number 1) {
-new CreateRelationsForSecondaryContent(cloud).execute(number,null);
+new
CreateRelationsForSecondaryContent(cloud,pageContext).execute(number,null);
+out.println(Total Asset count :
+pageContext.getAttribute(totalCount)+ added creationrel count :
+pageContext.getAttribute(addedRelationCount));
}
else {
if(RepositoryUtil.isChannel(String.valueOf(number))) {
- new CreateRelationsForSecondaryContent(cloud).execute(number,null);
+ new
CreateRelationsForSecondaryContent(cloud,pageContext).execute(number,null);
+ out.println(Total Asset count :
+pageContext.getAttribute(totalCount)+ added creationrel count :
+pageContext.getAttribute(addedRelationCount));
}
else {
out.println(The number should be a channel number!);
@@ -51,7 +53,8 @@
c:if test=${param.type == 'selfselect'}
mm:write referid=number jspvar=number vartype=Integer
%
- new
CreateRelationsForSecondaryContent(cloud).execute(number,selfselect);
+ new
CreateRelationsForSecondaryContent(cloud,pageContext).execute(number,selfselect);
+ out.println(Total Asset count :
+pageContext.getAttribute(totalCount)+ added creationrel count :
+pageContext.getAttribute(addedRelationCount));
%
/mm:write
/c:if
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/migration migration_1.5_to_1.6.txt
Update of /var/cvs/contributions/CMSContainer/migration In directory james.mmbase.org:/tmp/cvs-serv12127 Modified Files: migration_1.5_to_1.6.txt Log Message: CMSC-681 Asset Maintenance See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/migration See also: http://www.mmbase.org/jira/browse/CMSC-681 Index: migration_1.5_to_1.6.txt === RCS file: /var/cvs/contributions/CMSContainer/migration/migration_1.5_to_1.6.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -b -r1.10 -r1.11 --- migration_1.5_to_1.6.txt24 Dec 2008 14:35:28 - 1.10 +++ migration_1.5_to_1.6.txt7 Jan 2009 03:51:10 - 1.11 @@ -49,6 +49,9 @@ ALTER TABLE live_images MODIFY title text NULL; ALTER TABLE live_urls ADD column title text NULL; ALTER TABLE live_urls MODIFY description text NULL; + +update mm_urls set title=name; +update live_urls set title=name; --- End script --- Exceptions/errors/other problems and what to do: * ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard WizardController.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
In directory james.mmbase.org:/tmp/cvs-serv17159
Modified Files:
WizardController.java
Log Message:
CMSC-1206 Asset: enhance the create-relations-asset-channel.jsp script to
find a good channel
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
See also: http://www.mmbase.org/jira/browse/CMSC-1206
Index: WizardController.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- WizardController.java 7 Jan 2009 03:35:52 - 1.16
+++ WizardController.java 7 Jan 2009 07:04:28 - 1.17
@@ -266,11 +266,11 @@
RepositoryUtil.addCreationChannel(node, channelnr);
}
}
- NodeManager ownerManager = cloud.getNodeManager(USER);
- int owners = node.countRelatedNodes(ownerManager,
OWNERREL, DESTINATION);
- if (owners 1) {
- RelationUtil.createRelation(node,
SecurityUtil.getUserNode(cloud), OWNERREL);
- }
+ // NodeManager ownerManager = cloud.getNodeManager(USER);
+// int owners = node.countRelatedNodes(ownerManager,
OWNERREL, DESTINATION);
+// if (owners 1) {
+ //RelationUtil.createRelation(node,
SecurityUtil.getUserNode(cloud), OWNERREL);
+// }
// if (!Workflow.hasWorkflow(node)) {
//Workflow.create(node, );
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Proven clinically in men
If you are unable to see the message below, click here to view. Thank you for your interest in A Advertising and General Sign CompanyYou are receiving this e-mail because you have subscribed to product updates.If you want to unsubscribe from A Advertising and General Sign Company Newsletter, please visit subscription center and provide your address in the Unsubscribe field. Copyright (C) 2008, A Advertising and General Sign Company1 Campbell Ave Providence, RI 02904 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
