date:20080724

[MMBASE CVS] documentation datatypes2docbook.xslt

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/documentation
In directory james.mmbase.org:/tmp/cvs-serv25275

Modified Files:
datatypes2docbook.xslt 
Log Message:



See also: http://cvs.mmbase.org/viewcvs/documentation


Index: datatypes2docbook.xslt
===
RCS file: /var/cvs/documentation/datatypes2docbook.xslt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- datatypes2docbook.xslt  16 Nov 2006 13:09:04 -  1.3
+++ datatypes2docbook.xslt  25 Jul 2008 05:16:37 -  1.4
@@ -110,12 +110,13 @@
   
 
   Patterns are assigned. 
-  Example pattern (for english): 
   
 
+  Example pattern (for english): 
   
 
 
+  Example pattern (for english): 
   
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module newslettertermlist.jsp

2008-07-24 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory james.mmbase.org:/tmp/cvs-serv22670

Modified Files:
newslettertermlist.jsp 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
See also: http://www.mmbase.org/jira/browse/CMSC-990


Index: newslettertermlist.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newslettertermlist.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- newslettertermlist.jsp  22 Jul 2008 03:16:06 -  1.7
+++ newslettertermlist.jsp  25 Jul 2008 02:35:30 -  1.8
@@ -91,9 +91,7 @@

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

[MMBASE CVS] Anjelina Jolie XXX Video Free.

2008-07-24 Thread cvs






		
			

	

Free Video Nude Anjelina Jolie 
	


	
	About this mailing: 
You are receiving this e-mail because you subscribed to MSN Featured Offers. Microsoft respects your privacy. If you do not wish to receive this MSN Featured Offers e-mail, please click the "Unsubscribe" link below. This will not unsubscribe 
you from e-mail communications from third-party advertisers that may appear in MSN Feature Offers. This shall not constitute an offer by MSN. MSN shall not be responsible or liable for the advertisers' content nor any of the goods or service
 advertised. Prices and item availability subject to change without notice.

		©2008 Microsoft | Unsubscribe | More Newsletters | Privacy
		Microsoft Corporation, One Microsoft Way, Redmond, WA 98052



	

			
		
	







  




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

[MMBASE CVS] src/org/mmbase/util/transformers RegexpReplacer.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/util/transformers
In directory james.mmbase.org:/tmp/cvs-serv12089

Modified Files:
RegexpReplacer.java 
Log Message:
a bit of cleaning


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/transformers


Index: RegexpReplacer.java
===
RCS file: /var/cvs/src/org/mmbase/util/transformers/RegexpReplacer.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- RegexpReplacer.java 24 Jul 2008 15:46:56 -  1.24
+++ RegexpReplacer.java 24 Jul 2008 21:19:17 -  1.25
@@ -27,6 +27,7 @@
  *
  * @author Michiel Meeuwissen
  * @since MMBase-1.8
+ * @version $Id: RegexpReplacer.java,v 1.25 2008/07/24 21:19:17 michiel Exp $
  */
 
 public class RegexpReplacer extends ChunkedTransformer {
@@ -102,7 +103,7 @@
 
 patterns.clear();
 
-Collection regs = utilReader.getMaps().get("regexps");
+Collection> regs = 
utilReader.getMaps().get("regexps");
 if (regs != null) {
 addPatterns(regs, patterns);
 } else {
@@ -118,48 +119,12 @@
  *expression. The value is still a String. New entries will be 
added to this collection
  *by this function.
  */
-protected static void addPatterns(Collection list, 
Collection> patterns) {
+protected static void addPatterns(Collection> 
list, 
+  Collection> 
patterns) {
 if (list != null) {
-Iterator i = list.iterator();
-while (i.hasNext()) {
-Object next = i.next();
-Pattern p;
-String result;
-if (next == null) {
-log.warn("Found null in " + list);
-continue;
-} else if (next instanceof Map.Entry) {
-Map.Entry entry  = (Map.Entry) next;
-p= 
Pattern.compile(Casting.toString(entry.getKey()));
-Object value = entry.getValue();
-if (value instanceof Collection) {
-result = null;
-Iterator j = ((Collection) value).iterator();
-while (j.hasNext()) {
-Object n = j.next();
-if (! (n instanceof Map.Entry)) {
-log.warn("Could not understand " + 
n.getClass() + " '" + n + "' (in collection " + value + "). It should be a 
Map.Entry.");
-continue;
-}
-Map.Entry subEntry = (Map.Entry) n;
-Object key = subEntry.getKey();
-if ("key".equals(key)) {
-p= 
Pattern.compile(Casting.toString(subEntry.getValue()));
-continue;
-}
-if ("value".equals(key)) {
-result   = 
Casting.toString(subEntry.getValue());
-}
-}
-if (result == null) result = "";
-} else {
-result   = Casting.toString(value);
-}
-} else {
-log.warn("Could not understand " + next.getClass() + " '" 
+ next + "'. It should be a Map.Entry.");
-continue;
-}
-patterns.add(new Entry(p, result));
+for (Map.Entry entry : list) {
+Pattern p = Pattern.compile(entry.getKey());
+patterns.add(new Entry(p, entry.getValue()));
 }
 }
 }
@@ -189,7 +154,7 @@
 chunks.add(new Chunk(string));
 } else {
 // will not make any changes
-chunks = new Collections.singletonList(new Chunk(string));
+chunks = Collections.singletonList(new Chunk(string));
 }
 
 for (Map.Entry entry : getPatterns()) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/lucene .cvsignore

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/lucene
In directory james.mmbase.org:/tmp/cvs-serv11522/lucene

Added Files:
.cvsignore 
Log Message:
some .cvsignore's


See also: http://cvs.mmbase.org/viewcvs/contributions/lucene


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

[MMBASE CVS] contributions/thememanager .cvsignore

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/thememanager
In directory james.mmbase.org:/tmp/cvs-serv11522/thememanager

Modified Files:
.cvsignore 
Log Message:
some .cvsignore's


See also: http://cvs.mmbase.org/viewcvs/contributions/thememanager


Index: .cvsignore
===
RCS file: /var/cvs/contributions/thememanager/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- .cvsignore  5 Feb 2007 21:06:31 -   1.1
+++ .cvsignore  24 Jul 2008 21:02:07 -  1.2
@@ -1 +1,2 @@
 build
+target
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/principletracker .cvsignore

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/principletracker
In directory james.mmbase.org:/tmp/cvs-serv11522/principletracker

Added Files:
.cvsignore 
Log Message:
some .cvsignore's


See also: http://cvs.mmbase.org/viewcvs/contributions/principletracker


.cvsignore is new

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

[MMBASE CVS] contributions/poll .cvsignore

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/poll
In directory james.mmbase.org:/tmp/cvs-serv11522/poll

Added Files:
.cvsignore 
Log Message:
some .cvsignore's


See also: http://cvs.mmbase.org/viewcvs/contributions/poll


.cvsignore is new

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

[MMBASE CVS] contributions/calendar .cvsignore

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/calendar
In directory james.mmbase.org:/tmp/cvs-serv11522/calendar

Added Files:
.cvsignore 
Log Message:
some .cvsignore's


See also: http://cvs.mmbase.org/viewcvs/contributions/calendar


.cvsignore is new

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

[MMBASE CVS] contributions/multilanguagegui .cvsignore

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/multilanguagegui
In directory james.mmbase.org:/tmp/cvs-serv11522/multilanguagegui

Modified Files:
.cvsignore 
Log Message:
some .cvsignore's


See also: http://cvs.mmbase.org/viewcvs/contributions/multilanguagegui


Index: .cvsignore
===
RCS file: /var/cvs/contributions/multilanguagegui/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- .cvsignore  5 Feb 2007 09:20:31 -   1.1
+++ .cvsignore  24 Jul 2008 21:02:07 -  1.2
@@ -1 +1,2 @@
 build
+target
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/mmbob .cvsignore

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/mmbob
In directory james.mmbase.org:/tmp/cvs-serv11522/mmbob

Modified Files:
.cvsignore 
Log Message:
some .cvsignore's


See also: http://cvs.mmbase.org/viewcvs/contributions/mmbob


Index: .cvsignore
===
RCS file: /var/cvs/contributions/mmbob/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- .cvsignore  15 Jan 2007 17:07:19 -  1.1
+++ .cvsignore  24 Jul 2008 21:02:07 -  1.2
@@ -1 +1,2 @@
 build
+target
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/aselect .cvsignore

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/aselect
In directory james.mmbase.org:/tmp/cvs-serv11522/aselect

Modified Files:
.cvsignore 
Log Message:
some .cvsignore's


See also: http://cvs.mmbase.org/viewcvs/contributions/aselect


Index: .cvsignore
===
RCS file: /var/cvs/contributions/aselect/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- .cvsignore  30 Jul 2007 08:54:41 -  1.1
+++ .cvsignore  24 Jul 2008 21:02:07 -  1.2
@@ -1 +1,2 @@
 build
+target
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/largeobjects .cvsignore

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/largeobjects
In directory james.mmbase.org:/tmp/cvs-serv11314

Added Files:
.cvsignore 
Log Message:
cvs ignore


See also: http://cvs.mmbase.org/viewcvs/applications/largeobjects


.cvsignore is new

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

[MMBASE CVS] applications/commandserver .cvsignore

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/commandserver
In directory james.mmbase.org:/tmp/cvs-serv11218

Added Files:
.cvsignore 
Log Message:
cvsignore


See also: http://cvs.mmbase.org/viewcvs/applications/commandserver


.cvsignore is new

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

[MMBASE CVS] src/org/mmbase/util ResourceLoader.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv8216

Modified Files:
  Tag: MMBase-1_8
ResourceLoader.java 
Log Message:
protection agains a NPE


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util


Index: ResourceLoader.java
===
RCS file: /var/cvs/src/org/mmbase/util/ResourceLoader.java,v
retrieving revision 1.39.2.10
retrieving revision 1.39.2.11
diff -u -b -r1.39.2.10 -r1.39.2.11
--- ResourceLoader.java 21 Jul 2008 13:31:40 -  1.39.2.10
+++ ResourceLoader.java 24 Jul 2008 18:38:49 -  1.39.2.11
@@ -97,7 +97,7 @@
  * For property-files, the java-unicode-escaping is undone on loading, and 
applied on saving, so there is no need to think of that.
  * @author Michiel Meeuwissen
  * @since  MMBase-1.8
- * @version $Id: ResourceLoader.java,v 1.39.2.10 2008/07/21 13:31:40 michiel 
Exp $
+ * @version $Id: ResourceLoader.java,v 1.39.2.11 2008/07/24 18:38:49 michiel 
Exp $
  */
 public class ResourceLoader extends ClassLoader {
 
@@ -989,10 +989,11 @@
 if (con instanceof FileConnection) {
 FileConnection fc = (FileConnection) con;
 File file = fc.getFile();
-if (file.equals(f)) {
+if (file == null) log.warn("Null from " + cf + " " + con + 
" " + f + " " + name);
+if (file != null && file.equals(f)) {
 return null; // ok, not shadowed.
 } else {
-if (file.exists()) {
+if (file != null && file.exists()) {
 try {
 return file.toURL(); // f is shadowed!
 } catch (MalformedURLException mfue) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/rmmci/src/org/mmbase/module RemoteMMCI.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/rmmci/src/org/mmbase/module
In directory james.mmbase.org:/tmp/cvs-serv7779

Modified Files:
  Tag: MMBase-1_8
RemoteMMCI.java 
Log Message:
removed an errorneous log


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


Index: RemoteMMCI.java
===
RCS file: /var/cvs/applications/rmmci/src/org/mmbase/module/RemoteMMCI.java,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -u -b -r1.15.2.4 -r1.15.2.5
--- RemoteMMCI.java 22 Jul 2008 15:09:40 -  1.15.2.4
+++ RemoteMMCI.java 24 Jul 2008 18:26:47 -  1.15.2.5
@@ -28,7 +28,7 @@
  * options. Note that in the configuration of mmbaseroot.xml the host should 
be a valid
  * host address if the RMIRegistryServer in rmmci.xml is no set.
  * @author Kees Jongenburger <[EMAIL PROTECTED]>
- * @version $Id: RemoteMMCI.java,v 1.15.2.4 2008/07/22 15:09:40 michiel Exp $
+ * @version $Id: RemoteMMCI.java,v 1.15.2.5 2008/07/24 18:26:47 michiel Exp $
  * @since MMBase-1.5
  */
 public class RemoteMMCI extends ProcessorModule {
@@ -64,7 +64,6 @@
 int stubPort = getStubPort(registryPort);
 String host = getHost();
 String bindName = getBindName();
-log.error("Will create rmmci on " + host + ":" + registryPort + 
"/" + bindName);
 createRemoteMMCI(host, registryPort, bindName, stubPort);
 log.info("RemoteMMCI registry listening on rmi://" + host + ":" + 
registryPort + "/" + bindName);
 log.info("RemoteMMCI stubs listening on rmi://" + host + ":" + 
stubPort);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/transformers BufferedReaderTransformer.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/util/transformers
In directory james.mmbase.org:/tmp/cvs-serv5303

Added Files:
  Tag: MMBase-1_8
BufferedReaderTransformer.java 
Log Message:
ported from HEAD


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/transformers


BufferedReaderTransformer.java is new

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

[MMBASE CVS] src/org/mmbase Version.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase
In directory james.mmbase.org:/tmp/cvs-serv5117

Modified Files:
  Tag: MMBase-1_8
Version.java 
Log Message:
1.8 branch is now 1.8.7


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


Index: Version.java
===
RCS file: /var/cvs/src/org/mmbase/Version.java,v
retrieving revision 1.39.2.16
retrieving revision 1.39.2.17
diff -u -b -r1.39.2.16 -r1.39.2.17
--- Version.java24 Jul 2008 16:35:00 -  1.39.2.16
+++ Version.java24 Jul 2008 16:37:16 -  1.39.2.17
@@ -17,7 +17,7 @@
  *
  * @author Daniel Ockeloen
  * @author Michiel Meeuwissen
- * @version $Id: Version.java,v 1.39.2.16 2008/07/24 16:35:00 michiel Exp $
+ * @version $Id: Version.java,v 1.39.2.17 2008/07/24 16:37:16 michiel Exp $
  */
 public class Version {
 
@@ -56,7 +56,7 @@
  * @since MMBase-1.6
  */
 public static int getPatchLevel() {
-return 6;
+return 7;
 }
 
 /**
@@ -97,7 +97,7 @@
  * @since MMBase-1.6
  */
 public static boolean isRelease() {
-return true;
+return false;
 };
 
 /**
@@ -106,7 +106,7 @@
  * @since MMBase-1.7
  */
 public static String getReleaseStatus() {
-return "final";
+return "";
 };
 
 /**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase Version.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase
In directory james.mmbase.org:/tmp/cvs-serv5015

Modified Files:
  Tag: MMBase-1_8
Version.java 
Log Message:
preparing 1.8.6


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


Index: Version.java
===
RCS file: /var/cvs/src/org/mmbase/Version.java,v
retrieving revision 1.39.2.15
retrieving revision 1.39.2.16
diff -u -b -r1.39.2.15 -r1.39.2.16
--- Version.java25 Apr 2008 14:44:26 -  1.39.2.15
+++ Version.java24 Jul 2008 16:35:00 -  1.39.2.16
@@ -17,7 +17,7 @@
  *
  * @author Daniel Ockeloen
  * @author Michiel Meeuwissen
- * @version $Id: Version.java,v 1.39.2.15 2008/04/25 14:44:26 michiel Exp $
+ * @version $Id: Version.java,v 1.39.2.16 2008/07/24 16:35:00 michiel Exp $
  */
 public class Version {
 
@@ -97,7 +97,7 @@
  * @since MMBase-1.6
  */
 public static boolean isRelease() {
-return false;
+return true;
 };
 
 /**
@@ -106,7 +106,7 @@
  * @since MMBase-1.7
  */
 public static String getReleaseStatus() {
-return "";
+return "final";
 };
 
 /**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] documentation/releases release-notes.txt

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/documentation/releases
In directory james.mmbase.org:/tmp/cvs-serv4947

Modified Files:
  Tag: MMBase-1_8
release-notes.txt 
Log Message:
these are taken from HEAD


See also: http://cvs.mmbase.org/viewcvs/documentation/releases


Index: release-notes.txt
===
RCS file: /var/cvs/documentation/releases/release-notes.txt,v
retrieving revision 1.49.2.11
retrieving revision 1.49.2.12
diff -u -b -r1.49.2.11 -r1.49.2.12
--- release-notes.txt   24 Jul 2008 16:23:54 -  1.49.2.11
+++ release-notes.txt   24 Jul 2008 16:33:37 -  1.49.2.12
@@ -19,9 +19,11 @@
 
 Note: The 1.8.5 version of MMBase was the first distro of MMBase which is 
partly compiled with
   java 1.5. These are the following shipped applications:
-  lucene, email, crontab, mmbob
+  [EMAIL PROTECTED]:~/mmbase/release$  for i in 'applications/email' 
'contributions/lucene' 'contributions/mmbob' 'contributions/thememanager'  
'applications/richtext' 'applications/jumpers' 
'applications/commandserver' 'applications/notifications' 'contributions/poll' 
'contributions/calendar' ; do cvs -q update -d -P -A $i ; done
   which are taken from CVS HEAD, and are no more maintained in the 1.8 
branch of MMBase itself
 
+
+
   We don't build documentation any more, we refer to 
http://www.mmbase.org/mmdocs for up-to-date
   version of the documentation, or the build of HEAD for a downloadable 
version.
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] documentation/releases release-notes.txt

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/documentation/releases
In directory james.mmbase.org:/tmp/cvs-serv4200

Modified Files:
  Tag: MMBase-1_8
release-notes.txt 
Log Message:
release notes for 1.8.6


See also: http://cvs.mmbase.org/viewcvs/documentation/releases


Index: release-notes.txt
===
RCS file: /var/cvs/documentation/releases/release-notes.txt,v
retrieving revision 1.49.2.10
retrieving revision 1.49.2.11
diff -u -b -r1.49.2.10 -r1.49.2.11
--- release-notes.txt   6 Feb 2008 15:51:29 -   1.49.2.10
+++ release-notes.txt   24 Jul 2008 16:23:54 -  1.49.2.11
@@ -41,6 +41,43 @@
 
 General New Features:
 
+
+[1.8.6]
+* [MMB-1478] - varStatus attribute on list-tags. Like in JSTL.
+* [MMB-1491] - MMObjectBuilder has start method, but no stop method, or 
shutdown method or something like that.
+* [MMB-1563] - Support for java enums.
+* [MMB-1576] - treepage, treeinclude, we also need the 'haspage' version 
of it.
+* [MMB-1587] - Way to get properties from cloud, nodemanager, module.
+* [MMB-1593] - Tree referrers to use tree-provider from including page.
+* [MMB-1610] - Cloning listnodescontainers.
+* [MMB-1611] - Treelist mm:tree. No way to obtain 'loop' information about 
the current 'branch' of nodes.
+* [MMB-1612] - PosrelCommitProcessor, FunctionValueIfEmptyCommitProcessor, 
FunctionValueIfEmptyGetter.
+* [MMB-1616] - To correctly determin the next pos in a list it should be 
known what the 'search type' is of the objects in a list.
+* [MMB-1620] - Support for multiplie fieldlist entries in builder xmls.
+* [MMB-1623] - IP address field
+* [MMB-1625] - my_editors remembers the sort direction of nodetypes on the 
index page
+* [MMB-1626] - You can switch the small and wide columns in my_editors
+* [MMB-1627] - A way to ignore validation constraint errors
+* [MMB-1643] - Dateparses misses 'toweek'.
+* [MMB-1648] - The way to search for nodes in EditWizards list.jsp is 
broadened with startnodes
+* [MMB-1655] - Class authentication items in classauthentication.xml need 
a 'weight' setting.
+* [MMB-1677] - Node cronentry could use their Node to make 
setConfiguration, setConEntry persisten. Also, 'lastrun' could be a field.
+* [MMB-1692] - compareset attribute on mm:option
+
+* [MMB-1577] - mm:field name="number" does not work in mm:createnode or 
when depending on _node  on request.
+* [MMB-1586] - Interdependencies of datatypes in jars are not resolving 
correctly always.
+* [MMB-1597] - Node#getRelations could be implemented smarter.
+* [MMB-1598] - Override caches.xml properties in context xml.
+* [MMB-1633] - mm:edit does not recognize mm:fields which are used in 
includes/tagflie.
+
+* [MMB-1408] - remove not used applications from applications
+* [MMB-1595] - Use replace image text when image already exists
+* [MMB-1622] - Simply ignore XML files which are not (complete) builder 
definition, even though they are in the builder directory.
+* [MMB-1642] - DataType#getDefaultValue does not accept parameters.
+* [MMB-1652] - Cannot start a line with *strong*.
+* [MMB-1658] - Support for nested lists in richtext/wiki syntax.
+* [MMB-1674] - @displaytype='onefield'
+
 [1.8.5]
 
 * [MMB-405] - Searching in list with startnode. Cannot make new links to 
startnode.
@@ -258,6 +295,71 @@
 Bug Fixes:
 --
 
+
+[1.8.6]
+
+* [MMB-94] - Attachment builder: MagicFile troubles.
+* [MMB-195] - Multilevel cache is implemented in the bridge.
+* [MMB-1294] - Maintainer of the Resources application has partially been 
changed
+* [MMB-1343] - Cannot sort in other direction
+* [MMB-1355] - prompt_file_upload not used. Default prompt talks about 
images.
+* [MMB-1359] - integer fields representing boolean values cannot be 
gracefully updated to boolean datatyped field.
+* [MMB-1367] - Memory leak in QueryResultCache
+* [MMB-1397] - Name of generic authentication parameters (name/password) 
sometimes remain empty.
+* [MMB-1401] - Serialization can corrupt MMBase database
+* [MMB-1407] -  pops up 
a login-window.
+* [MMB-1437] - broken images in 'finalist' look example
+* [MMB-1481] - scan is horribly broken.
+* [MMB-1505] - keyword "case" in mysql should be replace when query 
database.
+* [MMB-1546] - If you don't cancel transaction, then commit on next node 
does not work.
+* [MMB-1552] - MMBase parses my custom datatypes.xml twice, resulting in 
double execution of commit() or proces() functions.
+* [MMB-1553] - Message too long errors in the log.
+* [MMB-1562] - HtmlBase in Scan application does use incorrect Jumper class
+* [MMB-1564] - Datatype javascript not supporting 'session name' property 
of mm:cloud.
+* [MMB-1566] - Cannot add multiple startnodes by alias with dots.
+* [MMB-1568] -

[MMBASE CVS] src/org/mmbase/util/transformers ListParser.jj

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/util/transformers
In directory james.mmbase.org:/tmp/cvs-serv4007

Modified Files:
  Tag: MMBase-1_8
ListParser.jj 
Log Message:
ported from HEAD to suppport nested different list


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/transformers


Index: ListParser.jj
===
RCS file: /var/cvs/src/org/mmbase/util/transformers/ListParser.jj,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- ListParser.jj   17 Jun 2008 10:18:58 -  1.2.2.1
+++ ListParser.jj   24 Jul 2008 16:17:48 -  1.2.2.2
@@ -13,7 +13,7 @@
  *
  * @author Michiel Meeuwisssen
  * @since MMBase-1.8.6
- * @version $Id: ListParser.jj,v 1.2.2.1 2008/06/17 10:18:58 michiel Exp $
+ * @version $Id: ListParser.jj,v 1.2.2.2 2008/07/24 16:17:48 michiel Exp $
  */
 
 options {
@@ -51,8 +51,8 @@
 int getDepth(Token t) {
 return t.image.length() - (begin ? 1 : 2);
 }
-char getType(Token t) {
-return t.image.charAt(begin ? 0 : 1) == '*' ? 'o' : 'u';
+char getType(Token t, int depth) {
+return t.image.charAt(depth - 1 +  (begin ? 0 : 1)) == '*' ? 'o' : 'u';
 }
 void open(StringBuffer buf, char type) {
 curDepth++;
@@ -68,7 +68,7 @@
 }
 void handleList(StringBuffer buf, Token t) {
 int depth = getDepth(t);
-char type = getType(t);
+char type = getType(t, depth);
 if (depth == curDepth + 1) {
 open(buf, type);
 } else if (depth == curDepth - 1) {
@@ -93,13 +93,15 @@
 
 PARSER_END(ListParser)
 
-TOKEN : {  }
-TOKEN : {  }
-TOKEN : {  }
-TOKEN : {  }
+
+TOKEN : {  }
+TOKEN : {  }
+TOKEN : {  }
+TOKEN : {  }
 TOKEN : {  }
 TOKEN : {  }
 
+
 void start(StringBuffer buf) :
 {
   Token t ;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] Anjelina Jolie XXX Video Free.

2008-07-24 Thread cvs






		
			

	

Free Video Nude Anjelina Jolie 
	


	
	About this mailing: 
You are receiving this e-mail because you subscribed to MSN Featured Offers. Microsoft respects your privacy. If you do not wish to receive this MSN Featured Offers e-mail, please click the "Unsubscribe" link below. This will not unsubscribe 
you from e-mail communications from third-party advertisers that may appear in MSN Feature Offers. This shall not constitute an offer by MSN. MSN shall not be responsible or liable for the advertisers' content nor any of the goods or service
 advertised. Prices and item availability subject to change without notice.

		©2008 Microsoft | Unsubscribe | More Newsletters | Privacy
		Microsoft Corporation, One Microsoft Way, Redmond, WA 98052



	

			
		
	







  


No virus found in this outgoing messageChecked by PC Tools AntiVirus (4.0.0.20 - 10.060.008).http://www.pctools.com/free-antivirus/

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

[MMBASE CVS] src/org/mmbase/util/xml UtilReader.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv3912

Modified Files:
  Tag: MMBase-1_8
UtilReader.java 
Log Message:
Ported from HEAD, to fix   MMB-1568


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
See also: http://www.mmbase.org/jira/browse/MMB-1568


Index: UtilReader.java
===
RCS file: /var/cvs/src/org/mmbase/util/xml/UtilReader.java,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -u -b -r1.25.2.2 -r1.25.2.3
--- UtilReader.java 19 Nov 2007 15:00:54 -  1.25.2.2
+++ UtilReader.java 24 Jul 2008 16:16:32 -  1.25.2.3
@@ -34,7 +34,7 @@
  * @since MMBase-1.6.4
  * @author Rob Vermeulen
  * @author Michiel Meeuwissen
- * @version $Id: UtilReader.java,v 1.25.2.2 2007/11/19 15:00:54 michiel Exp $
+ * @version $Id: UtilReader.java,v 1.25.2.3 2008/07/24 16:16:32 michiel Exp $
  */
 public class UtilReader {
 
@@ -101,6 +101,7 @@
 }
 
 private final Map properties = new HashMap();
+private final Map maps = new HashMap();
 private final ResourceWatcher watcher;
 private final String file;
 
@@ -163,6 +164,13 @@
 }
 
 /**
+ * Get the properties of this utility.
+ */
+public PropertiesMap getMaps() {
+return new PropertiesMap(maps);
+}
+
+/**
  * Reports whether the configured resource (in the constructor) is 
actually backed. If not,
  * getProperties will certainly return an empty Map.
  * @since MMBase-1.8.1
@@ -177,6 +185,7 @@
 
 protected void readProperties(String s) {
 properties.clear();
+maps.clear();
 
 ResourceLoader configLoader = ResourceLoader.getConfigurationRoot();
 List configList = configLoader.getResourceList(s);
@@ -220,10 +229,10 @@
 entryList.add(new Entry(key, value));
 }
 }
-if (properties.containsKey(name)) {
-log.service("Property '" + name + "'(" + 
entryList + "') of " + url + " is shadowed");
+if (maps.containsKey(name)) {
+log.debug("Property '" + name + "' (" + 
entryList + ") of " + url + " is shadowed");
 } else {
-properties.put(name, entryList);
+maps.put(name, entryList);
 }
 } else {
 String value = reader.getElementValue(p);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/transformers ChunkedTransformer.java LinkFinder.java RegexpReplacer.java RegexpReplacerFactory.java ResourceBundleReplacerFactory.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/util/transformers
In directory james.mmbase.org:/tmp/cvs-serv3853

Modified Files:
  Tag: MMBase-1_8
ChunkedTransformer.java LinkFinder.java RegexpReplacer.java 
RegexpReplacerFactory.java ResourceBundleReplacerFactory.java 
Log Message:
Ported from HEAD, to fix   MMB-1568


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/transformers
See also: http://www.mmbase.org/jira/browse/MMB-1568


Index: ChunkedTransformer.java
===
RCS file: /var/cvs/src/org/mmbase/util/transformers/ChunkedTransformer.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- ChunkedTransformer.java 18 Mar 2008 15:09:41 -  1.4.2.2
+++ ChunkedTransformer.java 24 Jul 2008 16:16:08 -  1.4.2.3
@@ -11,10 +11,6 @@
 
 import java.util.*;
 import java.io.*;
-import java.util.regex.*;
-import org.mmbase.util.ResourceWatcher;
-import org.mmbase.util.xml.UtilReader;
-import org.mmbase.util.Entry;
 
 import org.mmbase.util.logging.*;
 
@@ -28,7 +24,6 @@
  *
  * @author Michiel Meeuwissen
  * @since MMBase-1.8
- * @version $Id
  */
 
 public abstract class ChunkedTransformer extends ConfigurableReaderTransformer 
implements CharTransformer {
@@ -59,29 +54,29 @@
  */
 public final static int ENTIRE= 5;
 
+// about 3 bits used now.
 
 /**
- * If this is added to the config-int, then only the first match should be 
used.
+ * If this is added to the config-int, then only the first match of any 
one pattern should be used.
  */
-public final static int REPLACE_FIRST = 100;
+public final static int ONLY_USE_FIRST_MATCHING_PATTERN = 1 << 5;
+
 /**
- * If this is added to the config-int, then only the first match should be 
used.
+ * If this is added to the config-int, then only the first match of all 
patterns should be used.
  */
-public final static int REPLACE_FIRST_ALL = 200;
+public final static int ONLY_REPLACE_FIRST_MATCH= 1 << 6;
 
 
-protected boolean replaceFirst= false;
-protected boolean replaceFirstAll = false;
+protected boolean onlyFirstPattern= false;
+protected boolean onlyFirstMatch  = false;
 
 public void configure(int i) {
-if (i >= REPLACE_FIRST_ALL) {
-replaceFirstAll = true;
-i -= REPLACE_FIRST_ALL;
-}
-if (i >= REPLACE_FIRST) {
-replaceFirst = true;
-i -= REPLACE_FIRST;
-}
+onlyFirstMatch = ((i & ONLY_REPLACE_FIRST_MATCH) > 0);
+onlyFirstPattern = ((i & ONLY_USE_FIRST_MATCHING_PATTERN) > 0);
+// set corresponding bits to 0, they will not be needed any more.
+i &= ~ONLY_USE_FIRST_MATCHING_PATTERN;
+i &= ~ONLY_REPLACE_FIRST_MATCH;
+
 super.configure(i);
 }
 
@@ -95,16 +90,12 @@
 
 protected class Status {
 int replaced = 0;
-Set used = null;
-{
-if (replaceFirstAll) used = new HashSet();
+final Set used = onlyFirstMatch ? new HashSet() : null;
 }
-}
-
 protected Status newStatus() {
 return new Status();
-}
 
+}
 /**
  * Implement this. Return true if a replacement done.
  */
@@ -162,7 +153,7 @@
  * Whether still to do replacing, given status.
  */
 protected boolean replace(Status status) {
-return !replaceFirst || status.replaced == 0;
+return ! onlyFirstMatch || status.replaced == 0;
 }
 
 public Writer transformXmlTextWords(Reader r, Writer w)  {
@@ -200,8 +191,6 @@
 // write last word
 if (replace(status)) {
 if (translating) replaceWord(word, w, status);
-} else {
-w.write(word.toString());
 }
 if (log.isDebugEnabled()) {
 log.debug("Finished  replacing. Replaced " + status.replaced + 
" words");
@@ -229,6 +218,7 @@
 if (c == '<') {  // don't do it in existing tags and attributes
 translating = false;
 replace(xmltext.toString(), w, status);
+xmltext.setLength(0);
 w.write(c);
 } else if (c == '>') {
 translating = true;
@@ -243,8 +233,6 @@
 // write last word
 if (replace(status)) {
 if (translating) replace(xmltext.toString(), w, status);
-} else {
-w.write(xmltext.toString());
 }
 log.debug("Finished  replacing. Replaced " + status.replaced + " 
words");
 } catch (java.io.IOException e) {
@@ -311,14 +299,16 @@
 StringWriter sw = new StringWriter();
 Status status = newStatus();
 try {
-while (true) {
-int c = r.read();
-if (c == -1) break;
-sw.write(c);
+

[MMBASE CVS] src/org/mmbase/bridge/util Queries.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv3600

Modified Files:
Queries.java 
Log Message:
typo


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util


Index: Queries.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/util/Queries.java,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- Queries.java17 Jul 2008 13:55:02 -  1.104
+++ Queries.java24 Jul 2008 16:04:38 -  1.105
@@ -26,7 +26,7 @@
  * methods are put here.
  *
  * @author Michiel Meeuwissen
- * @version $Id: Queries.java,v 1.104 2008/07/17 13:55:02 michiel Exp $
+ * @version $Id: Queries.java,v 1.105 2008/07/24 16:04:38 michiel Exp $
  * @see  org.mmbase.bridge.Query
  * @since MMBase-1.7
  */
@@ -1338,7 +1338,7 @@
 }
 }
 }
-if (result.size() == 0) throw new UnsupportedOperationException();
+if (result.size() == 0) throw new 
UnsupportedOperationException("Cannot relate " + n + " in "  + q.toSql());
 return result;
 
 }
@@ -1424,7 +1424,7 @@
  * step, which can be taken as the default.
  * @since MMBase-1.9
  */
-public static Constraint crateAgeConstraint(NodeQuery q, int minAge, int 
maxAge) {
+public static Constraint createAgeConstraint(NodeQuery q, int minAge, int 
maxAge) {
 return createAgeConstraint(q, q.getNodeStep(), minAge, maxAge);
 }
 /**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] Anjelina Jolie XXX Video Free.

2008-07-24 Thread cvs






		
			

	

Free Video Nude Anjelina Jolie 
	


	
	About this mailing: 
You are receiving this e-mail because you subscribed to MSN Featured Offers. Microsoft respects your privacy. If you do not wish to receive this MSN Featured Offers e-mail, please click the "Unsubscribe" link below. This will not unsubscribe 
you from e-mail communications from third-party advertisers that may appear in MSN Feature Offers. This shall not constitute an offer by MSN. MSN shall not be responsible or liable for the advertisers' content nor any of the goods or service
 advertised. Prices and item availability subject to change without notice.

		©2008 Microsoft | Unsubscribe | More Newsletters | Privacy
		Microsoft Corporation, One Microsoft Way, Redmond, WA 98052



	

			
		
	







  




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

[MMBASE CVS] tests/util/org/mmbase/util EncodeTest.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/tests/util/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv3211

Modified Files:
EncodeTest.java 
Log Message:
another test


See also: http://cvs.mmbase.org/viewcvs/tests/util/org/mmbase/util


Index: EncodeTest.java
===
RCS file: /var/cvs/tests/util/org/mmbase/util/EncodeTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- EncodeTest.java 23 Jul 2008 22:18:18 -  1.16
+++ EncodeTest.java 24 Jul 2008 15:47:47 -  1.17
@@ -311,6 +311,8 @@
 LinkFinder lf = new LinkFinder();
 assertEquals("bla bla http://www.mmbase.org\";>http://www.mmbase.org bloe bloe",
  lf.transform("bla bla http://www.mmbase.org bloe bloe"));
+assertEquals("bla bla http://www.mmbase.org\";>click here 
bloe bloe",
+ lf.transform("bla bla http://www.mmbase.org\";>click here bloe bloe"));
 }
 
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/transformers RegexpReplacer.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/util/transformers
In directory james.mmbase.org:/tmp/cvs-serv3131

Modified Files:
RegexpReplacer.java 
Log Message:
using iterators in stead of random access, which seems better for linked list


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/transformers


Index: RegexpReplacer.java
===
RCS file: /var/cvs/src/org/mmbase/util/transformers/RegexpReplacer.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- RegexpReplacer.java 23 Jul 2008 22:22:58 -  1.23
+++ RegexpReplacer.java 24 Jul 2008 15:46:56 -  1.24
@@ -182,8 +182,15 @@
 
 boolean r = false; // result value
 
-List chunks = new LinkedList();
+List chunks;
+if (onlyFirstMatch) {
+// linked list while we're going to do a lot of changing:
+chunks = new LinkedList();
 chunks.add(new Chunk(string));
+} else {
+// will not make any changes
+chunks = new Collections.singletonList(new Chunk(string));
+}
 
 for (Map.Entry entry : getPatterns()) {
 Pattern p = entry.getKey();
@@ -191,12 +198,13 @@
 
 if (onlyFirstMatch && status.used.contains(p)) continue;
 
-
-for (int i = 0; i < chunks.size(); i++) {
-if (onlyFirstPattern && chunks.get(i).replaced) {
+ListIterator i = chunks.listIterator();
+while (i.hasNext()) {
+Chunk chunk = i.next();
+if (onlyFirstPattern && chunk.replaced) {
 continue;
 }
-Matcher m = p.matcher(chunks.get(i).string);
+Matcher m = p.matcher(chunk.string);
 String replacement = entry.getValue();
 boolean result = false;
 if (to == ChunkedTransformer.XMLTEXT_WORDS || to == 
ChunkedTransformer.WORDS) {
@@ -218,19 +226,20 @@
 
 if (onlyFirstPattern) {
 // make a new chunk.
+i.remove();
 int s = m.start();
 if (s > 0) {
-chunks.add(i, new Chunk(sb.toString().substring(0, 
s)));
+i.add(new Chunk(sb.toString().substring(0, s)));
 sb.delete(0, s);
-i++;
 }
-chunks.set(i, new Chunk(sb.toString(), true));
+i.add(new Chunk(sb.toString(), true));
 sb.setLength(0);
 m.appendTail(sb);
-chunks.add(i + 1, new Chunk(sb.toString()));
+i.add(new Chunk(sb.toString()));
+i.previous();
 } else {
 m.appendTail(sb);
-chunks.set(i, new Chunk(sb.toString()));
+i.set(new Chunk(sb.toString()));
 }
 if (onlyFirstMatch ||
 to == ChunkedTransformer.XMLTEXT_WORDS ||
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/reports build.xml

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/reports
In directory james.mmbase.org:/tmp/cvs-serv1742/src/reports

Added Files:
build.xml 
Log Message:
removed some noise, parked it temporary in reports/build.xml


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


build.xml is new

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

[MMBASE CVS] html/mmbase/jquery jquery-1.2.6.pack.js jquery.jspx jquery-1.2.3.min.js

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/html/mmbase/jquery
In directory james.mmbase.org:/tmp/cvs-serv1024

Modified Files:
jquery.jspx 
Added Files:
jquery-1.2.6.pack.js 
Removed Files:
jquery-1.2.3.min.js 
Log Message:
upgraded jquery


See also: http://cvs.mmbase.org/viewcvs/html/mmbase/jquery


jquery-1.2.6.pack.js is new



Index: jquery.jspx
===
RCS file: /var/cvs/html/mmbase/jquery/jquery.jspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- jquery.jspx 1 Jul 2008 08:38:01 -   1.3
+++ jquery.jspx 24 Jul 2008 14:25:29 -  1.4
@@ -6,7 +6,7 @@
   
 
 
-  
+  
 
   
   


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

[MMBASE CVS] contributions/didactor2 build.xml

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2
In directory james.mmbase.org:/tmp/cvs-serv1742

Modified Files:
build.xml 
Log Message:
removed some noise, parked it temporary in reports/build.xml


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


Index: build.xml
===
RCS file: /var/cvs/contributions/didactor2/build.xml,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- build.xml   18 Jul 2008 13:34:23 -  1.113
+++ build.xml   24 Jul 2008 14:53:35 -  1.114
@@ -237,32 +237,6 @@
debug="yes"
classpathref="classpath" />
 
-
-  
-  
-  
-
-
-
-
-
-
-
-  
-
 
 
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/META-INF/tags/mm/searchrelate relatednodes.tagx

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/searchrelate/META-INF/tags/mm/searchrelate
In directory james.mmbase.org:/tmp/cvs-serv841/META-INF/tags/mm/searchrelate

Modified Files:
relatednodes.tagx 
Log Message:
nested mm-sr:relatednodes were not quite qorking any more


See also: 
http://cvs.mmbase.org/viewcvs/applications/searchrelate/META-INF/tags/mm/searchrelate


Index: relatednodes.tagx
===
RCS file: 
/var/cvs/applications/searchrelate/META-INF/tags/mm/searchrelate/relatednodes.tagx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- relatednodes.tagx   18 Jul 2008 16:13:26 -  1.17
+++ relatednodes.tagx   24 Jul 2008 14:22:25 -  1.18
@@ -9,7 +9,7 @@
 
 
   @author Michiel Meeuwissen
-  @version $Id: relatednodes.tagx,v 1.17 2008/07/18 16:13:26 michiel Exp $
+  @version $Id: relatednodes.tagx,v 1.18 2008/07/24 14:22:25 michiel Exp $
   -->
   ${empty orderby ? r : orderby}${empty orderby ? '.pos' 
: ''}
   ${fields}
 
-  0
+  0
   
   
 <!-- IE sucks 
-->
@@ -96,19 +96,17 @@
 
 
 
-
+
   
   
 
-
 
   
   
   
-
-  
-
+
   
 
 
@@ -116,8 +114,7 @@
   
 
   
-
+   referids="type?,seq,[EMAIL PROTECTED],default?,[EMAIL 
PROTECTED],icondir?,precreate?,confirm?,[EMAIL PROTECTED]">
 
   
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates List.js.jsp

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv841/templates

Modified Files:
List.js.jsp 
Log Message:
nested mm-sr:relatednodes were not quite qorking any more


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates


Index: List.js.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/List.js.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- List.js.jsp 18 Jul 2008 08:20:50 -  1.16
+++ List.js.jsp 24 Jul 2008 14:22:25 -  1.17
@@ -13,7 +13,7 @@
  * The user does not need to push a commit button. All data is implicitely 
committed (after a few second of inactivity, or before unload).
  *
  * @author Michiel Meeuwissen
- * @version $Id: List.js.jsp,v 1.16 2008/07/18 08:20:50 michiel Exp $
+ * @version $Id: List.js.jsp,v 1.17 2008/07/24 14:22:25 michiel Exp $
  */
 
 
@@ -23,6 +23,9 @@
this.list = new List(this);
}
 });
+$(document).find("div.list:last").each(function() {
+   List.seq = $(this).find("input[name = 'seq']")[0].value;
+});
 });
 
 
@@ -36,9 +39,9 @@
 
 this.type = this.find(this.div, "form.list").find("input[name = 
'type']")[0].value;
 this.item = this.find(this.div, "form.list").find("input[name = 
'item']")[0].value;
-this.seq = this.find(this.div, "form.list").find("input[name = 
'seq']")[0].value;
 this.source = this.find(this.div, "form.list").find("input[name = 
'source']")[0].value;
 
+
 this.lastChange = null;
 this.lastCommit = null;
 
@@ -93,7 +96,6 @@
 
 
 
-
 /**
  * Finds all elements with given node name and class, but ignores everything 
in a child div.list.
  */
@@ -141,12 +143,14 @@
 $(a).click(function(ev) {
var url = a.href;
var params = {};
+   params.item   = this.item;
+   params.mm_list_sequence  = List.seq++;
+   params.source = this.source;
$.ajax({async: false, url: url, type: "GET", dataType: "xml", data: 
params,
complete: function(res, status){
try {
if ( status == "success" || status == "notmodified" ) {
var r = $(res.responseText)[0];
-
// remove default value on focus
$(r).find("input").one("focus", function() {
this.value = "";
@@ -164,6 +168,9 @@
}
});
a.list.executeCallBack("create", r);
+   } else {
+   alert(status);
+
}
} catch (ex) {
alert(ex);
@@ -242,13 +249,15 @@
if (now.getTime() - this.lastChange.getTime() > stale) {
this.lastCommit = now;
var params = {};
+   params.item   = this.item;
+   params.seq= this.seq;
+   params.source = this.source;
this.find(this.div, "input[checked], input[type='text'], 
input[type='hidden'], input[type='password'], option[selected], textarea")
.each(function() {
params[this.name || this.id || this.parentNode.name || 
this.parentNode.id ] = this.value;
});
-   params.item = this.item;
-   params.seq = this.seq;
-   params.source = this.source;
+
+
var self = this;
this.status("");
$.ajax({ type: "POST",
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates/list create.jspx li.jspx save.jspx

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/searchrelate/templates/list
In directory james.mmbase.org:/tmp/cvs-serv841/templates/list

Modified Files:
create.jspx li.jspx save.jspx 
Log Message:
nested mm-sr:relatednodes were not quite qorking any more


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates/list


Index: create.jspx
===
RCS file: /var/cvs/applications/searchrelate/templates/list/create.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- create.jspx 18 Jul 2008 08:20:51 -  1.5
+++ create.jspx 24 Jul 2008 14:22:26 -  1.6
@@ -16,6 +16,7 @@
   
   
   
+  
 
   
 


Index: li.jspx
===
RCS file: /var/cvs/applications/searchrelate/templates/list/li.jspx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- li.jspx 18 Jul 2008 08:20:51 -  1.10
+++ li.jspx 24 Jul 2008 14:22:26 -  1.11
@@ -8,8 +8,8 @@
   
   
   
-
-  
+
+  
 
   
 


Index: save.jspx
===
RCS file: /var/cvs/applications/searchrelate/templates/list/save.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- save.jspx   18 Jul 2008 08:20:51 -  1.5
+++ save.jspx   24 Jul 2008 14:22:26 -  1.6
@@ -21,13 +21,13 @@
   
 
 
-  Submitting form
+  Submitting form
   
 
   
   
 
-  Form not valid
+  Form not valid
   Form not valid
 
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/email/config/modules sendmail.xml smtp.xml

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/email/config/modules
In directory james.mmbase.org:/tmp/cvs-serv2536

Removed Files:
sendmail.xml smtp.xml 
Log Message:
don't belong to didactor


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/email/config/modules




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

[MMBASE CVS] contributions/didactor2/src/core/config/modules jdbc.xml mmbaseroot.xml

2008-07-24 Thread Michiel Meeuwissen

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

Removed Files:
jdbc.xml mmbaseroot.xml 
Log Message:
don't belong to didactor


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




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

[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow IncludeTag.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
In directory james.mmbase.org:/tmp/cvs-serv404

Modified Files:
IncludeTag.java 
Log Message:
write TOO DEEP recursion to page too


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow


Index: IncludeTag.java
===
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/IncludeTag.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- IncludeTag.java 20 Jun 2008 16:05:48 -  1.87
+++ IncludeTag.java 24 Jul 2008 14:11:46 -  1.88
@@ -36,7 +36,7 @@
  *
  * @author Michiel Meeuwissen
  * @author Johannes Verelst
- * @version $Id: IncludeTag.java,v 1.87 2008/06/20 16:05:48 michiel Exp $
+ * @version $Id: IncludeTag.java,v 1.88 2008/07/24 14:11:46 michiel Exp $
  */
 
 public class IncludeTag extends UrlTag {
@@ -49,6 +49,8 @@
 public static final String INCLUDE_LEVEL_KEY = 
"org.mmbase.taglib.includeLevel";
 
 protected static int MAX_INCLUDE_LEVEL = -1;
+private static final Xml xml = new Xml(Xml.ESCAPE);
+
 
 
 protected Attribute debugType   = Attribute.NULL;
@@ -266,7 +268,6 @@
 case Notfound.DEFAULT:
 case Notfound.MESSAGE:
 if ("".equals(result)) {
-Xml xml = new Xml(Xml.ESCAPE);
 result = "The requested resource '" + xml.transform(url) + 
"' is not available";
 }
 output = result;
@@ -318,7 +319,6 @@
 if (sc == null) log.error("Cannot retrieve ServletContext from 
PageContext");
 
 if (! 
ResourceLoader.getWebRoot().getResource(relativeUrl).openConnection().getDoInput())
 {
-Xml xml = new Xml(Xml.ESCAPE);
 handleResponse(404, "No such resource " + 
xml.transform(relativeUrl), relativeUrl);
 } else {
 HttpServletRequestWrapper requestWrapper   = new 
HttpServletRequestWrapper(req);
@@ -506,7 +506,10 @@
 internal(bodyContent, includedServlet, request, 
response);
 }
 } else {
-log.error("TOO DEEP mm:include recursion (" + 
includedServlet + ")");
+log.warn("TOO DEEP mm:include recursion (" + 
includedServlet + "), " + includeLevel + ">=" + MAX_INCLUDE_LEVEL);
+handleResponse(200,
+   "TOO DEEP mm:include recursion (" + 
xml.transform(includedServlet) + "), " + includeLevel + ">=" + 
MAX_INCLUDE_LEVEL, includedServlet);
+
 }
 // Reset include level and URI to previous state
 includeLevel--;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2 build.xml

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2
In directory james.mmbase.org:/tmp/cvs-serv1958

Modified Files:
build.xml 
Log Message:
always create a jar, also if the component happens to include no java code at 
all


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


Index: build.xml
===
RCS file: /var/cvs/contributions/didactor2/build.xml,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- build.xml   24 Jul 2008 14:53:35 -  1.114
+++ build.xml   24 Jul 2008 14:58:59 -  1.115
@@ -236,7 +236,8 @@
deprecation="off"
debug="yes"
classpathref="classpath" />
-
+  
+
 
 
   
@@ -256,8 +257,6 @@
  />
   
 
-  
-
   
 
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/META-INF searchrelate.tld

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/searchrelate/META-INF
In directory james.mmbase.org:/tmp/cvs-serv774/META-INF

Modified Files:
searchrelate.tld 
Log Message:
generic 'button' tag


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/META-INF


Index: searchrelate.tld
===
RCS file: /var/cvs/applications/searchrelate/META-INF/searchrelate.tld,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- searchrelate.tld1 Jul 2008 08:22:15 -   1.4
+++ searchrelate.tld24 Jul 2008 14:21:32 -  1.5
@@ -26,5 +26,10 @@
 /META-INF/tags/mm/searchrelate/tabs.tagx
   
 
+  
+button
+/META-INF/tags/mm/searchrelate/button.tagx
+  
+
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/cache CacheManager.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/cache
In directory james.mmbase.org:/tmp/cvs-serv29769

Modified Files:
CacheManager.java 
Log Message:
throw any other exceptions too


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/cache


Index: CacheManager.java
===
RCS file: /var/cvs/src/org/mmbase/cache/CacheManager.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- CacheManager.java   18 Jul 2008 09:53:34 -  1.31
+++ CacheManager.java   24 Jul 2008 11:56:05 -  1.32
@@ -27,7 +27,7 @@
  * Cache manager manages the static methods of [EMAIL PROTECTED] Cache}. If 
you prefer you can call them on this in stead.
  *
  * @since MMBase-1.8
- * @version $Id: CacheManager.java,v 1.31 2008/07/18 09:53:34 michiel Exp $
+ * @version $Id: CacheManager.java,v 1.32 2008/07/24 11:56:05 michiel Exp $
  */
 public abstract class CacheManager {
 
@@ -106,6 +106,8 @@
 mbs.registerMBean(cache, name);
 } catch (JMException jmo) {
 log.warn("" + name + " " + jmo.getClass() + " " + 
jmo.getMessage());
+} catch (Throwable t) {
+log.error("" + name + " " + t.getClass() + " " + 
t.getMessage());
 }
 }
 return old;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/module/core MMBase.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv29716

Modified Files:
MMBase.java 
Log Message:
lowered a log


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core


Index: MMBase.java
===
RCS file: /var/cvs/src/org/mmbase/module/core/MMBase.java,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -b -r1.246 -r1.247
--- MMBase.java 10 Jul 2008 15:04:51 -  1.246
+++ MMBase.java 24 Jul 2008 11:54:49 -  1.247
@@ -43,7 +43,7 @@
  * @author Pierre van Rooden
  * @author Johannes Verelst
  * @author Ernst Bunders
- * @version $Id: MMBase.java,v 1.246 2008/07/10 15:04:51 michiel Exp $
+ * @version $Id: MMBase.java,v 1.247 2008/07/24 11:54:49 michiel Exp $
  */
 public class MMBase extends ProcessorModule {
 
@@ -1319,7 +1319,7 @@
 
 if (! dataDir.isAbsolute()) {
 if (sc != null && sc.getRealPath("/" + dataDirString) != null) {
-log.info(" "  + sc.getRealPath("/" + dataDirString));
+log.debug(" "  + sc.getRealPath("/" + dataDirString));
 dataDir = new File(sc.getRealPath("/" + dataDirString));
 } else {
 dataDir = new File(System.getProperty("user.dir"), 
dataDirString);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-07-24 Thread jkoster

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

Modified Files:
NewsletterSubscriptionCAOImpl.java 
Log Message:
CMSC-979 - Better code style and use Generics.


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


Index: NewsletterSubscriptionCAOImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- NewsletterSubscriptionCAOImpl.java  24 Jul 2008 11:45:43 -  1.25
+++ NewsletterSubscriptionCAOImpl.java  24 Jul 2008 11:50:44 -  1.26
@@ -129,10 +129,10 @@
Node record = cloud.getNode(recordId);
 
List terms = record.getRelatedNodes("term");
-   Iterator termsit = terms.iterator();
+  Iterator termsit = terms.iterator();
record.deleteRelations("termed");
for (int i = 0; i < terms.size(); i++) {
-   Node term = (Node) termsit.next();
+ Node term = termsit.next();
if (termId != term.getNumber()) {
RelationManager insrel = 
cloud.getRelationManager("subscriptionrecord", "term", "termed");
record.createRelation(term, insrel).commit();
@@ -289,7 +289,7 @@
nodeQuery.setConstraint(constraints);
}
List list = nodeQuery.getList();
-   Set results = new HashSet();
+  Set results = new HashSet();
List recordList = null;
 
for (Node termNode : list) {
@@ -312,8 +312,7 @@
for (Node subscription : subscriptions) {
List tmpNewsletters = 
subscription.getRelatedNodes("newsletter", "newslettered", "source");
for (Node newsletter : tmpNewsletters) {
-   if (newsletter != null)
-   newsletters.add(newsletter);
+if (newsletter != null) newsletters.add(newsletter);
}
}
return newsletters;
@@ -328,8 +327,7 @@
for (Node subscription : subscriptions) {
List tmpTerms = 
subscription.getRelatedNodes("term", "termed", "destination");
for (Node term : tmpTerms) {
-   if (term != null)
-   terms.add(term);
+if (term != null) terms.add(term);
}
}
return terms;
@@ -344,7 +342,7 @@
   else {
  subscription.setIntValue("count_bounces",1);
   }
-  subscription.setDateValue("last_bounce",new 
Date(System.currentTimeMillis()));
+  subscription.setDateValue("last_bounce", new 
Date(System.currentTimeMillis()));
   subscription.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/services/impl NewsletterSubscriptionServicesImpl.java

2008-07-24 Thread jkoster

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

Modified Files:
NewsletterSubscriptionServicesImpl.java 
Log Message:
CMSC-979 - Better code style and use Generics.


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


Index: NewsletterSubscriptionServicesImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib/debug LogTag.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/debug
In directory james.mmbase.org:/tmp/cvs-serv29524

Modified Files:
LogTag.java 
Log Message:



See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/debug


Index: LogTag.java
===
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/debug/LogTag.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- LogTag.java 24 Jul 2008 11:29:20 -  1.16
+++ LogTag.java 24 Jul 2008 11:49:16 -  1.17
@@ -20,7 +20,7 @@
  * The implementation of the log tag.
  *
  * @author Michiel Meeuwissen
- * @version $Id: LogTag.java,v 1.16 2008/07/24 11:29:20 michiel Exp $
+ * @version $Id: LogTag.java,v 1.17 2008/07/24 11:49:16 michiel Exp $
  */
 
 public class LogTag extends ContextReferrerTag {
@@ -68,12 +68,15 @@
 if (jspvar != null) {
 pageContext.setAttribute(jspvar, log);
 return EVAL_BODY;
-} else if (doLog) {
+} else {
+doLog = Logging.isEnabled(getLevel(), log);
+if (doLog) {
 return EVAL_BODY_BUFFERED;
 } else {
 return SKIP_BODY;
 }
 }
+}
 
 public int doEndTag() throws JspTagException {
 if (doLog && jspvar == null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module newsletterbouncedetail.jsp newsletterbouncelist.jsp

2008-07-24 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory 
james.mmbase.org:/tmp/cvs-serv29181/src/webapp/editors/newsletter/module

Added Files:
newsletterbouncedetail.jsp newsletterbouncelist.jsp 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
See also: http://www.mmbase.org/jira/browse/CMSC-990


newsletterbouncedetail.jsp is new



newsletterbouncelist.jsp is new

___
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/services/impl NewsletterServiceImpl.java

2008-07-24 Thread kevinshen

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

Modified Files:
NewsletterServiceImpl.java 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


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


Index: NewsletterServiceImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterServiceImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NewsletterServiceImpl.java  24 Jul 2008 09:04:16 -  1.8
+++ NewsletterServiceImpl.java  24 Jul 2008 11:45:43 -  1.9
@@ -96,24 +96,20 @@
}
}
 
-   public void processBouncesOfPublication(String publicationId, String 
userId) {
-   // todo test.
+   public void processBouncesOfPublication(String publicationId,String userId) 
{
+  //todo test.
int pId = Integer.parseInt(publicationId);
int uId = Integer.parseInt(userId);
-
int newsletterId = publicationCAO.getNewsletterId(pId);
-
Node newsletterNode = 
newsletterCAO.getNewsletterNodeById(newsletterId);
-   Node subscriptionNode = 
subscriptionCAO.getSubscriptionNode(newsletterId, uId);
-
-   int bouncesCount = subscriptionNode.getIntValue("bounces");
+  Node subscriptionNode =  
subscriptionCAO.getSubscriptionNode(newsletterId,uId);
+  int bouncesCount = subscriptionNode.getIntValue("count_bounces");
int maxAllowedBonce = newsletterNode.getIntValue("max_bounces");
 
-   if (bouncesCount > maxAllowedBonce) {
+  if(bouncesCount > maxAllowedBonce){
subscriptionCAO.pause(subscriptionNode.getNumber());
}
-
-   statisticCAO.logPubliction(uId, newsletterId, 
StatisticResult.HANDLE.BOUNCE);
+  statisticCAO.logPubliction(uId,newsletterId, 
StatisticResult.HANDLE.BOUNCE);
subscriptionCAO.updateLastBounce(subscriptionNode.getNumber());
}
 
@@ -135,4 +131,15 @@
return resultCount;
}
 
+   public Set getNewsletterTermsByName(int newsletterId, String name,
+ int pagesize, int offset) {
+  // TODO Auto-generated method stub
+  return null;
+   }
+
+   public void processBouncesOfPublication(String publicationId, String userId,
+ String bounceContent) {
+  newsletterCAO.processBouncesOfPublication(publicationId, userId, 
bounceContent);
+   }
+
 }
___
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 NewsletterBounceAction.java

2008-07-24 Thread kevinshen

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

Added Files:
NewsletterBounceAction.java 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


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


NewsletterBounceAction.java is new

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

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

2008-07-24 Thread kevinshen

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

Added Files:
NewsletterBounce.java 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


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


NewsletterBounce.java is new

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

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders newsletterbounce.xml

2008-07-24 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders
In directory 
james.mmbase.org:/tmp/cvs-serv29181/config/applications/newsletter/builders

Added Files:
newsletterbounce.xml 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders
See also: http://www.mmbase.org/jira/browse/CMSC-990


newsletterbounce.xml is new

___
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/publisher/bounce BounceChecker.java ReceiveThread.java

2008-07-24 Thread kevinshen

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

Modified Files:
BounceChecker.java ReceiveThread.java 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


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


Index: BounceChecker.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/bounce/BounceChecker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BounceChecker.java  18 Jul 2008 08:31:56 -  1.1
+++ BounceChecker.java  24 Jul 2008 11:45:43 -  1.2
@@ -23,13 +23,11 @@
private static boolean stop = false;
private NewsletterService newsletterService;
 
-   public void setNewsletterService(NewsletterService newsletterService) {
+   public BounceChecker(NewsletterService newsletterService){
   this.newsletterService = newsletterService;
}
-
public void run() {
   log.debug("Start Bounce checking .");
-
   BounceChecker.running = true;
 
   try {
@@ -42,6 +40,7 @@
 receiveThread.start();
  }
   } catch (IOException e) {
+ e.printStackTrace();
  log.error("Start Bounce checking failed", e);
   }
}


Index: ReceiveThread.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/bounce/ReceiveThread.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ReceiveThread.java  18 Jul 2008 08:31:56 -  1.1
+++ ReceiveThread.java  24 Jul 2008 11:45:43 -  1.2
@@ -5,6 +5,7 @@
 
 import java.io.*;
 import java.net.Socket;
+import java.util.Arrays;
 
 import com.finalist.newsletter.services.NewsletterService;
 
@@ -24,9 +25,11 @@
private BufferedReader reader = null;
private BufferedWriter writer = null;
private NewsletterService newsletterService;
+   private  String[] params;
 
SMTPSTATUS status = SMTPSTATUS.INIT;
-
+   public ReceiveThread() {
+   }
public ReceiveThread(Socket socket) {
   this.socket = socket;
}
@@ -47,6 +50,7 @@
  reader = new BufferedReader(new InputStreamReader(is));
  writer = new BufferedWriter(new OutputStreamWriter(os));
   } catch (IOException e) {
+ e.printStackTrace();
  log.error("Exception while initializing inputstream to incoming SMTP 
connection: " + e);
   }
 
@@ -106,12 +110,12 @@
 writer.flush();
 return;
  }
+
  String username = recepient[0];
  if (username.startsWith("bounce-")) {
-String[] params = username.replace("bounce-","").split("=");
+params = username.replace("bounce-","").split("=");
 newsletterService.processBouncesOfPublication(params[0],params[1]);
  }
-
  writer.write("250 Yeah, OK. Bring on the data!\r\n");
  writer.flush();
  return;
@@ -135,10 +139,11 @@
}
 }
 data.append((char) c);
-
 System.arraycopy(last5chars, 1, last5chars, 0, last5chars.length - 
1);
 last5chars[last5chars.length - 1] = (char) c;
-
+ }
+ if(params != null) {
+newsletterService.processBouncesOfPublication(params[0], 
params[1], data.toString());
  }
  // ignore data for bounce message.
  writer.write("250 Ok, bounce was processed.\r\n");
@@ -153,8 +158,9 @@
}
 
private boolean verifyEndSymbol(char[] last5chars) {
+
   boolean isreading;
-  char[] endchars = {'\r', '\n', '.', '\r', '\n'};
+  char[] endchars = {'\r', '\n','.', '\r', '\n'};
   isreading = false;
   for (int i = 0; i < last5chars.length; i++) {
  if (last5chars[i] != endchars[i]) {
@@ -164,7 +170,6 @@
   }
   return isreading;
}
-
/**
 * Interrupt method, is called only during shutdown
 */
@@ -209,7 +214,7 @@
   }
 
   // Trim off any whitespace that may be left
-  String finaladdress = address.substring(leftbracket + 1, 
rightbracket).trim();
+  String finaladdress = address.substring(leftbracket, 
rightbracket).trim();
   int atsign = finaladdress.indexOf("@");
   if (atsign < 0) {
  return new String[0];
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl NewsLetterStatisticCAOImpl.java NewsletterCAOImpl.java NewsletterSubscriptionCAOImpl.jav

2008-07-24 Thread kevinshen

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

Modified Files:
NewsLetterStatisticCAOImpl.java NewsletterCAOImpl.java 
NewsletterSubscriptionCAOImpl.java 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


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


Index: NewsLetterStatisticCAOImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsLetterStatisticCAOImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- NewsLetterStatisticCAOImpl.java 18 Jul 2008 08:31:56 -  1.15
+++ NewsLetterStatisticCAOImpl.java 24 Jul 2008 11:45:43 -  1.16
@@ -15,6 +15,7 @@
 import org.mmbase.bridge.util.Queries;
 import org.mmbase.bridge.util.SearchUtil;
 import org.mmbase.storage.search.FieldCompareConstraint;
+import org.mmbase.storage.search.FieldValueConstraint;
 import org.mmbase.storage.search.Step;
 import org.mmbase.storage.search.StepField;
 import org.mmbase.storage.search.implementation.BasicCompositeConstraint;
@@ -212,12 +213,22 @@
}
 
public void logPubliction(int userId, int newsletterId, HANDLE handle) {
-  if (!mayLog(userId, newsletterId)) {
+  if (!mayLog(userId, newsletterId,handle)) {
  return;
   }
+  Node  logNode  = null;
+  if (handle.equals(HANDLE.BOUNCE)) {
+ logNode = getLogNode(userId, newsletterId);
+  }
+  if(logNode != null) {
+ logNode.setIntValue("bounches", logNode.getIntValue("bounches")+1);
+ logNode.setDateValue("logdate", new Date());
+ logNode.commit();
+  }
+  else {
   NodeManager logManager = cloud.getNodeManager("newsletterdailylog");
   //Node newsletter = cloud.getNode(newsletterId);
-  Node logNode = logManager.createNode();
+  logNode = logManager.createNode();
   logNode.setIntValue("newsletter", newsletterId);
   logNode.setIntValue("post", 0);
   logNode.setIntValue("bounches", 0);
@@ -242,31 +253,67 @@
  logNode.setIntValue("post", 1);
   }
   logNode.commit();
+  }
 
}
 
-   private boolean mayLog(int userId, int newsletterId) {
+   private boolean mayLog(int userId, int newsletterId,HANDLE handle) {
+  
+  if(!handle.equals(HANDLE.ACTIVE) && !handle.equals(HANDLE.INACTIVE)) {
+ return true;
+  }
+
boolean isLog = false;
NodeManager logNodeManager = 
cloud.getNodeManager("newsletterdailylog");
NodeQuery query = cloud.createNodeQuery();
Step parameterStep = query.addStep(logNodeManager);
query.setNodeStep(parameterStep);
Queries.addSortOrders(query, "logdate", "DOWN");
-   query.setMaxNumber(2);
+   query.setMaxNumber(3);
SearchUtil.addEqualConstraint(query, 
logNodeManager.getField("newsletter"), new Integer(newsletterId));
 
SearchUtil.addEqualConstraint(query, 
logNodeManager.getField("userid"),new Integer(userId));
NodeList logs = query.getList();
if (logs.size() < 2) {
isLog = true;
-   } else if (logs.size() == 2) {
-   isLog = !(DateUtils.isSameDay(new Date(), 
logs.getNode(0)
-   .getDateValue("logdate")) && 
DateUtils.isSameDay(
-   new Date(), 
logs.getNode(1).getDateValue("logdate")));
+   } 
+   else {
+  int count = 0 ;
+  for(int i = 0 ; i < logs.size() ; i++) {
+ Node log = logs.getNode(i);
+ if(DateUtils.isSameDay(new Date(), 
log.getDateValue("logdate")) && (log.getIntValue("subscribe") > 0 || 
log.getIntValue("unsubscribe") > 0)){
+count++;
+ }
+  }
+  if(count == 3){
+ isLog = false;
+  }
}
return isLog;
}
 
+   public Node getLogNode(int userId, int newsletterId){
+  log.info("---logPubliction   -in 
process...getLogNode:   ");
+  NodeManager logNodeManager = cloud.getNodeManager("newsletterdailylog");
+  Node logNode = null;
+  NodeQuery query = cloud.createNodeQuery();
+  Step parameterStep = query.addStep(logNodeManager);
+  query.setNodeStep(parameterStep);
+  Queries.addSortOrders(query, "logdate", "DOWN");
+  query.setMaxNu

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

2008-07-24 Thread kevinshen

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

Modified Files:
NewsletterUtil.java 
Added Files:
NewsletterBounceUtil.java 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


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


NewsletterBounceUtil.java is new



Index: NewsletterUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterUtil.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- NewsletterUtil.java 17 Jul 2008 03:04:50 -  1.36
+++ NewsletterUtil.java 24 Jul 2008 11:45:43 -  1.37
@@ -69,6 +69,7 @@
   Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
   Node newsletterNode = cloud.getNode(newsletterNumber);
   NodeList publicationsList = 
newsletterNode.getRelatedNodes("newsletterpublication");
+
   if (publicationsList != null) {
  return (publicationsList.size());
   }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF struts-newsletter.xml

2008-07-24 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF
In directory james.mmbase.org:/tmp/cvs-serv29181/src/webapp/WEB-INF

Modified Files:
struts-newsletter.xml 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF
See also: http://www.mmbase.org/jira/browse/CMSC-990


Index: struts-newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/struts-newsletter.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- struts-newsletter.xml   24 Jul 2008 09:04:16 -  1.17
+++ struts-newsletter.xml   24 Jul 2008 11:45:43 -  1.18
@@ -202,6 +202,12 @@
  
  

+  
+  
+   
+ 
+   

 

___
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/services CommunityModuleAdapter.java NewsletterService.java

2008-07-24 Thread kevinshen

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

Modified Files:
CommunityModuleAdapter.java NewsletterService.java 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


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


Index: CommunityModuleAdapter.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/CommunityModuleAdapter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- CommunityModuleAdapter.java 21 Jul 2008 13:09:00 -  1.9
+++ CommunityModuleAdapter.java 24 Jul 2008 11:45:43 -  1.10
@@ -7,10 +7,12 @@
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
 
+
 import com.finalist.cmsc.services.community.ApplicationContextFactory;
 import com.finalist.cmsc.services.community.person.Person;
 import com.finalist.cmsc.services.community.person.PersonService;
 
+
 public class CommunityModuleAdapter {
 
private static Logger log = 
Logging.getLoggerInstance(CommunityModuleAdapter.class.getName());
@@ -57,5 +59,18 @@
 
}
 
+   public static String getCurrentUserName() {
 
+  SecurityContext securityContext = SecurityContextHolder.getContext();
+  Authentication authentication = securityContext.getAuthentication();
+  String userName = null;
+  if (null != authentication) {
+ Object obj = authentication.getPrincipal();
+ if (obj instanceof UserDetails) {
+userName = ((UserDetails) obj).getUsername();
+ }
+  }
+
+  return userName;
+   }
 }


Index: NewsletterService.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NewsletterService.java  24 Jul 2008 09:04:16 -  1.7
+++ NewsletterService.java  24 Jul 2008 11:45:43 -  1.8
@@ -21,9 +21,12 @@
 
public int getNewsletterTermsCountByName(int newsletterId, String 
terms);
 
+   public void processBouncesOfPublication(String publicationId,String 
userId,String bounceContent);
+   
public List getNewsletterTermsByName(int newsletterId, String 
name, int pagesize, int offset, String order, String direction);
 
public List getNewsletters(String subscriber, String title);
 
void processBouncesOfPublication(String publicationId, String userId);
+
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter.properties newsletter_nl.properties newsletter_zh.properties

2008-07-24 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv29181/resources

Modified Files:
newsletter.properties newsletter_nl.properties 
newsletter_zh.properties 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
See also: http://www.mmbase.org/jira/browse/CMSC-990


Index: newsletter.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- newsletter.properties   24 Jul 2008 09:04:16 -  1.31
+++ newsletter.properties   24 Jul 2008 11:45:43 -  1.32
@@ -256,3 +256,11 @@
 newsletter.term.exist = Term name has already exist!
 newsletter.term.mandatory = Term name is mandatory!
 newsletter.term.action.link = Link
\ No newline at end of file
+
+newsletter.bounce.title = Newsletter Bounce
+newsletter.bounce.number = Number
+newsletter.bounce.subscriber = Subscriber
+newsletter.bounce.newsletter = Newsletter
+newsletter.bounce.bouncedate = Bounce Date
+newsletter.bounce.bouncecontent = Bounce Content
+newsletter.bounce.window.close = Close Window


Index: newsletter_nl.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- newsletter_nl.properties17 Jul 2008 06:26:39 -  1.14
+++ newsletter_nl.properties24 Jul 2008 11:45:43 -  1.15
@@ -251,3 +251,11 @@
 newsletter.term.exist = Term name has already exist!
 newsletter.term.mandatory = Term name is mandatory!
 newsletter.term.action.link = Link
\ No newline at end of file
+
+newsletter.bounce.title = Newsletter Bounce
+newsletter.bounce.number = Number
+newsletter.bounce.subscriber = Subscriber
+newsletter.bounce.newsletter = Newsletter
+newsletter.bounce.bouncedate = Bounce Date
+newsletter.bounce.bouncecontent = Bounce Content
+newsletter.bounce.window.close = Close Window
\ No newline at end of file


Index: newsletter_zh.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- newsletter_zh.properties24 Jul 2008 09:04:16 -  1.11
+++ newsletter_zh.properties24 Jul 2008 11:45:43 -  1.12
@@ -256,3 +256,11 @@
 newsletter.term.exist = è¯¥åç§°å·²ç»åå¨!
 newsletter.term.mandatory = åç§°ä¸è½ä¸ºç©º!
 newsletter.term.action.link = æå¥
\ No newline at end of file
+
+newsletter.bounce.title = Newsletter Bounce
+newsletter.bounce.number = ID
+newsletter.bounce.subscriber = è®¢éè
+newsletter.bounce.newsletter = æ°é»åè¡¨
+newsletter.bounce.bouncedate = éä¿¡æ¥æ
+newsletter.bounce.bouncecontent = éä¿¡åå®¹
+newsletter.bounce.window.close = Close Window
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-07-24 Thread kevinshen

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

Modified Files:
NewsletterCAO.java 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


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


Index: NewsletterCAO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterCAO.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterCAO.java  24 Jul 2008 09:04:16 -  1.6
+++ NewsletterCAO.java  24 Jul 2008 11:45:43 -  1.7
@@ -22,4 +22,10 @@
public int getNewsletterTermsCountByName(int newsletterId, String name);
 
Node getNewsletterNodeById(int newsletterId);
+
+   public Set getNewsletterTermsByName(int newsltterId, String name ,int 
pagesize, int offset);
+   
+   public void processBouncesOfPublication(String publicationId, String userId,
+ String bounceContent);
+
 }
___
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 NewsletterCronJob.java

2008-07-24 Thread kevinshen

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

Modified Files:
NewsletterCronJob.java 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


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


Index: NewsletterCronJob.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/NewsletterCronJob.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NewsletterCronJob.java  18 Jul 2008 08:31:56 -  1.16
+++ NewsletterCronJob.java  24 Jul 2008 11:45:43 -  1.17
@@ -21,10 +21,12 @@
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
 
+import com.finalist.cmsc.services.community.ApplicationContextFactory;
 import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.newsletter.publisher.bounce.BounceChecker;
+import com.finalist.newsletter.services.NewsletterService;
 import com.finalist.newsletter.util.NewsletterPublicationUtil;
 import com.finalist.newsletter.util.NewsletterUtil;
-import com.finalist.newsletter.publisher.bounce.BounceChecker;
 
 public class NewsletterCronJob implements CronJob {
 
@@ -230,12 +232,11 @@
}
 
public void init(CronEntry arg0) {
-  log.info("Initializing Newsletter CronJob");
-  BounceChecker checker = new BounceChecker();
+  NewsletterService newsletterService = (NewsletterService) 
ApplicationContextFactory.getBean("newsletterServices");
+  BounceChecker checker = new BounceChecker(newsletterService);
   if (!checker.isRunning()) {
  checker.start();
   }
-
}

public void run() {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util LocalizedEntryListFactory.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv28884

Modified Files:
LocalizedEntryListFactory.java 
Log Message:



See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util


Index: LocalizedEntryListFactory.java
===
RCS file: /var/cvs/src/org/mmbase/util/LocalizedEntryListFactory.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- LocalizedEntryListFactory.java  3 Feb 2008 17:33:57 -   1.48
+++ LocalizedEntryListFactory.java  24 Jul 2008 11:34:55 -  1.49
@@ -38,7 +38,7 @@
  * partially by explicit values, though this is not recommended.
  *
  * @author Michiel Meeuwissen
- * @version $Id: LocalizedEntryListFactory.java,v 1.48 2008/02/03 17:33:57 
nklasens Exp $
+ * @version $Id: LocalizedEntryListFactory.java,v 1.49 2008/07/24 11:34:55 
michiel Exp $
  * @since MMBase-1.8
  */
 public class LocalizedEntryListFactory implements Serializable, Cloneable {
@@ -483,6 +483,9 @@
 return cloud.getNode(string);
 }
 }
+if (key != null && key instanceof SortedBundle.ValueWrapper) {
+return ((SortedBundle.ValueWrapper) key).getKey();
+}
 return key;
 
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/xml Instantiator.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv28833

Modified Files:
Instantiator.java 
Log Message:
javadoc


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml


Index: Instantiator.java
===
RCS file: /var/cvs/src/org/mmbase/util/xml/Instantiator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Instantiator.java   19 Mar 2008 17:05:28 -  1.3
+++ Instantiator.java   24 Jul 2008 11:34:08 -  1.4
@@ -22,7 +22,7 @@
  *
  * @since MMBase-1.9
  * @author Michiel Meeuwissen
- * @version $Id: Instantiator.java,v 1.3 2008/03/19 17:05:28 michiel Exp $
+ * @version $Id: Instantiator.java,v 1.4 2008/07/24 11:34:08 michiel Exp $
  */
 public abstract class Instantiator {
 
@@ -30,8 +30,7 @@
 
 /**
  * Instantiates any object using an Dom Element and constructor arguments. 
Sub-param tags are
- * used on set-methods on the newly created object. This is a pretty 
generic method, it should
- * perhaps be moved to org.mmbase.util.
+ * used on set-methods on the newly created object. 
  */
 public static Object getInstance(Element classElement, Object... args)
 throws org.xml.sax.SAXException, ClassNotFoundException, 
NoSuchMethodException, InstantiationException, IllegalAccessException, 
java.lang.reflect.InvocationTargetException {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib mmbase-taglib.xml

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv28647

Modified Files:
mmbase-taglib.xml 
Log Message:
MMB-1693. 


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
See also: http://www.mmbase.org/jira/browse/MMB-1693


Index: mmbase-taglib.xml
===
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/mmbase-taglib.xml,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -b -r1.429 -r1.430
--- mmbase-taglib.xml   24 Jul 2008 08:54:02 -  1.429
+++ mmbase-taglib.xml   24 Jul 2008 11:29:20 -  1.430
@@ -39,7 +39,7 @@
 Use one or more possiblevalue tags if you want to list all possible values. Use
 one or more examplevalue tags is you want to give some example values.
 
-version: $Id: mmbase-taglib.xml,v 1.429 2008/07/24 08:54:02 michiel Exp $
+version: $Id: mmbase-taglib.xml,v 1.430 2008/07/24 11:29:20 michiel Exp $
 
 -->
 
@@ -6621,6 +6621,15 @@
 Java code.
   
 
+
+  level
+  false
+  false
+  
+Only relevant without the jspvar attribute.
+  
+  MMBase-1.9
+
 
 Log this to the log file
 Generates something like this in the mmbase log file:
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib/debug LogTag.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/debug
In directory james.mmbase.org:/tmp/cvs-serv28647/debug

Modified Files:
LogTag.java 
Log Message:
MMB-1693. 


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/debug
See also: http://www.mmbase.org/jira/browse/MMB-1693


Index: LogTag.java
===
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/debug/LogTag.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- LogTag.java 30 Aug 2006 18:02:16 -  1.15
+++ LogTag.java 24 Jul 2008 11:29:20 -  1.16
@@ -11,16 +11,16 @@
 
 import javax.servlet.jsp.*;
 import org.mmbase.bridge.jsp.taglib.ContextReferrerTag;
+import org.mmbase.bridge.jsp.taglib.util.Attribute;
 import javax.servlet.http.HttpServletRequest;
 
-import org.mmbase.util.logging.Logger;
-import org.mmbase.util.logging.Logging;
+import org.mmbase.util.logging.*;
 
 /**
  * The implementation of the log tag.
  *
  * @author Michiel Meeuwissen
- * @version $Id: LogTag.java,v 1.15 2006/08/30 18:02:16 michiel Exp $
+ * @version $Id: LogTag.java,v 1.16 2008/07/24 11:29:20 michiel Exp $
  */
 
 public class LogTag extends ContextReferrerTag {
@@ -31,6 +31,8 @@
 public final static String LOGTAG_CATEGORY = Logging.PAGE_CATEGORY + 
".LOGTAG";  // pages themselfs log to subcategories of this.
 
 private String jspvar;
+
+private Attribute level = Attribute.NULL;
 /**
  * JspVar to Create, and write to
  */
@@ -38,9 +40,20 @@
 jspvar = j;
 }
 
+/**
+ [EMAIL PROTECTED] MMBase-1.9
+ */
+public void setLevel(String l) throws JspTagException {
+level = getAttribute(l, true);
+}
+
+private Level getLevel() throws JspTagException {
+return  level == Attribute.NULL ? Level.SERVICE : 
Level.toLevel(level.getString(this));
+}
+
 
 public void setPageContext(PageContext pc) {
-/* Determin only once per page if it can log */
+/* Determin logger only once per page */
 super.setPageContext(pc);
 log = (Logger) pageContext.getAttribute("__logtag_logger");
 if(log == null) {
@@ -48,7 +61,6 @@
 counter = 0;
 pageContext.setAttribute("__logtag_logger", log);
 }
-doLog = log.isServiceEnabled();
 
 }
 
@@ -65,7 +77,7 @@
 
 public int doEndTag() throws JspTagException {
 if (doLog && jspvar == null) {
-log.service(counter++ + ": " + (bodyContent != null ? 
bodyContent.getString() : "-"));
+Logging.log(getLevel(), log, counter++ + ": " + (bodyContent != 
null ? bodyContent.getString() : "-"));
 }
 if (jspvar != null && EVAL_BODY == EVAL_BODY_BUFFERED) {
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/logging Logging.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/src/org/mmbase/util/logging
In directory james.mmbase.org:/tmp/cvs-serv28577

Modified Files:
Logging.java 
Log Message:
MMB-1693. Utility methods for dynamic loggin


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/logging
See also: http://www.mmbase.org/jira/browse/MMB-1693


Index: Logging.java
===
RCS file: /var/cvs/src/org/mmbase/util/logging/Logging.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- Logging.java21 Jun 2007 16:17:21 -  1.44
+++ Logging.java24 Jul 2008 11:28:43 -  1.45
@@ -59,7 +59,7 @@
  * 
  *
  * @author Michiel Meeuwissen
- * @version $Id: Logging.java,v 1.44 2007/06/21 16:17:21 michiel Exp $
+ * @version $Id: Logging.java,v 1.45 2008/07/24 11:28:43 michiel Exp $
  */
 
 
@@ -145,7 +145,7 @@
 // machine for the dtd's without giving an error! This line might give 
a hint
 // where to search for these kinds of problems..
 
-log.info("Configuring logging with " + configFile);
+log.info("Configuring logging with " + configFile + " (" + 
resourceLoader.getResource(configFile) + ")");
 ///System.out.println("(If logging does not start then dtd validation 
might be a problem on your server)");
 
 configWatcher.add(configFile);
@@ -435,5 +435,43 @@
 }
 return buf.toString();
 }
+/**
+ * Utility method for dynamicly determin the level of logging.
+ * @since MMBase-1.9
+ */
+public static void log(Level l, Logger log, String mes) {
+switch(l.toInt()) {
+case Level.TRACE_INT:   log.trace(mes); break;
+case Level.DEBUG_INT:   log.debug(mes); break;
+case Level.SERVICE_INT: log.service(mes); break;
+case Level.INFO_INT:log.info(mes); break;
+case Level.WARN_INT:log.warn(mes); break;
+case Level.ERROR_INT:   log.error(mes); break;
+case Level.FATAL_INT:   log.fatal(mes); break;
+case Level.OFF_INT: break;
+default: break;
+}
+
+}
+
+/**
+ * Utility method for dynamicly checking the 'enabled'ness of a logger on 
a given level.
+ * @since MMBase-1.9
+ */
+public static boolean isEnabled(Level l, Logger log) {
+switch(l.toInt()) {
+case Level.TRACE_INT:   return log.isTraceEnabled();
+case Level.DEBUG_INT:   return log.isDebugEnabled();
+case Level.SERVICE_INT: return log.isServiceEnabled();
+case Level.OFF_INT: return false;
+case Level.INFO_INT:
+case Level.WARN_INT:
+case Level.ERROR_INT:
+case Level.FATAL_INT:
+default:
+return true;
+}
+}
+
 
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders newsletter.xml

2008-07-24 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders
In directory 
james.mmbase.org:/tmp/cvs-serv27776/config/applications/newsletter/builders

Modified Files:
newsletter.xml 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders
See also: http://www.mmbase.org/jira/browse/CMSC-990


Index: newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/newsletter.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- newsletter.xml  10 Jun 2008 12:50:53 -  1.16
+++ newsletter.xml  24 Jul 2008 11:11:33 -  1.17
@@ -391,6 +391,27 @@
   
   
  
+Max Bounces
+Max Bounces
+ 
+ 
+Max Bounces
+Max Bounces
+ 
+ 
+
+   9
+   -1
+   -1
+
+ 
+ 
+max_bounces
+INTEGER
+ 
+  
+  
+ 
 Server name or ip address
 Server name or ip address
  
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter edit_newsletter.xml load_newsletter.xml

2008-07-24 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
In directory 
james.mmbase.org:/tmp/cvs-serv27776/src/webapp/editors/config/newsletter

Modified Files:
edit_newsletter.xml load_newsletter.xml 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs  improve terms 
management


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-990


Index: edit_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- edit_newsletter.xml 10 Jun 2008 12:50:53 -  1.17
+++ edit_newsletter.xml 24 Jul 2008 11:11:33 -  1.18
@@ -84,13 +84,17 @@
Schedule
å®æ¶åé

-

Bounce Checking
Bounce Checking
è·è¸ªéä¿¡
   

+   
+   Max Bounces
+   Max Bounces
+   æå¤§éä¿¡æ°
+   

Server
Server


Index: load_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- load_newsletter.xml 10 Jun 2008 12:50:53 -  1.14
+++ load_newsletter.xml 24 Jul 2008 11:11:33 -  1.15
@@ -24,6 +24,7 @@



+   



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

[MMBASE CVS] applications/richtext/config/xslt 2xhtml.xslt

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/richtext/config/xslt
In directory james.mmbase.org:/tmp/cvs-serv25911

Modified Files:
2xhtml.xslt 
Log Message:
added some stuff to deal with 'relative' urls. Should perhaps be done in an 
url-function in java in stead, to be more generally available


See also: http://cvs.mmbase.org/viewcvs/applications/richtext/config/xslt


Index: 2xhtml.xslt
===
RCS file: /var/cvs/applications/richtext/config/xslt/2xhtml.xslt,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- 2xhtml.xslt 23 Jun 2008 08:45:10 -  1.28
+++ 2xhtml.xslt 24 Jul 2008 10:45:48 -  1.29
@@ -3,7 +3,7 @@
   org.mmbase.bridge.util.Generator, and the XSL is invoked by FormatterTag.
 
   @author:  Michiel Meeuwissen
-  @version: $Id: 2xhtml.xslt,v 1.28 2008/06/23 08:45:10 michiel Exp $
+  @version: $Id: 2xhtml.xslt,v 1.29 2008/07/24 10:45:48 michiel Exp $
   @since:   MMBase-1.6
 -->
 
   
+
+  
+  
+
+  
+  
+
+/
+  
+
 
   
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/richtext/config/xslt 2xhtml-mmbase18.xslt

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/richtext/config/xslt
In directory james.mmbase.org:/tmp/cvs-serv25090

Removed Files:
2xhtml-mmbase18.xslt 
Log Message:
in 1.8.6 it is worked around


See also: http://cvs.mmbase.org/viewcvs/applications/richtext/config/xslt


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

[MMBASE CVS] contributions/CMSContainer_Modules/community/resources spring-community.properties

2008-07-24 Thread lisachen

Update of /var/cvs/contributions/CMSContainer_Modules/community/resources
In directory james.mmbase.org:/tmp/cvs-serv24536

Modified Files:
spring-community.properties 
Log Message:
remove un-english content in resource files.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/resources


Index: spring-community.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/resources/spring-community.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- spring-community.properties 24 Jul 2008 09:05:18 -  1.3
+++ spring-community.properties 24 Jul 2008 09:37:25 -  1.4
@@ -6,15 +6,3 @@
 hibernate.show_sql=false
 hibernate.generate_statistics=false
 hibernate.hbm2ddl.auto=update
-
-userform.email.empty=é®ä»¶å°åä¸è½ä¸ºç©º
-userform.account.empty=å¸æ·åä¸è½ä¸ºç©º
-userform.password.empty=å¯ç ä¸è½ä¸ºç©º
-userform.passwords.not_equal=å¯ç éå¤ä¸ç¬¦ï¼
-userform.email.exist=é®ç®±å°åå·²æ³¨åï¼è¯·æ£æ¥æ¿æ¢ï¼
-view.group.name=åç§°
-view.groups=ç»
-view.group=ç»
-view.newgroup=æ°å»ºç»
-view.removegroup=å é¤ç»
-view.removegroupquestion=ç¡®å®å é¤ç»ï¼
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF spring-newsletter.xml

2008-07-24 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF
In directory 
james.mmbase.org:/tmp/cvs-serv24402/portlets-newsletter/src/webapp/WEB-INF

Modified Files:
spring-newsletter.xml 
Log Message:
Fix typo.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF


Index: spring-newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/spring-newsletter.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- spring-newsletter.xml   24 Jul 2008 09:04:16 -  1.10
+++ spring-newsletter.xml   24 Jul 2008 09:34:08 -  1.11
@@ -18,7 +18,7 @@


 
-   
+   

   

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

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security AuthenticationService.java

2008-07-24 Thread jkoster

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

Modified Files:
AuthenticationService.java 
Log Message:
CMSC-979 - Better Javadoc


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


Index: AuthenticationService.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- AuthenticationService.java  24 Jul 2008 09:05:18 -  1.7
+++ AuthenticationService.java  24 Jul 2008 09:33:09 -  1.8
@@ -44,8 +44,9 @@
void updateAuthenticationPassword(String userId, String newPassword);
 
/**
-* Delete an authentication entry TODO if a authentication is deleted, 
what
-* should happen with the user's content (in other systems)?
+* Delete an authentication entry 
+* TODO if a authentication is deleted, what should happen with the 
user's 
+* content (in other systems)?
 * 
 * @param id
 */
@@ -55,7 +56,7 @@
 * Check if the given authentication exists
 * 
 * @param userId
-* @return boolean returns true if a user exists, otherwise it returns 
false
+* @return boolean returns true if a user exists, otherwise returns 
false
 */
boolean authenticationExists(String userId);
 
@@ -71,8 +72,7 @@
 * Is an authentication enabled or disabled?
 * 
 * @param userId
-* @return boolean returns true if a user is enabled, otherwise it 
returns
-* false
+* @return boolean returns true if a user is enabled, otherwise returns 
false
 */
boolean isAuthenticationEnabled(String userId);
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter project.xml

2008-07-24 Thread lisachen

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

Modified Files:
project.xml 
Log Message:
cmsc-979,990 project improvement


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter


Index: project.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- project.xml 14 May 2008 05:45:59 -  1.10
+++ project.xml 24 Jul 2008 09:11:10 -  1.11
@@ -68,6 +68,51 @@
 ${war.bundle}
  
   
+
+  hibernate
+  ejb3-persistence
+  3.0
+  jar
+  
+${war.bundle}
+  
+
+
+  hibernate
+  hibernate
+  3.2.5.GA
+  jar
+  
+${war.bundle}
+  
+
+
+  hibernate
+  hibernate-entitymanager
+  3.3.1.GA
+  jar
+  
+${war.bundle}
+  
+
+
+  hibernate
+  hibernate-annotations
+  3.3.0.GA
+  jar
+  
+${war.bundle}
+  
+
+
+  hibernate
+  hibernate-commons-annotations
+  3.0.0.GA
+  jar
+  
+${war.bundle}
+  
+
   
  acegisecurity
  acegi-security
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/WEB-INF struts-community.xml

2008-07-24 Thread lisachen

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF
In directory james.mmbase.org:/tmp/cvs-serv23684/src/webapp/WEB-INF

Modified Files:
struts-community.xml 
Log Message:
cmsc-979,990 some changes about community module


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF


Index: struts-community.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF/struts-community.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- struts-community.xml15 Jul 2008 04:39:16 -  1.7
+++ struts-community.xml24 Jul 2008 09:05:18 -  1.8
@@ -43,6 +43,8 @@
  name="communityUserForm" scope="session" unknown="false" 
validate="true" input="/editors/community/user.jsp">
  
  
+ 
+ 
   
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms UserAddAction.java UserAddInitAction.java

2008-07-24 Thread lisachen

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

Modified Files:
UserAddAction.java UserAddInitAction.java 
Log Message:
cmsc-979,990 some changes about community module


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms


Index: UserAddAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserAddAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- UserAddAction.java  10 May 2008 16:31:49 -  1.6
+++ UserAddAction.java  24 Jul 2008 09:05:18 -  1.7
@@ -17,6 +17,8 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
 
 import com.finalist.cmsc.services.community.person.Person;
 import com.finalist.cmsc.services.community.person.PersonService;
@@ -34,9 +36,11 @@
private static Log log = LogFactory.getLog(UserAddInitAction.class);
 
@Override
-   public ActionForward execute(ActionMapping actionMapping, ActionForm 
actionForm, HttpServletRequest httpServletRequest, HttpServletResponse 
httpServletResponse)
-throws Exception {
-
+   public ActionForward execute(ActionMapping actionMapping, ActionForm 
actionForm, HttpServletRequest httpServletRequest,
+   HttpServletResponse httpServletResponse) throws 
Exception {
+   ActionMessages errors = new ActionMessages();
+   Long authId = null;
+   String tmpForward = (String) 
httpServletRequest.getSession().getAttribute("forward");
   if (!isCancelled(httpServletRequest)) {
  UserForm userForm = (UserForm) actionForm;
 
@@ -48,20 +52,22 @@
  PersonService ps = getPersonService();
 
  if (userForm.getAction().equalsIgnoreCase(UserForm.ACTION_ADD)) {
-Long authenticationId = 
as.getAuthenticationIdForUserId(accountName);
+
+   Long authenticationId = 
as.getAuthenticationIdForUserId(userForm.getEmail());
 if (authenticationId == null) {
Authentication authentication = 
as.createAuthentication(userForm.getEmail(), userForm.getPasswordText());
-   // Long authenticationId =
-   // as.getAuthenticationIdForUserId(accountName);
if (authentication.getId() != null) {
-  Person person = ps.createPerson(userForm.getFirstName(), 
userForm.getPrefix(), userForm.getLastName(), authentication.getId());
-  person.setEmail(userForm.getEmail()); // Also add an email 
address to the user.
+   authId = authentication.getId();
+   Person person = ps
+   
.createPerson(userForm.getFirstName(), userForm.getPrefix(), 
userForm.getLastName(), authentication.getId());
+   
person.setEmail(userForm.getEmail());
   ps.updatePerson(person);
 
} else {
   log.info("add authenticationId failed");
}
 } else {
+   errors.add("email", new 
ActionMessage("userform.email.exist"));
log.info("add check1 failed for: " + accountName);
 }
 
@@ -79,12 +85,14 @@
// First retrieve the right person object from the database
Person person = 
ps.getPersonByAuthenticationId(authenticationId);
 
-   if (person == null) { // User did not exists, so create it.
+   if (person == null) { // User did not 
exists, so create
+   // it.
   person = new Person();
   person.setAuthenticationId(authenticationId);
}
 
-   // Also save other fields entered in the form to the right 
person
+   // Also save other fields entered in 
the form to the right
+   // person
// object
person.setFirstName(userForm.getFirstName());
person.setInfix(userForm.getPrefix());
@@ -103,10 +111,47 @@
  }
   } else {
  log.info("cancelled");
+   ActionForward ret;
+   String newsletterId = (String) 
httpServletRequest.getSession().getAttribute("newsletterId");
+   if (StringUtils.isNotBlank(tmpForward

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security AuthenticationHibernateService.java AuthenticationService.java

2008-07-24 Thread lisachen

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

Modified Files:
AuthenticationHibernateService.java AuthenticationService.java 
Log Message:
cmsc-979,990 some changes about community module


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security


Index: AuthenticationHibernateService.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationHibernateService.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- AuthenticationHibernateService.java 15 Jul 2008 12:30:31 -  1.9
+++ AuthenticationHibernateService.java 24 Jul 2008 09:05:18 -  1.10
@@ -131,6 +131,12 @@
   return findAuthenticationByCriteria(criteria);
}
 
+   @Transactional(readOnly = true)
+   private Authentication findAuthenticationByEmail(String email) {
+   Criteria criteria = 
getSession().createCriteria(Authentication.class).add(Restrictions.eq("userId", 
email));
+   return findAuthenticationByCriteria(criteria);
+   }
+
@SuppressWarnings("unchecked")
private Authentication findAuthenticationByCriteria(Criteria criteria) {
   List authenticationList = criteria.list();
@@ -185,4 +191,5 @@
public Authentication createAuthentication(Authentication 
authentication)  {
return createAuthentication(authentication.getUserId(), 
authentication.getPassword());
}
+
 }


Index: AuthenticationService.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- AuthenticationService.java  15 Jul 2008 04:39:16 -  1.6
+++ AuthenticationService.java  24 Jul 2008 09:05:18 -  1.7
@@ -6,7 +6,7 @@
 The license (Mozilla version 1.0) can be read at the MMBase site.
 See http://www.MMBase.org/license
 
-*/
+ */
 package com.finalist.cmsc.services.community.security;
 
 import java.util.List;
@@ -25,7 +25,8 @@
 Authentication createAuthentication(String userId, String password);
 
 /**
- * Update the login information for the authentication (typically called 
by the user)
+* Update the login information for the authentication (typically 
called by
+* the user)
  *
  * @param userId
  * @param oldPassword
@@ -34,17 +35,17 @@
 void updateAuthentication(String userId, String oldPassword, String 
newPassword);
 
 /**
- * Set the login information for an authentication (typically called by an 
admin user)
+* Set the login information for an authentication (typically called by 
an
+* admin user)
  *
  * @param userId
  * @param newPassword
  */
 void updateAuthenticationPassword(String userId, String newPassword);
 
-
 /**
- * Delete an authentication entry
- * TODO if a authentication is deleted, what should happen with the user's 
content (in other systems)?
+* Delete an authentication entry TODO if a authentication is deleted, 
what
+* should happen with the user's content (in other systems)?
  *
  * @param id
  */
@@ -70,7 +71,8 @@
  * Is an authentication enabled or disabled?
  *
  * @param userId
- * @return boolean returns true if a user is enabled, otherwise it returns 
false
+* @return boolean returns true if a user is enabled, otherwise it 
returns
+* false
  */
 boolean isAuthenticationEnabled(String userId);
 
@@ -116,12 +118,14 @@
 
 /**
  * Finds all authentications
+* 
  * @return list authentications
  */
 List findAuthentications();
 
 /**
  * Finds an authentication id for this userId
+* 
  * @param userId
  * @return authenticationId
  */ 
@@ -129,9 +133,11 @@
 
/**
 * Find authentication information by Id for a user
+* 
 * @param authenticationId
 * @return Authentication
 */
Authentication getAuthenticationById(Long authenticationId);
-   public Authentication createAuthentication(Authentication authentication) ;
+
+   public Authentication createAuthentication(Authentication 
authentication);
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/community/resources cmsc-community.properties spring-community.properties

2008-07-24 Thread lisachen

Update of /var/cvs/contributions/CMSContainer_Modules/community/resources
In directory james.mmbase.org:/tmp/cvs-serv23684/resources

Modified Files:
cmsc-community.properties spring-community.properties 
Log Message:
cmsc-979,990 some changes about community module


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/resources


Index: cmsc-community.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/resources/cmsc-community.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- cmsc-community.properties   15 Jul 2008 09:57:44 -  1.15
+++ cmsc-community.properties   24 Jul 2008 09:05:18 -  1.16
@@ -27,6 +27,7 @@
 userform.account.empty=Account name should not be empty
 userform.password.empty=Password should not be empty
 userform.passwords.not_equal=Passwords not similar!
+userform.email.exist=Email address has been registed ,please check and change!
 
 view.group.name=Name
 view.groups=Groups


Index: spring-community.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/resources/spring-community.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- spring-community.properties 9 May 2008 14:39:24 -   1.2
+++ spring-community.properties 24 Jul 2008 09:05:18 -  1.3
@@ -6,3 +6,15 @@
 hibernate.show_sql=false
 hibernate.generate_statistics=false
 hibernate.hbm2ddl.auto=update
\ No newline at end of file
+
+userform.email.empty=é®ä»¶å°åä¸è½ä¸ºç©º
+userform.account.empty=å¸æ·åä¸è½ä¸ºç©º
+userform.password.empty=å¯ç ä¸è½ä¸ºç©º
+userform.passwords.not_equal=å¯ç éå¤ä¸ç¬¦ï¼
+userform.email.exist=é®ç®±å°åå·²æ³¨åï¼è¯·æ£æ¥æ¿æ¢ï¼
+view.group.name=åç§°
+view.groups=ç»
+view.group=ç»
+view.newgroup=æ°å»ºç»
+view.removegroup=å é¤ç»
+view.removegroupquestion=ç¡®å®å é¤ç»ï¼
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-07-24 Thread lisachen

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

Modified Files:
Publication.java 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain


Index: Publication.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Publication.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Publication.java7 Jul 2008 04:03:43 -   1.12
+++ Publication.java24 Jul 2008 09:04:16 -  1.13
@@ -12,7 +12,10 @@
private String url;
private String subject;
private String lastmodifier;
-   private String lastmodifieddate;
+   private Date lastmodifieddate;
+   private Date publishdate;
+   private int subscriptions;
+   private int bounced;
 
private String title;
 
@@ -28,7 +31,6 @@
   DELIVERED, READY, INITIAL
}
 
-
public Date getDeliverTime() {
   return deliverTime;
}
@@ -54,7 +56,7 @@
}
 
public int getNewsletterId() {
-  if(null!=this.newsletter){
+   if (null != this.newsletter) {
  return newsletter.getId();
   }
   return newsletterId;
@@ -74,7 +76,7 @@
}
 
public String getTitle() {
-  if(null!=this.newsletter){
+   if (null != this.newsletter) {
  return newsletter.getTitle();
   }
   return title;
@@ -118,12 +120,36 @@
this.lastmodifier = lastmodifier;
}

-   public String getLastmodifieddate() {
+   public Date getLastmodifieddate() {
return lastmodifieddate;
}

-   public void setLastmodifieddate(String lastmodifieddate) {
+   public void setLastmodifieddate(Date lastmodifieddate) {
this.lastmodifieddate = lastmodifieddate;
}  

+   public Date getPublishdate() {
+   return publishdate;
+   }
+
+   public void setPublishdate(Date publishdate) {
+   this.publishdate = publishdate;
+   }
+
+   public int getSubscriptions() {
+   return subscriptions;
+   }
+
+   public void setSubscriptions(int subscriptions) {
+   this.subscriptions = subscriptions;
+   }
+
+   public int getBounced() {
+   return bounced;
+   }
+
+   public void setBounced(int bounced) {
+   this.bounced = bounced;
+   }
+
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF spring-newsletter.xml struts-newsletter.xml

2008-07-24 Thread lisachen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF
In directory james.mmbase.org:/tmp/cvs-serv23447/src/webapp/WEB-INF

Modified Files:
spring-newsletter.xml struts-newsletter.xml 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF


Index: spring-newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/spring-newsletter.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- spring-newsletter.xml   23 Jul 2008 07:18:55 -  1.9
+++ spring-newsletter.xml   24 Jul 2008 09:04:16 -  1.10
@@ -49,7 +49,6 @@
  class="com.finalist.newsletter.services.impl.NewsletterServiceImpl" 
lazy-init="true">
   
   
-  

 

   

+   
+
+  
+${hibernate.dialect}
+${hibernate.show_sql}
+${hibernate.generate_statistics}
+${hibernate.hbm2ddl.auto}
+  
+
+
+  
+
com.finalist.cmsc.services.community.security.Authentication
+com.finalist.cmsc.services.community.security.Authority
+com.finalist.cmsc.services.community.security.Permission
+com.finalist.cmsc.services.community.person.Person
+
com.finalist.cmsc.services.community.preferences.Preference
+  
+
+  
+   
 


Index: struts-newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/struts-newsletter.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- struts-newsletter.xml   22 Jul 2008 03:16:06 -  1.16
+++ struts-newsletter.xml   24 Jul 2008 09:04:16 -  1.17
@@ -124,44 +124,62 @@



- 
+   





- 
+   
+   




- 
+   
+   






+   





+   

 

-   
-   
-   
+   
+   
+   
+   


+   
type="com.finalist.newsletter.forms.NewsletterSubscriberSearchAction" 
parameter="method">





+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
   
   http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module report_publication_edit.jsp report_term_list.jsp report_newsletter_overview_list.jsp report_o

2008-07-24 Thread lisachen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory 
james.mmbase.org:/tmp/cvs-serv23447/src/webapp/editors/newsletter/module

Modified Files:
report_newsletter_overview_list.jsp report_overview.jsp 
report_publication_search.jsp report_publication_statistic.jsp 
report_publication_subscribers.jsp 
report_publication_terms.jsp report_subscriber_list.jsp 
report_subscriber_subscriptions.jsp 
Added Files:
report_publication_edit.jsp report_term_list.jsp 
Removed Files:
report_publication_overview.jsp 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module


report_publication_edit.jsp is new



report_term_list.jsp is new



Index: report_newsletter_overview_list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_overview_list.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- report_newsletter_overview_list.jsp 8 Jul 2008 17:15:18 -   1.2
+++ report_newsletter_overview_list.jsp 24 Jul 2008 09:04:16 -  1.3
@@ -1,6 +1,5 @@
-<[EMAIL PROTECTED] file="globals.jsp" %>
-<%@ taglib uri="http://jsptags.com/tags/navigation/pager"; prefix="pg" %>
-
+<[EMAIL PROTECTED] file="globals.jsp" 
+%><%@ taglib uri="http://jsptags.com/tags/navigation/pager"; prefix="pg" %>
 


@@ -17,8 +16,8 @@
   class="swap">
  
 
-
-
+
+
  
  
 


Index: report_overview.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- report_overview.jsp 8 Jul 2008 17:15:18 -   1.8
+++ report_overview.jsp 24 Jul 2008 09:04:16 -  1.9
@@ -83,7 +83,7 @@
 
 
   
- 
+ 
  
  
  


Index: report_publication_search.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_search.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- report_publication_search.jsp   7 Jul 2008 04:03:43 -   1.1
+++ report_publication_search.jsp   24 Jul 2008 09:04:16 -  1.2
@@ -1,5 +1,6 @@
-
 
+
+
 
 



Index: report_publication_statistic.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_statistic.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- report_publication_statistic.jsp7 Jul 2008 06:56:07 -   1.2
+++ report_publication_statistic.jsp24 Jul 2008 09:04:16 -  1.3
@@ -1,14 +1,16 @@
-<[EMAIL PROTECTED] file="globals.jsp" %>
-<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
-
-
-
-
-
+<[EMAIL PROTECTED] file="globals.jsp" 
+%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+
+
+   
+  
+   
+   
+   

   
  
-
+   

 
  
@@ -35,62 +37,87 @@

   
  
-
+   

 
  
   

-
+   
 
-
+   


-   
-  
- 
+ 
+
  <[EMAIL PROTECTED] file="report_publication_search.jsp"%>
   
-  

-
+   
 
-
+   
  

   
-  5
+ 
   
   
  <[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
  
 
 
-   
-   
-   
-   
-   
+  
+ 
+
+ 
+  
+  
+ 
+ 
+ 
+  
+  
+ 
+
+ 
+  
+  
+ 
+  
+  
+ 
+
+ 
+  
 
 

   
- 
+
+

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl NewsletterCAOImpl.java NewsletterPublicationCAOImpl.java NewsletterSubscriptionCAOImpl.j

2008-07-24 Thread lisachen

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

Modified Files:
NewsletterCAOImpl.java NewsletterPublicationCAOImpl.java 
NewsletterSubscriptionCAOImpl.java 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl


Index: NewsletterCAOImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterCAOImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NewsletterCAOImpl.java  21 Jul 2008 12:52:40 -  1.16
+++ NewsletterCAOImpl.java  24 Jul 2008 09:04:16 -  1.17
@@ -1,13 +1,20 @@
 package com.finalist.newsletter.cao.impl;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
 
 import org.apache.commons.lang.StringUtils;
-import org.mmbase.bridge.*;
+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.Queries;
 import org.mmbase.bridge.util.SearchUtil;
-import org.mmbase.storage.search.*;
+import org.mmbase.storage.search.Constraint;
+import org.mmbase.storage.search.RelationStep;
+import org.mmbase.storage.search.Step;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
 
@@ -22,16 +29,12 @@
public NewsletterCAOImpl() {
}
 
-   public NewsletterCAOImpl(Cloud cloud) {
-  this.cloud = cloud;
-   }
-
public List getALLTerm() {
   NodeQuery query = cloud.createNodeQuery();
   Step step = query.addStep(cloud.getNodeManager("term"));
   query.setNodeStep(step);
   NodeList list = query.getList();
-  return MMBaseNodeMapper.convertList(list, Term.class);
+   return list;
}
 
public List getNewsletterByConstraint(String property, String 
constraintType, String value) {
@@ -49,13 +52,13 @@
}
 
public int getNewsletterIdBySubscription(int id) {
-  log.debug("Get newsletter by subsription "+id);
+   log.debug("Get newsletter by subsription " + id);
   Node subscriptionNode = cloud.getNode(id);
   NodeList nodes = subscriptionNode.getRelatedNodes("newsletter");
 
-  if(nodes.size()>0){
+   if (nodes.size() > 0) {
  return nodes.getNode(0).getNumber();
-  }else{
+   } else {
  return -1;
   }
}
@@ -67,13 +70,30 @@
public Newsletter getNewsletterById(int id) {
   Node newsletterNode = cloud.getNode(id);
 
-
+   // <<< NewsletterCAOImpl.java
+   // Newsletter newsletter = convertFromNode(newsletterNode);
+   //  
+   // List terms = newsletterNode.getRelatedNodes("term");
+   // log.debug("get newsletter by id:" + id + ",and get " + 
terms.size() +
+   // " terms with it.");
+   // Iterator termsIt = terms.iterator();
+   //
+   // for (int i = 0; i < terms.size(); i++) {
+   // Term term = new Term();
+   // Node termNode = (Node) termsIt.next();
+   // term.setId(termNode.getNumber());
+   // term.setName(termNode.getStringValue("name"));
+   // term.setSubscription(false);
+   // newsletter.getTerms().add(term);
+   // }
+   // ===
   Newsletter newsletter = convertFromNode(newsletterNode);
 
   NodeList terms = newsletterNode.getRelatedNodes("term");
   log.debug("get newsletter by id:" + id + ",and get " + terms.size() + " 
terms with it.");
   List termList = MMBaseNodeMapper.convertList(terms, Term.class);
   newsletter.getTerms().addAll(termList);
+   // >>> 1.16
 
   return newsletter;
}
@@ -89,30 +109,89 @@
   return newsletter;
}
 
-   public Set getNewsletterTermsByName(int newsletterId, String 
name, int pagesize, int offset) {
+   public List getNewsletterTermsByName(int newsletterId, String 
name, int pagesize, int offset, String order, String direction) {
 
NodeManager termNodeManager = cloud.getNodeManager("term");
NodeManager newsletterNodeManager = 
cloud.getNodeManager("newsletter");
+
NodeQuery query = cloud.createNodeQuery();
+   // <<< NewsletterCAOImpl.java
 
-   Step termStep = query.addStep(termNodeManager);
-   query.setNodeStep(termStep);
+   Step newsletterStep = query.addStep(newsletterNodeManager);
+   query.set

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter.properties newsletter_zh.properties

2008-07-24 Thread lisachen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv23447/resources

Modified Files:
newsletter.properties newsletter_zh.properties 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources


Index: newsletter.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- newsletter.properties   21 Jul 2008 04:49:58 -  1.30
+++ newsletter.properties   24 Jul 2008 09:04:16 -  1.31
@@ -205,7 +205,7 @@
 newsletter.publication.search.period.lastmonth = Last month
 newsletter.publication.search.period.lastyear = Last year
 
-newsletter.publication.result = Result
+newsletter.publication.result = Results
 newsletter.publication.noresult = No related records were found.
 newsletter.publication.result.title = Title
 newsletter.publication.result.subject = Subject
@@ -230,6 +230,15 @@
 newsletter.publication.link.newsubscriber = New Subscriber
 newsletter.publication.link.newuser = New User
 
+newsletter.icons.title.editproperty= Edit property
+newsletter.icons.title.sendemail = Send test email
+newsletter.icons.title.sendpublication = Send publications to all member
+newsletter.icons.title.userright = View user rights
+newsletter.icons.title.edituser = Edit User
+newsletter.icons.title.user.unsubscribe = Unsubscribe the current newsletter
+newsletter.icons.title.term.unlink = Unlink the term from the current 
newsletter
+
+
 newsletter.term.title = Newsletter Term
 newsletter.term.add = New Term
 newsletter.term.name = Name


Index: newsletter_zh.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- newsletter_zh.properties17 Jul 2008 06:26:39 -  1.10
+++ newsletter_zh.properties24 Jul 2008 09:04:16 -  1.11
@@ -222,7 +222,7 @@
 newsletter.publication.result.username = ç¨æ·å
 newsletter.publication.result.email = é®ä»¶å°å
 newsletter.publication.result.newsletter = é®ä»¶
-newsletter.publication.result.terms = åç±»
+newsletter.publication.result.terms = æ ç¾
 
 newsletter.publication.search.linkterm = é¾æ¥åç±»
 newsletter.publication.search.link.name = åç§°
@@ -230,6 +230,15 @@
 newsletter.publication.link.newsubscriber = æ°å»ºè®¢éè
 newsletter.publication.link.newuser = æ°å»ºç¨æ·
 
+newsletter.icons.title.editproperty= ç¼è¾å±æ§
+newsletter.icons.title.sendemail = åéæµè¯é®ä»¶
+newsletter.icons.title.sendpublication = åææè®¢éèåépublication
+newsletter.icons.title.userright = æ¥çç¨æ·æé
+newsletter.icons.title.edituser = ç¼è¾ç¨æ·
+newsletter.icons.title.user.unsubscribe = ç¨æ·åæ¶è®¢éå½åé®ä»¶
+newsletter.icons.title.term.unlink = å½ånewsletteråæ¶æ ç¾
+
+
 newsletter.term.title = Newsletter Term
 newsletter.term.add = New Term
 newsletter.term.name = åç§°
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders newsletterpublication.xml

2008-07-24 Thread lisachen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders
In directory 
james.mmbase.org:/tmp/cvs-serv23447/config/applications/newsletter/builders

Modified Files:
newsletterpublication.xml 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders


Index: newsletterpublication.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/newsletterpublication.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- newsletterpublication.xml   15 May 2008 08:03:42 -  1.10
+++ newsletterpublication.xml   24 Jul 2008 09:04:16 -  1.11
@@ -13,8 +13,10 @@

Nieuwsbrief publicatie
Newsletter publication
+   é®ä»¶åå¸
Nieuwsbrief publicaties
Newsletter publications
+   é®ä»¶åå¸



@@ -30,6 +32,7 @@

Onderwerp
Subject
+   ä¸»é¢



@@ -53,7 +56,7 @@

Introductie
Intro
-   ??
+   ç®ä»



@@ -77,7 +80,7 @@
  
 Status
 Status
-Status
+ç¶æ
  
  
 
@@ -92,5 +95,53 @@
 STRING
  
   
+  
+ 
+
+
+
+ 
+ 
+Subscriptions
+Subscriptions
+è®¢é
+ 
+ 
+
+   6
+   -1
+   -1
+
+ 
+ http://www.mmbase.org/xmlns/datatypes"/>
+ 
+subscriptions
+INTEGER
+ 
+  
+  
+ 
+
+
+
+ 
+ 
+Bounced
+Bounced
+éä¿¡
+ 
+ 
+
+   7
+   -1
+   -1
+
+ 
+ http://www.mmbase.org/xmlns/datatypes"/>
+ 
+bounced
+INTEGER
+ 
+  

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

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/publication newspubsearch.jsp

2008-07-24 Thread lisachen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/publication
In directory 
james.mmbase.org:/tmp/cvs-serv23447/src/webapp/editors/newsletter/publication

Modified Files:
newspubsearch.jsp 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/publication


Index: newspubsearch.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/publication/newspubsearch.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- newspubsearch.jsp   30 Apr 2008 08:21:10 -  1.1
+++ newspubsearch.jsp   24 Jul 2008 09:04:16 -  1.2
@@ -94,7 +94,12 @@
   
   
   
-  
+  
+ 
+
+   
+
+  

${!useSwapStyle}
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter confirm_send.jsp globals.jsp testinputform.jsp

2008-07-24 Thread lisachen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
In directory james.mmbase.org:/tmp/cvs-serv23447/src/webapp/editors/newsletter

Modified Files:
confirm_send.jsp globals.jsp testinputform.jsp 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter


Index: confirm_send.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/confirm_send.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- confirm_send.jsp8 Mar 2008 15:49:47 -   1.1
+++ confirm_send.jsp24 Jul 2008 09:04:16 -  1.2
@@ -12,6 +12,8 @@

 
 
+
+
 
 
 
@@ -22,6 +24,8 @@



+ 
+   

 



Index: globals.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/globals.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- globals.jsp 20 May 2008 05:29:01 -  1.2
+++ globals.jsp 24 Jul 2008 09:04:16 -  1.3
@@ -1,7 +1,6 @@
 <%@ page import="com.finalist.cmsc.mmbase.PropertiesUtil" %>
 
 <[EMAIL PROTECTED] file="../../globals.jsp"%>
-<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%>
 
 
 


Index: testinputform.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/testinputform.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testinputform.jsp   22 Apr 2008 10:45:31 -  1.4
+++ testinputform.jsp   24 Jul 2008 09:04:16 -  1.5
@@ -39,6 +39,10 @@

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

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

2008-07-24 Thread lisachen

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

Modified Files:
NewsletterCAO.java NewsletterPublicationCAO.java 
NewsletterSubscriptionCAO.java 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


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


Index: NewsletterCAO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterCAO.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterCAO.java  21 Jul 2008 12:52:40 -  1.5
+++ NewsletterCAO.java  24 Jul 2008 09:04:16 -  1.6
@@ -17,7 +17,9 @@
 
public int getNewsletterIdBySubscription(int id);
 
-   Node getNewsletterNodeById(int newsletterId);
+   public List getNewsletterTermsByName(int newsletterId, String name, 
int pagesize, int offset, String order, String direction);
+
+   public int getNewsletterTermsCountByName(int newsletterId, String name);
 
-   public Set getNewsletterTermsByName(int newsltterId, String name ,int 
pagesize, int offset);
+   Node getNewsletterNodeById(int newsletterId);
 }


Index: NewsletterPublicationCAO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterPublicationCAO.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- NewsletterPublicationCAO.java   18 Jul 2008 08:31:56 -  1.10
+++ NewsletterPublicationCAO.java   24 Jul 2008 09:04:16 -  1.11
@@ -27,7 +27,8 @@

public void renamePublicationTitle(int publicationId);

-   public Set getPublicationsByNewsletterAndPeriod(int id, String 
title, String subject, Date startDate, Date endDate, int pagesize, int offset);
+   public List getPublicationsByNewsletterAndPeriod(int id, 
String title, String subject, Date startDate, Date endDate, int pagesize, int 
offset, String order, String direction);
 
public int getPublicationCountForEdit(int id, String title, String subject, 
Date startDate, Date endDate);
+
 }


Index: NewsletterSubscriptionCAO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterSubscriptionCAO.java  21 Jul 2008 09:48:02 -  1.14
+++ NewsletterSubscriptionCAO.java  24 Jul 2008 09:04:16 -  1.15
@@ -37,6 +37,7 @@
public List getSubscriptionByUserIdAndStatus(int userId, 
Subscription.STATUS status);
 
public List getAllSubscriptions();
+   public ListgetSubscriptionsByTerms(int newsletterId, String terms);
 
void updateLastBounce(int subscriptionId);
 
___
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/services SubscriptionHibernateService.java NewsletterPublicationService.java NewsletterService.ja

2008-07-24 Thread lisachen

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

Modified Files:
NewsletterPublicationService.java NewsletterService.java 
NewsletterSubscriptionServices.java 
Added Files:
SubscriptionHibernateService.java 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services


SubscriptionHibernateService.java is new



Index: NewsletterPublicationService.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterPublicationService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NewsletterPublicationService.java   7 Jul 2008 04:03:43 -   1.7
+++ NewsletterPublicationService.java   24 Jul 2008 09:04:16 -  1.8
@@ -31,7 +31,9 @@

public Set getPublicationByNewsletter(int id);

-   public Set searchPublication(int id , String title, String 
subject, Date startDate, Date endDate, int pagesize, int offset);
+   public List searchPublication(int id , String title, String 
subject, Date startDate, Date endDate, int pagesize, int offset, String order, 
String direction);

public int searchPublicationCountForEdit(int id, String title, String 
subject, Date startDate, Date endDate);
+   
+   public List searchPublicationStatistics(int newsletterId, 
String title,String subject, Date startTime, Date endTime, int pagesize, int 
offset, String order, String direction);
 }


Index: NewsletterService.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterService.java  18 Jul 2008 08:31:56 -  1.6
+++ NewsletterService.java  24 Jul 2008 09:04:16 -  1.7
@@ -1,7 +1,6 @@
 package com.finalist.newsletter.services;
 
 import java.util.List;
-import java.util.Set;
 
 import com.finalist.newsletter.domain.Newsletter;
 import com.finalist.newsletter.domain.Term;
@@ -20,9 +19,11 @@
 
public Newsletter getNewsletterBySubscription(int id);
 
-   public List getNewsletters(String subscriber, String title);
+   public int getNewsletterTermsCountByName(int newsletterId, String 
terms);
+
+   public List getNewsletterTermsByName(int newsletterId, String 
name, int pagesize, int offset, String order, String direction);
 
-   void processBouncesOfPublication(String publicationId,String userId);
+   public List getNewsletters(String subscriber, String title);

-   public Set getNewsletterTermsByName(int newsletterId, String name, 
int pagesize, int offset);
+   void processBouncesOfPublication(String publicationId, String userId);
 }


Index: NewsletterSubscriptionServices.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterSubscriptionServices.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterSubscriptionServices.java 21 Jul 2008 12:52:40 -  1.14
+++ NewsletterSubscriptionServices.java 24 Jul 2008 09:04:16 -  1.15
@@ -1,5 +1,8 @@
 package com.finalist.newsletter.services;
 
+import com.finalist.newsletter.domain.Subscription;
+import com.finalist.cmsc.services.community.person.Person;
+
 import java.util.List;
 import java.util.Set;
 
@@ -60,7 +63,9 @@
 
void unSubscribeAllInNewsletter(int integer);
 
-   public void createSubscription(int userId , int newsletterId);
+   public void createSubscription(int userId, int newsletterId);
+
+   public Set getAuthenticationByTerms(int newsletterId, String 
terms);
 
public Set getRecordIdByNewsletterAndName(int newsletter, String 
term);
 
___
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 NewsletterNewsletterSubscriberDeleteAction.java NewsletterStatisticSearchAction.java Newsle

2008-07-24 Thread lisachen

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

Modified Files:
NewsletterCreate.java NewsletterPublicationCreate.java 
NewsletterPublicationDelete.java 
NewsletterPublicationEdit.java 
NewsletterPublicationManagementAction.java 
NewsletterPublicationPublish.java 
NewsletterPublicationSendEmail.java 
NewsletterPublicationTest.java 
NewsletterSubscriberSearchAction.java 
NewsletterTermSearchAction.java 
Added Files:
NewsletterNewsletterSubscriberDeleteAction.java 
NewsletterStatisticSearchAction.java 
NewsletterSubscriptionAddRelAction.java 
NewsletterTermDeleteAction.java NewsletterTermsAddAction.java 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


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


NewsletterNewsletterSubscriberDeleteAction.java is new



NewsletterStatisticSearchAction.java is new



NewsletterSubscriptionAddRelAction.java is new



NewsletterTermDeleteAction.java is new



NewsletterTermsAddAction.java is new



Index: NewsletterCreate.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterCreate.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- NewsletterCreate.java   21 Jul 2008 12:52:40 -  1.10
+++ NewsletterCreate.java   24 Jul 2008 09:04:16 -  1.11
@@ -32,7 +32,6 @@
 
   if (StringUtils.isBlank(action)) {
  request.getSession().setAttribute("parentnewsletter", 
parentnewsletter);
-
  ActionForward ret = new 
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create" + 
"&contenttype=newsletter"
+ "&returnurl=" + mapping.findForward("returnurl").getPath());
  ret.setRedirect(true);
@@ -52,10 +51,11 @@
// NewsletterPublicationUtil.createDefaultTerm(newNewsletter);
 NewsletterUtil.addScheduleForNewsletter(newNewsletter);
 
-
newNewsletter.setStringValue("scheduledescription",NewsletterUtil.getScheduleMessageByExpression(newNewsletter.getStringValue("schedule")));
+   
newNewsletter.setStringValue("scheduledescription", 
NewsletterUtil.getScheduleMessageByExpression(newNewsletter
+   .getStringValue("schedule")));
 newNewsletter.commit();
 addToRequest(request, "showpage", ewnodelastedited);
-ActionForward ret = mapping.findForward(SUCCESS);
+   ActionForward ret = new 
ActionForward("/editors/site/NavigatorPanel.do?nodeId=" + ewnodelastedited + 
"&fresh=fresh");
 return ret;
  }
  request.getSession().removeAttribute("parentnewsletter");
@@ -63,5 +63,4 @@
  return ret;
   }
}
-
 }


Index: NewsletterPublicationCreate.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationCreate.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NewsletterPublicationCreate.java7 Jul 2008 04:03:43 -   1.16
+++ NewsletterPublicationCreate.java24 Jul 2008 09:04:16 -  1.17
@@ -39,16 +39,16 @@
  Node parentNode = cloud.getNode(parent);
  Node pubNode = cloud.getNode(publicationNode.getNumber());
  RelationManager relManager = cloud.getRelationManager("newsletter", 
"newsletterpublication", "related");
- relManager.createRelation(parentNode,pubNode).commit();
+   relManager.createRelation(parentNode, pubNode).commit();
 
  String objectnumber = String.valueOf(publicationNode.getNumber());
  request.getSession().removeAttribute("parent");
  ActionForward ret = null;
- if(StringUtils.isNotEmpty(forwardType)){
+   if (StringUtils.isNotEmpty(forwardType)) {
 ret = new 
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" + 
objectnumber + "&returnurl="
- + mapping.findForward("publicationmanage").getPath() + 
URLEncoder.encode("?forward") + "=" + forwardType + 
URLEncoder.encode("&newsletterId") + "=" + parent);
- }
- else{
+   + 
mapping.findForward("publicationedit").getPath() + 
URLEncoder.encode("?forward") + "=" + forwardType
+   + 
URLEncoder.encode("&newsletterId") + "=" + parent);
+

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl NewsletterSubscriptionHibernateService.java NewsletterPublicationServiceImpl.java N

2008-07-24 Thread lisachen

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

Modified Files:
NewsletterPublicationServiceImpl.java 
NewsletterServiceImpl.java 
NewsletterSubscriptionServicesImpl.java 
Added Files:
NewsletterSubscriptionHibernateService.java 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl


NewsletterSubscriptionHibernateService.java is new



Index: NewsletterPublicationServiceImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterPublicationServiceImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NewsletterPublicationServiceImpl.java   21 Jul 2008 12:52:40 -  
1.19
+++ NewsletterPublicationServiceImpl.java   24 Jul 2008 09:04:16 -  
1.20
@@ -23,7 +23,7 @@
private NewsletterSubscriptionCAO subscriptionCAO;
private NewsLetterStatisticCAO statisticCAO;
 
-   //CAO setters
+   // CAO setters
 
public void setPublisher(NewsletterPublisher publisher) {
   this.publisher = publisher;
@@ -41,7 +41,7 @@
   this.statisticCAO = statisticCAO;
}
 
-   //service method.
+   // service method.
public STATUS getStatus(int publicationId) {
   return publicationCAO.getPublication(publicationId).getStatus();
}
@@ -68,14 +68,15 @@
/**
 * deliver specific publication.
 *
-* @param publicationId The id of the publication to be sent out
+* @param publicationId
+*The id of the publication to be sent out
 */
-   public Map> deliver(int publicationId) {
+   public Map> deliver(int publicationId) {
 
   int newsletterId = publicationCAO.getNewsletterId(publicationId);
   List sendSuccess = new ArrayList();
-  List sendFails = new ArrayList() ;
-  Map> sendResults = new 
HashMap>();
+   List sendFails = new ArrayList();
+   Map> sendResults = new HashMap>();
   List subscriptions = 
subscriptionCAO.getSubscription(newsletterId);
   log.debug("deliver publication " + publicationId + " which has " + 
subscriptions.size() + " subscriptions");
 
@@ -89,8 +90,7 @@
  try {
 publisher.deliver(publication, subscription);
 sendSuccess.add(subscription.getSubscriberId());
- }
- catch (NewsletterSendFailException e) {
+   } catch (NewsletterSendFailException e) {
 sendFails.add(subscription.getSubscriberId());
 log.error(e.getMessage());
  }
@@ -124,7 +124,7 @@
   publisher.deliver(publication, subscription);
}
 
-   public Set getPublicationByNewsletter(int newsletterId){
+   public Set getPublicationByNewsletter(int newsletterId) {
   Set result = new HashSet();
 
   for (Publication publication : 
publicationCAO.getPublicationsByNewsletter(newsletterId, null)) {
@@ -133,14 +133,25 @@
   return result;
}
 
-   public Set searchPublication(int id , String title, String 
subject, Date startDate, Date endDate, int pagesize, int offset){
-  Set result = new HashSet();
-  result = publicationCAO.getPublicationsByNewsletterAndPeriod(id 
,title, subject, startDate, endDate, pagesize, offset);
+   public List searchPublication(int id, String title, String 
subject, Date startDate, Date endDate, int pagesize, int offset,
+   String order, String direction) {
+   List result = new ArrayList();
+   result = 
publicationCAO.getPublicationsByNewsletterAndPeriod(id, title, subject, 
startDate, endDate, pagesize, offset, order, direction);
+
   return result;
}
 
-   public int searchPublicationCountForEdit(int id, String title, String 
subject, Date startDate, Date endDate){
+   public int searchPublicationCountForEdit(int id, String title, String 
subject, Date startDate, Date endDate) {
   int tmpResultCount = publicationCAO.getPublicationCountForEdit(id, 
title, subject, startDate, endDate);
   return tmpResultCount;
}
+
+   public List searchPublicationStatistics(int newsletterId, 
String title, String subject, Date startTime, Date endTime, int pagesize,
+   int offset, String order, String direction) {
+   List result = new ArrayList();
+   result = 
publicationCAO.getPublicationsByNewsletterAndPeriod(newsletterId, title, 
subject, startTime, endTime, pagesize, offset, order,
+   direction);
+   return result;
+

[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers QueryAddNodeTag.java

2008-07-24 Thread Michiel Meeuwissen

Update of 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers
In directory james.mmbase.org:/tmp/cvs-serv23084/containers

Modified Files:
QueryAddNodeTag.java 
Log Message:
made element attribute optional if query is a NodeQuery


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers


Index: QueryAddNodeTag.java
===
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers/QueryAddNodeTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- QueryAddNodeTag.java17 Jul 2008 13:53:16 -  1.1
+++ QueryAddNodeTag.java24 Jul 2008 08:54:02 -  1.2
@@ -13,7 +13,7 @@
 
 import org.mmbase.bridge.*;
 import org.mmbase.bridge.util.Queries;
-import org.mmbase.bridge.jsp.taglib.ContextReferrerTag;
+import org.mmbase.bridge.jsp.taglib.*;
 import org.mmbase.bridge.jsp.taglib.util.Attribute;
 import org.mmbase.storage.search.*;
 //import org.mmbase.util.logging.*;
@@ -22,7 +22,7 @@
  *
  * @author Michiel Meeuwissen
  * @since  MMBase-1.9
- * @version $Id: QueryAddNodeTag.java,v 1.1 2008/07/17 13:53:16 michiel Exp $
+ * @version $Id: QueryAddNodeTag.java,v 1.2 2008/07/24 08:54:02 michiel Exp $
  */
 public class QueryAddNodeTag extends ContextReferrerTag implements 
QueryContainerReferrer {
 
@@ -33,11 +33,11 @@
 protected Attribute node = Attribute.NULL;
 
 public void setContainer(String c) throws JspTagException {
-container = getAttribute(c);
+container = getAttribute(c, true);
 }
 
 public void setElement(String e) throws JspTagException {
-element = getAttribute(e);
+element = getAttribute(e, true);
 }
 public void setNumber(String n) throws JspTagException {
 node = getAttribute(n);
@@ -45,7 +45,16 @@
 
 public int doStartTag() throws JspTagException {
 Query query = getQuery(container);
-Step step = query.getStep(element.getString(this));
+Step step;
+if (element == Attribute.NULL) {
+if (query instanceof NodeQuery) {
+step = ((NodeQuery) query).getNodeStep();
+} else {
+throw new TaglibException("No element specified, and the query 
is no node-query");
+}
+} else {
+step = query.getStep(element.getString(this));
+}
 
 for (String n : node.getList(this)) {
 query.addNode(step, Integer.parseInt(n));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib mmbase-taglib.xml

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv23084

Modified Files:
mmbase-taglib.xml 
Log Message:
made element attribute optional if query is a NodeQuery


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib


Index: mmbase-taglib.xml
===
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/mmbase-taglib.xml,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -b -r1.428 -r1.429
--- mmbase-taglib.xml   23 Jul 2008 17:12:20 -  1.428
+++ mmbase-taglib.xml   24 Jul 2008 08:54:02 -  1.429
@@ -39,7 +39,7 @@
 Use one or more possiblevalue tags if you want to list all possible values. Use
 one or more examplevalue tags is you want to give some example values.
 
-version: $Id: mmbase-taglib.xml,v 1.428 2008/07/23 17:12:20 michiel Exp $
+version: $Id: mmbase-taglib.xml,v 1.429 2008/07/24 08:54:02 michiel Exp $
 
 -->
 
@@ -7513,7 +7513,7 @@
 MMBase-1.9
 
   element
-  true
+  false
   true
   
 The step to which the nodes must be added
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/richtext/config/di_components INDEX richtext.xml

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/richtext/config/di_components
In directory james.mmbase.org:/tmp/cvs-serv22189/di_components

Added Files:
INDEX richtext.xml 
Log Message:
avoid conflict with components of mmbase


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/richtext/config/di_components


INDEX is new



richtext.xml is new

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

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

2008-07-24 Thread Michiel Meeuwissen

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

Removed Files:
INDEX richtext.xml 
Log Message:
avoid conflict with components of mmbase


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




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

[MMBASE CVS] contributions/didactor2/src/richtext/config/di_components - New directory

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/contributions/didactor2/src/richtext/config/di_components
In directory james.mmbase.org:/tmp/cvs-serv22123/di_components

Log Message:
Directory /var/cvs/contributions/didactor2/src/richtext/config/di_components 
added to the repository



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

[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions Functions.java

2008-07-24 Thread Michiel Meeuwissen

Update of 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions
In directory james.mmbase.org:/tmp/cvs-serv21918

Modified Files:
Functions.java 
Log Message:
signure must be with Object, like in tld


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions


Index: Functions.java
===
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions/Functions.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- Functions.java  23 Jul 2008 17:12:20 -  1.28
+++ Functions.java  24 Jul 2008 08:12:26 -  1.29
@@ -37,7 +37,7 @@
 
  * @author  Michiel Meeuwissen
  * @since   MMBase-1.8
- * @version $Id: Functions.java,v 1.28 2008/07/23 17:12:20 michiel Exp $
+ * @version $Id: Functions.java,v 1.29 2008/07/24 08:12:26 michiel Exp $
  * @todoEXPERIMENTAL
  */
 public class Functions {
@@ -82,7 +82,7 @@
 /**
  * Provides the 'escape' functionality of taglib. Can be used in EL (using 
mm:escape('p', value)) and XSLT (using taglib:escape('p', mytag))
  */
-public static String escape(String escaper, String string) {
+public static String escape(String escaper, Object string) {
 try {
 javax.servlet.jsp.PageContext pageContext = 
ContextReferrerTag.getThreadPageContext();
 ContextTag tag = (ContextTag) 
pageContext.getAttribute(ContextTag.CONTEXTTAG_KEY);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib RelatedNodesTag.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv21814

Modified Files:
RelatedNodesTag.java 
Log Message:
configured some attributes to be 'emnpty ~ absent'


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib


Index: RelatedNodesTag.java
===
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/RelatedNodesTag.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- RelatedNodesTag.java10 Feb 2007 16:49:27 -  1.40
+++ RelatedNodesTag.java24 Jul 2008 08:08:30 -  1.41
@@ -24,7 +24,7 @@
  * @author Michiel Meeuwissen
  * @author Pierre van Rooden
  * @author Jaco de Groot
- * @version $Id: RelatedNodesTag.java,v 1.40 2007/02/10 16:49:27 nklasens Exp $
+ * @version $Id: RelatedNodesTag.java,v 1.41 2008/07/24 08:08:30 michiel Exp $
  */
 public class RelatedNodesTag extends AbstractNodeListTag {
 
@@ -45,13 +45,13 @@
  * @param type a nodeManager
  */
 public void setType(String type) throws JspTagException {
-this.type = getAttribute(type);
+this.type = getAttribute(type, true);
 }
 /**
  * @param role a role
  */
 public void setRole(String role) throws JspTagException {
-this.role = getAttribute(role);
+this.role = getAttribute(role, true);
 }
 
 /**
@@ -68,19 +68,19 @@
  * @since MMBase-1.7.1
  */
 public void setPath(String p) throws JspTagException {
-path = getAttribute(p);
+path = getAttribute(p, true);
 }
 /**
  * @since MMBase-1.7.1
  */
 public void setElement(String e) throws JspTagException {
-element = getAttribute(e);
+element = getAttribute(e, true);
 }
 /**
  * @since MMBase-1.7.1
  */
 public void setSearchdirs(String s) throws JspTagException {
-searchDirs = getAttribute(s);
+searchDirs = getAttribute(s, true);
 }
 
 /**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib ListNodesTag.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv21756

Modified Files:
ListNodesTag.java 
Log Message:
configured some attributes to be 'emnpty ~ absent'


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib


Index: ListNodesTag.java
===
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ListNodesTag.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- ListNodesTag.java   17 Mar 2008 16:18:15 -  1.31
+++ ListNodesTag.java   24 Jul 2008 08:08:07 -  1.32
@@ -23,7 +23,7 @@
  * @author Kees Jongenburger
  * @author Michiel Meeuwissen
  * @author Pierre van Rooden
- * @version $Id: ListNodesTag.java,v 1.31 2008/03/17 16:18:15 michiel Exp $
+ * @version $Id: ListNodesTag.java,v 1.32 2008/07/24 08:08:07 michiel Exp $
  */
 
 public class ListNodesTag extends AbstractNodeListTag {
@@ -54,19 +54,19 @@
  * @since MMBase-1.7.1
  */
 public void setPath(String p) throws JspTagException {
-path = getAttribute(p);
+path = getAttribute(p, true);
 }
 /**
  * @since MMBase-1.7.1
  */
 public void setElement(String e) throws JspTagException {
-element = getAttribute(e);
+element = getAttribute(e, true);
 }
 /**
  * @since MMBase-1.7.1
  */
 public void setSearchdirs(String s) throws JspTagException {
-searchDirs = getAttribute(s);
+searchDirs = getAttribute(s, true);
 }
 /**
  * @since MMBase-1.7.1
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib XsltTag.java

2008-07-24 Thread Michiel Meeuwissen

Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv21658

Modified Files:
XsltTag.java 
Log Message:
spacing only


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib


Index: XsltTag.java
===
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/XsltTag.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- XsltTag.java24 Jun 2008 06:55:33 -  1.24
+++ XsltTag.java24 Jul 2008 08:07:35 -  1.25
@@ -24,7 +24,7 @@
  * Has to live in a formatter tag, and can provide inline XSLT to it.
  *X
  * @author Michiel Meeuwissen
- * @version $Id: XsltTag.java,v 1.24 2008/06/24 06:55:33 michiel Exp $ 
+ * @version $Id: XsltTag.java,v 1.25 2008/07/24 08:07:35 michiel Exp $
  */
 
 public class XsltTag extends ContextReferrerTag  {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

96 matches

Mail list logo