Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv15123
Modified Files:
BlockUrlConverter.java DirectoryUrlConverter.java
MMBaseUrlConverter.java
Log Message:
deails
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic
Index: BlockUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BlockUrlConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- BlockUrlConverter.java 21 Oct 2008 15:17:37 -0000 1.4
+++ BlockUrlConverter.java 21 Oct 2008 15:56:53 -0000 1.5
@@ -25,7 +25,7 @@
* URLConverters would probably like this, and can extend from this.
*
* @author Michiel Meeuwissen
- * @version $Id: BlockUrlConverter.java,v 1.4 2008/10/21 15:17:37 michiel Exp $
+ * @version $Id: BlockUrlConverter.java,v 1.5 2008/10/21 15:56:53 michiel Exp $
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -171,12 +171,16 @@
}
HttpServletRequest request =
BasicUrlConverter.getUserRequest(frameworkParameters.get(Parameter.REQUEST));
+ if (niceUrl.startsWith(request.getServletPath())) {
// conserve other parameters which happen to be on the request
-
for (Object e : request.getParameterMap().entrySet()) {
Map.Entry<String, String[]> entry = (Map.Entry<String,
String[]>) e;
map.put(entry.getKey(), entry.getValue());
}
+ } else {
+ log.debug("" + niceUrl + " does not start with " +
request.getServletPath());
+ }
+
Map<String, Object> params =
framework.prefix(getState(frameworkParameters),
blockParameters.toMap());
if (log.isDebugEnabled()) {
Index: DirectoryUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/DirectoryUrlConverter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- DirectoryUrlConverter.java 21 Oct 2008 15:17:37 -0000 1.6
+++ DirectoryUrlConverter.java 21 Oct 2008 15:56:53 -0000 1.7
@@ -28,7 +28,7 @@
* It is also assumed that the niceness of the URL's is basicly about one
block.
*
* @author Michiel Meeuwissen
- * @version $Id: DirectoryUrlConverter.java,v 1.6 2008/10/21 15:17:37 michiel
Exp $
+ * @version $Id: DirectoryUrlConverter.java,v 1.7 2008/10/21 15:56:53 michiel
Exp $
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -47,7 +47,7 @@
}
- @Override protected String getNiceUrl(Block block,
+ @Override protected final String getNiceUrl(Block block,
Parameters parameters,
Parameters frameworkParameters, boolean
action) throws FrameworkException {
StringBuilder b = new StringBuilder(directory);
@@ -55,7 +55,7 @@
return b.toString();
}
- protected abstract String getNiceDirectoryUrl(StringBuilder b, Block block,
+ protected abstract void getNiceDirectoryUrl(StringBuilder b, Block block,
Parameters parameters,
Parameters frameworkParameters,
boolean action) throws FrameworkException;
Index: MMBaseUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/MMBaseUrlConverter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- MMBaseUrlConverter.java 20 Oct 2008 17:03:31 -0000 1.15
+++ MMBaseUrlConverter.java 21 Oct 2008 15:56:53 -0000 1.16
@@ -20,7 +20,7 @@
* was configured for this prefix).
*
* @author Michiel Meeuwissen
- * @version $Id: MMBaseUrlConverter.java,v 1.15 2008/10/20 17:03:31 michiel
Exp $
+ * @version $Id: MMBaseUrlConverter.java,v 1.16 2008/10/21 15:56:53 michiel
Exp $
* @since MMBase-1.9
*/
public class MMBaseUrlConverter extends DirectoryUrlConverter {
@@ -38,7 +38,7 @@
public MMBaseUrlConverter(BasicFramework fw) {
super(fw);
- setDirectory("/mmbase/");
+ setDirectory("mmbase");
}
@@ -66,7 +66,7 @@
}
}
- @Override protected String getNiceUrl(Block block, Parameters
blockParameters, Parameters frameworkParameters, boolean action) throws
FrameworkException {
+ @Override protected void getNiceDirectoryUrl(StringBuilder b, Block block,
Parameters blockParameters, Parameters frameworkParameters, boolean action)
throws FrameworkException {
if (log.isDebugEnabled()) {
log.debug("block '" + block + "' framework parameters " +
frameworkParameters);
}
@@ -76,7 +76,11 @@
if (category == null && state.isRendering()) {
category = state.getFrameworkParameters().get(CATEGORY);
}
- return directory + (category == null ? "_" : category) + "/" +
block.getComponent().getName() + "/" + block.getName();
+ b.append((category == null ? "_" : category));
+ b.append('/');
+ b.append(block.getComponent().getName());
+ b.append('/');
+ b.append(block.getName());
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
