[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

2009-04-27 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv3530

Modified Files:
AbstractServletBuilder.java 
Log Message:
added @Override annotation


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


Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- AbstractServletBuilder.java 9 Dec 2008 15:56:31 -   1.60
+++ AbstractServletBuilder.java 27 Apr 2009 12:04:52 -  1.61
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.60 2008/12/09 15:56:31 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.61 2009/04/27 12:04:52 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -117,6 +117,7 @@
 /**
  * Read 'externalUrlField' property
  */
+@Override
 public boolean init() {
 String property = getInitParameter(PROPERTY_EXTERNAL_URL_FIELD);
 if (property != null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

2008-12-09 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv4451

Modified Files:
AbstractServletBuilder.java 
Log Message:
  MMB-1750


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/builders
See also: http://www.mmbase.org/jira/browse/MMB-1750


Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- AbstractServletBuilder.java 15 Nov 2008 10:58:40 -  1.59
+++ AbstractServletBuilder.java 9 Dec 2008 15:56:31 -   1.60
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.59 2008/11/15 10:58:40 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.60 2008/12/09 15:56:31 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -363,6 +363,7 @@
 fileName = fileName.substring(backSlash + 1);
 }
 
+
 
buf.append(urlEscaper.transform(legalizeFileName.matcher(fileName).replaceAll(_)));
 return buf;
 }
@@ -449,6 +450,7 @@
  new 
ParameterString(field,String.class), // The field to use as argument, 
defaults to number unless 'argument' is specified.
  new 
ParameterString(context,  String.class), // Path to the context root, 
defaults to / (but can specify something relative).
  new 
ParameterString(argument, String.class), // Parameter to use for the 
argument, overrides 'field'
+ new 
ParameterString(disposition, String.class),
  Parameter.REQUEST,
  Parameter.CLOUD
  },
@@ -517,6 +519,16 @@
 }
 
 servlet.append(argument);
+
+String disposition = (String) a.get(disposition);
+if (disposition != null) {
+String defaultDisposition = 
node.getNodeManager().getProperty(Content-Disposition);
+if (! disposition.equals(defaultDisposition)) {
+servlet.append('/');
+servlet.append(disposition);
+addFileName = true;
+}
+}
 if (addFileName) {
 servlet.append('/');
 getFileName(mmnode, servlet);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

2008-12-09 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv4782

Modified Files:
  Tag: MMBase-1_8
AbstractServletBuilder.java 
Log Message:
  MMB-1750


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/builders
See also: http://www.mmbase.org/jira/browse/MMB-1750


Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.42.2.6
retrieving revision 1.42.2.7
diff -u -b -r1.42.2.6 -r1.42.2.7
--- AbstractServletBuilder.java 15 Nov 2008 11:00:45 -  1.42.2.6
+++ AbstractServletBuilder.java 9 Dec 2008 16:05:19 -   1.42.2.7
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.42.2.6 2008/11/15 11:00:45 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.42.2.7 2008/12/09 16:05:19 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -440,6 +440,7 @@
  new Parameter(field,
String.class), // The field to use as argument, defaults to number unless 
'argument' is specified.
  new Parameter(context,  
String.class), // Path to the context root, defaults to / (but can specify 
something relative).
  new Parameter(argument, 
String.class), // Parameter to use for the argument, overrides 'field'
+ new Parameter(disposition, 
String.class),
  Parameter.REQUEST,
  Parameter.CLOUD
  },
@@ -497,14 +498,23 @@
 if (usesBridgeServlet   session != null) {
 servlet.append(session= + session + +);
 }
+servlet.append(argument);
 
-if (! addFileName) {
-return servlet.append(argument).toString();
-} else {
-servlet.append(argument).append('/');
+String disposition = (String) a.get(disposition);
+if (disposition != null) {
+String defaultDisposition = 
node.getNodeManager().getProperty(Content-Disposition);
+if (! disposition.equals(defaultDisposition)) {
+servlet.append('/');
+servlet.append(disposition);
+addFileName = true;
+}
+}
+
+if (addFileName) {
+servlet.append('/');
 getFileName(mmnode, servlet);
-return servlet.toString();
 }
+return servlet.toString();
 }
 
 public Object getFunctionValue(Parameters a) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

2008-11-15 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv15048

Modified Files:
AbstractServletBuilder.java 
Log Message:
  MMB-1458


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/builders
See also: http://www.mmbase.org/jira/browse/MMB-1458


Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- AbstractServletBuilder.java 27 Oct 2008 16:40:44 -  1.58
+++ AbstractServletBuilder.java 15 Nov 2008 10:58:40 -  1.59
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.58 2008/10/27 16:40:44 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.59 2008/11/15 10:58:40 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -329,7 +329,7 @@
 }
 
 protected static final Pattern legalizeFileName = 
Pattern.compile([%\\/\\:\\; \\?\\]+);
-
+private   static final org.mmbase.util.transformers.CharTransformer 
urlEscaper = new org.mmbase.util.transformers.Url();
 
 /**
  * @since MMBase-1.8
@@ -362,7 +362,8 @@
 if (backSlash  -1)  {
 fileName = fileName.substring(backSlash + 1);
 }
-buf.append(legalizeFileName.matcher(fileName).replaceAll(_));
+
+
buf.append(urlEscaper.transform(legalizeFileName.matcher(fileName).replaceAll(_)));
 return buf;
 }
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

2008-11-15 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv15161

Modified Files:
  Tag: MMBase-1_8
AbstractServletBuilder.java 
Log Message:
  MMB-1458


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/builders
See also: http://www.mmbase.org/jira/browse/MMB-1458


Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.42.2.5
retrieving revision 1.42.2.6
diff -u -b -r1.42.2.5 -r1.42.2.6
--- AbstractServletBuilder.java 27 Oct 2008 17:00:41 -  1.42.2.5
+++ AbstractServletBuilder.java 15 Nov 2008 11:00:45 -  1.42.2.6
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.42.2.5 2008/10/27 17:00:41 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.42.2.6 2008/11/15 11:00:45 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -323,6 +323,7 @@
 }
 
 protected static final Pattern legalizeFileName = 
Pattern.compile([%\\/\\:\\; \\?\\]+);
+private   static final org.mmbase.util.transformers.CharTransformer 
urlEscaper = new org.mmbase.util.transformers.Url();
 
 
 /**
@@ -356,7 +357,7 @@
 if (backSlash  -1)  {
 fileName = fileName.substring(backSlash + 1);
 }
-buf.append(legalizeFileName.matcher(fileName).replaceAll(_));
+
buf.append(urlEscaper.transform(legalizeFileName.matcher(fileName).replaceAll(_)));
 return buf;
 }
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

2008-10-27 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv19293

Modified Files:
AbstractServletBuilder.java 
Log Message:
removed some superflouous parentheses


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


Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- AbstractServletBuilder.java 18 Sep 2008 10:41:24 -  1.57
+++ AbstractServletBuilder.java 27 Oct 2008 16:40:44 -  1.58
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.57 2008/09/18 10:41:24 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.58 2008/10/27 16:40:44 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -539,11 +539,6 @@
 });
 
 
-}
-
-
-
-{
 /**
  * @since MMBase-1.8
  */
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

2008-10-27 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv19713/module/builders

Modified Files:
  Tag: MMBase-1_8
AbstractServletBuilder.java 
Log Message:
ported generic 'url' function from HEAD


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


Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.42.2.4
retrieving revision 1.42.2.5
diff -u -b -r1.42.2.4 -r1.42.2.5
--- AbstractServletBuilder.java 10 Jun 2008 11:10:30 -  1.42.2.4
+++ AbstractServletBuilder.java 27 Oct 2008 17:00:41 -  1.42.2.5
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.42.2.4 2008/06/10 11:10:30 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.42.2.5 2008/10/27 17:00:41 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -511,11 +511,16 @@
 }
 });
 
-}
-
 
+addFunction(new NodeFunction(url, new Parameter[] { 
Parameter.REQUEST, Parameter.CLOUD }, ReturnType.STRING) {
+public Object getFunctionValue(Node node, Parameters a) {
+Function spFunction = node.getFunction(servletpath);
+Parameters p = spFunction.createParameters();
+p.setAll(a);
+return  node.getFunctionValue(servletpath, p).toString();
+}
+});
 
-{
 /**
  * @since MMBase-1.8
  */
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

2008-09-18 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv5520

Modified Files:
AbstractServletBuilder.java 
Log Message:
url function should not again add file name


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


Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- AbstractServletBuilder.java 7 Sep 2008 10:03:55 -   1.55
+++ AbstractServletBuilder.java 18 Sep 2008 10:24:35 -  1.56
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.55 2008/09/07 10:03:55 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.56 2008/09/18 10:24:35 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -515,13 +515,13 @@
 servlet.append(session= + session + +);
 }
 
-if (! addFileName) {
-return servlet.append(argument).toString();
-} else {
-servlet.append(argument).append('/');
+servlet.append(argument);
+if (addFileName) {
+servlet.append('/');
 getFileName(mmnode, servlet);
-return servlet.toString();
 }
+return servlet.toString();
+
 }
 
 public String getFunctionValue(Parameters a) {
@@ -531,16 +531,7 @@
 
 addFunction(new NodeFunctionString(url, new Parameter[] { 
Parameter.REQUEST, Parameter.CLOUD }) {
 public String getFunctionValue(Node node, Parameters a) {
-String sp = node.getFunctionValue(servletpath, 
a).toString();
-MMObjectNode mmnode = node.getNumber()  0 ?
-AbstractServletBuilder.this.getNode(node.getNumber()) :
-new MMObjectNode(AbstractServletBuilder.this, new 
org.mmbase.bridge.util.NodeMap(node));
-if(addFileName(mmnode, sp)) {
-StringBuilder buf = new StringBuilder(sp);
-buf.append('/');
-sp = getFileName(mmnode, buf).toString();
-}
-return sp;
+return  node.getFunctionValue(servletpath, a).toString();
 }
 });
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

2008-09-18 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv5870

Modified Files:
AbstractServletBuilder.java 
Log Message:
'url' function (~ servletpath, but with less arguments) was not quite correct 


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


Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- AbstractServletBuilder.java 18 Sep 2008 10:24:35 -  1.56
+++ AbstractServletBuilder.java 18 Sep 2008 10:41:24 -  1.57
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.56 2008/09/18 10:24:35 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.57 2008/09/18 10:41:24 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -477,7 +477,7 @@
 return servlet;
 }
 
-public String getFunctionValue(Node node, Parameters 
a) {
+@Override public String getFunctionValue(Node node, 
Parameters a) {
 // verify if the object is stored externally (in 
which case
 // its url has been filled in)
 // if so, return the url of the external source
@@ -524,14 +524,17 @@
 
 }
 
-public String getFunctionValue(Parameters a) {
+@Override public String getFunctionValue(Parameters a) 
{
 return getServletPath(a).toString();
 }
 });
 
 addFunction(new NodeFunctionString(url, new Parameter[] { 
Parameter.REQUEST, Parameter.CLOUD }) {
-public String getFunctionValue(Node node, Parameters a) {
-return  node.getFunctionValue(servletpath, a).toString();
+@Override public String getFunctionValue(Node node, Parameters 
a) {
+Function spFunction = node.getFunction(servletpath);
+Parameters p = spFunction.createParameters();
+p.setAll(a);
+return  node.getFunctionValue(servletpath, p).toString();
 }
 });
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

2008-07-29 Thread Pierre van Rooden 
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv7265/src/org/mmbase/module/builders

Modified Files:
AbstractServletBuilder.java 
Log Message:
move some code from ReferredATtcahments to AbstractServletBuilder. This allows 
for the sue of url fields to store references to binary files, rather than the 
files themselves


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


Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- AbstractServletBuilder.java 25 Feb 2008 12:35:05 -  1.53
+++ AbstractServletBuilder.java 29 Jul 2008 08:38:53 -  1.54
@@ -30,13 +30,15 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.53 2008/02/25 12:35:05 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.54 2008/07/29 08:38:53 pierre 
Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
 
 private static final Logger log = 
Logging.getLoggerInstance(AbstractServletBuilder.class);
 
+public static final String PROPERTY_EXTERNAL_URL_FIELD = 
externalUrlField;
+
 public static final String FIELD_MIMETYPE   = mimetype;
 public static final String FIELD_FILENAME   = filename;
 public static final String FIELD_HANDLE = handle;
@@ -49,13 +51,9 @@
 new Parameter.Wrapper(MMObjectBuilder.GUI_PARAMETERS) // example, does 
not make too much sense :-)
 };
 
-
 public final static Parameter[] FORMAT_PARAMETERS   = {};
 public final static Parameter[] MIMETYPE_PARAMETERS = {};
 
-
-
-
 /**
  * In this string the path to the servlet is stored.
  */
@@ -110,10 +108,27 @@
 abstract protected String getDefaultPath();
 
 /**
+ * If set, this points out a field in the builder that optionally contains
+ * a url to an external (binary) source, which is then used as the stored
+ * attachment (instead of accessing the database).
+ */
+protected String externalUrlField = null;
+
+/**
+ * Read 'externalUrlField' property
+ */
+public boolean init() {
+String property = getInitParameter(PROPERTY_EXTERNAL_URL_FIELD);
+if (property != null) {
+externalUrlField = property;
+}
+return super.init();
+}
+
+/**
  * @param association e.g. 'images' or 'attachments'
  * @param rootPath to root of appliciation (perhaps relative).
  */
-
 private String getServletPathWithAssociation(String association, String 
root) {
 if (MMBaseContext.isInitialized()) {
 javax.servlet.ServletContext sx = 
MMBaseContext.getServletContext();
@@ -248,13 +263,16 @@
 }
 return result;
 }
+
 public boolean commit(MMObjectNode node) {
 CollectionString changed = node.getChanged();
 if (log.isDebugEnabled()) {
 log.debug(Committing node  + node.getNumber() +  memory:  + 
SizeOf.getByteSize(node) +  fields  + changed);
 }
 
-if (changed.contains(FIELD_HANDLE)) {
+if (changed.contains(FIELD_HANDLE) ||
+(externalUrlField != null  changed.contains(externalUrlField))
+   ) {
 // set those fields to null, which are not changed too:
 CollectionString cp = new ArrayListString();
 cp.addAll(getHandleFields());
@@ -460,6 +478,15 @@
 }
 
 public String getFunctionValue(Node node, Parameters a) {
+// verify if the object is stored externally (in which case
+// its url has been filled in)
+// if so, return the url of the external source
+if (AbstractServletBuilder.this.externalUrlField != null ) 
{
+String url = node.getStringValue(externalUrlField);
+if (url != null  !url.equals()) {
+   return url;
+}
+}
 StringBuilder servlet = getServletPath(a);
 
 String session = getSession(a, node.getNumber());
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

2008-06-10 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv7423

Modified Files:
  Tag: MMBase-1_8
AbstractServletBuilder.java 
Log Message:
made gui indicator public


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


Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.42.2.3
retrieving revision 1.42.2.4
diff -u -b -r1.42.2.3 -r1.42.2.4
--- AbstractServletBuilder.java 25 Feb 2008 12:34:34 -  1.42.2.3
+++ AbstractServletBuilder.java 10 Jun 2008 11:10:30 -  1.42.2.4
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.42.2.3 2008/02/25 12:34:34 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.42.2.4 2008/06/10 11:10:30 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -305,7 +305,7 @@
 return super.getGUIIndicator(field, node);
 }
 
-final protected String getGUIIndicator(MMObjectNode node, Parameters pars) 
{
+final public String getGUIIndicator(MMObjectNode node, Parameters pars) {
 String field = (String) pars.get(field);
 if (field == null || .equals(field) || FIELD_HANDLE.equals(field)) {
 return getSGUIIndicator(node, pars);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

2008-02-25 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv25431

Modified Files:
  Tag: MMBase-1_8
AbstractServletBuilder.java 
Log Message:
added also  as a forbidden character in filenames. ( at least is cumbersome 
in xmls...)


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


Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.42.2.2
retrieving revision 1.42.2.3
diff -u -b -r1.42.2.2 -r1.42.2.3
--- AbstractServletBuilder.java 3 Oct 2007 15:19:23 -   1.42.2.2
+++ AbstractServletBuilder.java 25 Feb 2008 12:34:34 -  1.42.2.3
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.42.2.2 2007/10/03 15:19:23 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.42.2.3 2008/02/25 12:34:34 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -322,7 +322,7 @@
 return getSGUIIndicator(node, new 
Parameters(GUI_PARAMETERS).set(field, field));
 }
 
-protected static final Pattern legalizeFileName = 
Pattern.compile([%\\/\\:\\; \\?]+);
+protected static final Pattern legalizeFileName = 
Pattern.compile([%\\/\\:\\; \\?\\]+);
 
 
 /**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs