date:20081211

[MMBASE CVS] contributions/CMSContainer_Modules/staticdownload/src/java/com/finalist/cmsc/staticdownload DownloadThread.java

2008-12-11 Thread evaguo

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

Modified Files:
DownloadThread.java 
Log Message:
CMSC-1086(Modify the liveUrl used in downloading.)


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


Index: DownloadThread.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/staticdownload/src/java/com/finalist/cmsc/staticdownload/DownloadThread.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- DownloadThread.java 14 Oct 2008 09:39:33 -  1.12
+++ DownloadThread.java 11 Dec 2008 08:34:30 -  1.13
@@ -82,7 +82,6 @@
 buffer.append(line);
  }
   } catch (IOException e) {
- // TODO Auto-generated catch block
  log.info(Some errors happened while reading the subfix.txt);
   } finally {
  if (is != null) {
@@ -102,7 +101,7 @@
  File file = new File(downloadSettings.getTempPath());//get the files 
which wget last download
  setupSuffix();
  modifyDownloadPath();
- downloadAssociatedCss(file,new FileNameFilter(.css,.html));
+ downloadAssociatedCss(file,new FileNameFilter(.css,.html));//find 
the hidden css (@import)
  findAssociatedFiles(file, new MyFilenameFilter(.css, .js, 
.html));
  redownload(redownloadfiles);
  redownloadfiles.clear();//this will avoid to redownload picture in 
different request
@@ -422,7 +421,7 @@
}
 
/**
-* the method is used to filter files by the suffixes
+* the class is used to filter files by the suffixes
 */
static class MyFilenameFilter implements FilenameFilter {
   private String suffix = ;
@@ -436,7 +435,6 @@
   }
 
   public boolean accept(File dir, String name) {
- // TODO Auto-generated method stub
  if (new File(dir, name).isFile()) {
 return name.endsWith(suffix) || name.endsWith(suffix1)
   || name.endsWith(suffix2);
@@ -480,10 +478,12 @@
   String path = webPath + str1;
   if (!redownloadfiles.contains(path))
  redownloadfiles.add(path);
+ System.out.println(eee--+path); 
}
 
private String getUrl() {
-  return downloadSettings.getLiveUrl();
+  modifyDownloadPath();
+  return webPath;
}
 
/**Use the filter to find the associated files which last wget downloads,
@@ -640,16 +640,22 @@
  String tempString, File file) {
   String downloadPath;
   if (StringUtils.isEmpty(webappName)) {
- downloadPath = webPath + targetStringNew.substring(1);
+ String webPathNew = getRootFile(file,webPath);
+ if(!webPathNew.endsWith(/)){
+webPathNew += /;
+ }
+ downloadPath = webPathNew + targetStringNew.substring(1);
   } else {
  downloadPath = webPath
+ targetStringNew.substring(targetStringNew.indexOf(webappName) 
+webappName.length()+ 1);
   }
-  if (!redownloadfiles.contains(downloadPath))
+  if (!redownloadfiles.contains(downloadPath)){
  redownloadfiles.add(downloadPath);
-  
+ System.out.println(eee--+downloadPath);
+  }
   String filePath = file.getParent();
   String lurl = changeUrl(getUrl());
+  lurl = getRootFile(file,lurl);
   if(lurl.contains(/)){
  lurl = regularReplace(lurl,/,);
   }
@@ -684,16 +690,32 @@
   }
   return tempString;
}
+   private String getRootFile(File file,String url){
+  String filepath = file.getAbsolutePath();
+  if(StringUtils.isEmpty(webappName)){
+ String[] paraUrl = url.split(/);
+ for(String pUrl:paraUrl){
+String newPath = 
filepath.substring(0,filepath.indexOf(pUrl)+pUrl.length());
+File fileRoot = new File(newPath);
+if(fileRoot.listFiles().length1){
+   return pUrl;
+}
 
+ }
+  }
+  return url;
+   }
private void addDownloadPath(String str, File file, String targetPath) {
   String filepath = file.getAbsolutePath();
   String url = changeUrl(getUrl());
 //String url = web.finalist.hk\\finalist; 
+
+//  log.info(##--  url=+url);
+//  log.info(##--  filepath=+filepath);
+  url = getRootFile(file,url);
   if(url.contains(/)){
  url = regularReplace(url,/,);
   }
-  log.info(##--  url=+url);
-  log.info(##--  filepath=+filepath);
   int tagStart = filepath.indexOf(url);
   String u = filepath.substring(tagStart);
   int tagEnd = u.indexOf(\\ + str);
@@

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

2008-12-11 Thread nikkoyin

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

Modified Files:
NewsletterEditionApprove.java 
Log Message:
CMSC-1163, Newsletter: Add extra information on which person approved 
newsletter edition,get user to fill


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


Index: NewsletterEditionApprove.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionApprove.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterEditionApprove.java   4 Dec 2008 09:23:09 -   1.3
+++ NewsletterEditionApprove.java   11 Dec 2008 08:35:19 -  1.4
@@ -11,9 +11,7 @@
protected void doSave(HttpServletRequest request, Node edition)
  throws Exception {
   
if(!EditionStatus.APPROVED.value().equals(edition.getValue(process_status))) {
- String 
appUser=request.getSession().getValue(cloud_mmbase).toString();
- String[] result = appUser.split(\\s);
- NewsletterPublicationUtil.approveEdition(edition,result[3]);
+ NewsletterPublicationUtil.approveEdition(edition);
   }
}
 
___
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 NewsletterPublicationUtil.java

2008-12-11 Thread nikkoyin

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

Modified Files:
NewsletterPublicationUtil.java 
Log Message:
CMSC-1163, Newsletter: Add extra information on which person approved 
newsletter edition,get user to fill


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


Index: NewsletterPublicationUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- NewsletterPublicationUtil.java  4 Dec 2008 09:23:09 -   1.36
+++ NewsletterPublicationUtil.java  11 Dec 2008 08:35:19 -  1.37
@@ -195,8 +195,9 @@
/**
 * Approve a edition
 */
-   public static void approveEdition(Node edition,String user) {
+   public static void approveEdition(Node edition) {
   edition.setStringValue(process_status, EditionStatus.APPROVED.value());
+  String user=edition.getCloud().getUser().getIdentifier();
   edition.setStringValue(approved_by, user);
   edition.commit();
}
___
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 NewsletterPublicationUtil.java

2008-12-11 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterPublicationUtil.java 
Log Message:
CMSC-1163, Newsletter: Add extra information on which person approved 
newsletter edition,get user to fill


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


Index: NewsletterPublicationUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.26.2.8
retrieving revision 1.26.2.9
diff -u -b -r1.26.2.8 -r1.26.2.9
--- NewsletterPublicationUtil.java  4 Dec 2008 09:24:54 -   1.26.2.8
+++ NewsletterPublicationUtil.java  11 Dec 2008 08:44:15 -  1.26.2.9
@@ -195,8 +195,9 @@
/**
 * Approve a edition
 */
-   public static void approveEdition(Node edition,String user) {
+   public static void approveEdition(Node edition) {
   edition.setStringValue(process_status, EditionStatus.APPROVED.value());
+  String user=edition.getCloud().getUser().getIdentifier();
   edition.setStringValue(approved_by, user);
   edition.commit();
}
___
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/forms NewsletterEditionApprove.java

2008-12-11 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterEditionApprove.java 
Log Message:
CMSC-1163, Newsletter: Add extra information on which person approved 
newsletter edition,get user to fill


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


Index: NewsletterEditionApprove.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionApprove.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- NewsletterEditionApprove.java   4 Dec 2008 09:24:53 -   1.2.2.3
+++ NewsletterEditionApprove.java   11 Dec 2008 08:44:15 -  1.2.2.4
@@ -11,9 +11,7 @@
protected void doSave(HttpServletRequest request, Node edition)
  throws Exception {
   
if(!EditionStatus.APPROVED.value().equals(edition.getValue(process_status))) {
- String 
appUser=request.getSession().getValue(cloud_mmbase).toString();
- String[] result = appUser.split(\\s);
- NewsletterPublicationUtil.approveEdition(edition,result[3]);
+ NewsletterPublicationUtil.approveEdition(edition);
   }
}
 
___
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/repository/forms AssetUploadAction.java

2008-12-11 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory 
james.mmbase.org:/tmp/cvs-serv27508/contentrepository/src/java/com/finalist/cmsc/repository/forms

Modified Files:
AssetUploadAction.java 
Log Message:
CMSC-681 Asset Maintenance upload zip file and trash listing


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-681


Index: AssetUploadAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- AssetUploadAction.java  9 Dec 2008 06:04:04 -   1.5
+++ AssetUploadAction.java  11 Dec 2008 09:19:55 -  1.6
@@ -39,9 +39,9 @@
   String parentchannel = assetUploadForm.getParentchannel();
   FormFile file = assetUploadForm.getFile();
 
-  String assetType = ;
 
   if (file.getFileSize() != 0  file.getFileName() != null) {
+ String assetType = ;
  if (isImage(file.getFileName())) {
 assetType = images;
  } else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF struts-repository.xml

2008-12-11 Thread kevinshen

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

Modified Files:
struts-repository.xml 
Log Message:
CMSC-681 Asset Maintenance upload zip file and trash listing


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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- struts-repository.xml   9 Dec 2008 06:04:04 -   1.27
+++ struts-repository.xml   11 Dec 2008 09:19:55 -  1.28
@@ -199,7 +199,8 @@
 
   action path=/editors/recyclebin/DeleteAction 
type=com.finalist.cmsc.recyclebin.forms.DeleteAction 
  unknown=false validate=false
- forward name=success path=/editors/recyclebin/index.jsp 
redirect=false /
+ forward name=content path=/editors/recyclebin/index.jsp 
redirect=false /
+ forward name=asset path=/editors/recyclebin/assettrash.jsp 
redirect=false /
   /action
 
   !--  Security role management  --
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/resources cmsc-repository.properties cmsc-repository_nl.properties cmsc-repository_zh.properties

2008-12-11 Thread kevinshen

Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources
In directory james.mmbase.org:/tmp/cvs-serv27508/contentrepository/resources

Modified Files:
cmsc-repository.properties cmsc-repository_nl.properties 
cmsc-repository_zh.properties 
Log Message:
CMSC-681 Asset Maintenance upload zip file and trash listing


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/resources
See also: http://www.mmbase.org/jira/browse/CMSC-681


Index: cmsc-repository.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- cmsc-repository.properties  9 Dec 2008 07:57:19 -   1.45
+++ cmsc-repository.properties  11 Dec 2008 09:19:55 -  1.46
@@ -79,7 +79,7 @@
 content.create=create
 content.existing=Link existing content
 content.reorder=Reorder content
-content.content=Content in this channel
+content.content=Content in  {0} 
 content.type=Of type b {0} /b:
 content.showchannels=Show where this item is linked.
 content.preview.title=Open a browser with a preview of this element.
@@ -399,9 +399,9 @@
 
 asset.title=Asset
 asset.channel=Channel b {0} /b.
-asset.new=New Url
-asset.create= Create
-asset.asset=asset in this channel
+asset.new=New
+asset.create=Create new URL
+asset.asset=asset in  {0} 
 asset.type=Of type b {0} /b:
 asset.preview.title=Open a browser with a preview of this element.
 asset.info=Info
@@ -437,3 +437,6 @@
 searchform.assettype=Asset type:
 searchform.assettypes.all=all types
 asset.upload.existed = This file is already in the repository!
\ No newline at end of file
+
+recyclebin.content.title = Content
+recyclebin.asset.title = Asset


Index: cmsc-repository_nl.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- cmsc-repository_nl.properties   9 Dec 2008 07:57:19 -   1.44
+++ cmsc-repository_nl.properties   11 Dec 2008 09:19:55 -  1.45
@@ -79,7 +79,7 @@
 content.create=maken
 content.existing=Bestaande content koppelen
 content.reorder=De volgorde van content wijzigen
-content.content=Content in deze rubriek
+content.content=Content in  {0} 
 content.type=Van het type b {0} /b:
 content.showchannels=Toon waarin dit element is gekoppeld.
 content.preview.title=Open een browser met een voorbeeld van dit element.
@@ -432,3 +432,6 @@
 searchform.assettype=Asset type:
 searchform.assettypes.all=all types
 asset.upload.existed = This file is already in the repository!
\ No newline at end of file
+
+recyclebin.content.title = Content
+recyclebin.asset.title = Asset


Index: cmsc-repository_zh.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- cmsc-repository_zh.properties   9 Dec 2008 07:57:19 -   1.24
+++ cmsc-repository_zh.properties   11 Dec 2008 09:19:55 -  1.25
@@ -1,4 +1,4 @@
-repository.title=ä»åº
+ï»¿repository.title=ä»åº
 
 repository.content.edit=åå®¹ç¼è¾
 repository.channel.edit=é¢éå±æ§
@@ -435,3 +435,6 @@
 searchform.assettype=Asset type:
 searchform.assettypes.all=all types
 asset.upload.existed = This file is already in the repository!
\ No newline at end of file
+
+recyclebin.content.title = Content
+recyclebin.asset.title = Asset
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin assettrash.jsp index.jsp recyclebin.js

2008-12-11 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
In directory 
james.mmbase.org:/tmp/cvs-serv27508/contentrepository/src/webapp/editors/recyclebin

Modified Files:
index.jsp recyclebin.js 
Added Files:
assettrash.jsp 
Log Message:
CMSC-681 Asset Maintenance upload zip file and trash listing


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
See also: http://www.mmbase.org/jira/browse/CMSC-681


assettrash.jsp is new



Index: index.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- index.jsp   2 Dec 2008 02:40:21 -   1.16
+++ index.jsp   11 Dec 2008 09:19:55 -  1.17
@@ -13,15 +13,23 @@
c:out value=${direction =='up'?'down':'up' }/
 /c:set
 body onload=refreshChannels();
-div class=tabs
+div class=tabs
+!-- active TAB --
 div class=tab_active
 div class=body
 div
-a href=#fmt:message key=recyclebin.title //a
+a href=index.jspfmt:message key=recyclebin.content.title 
//a
 /div
 /div
 /div
+   div class=tab
+  div class=body
+ div
+a href=assettrash.jspfmt:message 
key=recyclebin.asset.title//a
+ /div
+  /div
 /div
+/div
 
div class=editor
   mm:cloud jspvar=cloud rank=basic user method='http'
@@ -57,71 +65,6 @@

  div class=body   
 mm:node number=$parentchannel
-   mm:relatednodescontainer 
path=creationrel,assetelement searchdirs=source element=assetelement
-  
-
-  c:set var=listSizemm:size//c:set
-  c:set var=resultsPerPage value=50/
-  c:set var=offset value=${not empty 
param.offset ? param.offset : '0'}/
-  
-  mm:listnodes jspvar=node 
max=${resultsPerPage} offset=${offset*resultsPerPage}
- mm:first
-[EMAIL PROTECTED] file=../pages.jsp %
- table
-   thead
-  tr
- th style=width: 56px;/th
- th style=width: 68px;a 
href=?sortBy=otypedirection=${direction} class=headerlinkfmt:message 
key=locate.typecolumn //a/th
- tha 
href=?sortBy=titledirection=${direction} class=headerlinkfmt:message 
key=locate.titlecolumn //a/th
- th style=width: 50px;a 
href=?sortBy=creatordirection=${direction} class=headerlinkfmt:message 
key=locate.authorcolumn //a/th
- th style=width: 120px;a 
href=?sortBy=lastmodifieddatedirection=${direction} 
class=headerlinkfmt:message key=locate.lastmodifiedcolumn //a/th
- th style=width: 60px;a 
href=?sortBy=numberdirection=${direction} class=headerlinkfmt:message 
key=locate.numbercolumn //a/th
-  /tr
-   /thead
-   tbody class=hover
- /mm:first
-   
- tr mm:even 
inverse=trueclass=swap/mm:even
-td nowrap
-   a href=javascript:info('mm:field 
name=number /', 'mm:nodeinfo type=guitype/')img 
src=../gfx/icons/info.png width=16 height=16 alt=fmt:message 
key=recyclebin.info / title=fmt:message key=recyclebin.info ///a
-   a 
href=javascript:permanentDelete('mm:field name=number /', 'fmt:message 
key=recyclebin.removeconfirm /', '${offset}');img 
src=../gfx/icons/delete.png width=16 height=16 alt=fmt:message 
key=recyclebin.remove / title=fmt:message key=recyclebin.remove 
///a
-   a href=javascript:restore('mm:field 
name=number /', '${offset}','mm:nodeinfo type=guitype/');img 
src=../gfx/icons/restore.png width=16 height=16 alt=fmt:message 
key=recyclebin.restore / title=fmt:message key=recyclebin.restore 
///a
-/td
-td
-  mm:nodeinfo type=guitype/
-/td
-td style=white-space: nowrap; onMouseDown=objClick(this);
-   c:set var=assettype mm:nodeinfo type=guitype//c:set

[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http BulkUploadUtil.java

2008-12-11 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http
In directory 
james.mmbase.org:/tmp/cvs-serv27508/utilities/src/java/com/finalist/util/http

Modified Files:
BulkUploadUtil.java 
Log Message:
CMSC-681 Asset Maintenance upload zip file and trash listing


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http
See also: http://www.mmbase.org/jira/browse/CMSC-681


Index: BulkUploadUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- BulkUploadUtil.java 2 Dec 2008 08:43:11 -   1.13
+++ BulkUploadUtil.java 11 Dec 2008 09:19:55 -  1.14
@@ -32,7 +32,12 @@
 import org.apache.struts.upload.FormFile;
 import org.mmbase.bridge.Cloud;
 import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeList;
 import org.mmbase.bridge.NodeManager;
+import org.mmbase.bridge.NodeQuery;
+import org.mmbase.bridge.util.SearchUtil;
+import org.mmbase.util.transformers.ByteToCharTransformer;
+import org.mmbase.util.transformers.ChecksumFactory;
 
 import com.finalist.cmsc.mmbase.RelationUtil;
 import com.finalist.cmsc.util.UploadUtil;
@@ -47,7 +52,7 @@
private static final String CONFIGURATION_RESOURCE_NAME = 
/com/finalist/util/http/util.properties;
 
private static final String ZIP_MIME_TYPES[] = new String[] { 
application/x-zip-compressed, application/zip,
- application/x-zip };
+ \application/octet-stream, application/x-zip };
 
private static SetString supportedImages;
 
@@ -101,11 +106,11 @@
}
 
public static ListInteger store(Cloud cloud, NodeManager manager, String 
parentchannel, FormFile file) {
-  ListInteger nodes ;
+  ListInteger nodes;
   if (StringUtils.isEmpty(parentchannel)) {
  throw new NullPointerException(parentchannel is null);
   }
-  nodes = getNodeList(Integer.valueOf(parentchannel), manager, file);
+  nodes = getNodeList(Integer.valueOf(parentchannel), manager, file, 
cloud);
   return nodes;
}
 
@@ -158,16 +163,21 @@
   return node;
}
 
-   private static ListInteger getNodeList(Integer parentChannel, NodeManager 
manager, FormFile file) {
+   private static ListInteger getNodeList(Integer parentChannel, NodeManager 
manager, FormFile file, Cloud cloud) {
   ListInteger nodes = null;
   try {
  if (isZipFile(file)) {
-ZipInputStream zip = new ZipInputStream(new 
BufferedInputStream(new ByteArrayInputStream(file.getFileData(;
-nodes = createNodesInZip(parentChannel, manager, zip);
+byte[] fileData = file.getFileData();
+ByteArrayInputStream bis = new ByteArrayInputStream(fileData);
+InputStream is = new BufferedInputStream(bis);
+ZipInputStream zip = new ZipInputStream(is);
+
+nodes = createNodesInZip(parentChannel, manager, zip, cloud);
  } else {
 
-Node node = createNode(parentChannel, manager, file.getFileName(), 
file.getInputStream(), file.getFileSize());
-if(node!=null){
+Node node = createNode(parentChannel, manager, file.getFileName(), 
file.getInputStream(), file
+  .getFileSize());
+if (node != null) {
nodes = new ArrayListInteger();
nodes.add(node.getNumber());
 }
@@ -181,7 +191,6 @@
}
 
private static ArrayListInteger createNodesInZip(NodeManager manager, 
ZipInputStream zip) {
-
   ZipEntry entry = null;
   int count = 0;
   ArrayListInteger nodes = new ArrayListInteger();
@@ -215,14 +224,15 @@
  }
 
   } catch (IOException ex) {
- log.info(Failed to read uploaded zipfile, skipping it+ 
ex.getMessage());
+ log.info(Failed to read uploaded zipfile, skipping it + 
ex.getMessage());
   } finally {
  close(zip);
   }
   return nodes;
}
 
-   private static ArrayListInteger createNodesInZip(Integer parentChannel, 
NodeManager manager, ZipInputStream zip) {
+   private static ArrayListInteger createNodesInZip(Integer parentChannel, 
NodeManager manager, ZipInputStream zip,
+ Cloud cloud) {
 
   ZipEntry entry = null;
   int count = 0;
@@ -239,29 +249,40 @@
}
continue;
 }
+if (isImage(entry.getName())) {
+   manager = cloud.getNodeManager(images);
+} else {
+   manager = cloud.getNodeManager(attachments);
+}
 count++;
-// create temp file for zip entry, create a node from it and
-// remove the temp file
-File tempFile = File.createTempFile(cmsc, null);
-FileOutputStream out = new FileOutputStream(tempFile);
-

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms DeleteAction.java

2008-12-11 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
In directory 
james.mmbase.org:/tmp/cvs-serv27508/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms

Modified Files:
DeleteAction.java 
Log Message:
CMSC-681 Asset Maintenance upload zip file and trash listing


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
See also: http://www.mmbase.org/jira/browse/CMSC-681


Index: DeleteAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/DeleteAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- DeleteAction.java   3 Mar 2008 10:32:18 -   1.8
+++ DeleteAction.java   11 Dec 2008 09:19:55 -  1.9
@@ -1,11 +1,9 @@
 /*
-
-This software is OSI Certified Open Source Software.
-OSI Certified is a certification mark of the Open Source Initiative.
-
-The license (Mozilla version 1.0) can be read at the MMBase site.
-See http://www.MMBase.org/license
-
+ * 
+ * This software is OSI Certified Open Source Software. OSI Certified is a 
certification mark of the Open Source
+ * Initiative.
+ * 
+ * The license (Mozilla version 1.0) can be read at the MMBase site. See 
http://www.MMBase.org/license
  */
 package com.finalist.cmsc.recyclebin.forms;
 
@@ -27,7 +25,6 @@
 
private static Log log = LogFactory.getLog(DeleteAction.class);
 
-
@Override
public ActionForward execute(ActionMapping mapping, HttpServletRequest 
request, Cloud cloud) throws Exception {
 
@@ -36,6 +33,7 @@
   }   

   String action = getParameter(request, action);
+  String type = request.getParameter(type);
 
   if (deleteall.equals(action)) {
  Node objectNode = null;
@@ -49,13 +47,11 @@
   Workflow.complete(objectNode);
}
objectNode.delete(true);
-}
-catch (Exception e) {
+} catch (Exception e) {
log.warn(Unable to remove from trash  + ((objectNode == null) 
? null : objectNode.getNumber()));
 }
  }
-  }
-  else {
+  } else {
  String objectnumber = getParameter(request, objectnumber);
  Node objectNode = cloud.getNode(objectnumber);
  if (Workflow.hasWorkflow(objectNode)) {
@@ -64,6 +60,11 @@
  }
  objectNode.delete(true);
   }
-  return mapping.findForward(SUCCESS);
+  if (type.equalsIgnoreCase(content)) {
+ return mapping.findForward(content);
+  } else {
+ return mapping.findForward(asset);
}
+   }
+
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository assetupload.jsp

2008-12-11 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory 
james.mmbase.org:/tmp/cvs-serv27508/contentrepository/src/webapp/editors/repository

Modified Files:
assetupload.jsp 
Log Message:
CMSC-681 Asset Maintenance upload zip file and trash listing


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: assetupload.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- assetupload.jsp 9 Dec 2008 06:04:04 -   1.5
+++ assetupload.jsp 11 Dec 2008 09:19:55 -  1.6
@@ -14,7 +14,7 @@
 input type=hidden id=parentchannel name=parentchannel 
value=${parentchannel}/
 table border=0
tr
-  tdfmt:message key=asset.upload.explanation //tdbr/
+  tdfmt:message key=asset.upload.explanation //td
/tr
  c:if test=${exist=='1'}
 tr
___
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/repository/forms HighFrequencyImgAction.java

2008-12-11 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory james.mmbase.org:/tmp/cvs-serv28937

Modified Files:
HighFrequencyImgAction.java 
Log Message:
CMSC-681 Asset Maintenance


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-681


Index: HighFrequencyImgAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/HighFrequencyImgAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- HighFrequencyImgAction.java 4 Dec 2008 14:12:05 -   1.3
+++ HighFrequencyImgAction.java 11 Dec 2008 10:48:01 -  1.4
@@ -27,7 +27,7 @@
 
 import com.finalist.cmsc.mmbase.PropertiesUtil;
 import com.finalist.cmsc.struts.PagerAction;
-import com.finalist.cmsc.util.ComparisonUtil;
+import com.finalist.cmsc.util.ComparableComparator;
 
 /**
  * Select the often used images in all channels or in the current channel.
@@ -104,8 +104,7 @@
  results.add(result);
   }
 
-  ComparisonUtil comparator = new ComparisonUtil();
-  comparator.setFields_user(new String[] { COUNT });
+  ComparableComparator comparator = new ComparableComparator(new String[] 
{ COUNT });
   Collections.sort(results, comparator);
   Collections.reverse(results);
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] Re: Order status

2008-12-11 Thread cvs





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

[MMBASE CVS] Delivery Status Notification

2008-12-11 Thread cvs






___
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

2008-12-11 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
In directory james.mmbase.org:/tmp/cvs-serv30197

Modified Files:
WizardController.java 
Log Message:
CMSC-681 Asset Maintenance   create createrel when adding contentelements.and 
add assetelement to workflow


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


Index: WizardController.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- WizardController.java   4 Nov 2008 12:02:06 -   1.12
+++ WizardController.java   11 Dec 2008 12:01:53 -  1.13
@@ -4,17 +4,23 @@
  */
 package com.finalist.cmsc.editwizard;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.struts.util.LabelValueBean;
 import org.mmbase.applications.editwizard.Config;
 import org.mmbase.applications.editwizard.Config.WizardConfig;
 import org.mmbase.bridge.Cloud;
 import org.mmbase.bridge.Node;
-import org.mmbase.bridge.implementation.BasicNode;
+import org.mmbase.bridge.NodeList;
+import org.mmbase.bridge.NodeManager;
 import org.mmbase.security.Rank;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
@@ -28,6 +34,7 @@
 import com.finalist.cmsc.security.UserRole;
 import com.finalist.cmsc.services.versioning.Versioning;
 import com.finalist.cmsc.services.versioning.VersioningException;
+import com.finalist.cmsc.services.workflow.Workflow;
 
 /**
  * @author Nico Klasens This class contains code which extends wizard.jsp
@@ -222,7 +229,44 @@
 }else if (AssetElementUtil.isAssetElement(editNode)) {
closeAssetElement(session, editNode, objectnr, ewconfig, 
wizardConfig);
 }
+// create createrel for asset elements.and add asset elements to 
workflow.
 elementtype = editNode.getNodeManager().getName();
+ListLabelValueBean typesList = new ArrayListLabelValueBean();
+ListNodeManager types = 
AssetElementUtil.getAssetTypes(editNode.getCloud());
+ListString hiddenTypes = AssetElementUtil.getHiddenAssetTypes();
+for (NodeManager manager : types) {
+   String name = manager.getName();
+   if (!hiddenTypes.contains(name)) {
+  LabelValueBean bean = new 
LabelValueBean(manager.getGUIName(), name);
+  typesList.add(bean);
+   }
+}
+for (int i = 0 ; i  typesList.size(); i++) {
+   NodeList assets = 
editNode.getRelatedNodes(typesList.get(i).getValue());
+   if(assets.size()  0 ){
+  for( int j = 0 ; j  assets.size() ;j++) {
+ Node node = assets.getNode(j);
+ if (!RepositoryUtil.hasCreationChannel(node)) {
+String channelnr = (String) 
session.getAttribute(SESSION_CREATION);
+//if the channel is not exist get root channel .used 
for adding pages
+if (channelnr == null ||.equals(channelnr) ) {
+   channelnr = RepositoryUtil.getRoot(node.getCloud());
+}
+log.debug(Creation  + channelnr);
+
+if (StringUtils.isNotEmpty(channelnr)) {
+   RepositoryUtil.addCreationChannel(node, channelnr);
+} 
+ }
+ if (!Workflow.hasWorkflow(node)) { 
+Workflow.create(node, ); 
+ } 
+ else { 
+Workflow.addUserToWorkflow(node);
+}
+  }
+   }
+}
  }
  log.debug(contenttype  + elementtype);
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] RE: Message

2008-12-11 Thread cvs






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

[MMBASE CVS] Re: Order status

2008-12-11 Thread cvs





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

[MMBASE CVS] Your order

2008-12-11 Thread cvs






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

[MMBASE CVS] Delivery Status Notification (Failure)

2008-12-11 Thread cvs






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

[MMBASE CVS] Delivery Status Notification

2008-12-11 Thread cvs






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

[MMBASE CVS] RE: Message

2008-12-11 Thread cvs





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

[MMBASE CVS] Delivery Status Notification

2008-12-11 Thread cvs





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

[MMBASE CVS] Delivery Status Notification (Failure)

2008-12-11 Thread cvs






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

[MMBASE CVS] RE: Message

2008-12-11 Thread cvs






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

[MMBASE CVS] Delivery Status Notification

2008-12-11 Thread cvs





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

[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging project.xml

2008-12-11 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
In directory james.mmbase.org:/tmp/cvs-serv28697/war-staging

Modified Files:
project.xml 
Log Message:
CMSC-1104, JForum portlet does not work on test environment, added dependencies 
taht JForum-portlet needed in community and staging


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
See also: http://www.mmbase.org/jira/browse/CMSC-1104


Index: project.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- project.xml 1 Aug 2008 14:47:06 -   1.6
+++ project.xml 12 Dec 2008 04:28:51 -  1.7
@@ -52,6 +52,98 @@

mmbase.config.bundlefalse/mmbase.config.bundle
/properties
/dependency
+!--begin dependency by JForum portlet. --
 
+dependency
+groupIdfreemarker/groupId
+artifactIdfreemarker/artifactId
+version2.3.9/version
+typejar/type
+properties
+war.bundle${war.bundle}/war.bundle
+/properties
+/dependency
+
+dependency
+groupIdquartz/groupId
+artifactIdquartz/artifactId
+version1.5.1/version
+typejar/type
+properties
+war.bundle${war.bundle}/war.bundle
+/properties
+/dependency
+dependency
+groupIdc3p0/groupId
+artifactIdc3p0/artifactId
+version0.9.1/version
+typejar/type
+properties
+war.bundle${war.bundle}/war.bundle
+/properties
+/dependency
+dependency
+groupIdcom.octo.captcha/groupId
+artifactIdjcaptcha-all/artifactId
+version1.0-RC-2.0.1/version
+typejar/type
+properties
+war.bundle${war.bundle}/war.bundle
+/properties
+/dependency
+dependency
+groupIdlucene/groupId
+artifactIdlucene-core/artifactId
+version2.3.2/version
+typejar/type
+properties
+war.bundle${war.bundle}/war.bundle
+/properties
+/dependency
+dependency
+groupIdlucene/groupId
+artifactIdlucene-highlighter/artifactId
+version2.3.2/version
+typejar/type
+properties
+war.bundle${war.bundle}/war.bundle
+/properties
+/dependency
+dependency
+groupIdlucene/groupId
+artifactIdlucene-analyzers/artifactId
+version2.3.2/version
+typejar/type
+properties
+war.bundle${war.bundle}/war.bundle
+/properties
+/dependency
+   dependency
+groupIdjforum/groupId
+artifactIdjforum/artifactId
+version2.1.8/version
+typejar/type
+   properties
+war.bundle${war.bundle}/war.bundle
+   /properties
+/dependency
+dependency
+groupIdjavamail/groupId
+artifactIdmail/artifactId
+version1.4/version
+typejar/type
+   properties
+war.bundle${war.bundle}/war.bundle
+   /properties
+/dependency
+dependency
+groupIdconcurrent/groupId
+artifactIdconcurrent/artifactId
+version1.3.2/version
+typejar/type
+   properties
+war.bundle${war.bundle}/war.bundle
+   /properties
+/dependency
/dependencies
 /project
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community project.xml

2008-12-11 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
In directory james.mmbase.org:/tmp/cvs-serv28697/war-community

Modified Files:
project.xml 
Log Message:
CMSC-1104, JForum portlet does not work on test environment, added dependencies 
taht JForum-portlet needed in community and staging


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
See also: http://www.mmbase.org/jira/browse/CMSC-1104


Index: project.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- project.xml 4 Jul 2008 06:30:32 -   1.22
+++ project.xml 12 Dec 2008 04:28:51 -  1.23
@@ -216,7 +216,7 @@
   /dependency
 
 !--begin dependency by JForum portlet. --
-!--
+
 dependency
 groupIdfreemarker/groupId
 artifactIdfreemarker/artifactId
@@ -308,7 +308,7 @@
 war.bundle${war.bundle}/war.bundle
/properties
 /dependency
---
+
 !-- jboss --
 !--
 dependency
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community project.xml

2008-12-11 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
In directory james.mmbase.org:/tmp/cvs-serv29259/war-community

Modified Files:
project.xml 
Log Message:
CMSC-1104, JForum portlet does not work on test environment, change freemarker 
to 13


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
See also: http://www.mmbase.org/jira/browse/CMSC-1104


Index: project.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- project.xml 12 Dec 2008 04:28:51 -  1.23
+++ project.xml 12 Dec 2008 04:40:44 -  1.24
@@ -220,7 +220,7 @@
 dependency
 groupIdfreemarker/groupId
 artifactIdfreemarker/artifactId
-version2.3.9/version
+version2.3.13/version
 typejar/type
 properties
 war.bundle${war.bundle}/war.bundle
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging project.xml

2008-12-11 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
In directory james.mmbase.org:/tmp/cvs-serv29259/war-staging

Modified Files:
project.xml 
Log Message:
CMSC-1104, JForum portlet does not work on test environment, change freemarker 
to 13


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
See also: http://www.mmbase.org/jira/browse/CMSC-1104


Index: project.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- project.xml 12 Dec 2008 04:28:51 -  1.7
+++ project.xml 12 Dec 2008 04:40:44 -  1.8
@@ -57,7 +57,7 @@
 dependency
 groupIdfreemarker/groupId
 artifactIdfreemarker/artifactId
-version2.3.9/version
+version2.3.13/version
 typejar/type
 properties
 war.bundle${war.bundle}/war.bundle
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community project.xml

2008-12-11 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
In directory james.mmbase.org:/tmp/cvs-serv29346/war-community

Modified Files:
  Tag: b1_5
project.xml 
Log Message:
CMSC-1104, JForum portlet does not work on test environment, change freemarker 
to 13


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
See also: http://www.mmbase.org/jira/browse/CMSC-1104


Index: project.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -b -r1.22.2.1 -r1.22.2.2
--- project.xml 11 Dec 2008 02:37:16 -  1.22.2.1
+++ project.xml 12 Dec 2008 04:43:37 -  1.22.2.2
@@ -220,7 +220,7 @@
 dependency
 groupIdfreemarker/groupId
 artifactIdfreemarker/artifactId
-version2.3.9/version
+version2.3.13/version
 typejar/type
 properties
 war.bundle${war.bundle}/war.bundle
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging project.xml

2008-12-11 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
In directory james.mmbase.org:/tmp/cvs-serv29346/war-staging

Modified Files:
  Tag: b1_5
project.xml 
Log Message:
CMSC-1104, JForum portlet does not work on test environment, change freemarker 
to 13


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
See also: http://www.mmbase.org/jira/browse/CMSC-1104


Index: project.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging/project.xml,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -b -r1.6.2.1 -r1.6.2.2
--- project.xml 11 Dec 2008 02:37:17 -  1.6.2.1
+++ project.xml 12 Dec 2008 04:43:37 -  1.6.2.2
@@ -57,7 +57,7 @@
 dependency
 groupIdfreemarker/groupId
 artifactIdfreemarker/artifactId
-version2.3.9/version
+version2.3.13/version
 typejar/type
 properties
 war.bundle${war.bundle}/war.bundle
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf

2008-12-11 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv31338

Modified Files:
  Tag: b1_5
userlist_table.jspf 
Log Message:
CMSC-949, Blocking users: user status enhancements,add javascript to jspf


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949


Index: userlist_table.jspf
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -u -b -r1.6.2.7 -r1.6.2.8
--- userlist_table.jspf 11 Dec 2008 05:24:43 -  1.6.2.7
+++ userlist_table.jspf 12 Dec 2008 05:32:00 -  1.6.2.8
@@ -42,7 +42,23 @@
/edit:ui-tcolumn
 /edit:ui-table
 script language=JavaScript
- onState();
+ (function onState(){
+var sels = document.getElementsByTagName(select);
+for (i = 0; i  sels.length; i++) {
+var sel = sels[i];
+var options = sel.getElementsByTagName(option);
+var v = options[0];
+if ( == v.value) {
+options[0].parentNode.removeChild(options[0]);
+}
+for (j = 1; j  options.length; j++) {
+if (v.value.toUpperCase() == options[j].value.toUpperCase()) {
+options[j].selected=true;
+options[0].parentNode.removeChild(options[0]);
+}
+}
+}
+})();
  function selectAll(value, formName, elementPrefix) {
var elements = document.forms[formName].elements;
for (var i = 0; i  elements.length; i++) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf

2008-12-11 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv31448

Modified Files:
userlist_table.jspf 
Log Message:
CMSC-949, Blocking users: user status enhancements,add javascript to jspf


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949


Index: userlist_table.jspf
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- userlist_table.jspf 11 Dec 2008 05:32:57 -  1.13
+++ userlist_table.jspf 12 Dec 2008 05:34:21 -  1.14
@@ -42,7 +42,23 @@
/edit:ui-tcolumn
 /edit:ui-table
 script language=JavaScript
- onState();
+ (function onState(){
+var sels = document.getElementsByTagName(select);
+for (i = 0; i  sels.length; i++) {
+var sel = sels[i];
+var options = sel.getElementsByTagName(option);
+var v = options[0];
+if ( == v.value) {
+options[0].parentNode.removeChild(options[0]);
+}
+for (j = 1; j  options.length; j++) {
+if (v.value.toUpperCase() == options[j].value.toUpperCase()) {
+options[j].selected=true;
+options[0].parentNode.removeChild(options[0]);
+}
+}
+}
+})();
  function selectAll(value, formName, elementPrefix) {
var elements = document.forms[formName].elements;
for (var i = 0; i  elements.length; i++) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community/js formcheck.js

2008-12-11 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
In directory james.mmbase.org:/tmp/cvs-serv32165/js

Modified Files:
formcheck.js 
Log Message:
CMSC-949, Blocking users: user status enhancements,move javascript to jspf


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
See also: http://www.mmbase.org/jira/browse/CMSC-949


Index: formcheck.js
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js/formcheck.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- formcheck.js11 Dec 2008 05:32:57 -  1.6
+++ formcheck.js12 Dec 2008 06:19:28 -  1.7
@@ -23,25 +23,4 @@
document.forms[0].method.value = addInit;
document.forms[0].submit();
 }
-function selectState(url,ele){
-   surl=url+state=+ele.value
-   //  alert(surl);
-   window.location.href =surl;
-}
-function onState(){
-var sels = document.getElementsByTagName(select);
-for (i = 0; i  sels.length; i++) {
-var sel = sels[i];
-var options = sel.getElementsByTagName(option);
-var v = options[0];
-if ( == v.value) {
-options[0].parentNode.removeChild(options[0]);
-}
-for (j = 1; j  options.length; j++) {
-if (v.value.toUpperCase() == options[j].value.toUpperCase()) {
-options[j].selected=true;
-options[0].parentNode.removeChild(options[0]);
-}
-}
-}
-}
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf

2008-12-11 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv32165

Modified Files:
userlist_table.jspf 
Log Message:
CMSC-949, Blocking users: user status enhancements,move javascript to jspf


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949


Index: userlist_table.jspf
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- userlist_table.jspf 12 Dec 2008 05:34:21 -  1.14
+++ userlist_table.jspf 12 Dec 2008 06:19:28 -  1.15
@@ -58,7 +58,12 @@
 }
 }
 }
-})();
+ })();
+ function selectState(url,ele){
+   surl=url+state=+ele.value
+   //  alert(surl);
+   window.location.href =surl;
+ }
  function selectAll(value, formName, elementPrefix) {
var elements = document.forms[formName].elements;
for (var i = 0; i  elements.length; i++) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community/js formcheck.js

2008-12-11 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
In directory james.mmbase.org:/tmp/cvs-serv32285/js

Modified Files:
  Tag: b1_5
formcheck.js 
Log Message:
CMSC-949, Blocking users: user status enhancements,move javascript to jspf


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
See also: http://www.mmbase.org/jira/browse/CMSC-949


Index: formcheck.js
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js/formcheck.js,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -b -r1.2.2.4 -r1.2.2.5
--- formcheck.js11 Dec 2008 05:24:43 -  1.2.2.4
+++ formcheck.js12 Dec 2008 06:22:47 -  1.2.2.5
@@ -23,25 +23,3 @@
document.forms[0].method.value = addInit;
document.forms[0].submit();
 }
-function selectState(url,ele){
-   surl=url+state=+ele.value
-   //  alert(surl);
-   window.location.href =surl;
-}
-function onState(){
-var sels = document.getElementsByTagName(select);
-for (i = 0; i  sels.length; i++) {
-var sel = sels[i];
-var options = sel.getElementsByTagName(option);
-var v = options[0];
-if ( == v.value) {
-options[0].parentNode.removeChild(options[0]);
-}
-for (j = 1; j  options.length; j++) {
-if (v.value.toUpperCase() == options[j].value.toUpperCase()) {
-options[j].selected=true;
-options[0].parentNode.removeChild(options[0]);
-}
-}
-}
-}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf

2008-12-11 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv32285

Modified Files:
  Tag: b1_5
userlist_table.jspf 
Log Message:
CMSC-949, Blocking users: user status enhancements,move javascript to jspf


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949


Index: userlist_table.jspf
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -u -b -r1.6.2.8 -r1.6.2.9
--- userlist_table.jspf 12 Dec 2008 05:32:00 -  1.6.2.8
+++ userlist_table.jspf 12 Dec 2008 06:22:47 -  1.6.2.9
@@ -58,7 +58,12 @@
 }
 }
 }
-})();
+ })();
+ function selectState(url,ele){
+   surl=url+state=+ele.value
+   //  alert(surl);
+   window.location.href =surl;
+ }
  function selectAll(value, formName, elementPrefix) {
var elements = document.forms[formName].elements;
for (var i = 0; i  elements.length; i++) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/resources cmsc-repository.properties cmsc-repository_nl.properties cmsc-repository_zh.properties

2008-12-11 Thread kevinshen

Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources
In directory james.mmbase.org:/tmp/cvs-serv560

Modified Files:
cmsc-repository.properties cmsc-repository_nl.properties 
cmsc-repository_zh.properties 
Log Message:
CMSC-681 Asset Maintenance


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/resources
See also: http://www.mmbase.org/jira/browse/CMSC-681


Index: cmsc-repository.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- cmsc-repository.properties  11 Dec 2008 09:19:55 -  1.46
+++ cmsc-repository.properties  12 Dec 2008 06:57:30 -  1.47
@@ -399,8 +399,8 @@
 
 asset.title=Asset
 asset.channel=Channel b {0} /b.
-asset.new=New
-asset.create=Create new URL
+asset.new=New URL
+asset.create=Create
 asset.asset=asset in  {0} 
 asset.type=Of type b {0} /b:
 asset.preview.title=Open a browser with a preview of this element.


Index: cmsc-repository_nl.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- cmsc-repository_nl.properties   11 Dec 2008 09:19:55 -  1.45
+++ cmsc-repository_nl.properties   12 Dec 2008 06:57:30 -  1.46
@@ -395,7 +395,7 @@
 
 asset.title=Asset
 asset.channel=Channel b {0} /b.
-asset.new=New Url
+asset.new=New URL
 asset.create=Create
 asset.asset=asset in this channel
 asset.type=Of type b {0} /b:


Index: cmsc-repository_zh.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- cmsc-repository_zh.properties   11 Dec 2008 09:19:55 -  1.25
+++ cmsc-repository_zh.properties   12 Dec 2008 06:57:30 -  1.26
@@ -1,4 +1,4 @@
-ï»¿repository.title=ä»åº
+repository.title=ä»åº
 
 repository.content.edit=åå®¹ç¼è¾
 repository.channel.edit=é¢éå±æ§
@@ -398,7 +398,7 @@
 
 asset.title=èµæº
 asset.channel=é¢é b {0} /b.
-asset.new=æ°å»º é¾æ¥
+asset.new=æ°å»ºé¾æ¥
 asset.create= åå»º
 asset.asset=é¢éåçèµæº
 asset.type=ç±»å b {0} /b:
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] Delivery Status Notification

2008-12-11 Thread cvs





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

40 matches

Mail list logo