[MMBASE CVS] all/maven-base pom.xml
Update of /var/cvs/all/maven-base
In directory james.mmbase.org:/tmp/cvs-serv1312
Modified Files:
pom.xml
Log Message:
rationalized dependency managment a bit, because it was not quite wokring
everywhere. Added a 'servlet25' profile.
See also: http://cvs.mmbase.org/viewcvs/all/maven-base
Index: pom.xml
===
RCS file: /var/cvs/all/maven-base/pom.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- pom.xml 28 Apr 2009 15:16:09 - 1.24
+++ pom.xml 29 Apr 2009 07:01:49 - 1.25
@@ -552,7 +552,6 @@
groupIdjavax.servlet/groupId
artifactIdservlet-api/artifactId
version${servlet.version}/version
-scopeprovided/scope
/dependency
dependency
@@ -566,27 +565,23 @@
groupId${jsp.groupId}/groupId
artifactIdjsp-api/artifactId
version${jsp.version}/version
-scopeprovided/scope
/dependency
dependency
groupIdjavax.servlet/groupId
artifactIdjstl/artifactId
version${jstl.version}/version
-scopeprovided/scope
/dependency
dependency
groupIdtaglibs/groupId
artifactIdstandard/artifactId
version${taglib-standard.version}/version
-scopeprovided/scope
/dependency
dependency
groupIdlog4j/groupId
artifactIdlog4j/artifactId
version${log4j.version}/version
-scopeprovided/scope
/dependency
dependency
@@ -622,7 +617,6 @@
artifactIdservlet-api/artifactId
/exclusion
/exclusions
-scopeprovided/scope
/dependency
dependency
groupIdcommons-lang/groupId
@@ -633,7 +627,6 @@
groupIdcommons-fileupload/groupId
artifactIdcommons-fileupload/artifactId
version1.1/version
-scopeprovided/scope
/dependency
dependency
@@ -645,19 +638,6 @@
/dependencies
/dependencyManagement
- dependencies
-dependency
- groupIdjavax.servlet/groupId
- artifactIdservlet-api/artifactId
- scopeprovided/scope
-/dependency
-dependency
- groupId${jsp.groupId}/groupId
- artifactIdjsp-api/artifactId
- scopeprovided/scope
-/dependency
-
- /dependencies
distributionManagement
repository
@@ -868,6 +848,23 @@
/repository
/distributionManagement
/profile
+
+profile
+ idservlet25/id
+ properties
+servlet.version2.5/servlet.version
+jsp.version2.1/jsp.version
+jsp.groupIdjavax.servlet.jsp/jsp.groupId
+jstl.version1.2/jstl.version
+ /properties
+ dependencies
+dependency
+ groupIdtaglibs/groupId
+ artifactIdstandard/artifactId
+ scopeprovided/scope
+/dependency
+ /dependencies
+/profile
/profiles
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] all/base-webapp pom.xml
Update of /var/cvs/all/base-webapp
In directory james.mmbase.org:/tmp/cvs-serv1418
Modified Files:
pom.xml
Log Message:
rationalized dependency managment a bit, because it was not quite wokring
everywhere. Added a 'servlet25' profile.
See also: http://cvs.mmbase.org/viewcvs/all/base-webapp
Index: pom.xml
===
RCS file: /var/cvs/all/base-webapp/pom.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- pom.xml 1 Apr 2009 13:33:00 - 1.5
+++ pom.xml 29 Apr 2009 07:03:05 - 1.6
@@ -13,6 +13,11 @@
artifactIdbase-webapp/artifactId
packagingwar/packaging
nameMMBase Base webapp/name
+ version${base.version}/version
+
+ properties
+base.version${mmbase.version}/base.version
+ /properties
description
This is a minimalistic war containing the essentials for an MMBase web
applications. This can be used as initial war overlay for your own project.
@@ -44,7 +49,7 @@
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase/artifactId
- version${project.version}/version
+ version${mmbase.version}/version
/dependency
!--
@@ -54,9 +59,17 @@
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase-taglib/artifactId
- version${project.version}/version
+ version${mmbase.version}/version
typewar/type
/dependency
/dependencies
+ profiles
+profile
+ idservlet25/id
+ properties
+base.version${mmbase.version}-servlet25/base.version
+ /properties
+/profile
+ /profiles
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] all pom.xml
Update of /var/cvs/all
In directory james.mmbase.org:/tmp/cvs-serv1366
Modified Files:
pom.xml
Log Message:
rationalized dependency managment a bit, because it was not quite wokring
everywhere. Added a 'servlet25' profile.
See also: http://cvs.mmbase.org/viewcvs/all
Index: pom.xml
===
RCS file: /var/cvs/all/pom.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- pom.xml 28 Apr 2009 15:17:43 - 1.20
+++ pom.xml 29 Apr 2009 07:02:39 - 1.21
@@ -153,39 +153,32 @@
dependency
groupIdlog4j/groupId
artifactIdlog4j/artifactId
- scopecompile/scope
/dependency
dependency
groupIdcommons-fileupload/groupId
artifactIdcommons-fileupload/artifactId
- scopecompile/scope
/dependency
dependency
groupIdcommons-logging/groupId
artifactIdcommons-logging/artifactId
- scopecompile/scope
+ scopeprovided/scope
/dependency
dependency
- groupIdjavax.servlet/groupId
- artifactIdservlet-api/artifactId
-/dependency
-dependency
groupId${jsp.groupId}/groupId
artifactIdjsp-api/artifactId
+ scopeprovided/scope
/dependency
dependency
groupIdjavax.servlet/groupId
artifactIdjstl/artifactId
- scopecompile/scope
/dependency
-!-- the dependency on standard taglibs can be dropped when going to jstl
1.2 --
dependency
groupIdtaglibs/groupId
artifactIdstandard/artifactId
- scopecompile/scope
/dependency
+
!--
dependency
groupIdjavax.portlet/groupId
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] all/base-webapp .cvsignore
Update of /var/cvs/all/base-webapp In directory james.mmbase.org:/tmp/cvs-serv1483 Modified Files: .cvsignore Log Message: some addition of netbeans See also: http://cvs.mmbase.org/viewcvs/all/base-webapp Index: .cvsignore === RCS file: /var/cvs/all/base-webapp/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- .cvsignore 17 Feb 2009 22:41:33 - 1.1 +++ .cvsignore 29 Apr 2009 07:04:02 - 1.2 @@ -1,4 +1,5 @@ target +profiles.xml .classpath -.project *.log +.project ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications pom.xml
Update of /var/cvs/applications
In directory james.mmbase.org:/tmp/cvs-serv1536
Modified Files:
pom.xml
Log Message:
depending on 'mmbase.version' for modules that have that version
See also: http://cvs.mmbase.org/viewcvs/applications
Index: pom.xml
===
RCS file: /var/cvs/applications/pom.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- pom.xml 24 Apr 2009 08:14:11 - 1.15
+++ pom.xml 29 Apr 2009 07:04:42 - 1.16
@@ -23,25 +23,24 @@
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase/artifactId
- version${project.version}/version
+ version${mmbase.version}/version
scopeprovided/scope
/dependency
-
-
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase/artifactId
- version${project.version}/version
+ version${mmbase.version}/version
classifierjavadoc/classifier
scopeprovided/scope
/dependency
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase/artifactId
- version${project.version}/version
+ version${mmbase.version}/version
classifiersources/classifier
scopeprovided/scope
/dependency
+
/dependencies
build
@@ -143,4 +142,6 @@
modulescan/module
/modules
+
+
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/vwms pom.xml
Update of /var/cvs/applications/vwms
In directory james.mmbase.org:/tmp/cvs-serv1611
Modified Files:
pom.xml
Log Message:
vwms uses Mail
See also: http://cvs.mmbase.org/viewcvs/applications/vwms
Index: pom.xml
===
RCS file: /var/cvs/applications/vwms/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- pom.xml 28 Apr 2009 15:19:34 - 1.2
+++ pom.xml 29 Apr 2009 07:05:12 - 1.3
@@ -18,4 +18,14 @@
VWMS ('virtual webmasters') are legacy. Don't use it.
/description
+ dependencies
+dependency
+ groupIdorg.mmbase/groupId
+ artifactIdmmbase-email/artifactId
+ version${mmbase.version}/version
+ classifierclasses/classifier
+ scopeprovided/scope
+/dependency
+ /dependencies
+
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] all/maven pom.xml
Update of /var/cvs/all/maven In directory james.mmbase.org:/tmp/cvs-serv1676 Modified Files: pom.xml Log Message: accidentely commented out build of the webapps See also: http://cvs.mmbase.org/viewcvs/all/maven Index: pom.xml === RCS file: /var/cvs/all/maven/pom.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- pom.xml 28 Apr 2009 15:17:09 - 1.2 +++ pom.xml 29 Apr 2009 07:05:38 - 1.3 @@ -25,10 +25,8 @@ module../module module../applications/module -!-- module../base-webapp/module module../example-webapp/module --- /modules build ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/media/config/builders/media mediasources.xml
Update of /var/cvs/applications/media/config/builders/media In directory james.mmbase.org:/tmp/cvs-serv1889/media/config/builders/media Modified Files: mediasources.xml Log Message: added javaconstant to enumeration See also: http://cvs.mmbase.org/viewcvs/applications/media/config/builders/media Index: mediasources.xml === RCS file: /var/cvs/applications/media/config/builders/media/mediasources.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- mediasources.xml17 Apr 2009 11:14:11 - 1.9 +++ mediasources.xml29 Apr 2009 07:10:26 - 1.10 @@ -144,8 +144,11 @@ /gui editorpositionslist8/list/positions/editor datatype base=integer xmlns=http://www.mmbase.org/xmlns/datatypes; -enumeration - entry basename=org.mmbase.applications.media.builders.resources.states / +default value=UNDEFINED / +enumeration enforce=onchange + entry + javaconstants=org.mmbase.applications.media.State + basename=org.mmbase.applications.media.builders.resources.states / /enumeration /datatype /field ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/rmmci pom.xml
Update of /var/cvs/applications/rmmci
In directory james.mmbase.org:/tmp/cvs-serv1944
Modified Files:
pom.xml
Log Message:
depending on 'mmbase.version' for modules that have that version
See also: http://cvs.mmbase.org/viewcvs/applications/rmmci
Index: pom.xml
===
RCS file: /var/cvs/applications/rmmci/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- pom.xml 28 Apr 2009 15:19:34 - 1.3
+++ pom.xml 29 Apr 2009 07:10:54 - 1.4
@@ -24,8 +24,7 @@
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase/artifactId
-version${project.version}/version
-!-- classifierclasses/classifier --
+version${mmbase.version}/version
/dependency
dependency
groupIdjavax.servlet/groupId
@@ -95,4 +94,6 @@
/plugins
/build
+
+
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/rmmci/assembly client.xml
Update of /var/cvs/applications/rmmci/assembly In directory james.mmbase.org:/tmp/cvs-serv1998/assembly Modified Files: client.xml Log Message: See also: http://cvs.mmbase.org/viewcvs/applications/rmmci/assembly Index: client.xml === RCS file: /var/cvs/applications/rmmci/assembly/client.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- client.xml 18 Apr 2009 09:22:33 - 1.2 +++ client.xml 29 Apr 2009 07:11:09 - 1.3 @@ -69,6 +69,7 @@ includeorg/mmbase/util/HashCodeUtil*/include !-- used by SortedBundle, but is generic tool-- includeorg/mmbase/util/PublicCloneable*/include !-- used by SortedBundle, but is generic tool-- includeorg/mmbase/util/StringSplitter*/include !-- used by Queries-- + includeorg/mmbase/util/SerializableInputStream*/include !-- Representation of binaries-- includeorg/mmbase/storage/Storable.class/include !-- DataTypes uses .. -- includeorg/mmbase/storage/StorageException.class/include !-- -- ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib pom.xml
Update of /var/cvs/applications/taglib In directory james.mmbase.org:/tmp/cvs-serv2043 Modified Files: pom.xml Log Message: depending on 'mmbase.version' for modules that have that version See also: http://cvs.mmbase.org/viewcvs/applications/taglib Index: pom.xml === RCS file: /var/cvs/applications/taglib/pom.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- pom.xml 28 Apr 2009 15:19:34 - 1.12 +++ pom.xml 29 Apr 2009 07:11:33 - 1.13 @@ -110,11 +110,13 @@ dependency groupIdcommons-fileupload/groupId artifactIdcommons-fileupload/artifactId + scopeprovided/scope /dependency dependency groupIdjavax.servlet/groupId artifactIdjstl/artifactId + scopeprovided/scope /dependency /dependencies /project ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/vpro-wizards pom.xml
Update of /var/cvs/applications/vpro-wizards In directory james.mmbase.org:/tmp/cvs-serv2090 Modified Files: pom.xml Log Message: removed an odd newline See also: http://cvs.mmbase.org/viewcvs/applications/vpro-wizards Index: pom.xml === RCS file: /var/cvs/applications/vpro-wizards/pom.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- pom.xml 27 Apr 2009 11:09:37 - 1.3 +++ pom.xml 29 Apr 2009 07:11:59 - 1.4 @@ -4,8 +4,7 @@ parent groupIdorg.mmbase/groupId - artifactIdmmbase-application-parent - /artifactId + artifactIdmmbase-application-parent/artifactId version1.9-SNAPSHOT/version /parent ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/rmmci/src/org/mmbase/bridge/remote/rmi RemoteBridgeList_Rmi.java
Update of /var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi
In directory
james.mmbase.org:/tmp/cvs-serv2184/rmmci/src/org/mmbase/bridge/remote/rmi
Modified Files:
RemoteBridgeList_Rmi.java
Log Message:
spacing, javadoc
See also:
http://cvs.mmbase.org/viewcvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi
Index: RemoteBridgeList_Rmi.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi/RemoteBridgeList_Rmi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteBridgeList_Rmi.java 31 Mar 2007 17:15:00 - 1.1
+++ RemoteBridgeList_Rmi.java 29 Apr 2009 07:13:17 - 1.2
@@ -19,6 +19,10 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
+/**
+ * @javadoc Why is this implemented?
+ */
+
public class RemoteBridgeList_RmiR, L extends RemoteList_RmiR, L
implements RemoteBridgeListR, Unreferenced {
private static Logger log =
Logging.getLoggerInstance(RemoteBridgeList_Rmi.class);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/rmmci/src/org/mmbase/bridge/remote/rmi RemoteIterator_Rmi.java RemoteList_Rmi.java ServerMappedObject_Rmi.java
Update of /var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi
In directory james.mmbase.org:/tmp/cvs-serv2263/src/org/mmbase/bridge/remote/rmi
Modified Files:
RemoteIterator_Rmi.java RemoteList_Rmi.java
ServerMappedObject_Rmi.java
Log Message:
Added some @javadoc tags, because it seems useful to know hwy certain Rmi's are
manually overriden
See also:
http://cvs.mmbase.org/viewcvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi
Index: RemoteIterator_Rmi.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi/RemoteIterator_Rmi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteIterator_Rmi.java 31 Mar 2007 17:15:00 - 1.1
+++ RemoteIterator_Rmi.java 29 Apr 2009 07:14:27 - 1.2
@@ -15,7 +15,9 @@
import org.mmbase.bridge.remote.RemoteIterator;
import org.mmbase.bridge.remote.util.ObjectWrapper;
-
+/**
+ * @javadoc Why is this implemented?
+ */
public class RemoteIterator_RmiR, L extends
ServerMappedObject_RmiListIteratorL implements RemoteIteratorR {
public RemoteIterator_Rmi(ListIteratorL originalObject) throws
RemoteException {
Index: RemoteList_Rmi.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi/RemoteList_Rmi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteList_Rmi.java 31 Mar 2007 17:15:00 - 1.1
+++ RemoteList_Rmi.java 29 Apr 2009 07:14:27 - 1.2
@@ -15,6 +15,9 @@
import org.mmbase.bridge.remote.RemoteList;
import org.mmbase.bridge.remote.util.ObjectWrapper;
+/**
+ * @javadoc Why is this implemented?
+ */
public class RemoteList_RmiR, L extends ServerMappedObject_RmiListL
implements RemoteListR {
public RemoteList_Rmi(ListL originalObject) throws RemoteException {
Index: ServerMappedObject_Rmi.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi/ServerMappedObject_Rmi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ServerMappedObject_Rmi.java 31 Mar 2007 17:15:00 - 1.1
+++ ServerMappedObject_Rmi.java 29 Apr 2009 07:14:27 - 1.2
@@ -18,6 +18,9 @@
import org.mmbase.bridge.remote.util.StubToLocalMapper;
+/**
+ * @javadoc
+ */
public abstract class ServerMappedObject_RmiO extends UnicastRemoteObject
implements ServerMappedObject, Unreferenced {
//original object
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/media/src/org/mmbase/applications/media/builders/resources states_nl.properties states.properties
Update of /var/cvs/applications/media/src/org/mmbase/applications/media/builders/resources In directory james.mmbase.org:/tmp/cvs-serv2416/media/src/org/mmbase/applications/media/builders/resources Modified Files: states_nl.properties states.properties Log Message: using constants for the values See also: http://cvs.mmbase.org/viewcvs/applications/media/src/org/mmbase/applications/media/builders/resources Index: states_nl.properties === RCS file: /var/cvs/applications/media/src/org/mmbase/applications/media/builders/resources/states_nl.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- states_nl.properties3 Jun 2004 16:00:09 - 1.2 +++ states_nl.properties29 Apr 2009 07:16:28 - 1.3 @@ -1,6 +1,6 @@ -1=Aangevraagd -2=Bezig -3=Klaar -4=Bron --1=Ongedefinieerd -10=Verwijderd \ No newline at end of file +REQUEST=Aangevraagd +BUSY=Bezig +DONE=Klaar +SOURCE=Bron +UNDEFINED=Ongedefinieerd +REMOVED=Verwijderd Index: states.properties === RCS file: /var/cvs/applications/media/src/org/mmbase/applications/media/builders/resources/states.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- states.properties 3 Jun 2004 16:00:09 - 1.2 +++ states.properties 29 Apr 2009 07:16:28 - 1.3 @@ -1,6 +1,6 @@ -1=Request -2=Busy -3=Done -4=Source --1=Undefined -10=Removed \ No newline at end of file +REQUEST=Request +BUSY=Busy +DONE=Done +SOURCE=Source +UNDEFINED=Undefined +REMOVED=Removed ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/resources/src/org/mmbase/module/builders Resources.java
Update of /var/cvs/applications/resources/src/org/mmbase/module/builders
In directory
james.mmbase.org:/tmp/cvs-serv2517/resources/src/org/mmbase/module/builders
Modified Files:
Resources.java
Log Message:
added @Override annotations
See also:
http://cvs.mmbase.org/viewcvs/applications/resources/src/org/mmbase/module/builders
Index: Resources.java
===
RCS file:
/var/cvs/applications/resources/src/org/mmbase/module/builders/Resources.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Resources.java 24 Nov 2006 09:37:25 - 1.1
+++ Resources.java 29 Apr 2009 07:17:28 - 1.2
@@ -19,7 +19,7 @@
* (configuration files, classes, resourcebundles).
*
* @author Michiel Meeuwissen
- * @version $Id: Resources.java,v 1.1 2006/11/24 09:37:25 pierre Exp $
+ * @version $Id: Resources.java,v 1.2 2009/04/29 07:17:28 michiel Exp $
* @since MMBase-1.8
*/
public class Resources extends Attachments {
@@ -29,6 +29,7 @@
* Registers this builder in the ResourceLoader.
* {...@inheritdoc}
*/
+@Override
public boolean init() {
boolean res = super.init();
if (res) {
@@ -62,6 +63,7 @@
* Implements virtual filename field.
* {...@inheritdoc}
*/
+@Override
public Object getValue(MMObjectNode node, String field) {
if (field.equals(ResourceLoader.FILENAME_FIELD)) {
String s = node.getStringValue(ResourceLoader.RESOURCENAME_FIELD);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge/util AbstractNode.java
Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv2889/bridge/util
Modified Files:
AbstractNode.java
Log Message:
removed some logging
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util
Index: AbstractNode.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/util/AbstractNode.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- AbstractNode.java 24 Apr 2009 15:12:47 - 1.30
+++ AbstractNode.java 29 Apr 2009 07:36:08 - 1.31
@@ -32,7 +32,7 @@
* here, to minimalize the implementation effort of fully implemented Nodes.
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractNode.java,v 1.30 2009/04/24 15:12:47 michiel Exp $
+ * @version $Id: AbstractNode.java,v 1.31 2009/04/29 07:36:08 michiel Exp $
* @see org.mmbase.bridge.Node
* @since MMBase-1.8
*/
@@ -98,9 +98,6 @@
log.info(Setting size to + si.getSize());
}
-log.info(Size + getSize(fieldName));
-log.info(Found + value);
-
if (value == null dt instanceof
org.mmbase.datatypes.NumberDataType) {
// null would otherwise be converted to -1, which makes little
sense.
// but must happen because setNumericValue methods cannot
accept null.
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/core/util Fields.java
Update of /var/cvs/src/org/mmbase/core/util
In directory james.mmbase.org:/tmp/cvs-serv3193/core/util
Modified Files:
Fields.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/core/util
Index: Fields.java
===
RCS file: /var/cvs/src/org/mmbase/core/util/Fields.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Fields.java 24 Apr 2009 15:19:19 - 1.16
+++ Fields.java 29 Apr 2009 07:39:07 - 1.17
@@ -61,7 +61,7 @@
return new org.mmbase.module.corebuilders.FieldDefs(name, type,
listItemType, state, dataType);
}
/**
- * Defaulting version of {...@link #createField(name, int int, int,
DataType)} (no list item type,
+ * Defaulting version of {...@link #createField(String, int int, int,
DataType)} (no list item type,
* because it is nearly always irrelevant).
* @since MMBase-1.9
*/
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge/util DataTypeField.java NodeMap.java
Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv3193/bridge/util
Modified Files:
DataTypeField.java NodeMap.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util
Index: DataTypeField.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/util/DataTypeField.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- DataTypeField.java 22 Dec 2008 14:53:52 - 1.11
+++ DataTypeField.java 29 Apr 2009 07:39:07 - 1.12
@@ -20,14 +20,14 @@
/**
* Wraps a DataType object into a (virtual) Field object. It can be
instantiated with {...@link
* #DataTypeField(Cloud, DataType)} to have a 'virtual field with a Virtual
NodeManager with only one field
- * (itself). The constructor {...@link DataTypeField(Field, DataType)},
produces a new field object,
+ * (itself). The constructor {...@link #DataTypeField(Field, DataType)},
produces a new field object,
* that is very similar to the one wrapped, only with a different {...@link
DataType}.
*
* This also a way to associate a Cloud object with a DataType (it is actually
possible to see that
* as the essence of being a {...@link org.mmbase.bridge.Field}).
*
* @author Michiel Meeuwissen
- * @version $Id: DataTypeField.java,v 1.11 2008/12/22 14:53:52 michiel Exp $
+ * @version $Id: DataTypeField.java,v 1.12 2009/04/29 07:39:07 michiel Exp $
* @since MMBase-1.8.7
*/
Index: NodeMap.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/util/NodeMap.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NodeMap.java4 Sep 2008 06:54:27 - 1.5
+++ NodeMap.java29 Apr 2009 07:39:07 - 1.6
@@ -15,13 +15,13 @@
import org.mmbase.bridge.*;
/**
- * A {...@link java.util.Map} representing a Node. This class can be used if
you need a bridge {...@org.mmbase.bridge.node} object to look like a
+ * A {...@link java.util.Map} representing a Node. This class can be used if
you need a bridge {...@link org.mmbase.bridge.Node} object to look like a
* {...@link java.util.Map} (where the keys are the fields). Don't confuse
this with {...@link MapNode}.
*
* This object is also still a Node object.
*
* @author Michiel Meeuwissen
- * @version $Id: NodeMap.java,v 1.5 2008/09/04 06:54:27 michiel Exp $
+ * @version $Id: NodeMap.java,v 1.6 2009/04/29 07:39:07 michiel Exp $
* @since MMBase-1.8
*/
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/transformers TransformingReader.java
Update of /var/cvs/src/org/mmbase/util/transformers
In directory james.mmbase.org:/tmp/cvs-serv3193/util/transformers
Modified Files:
TransformingReader.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/transformers
Index: TransformingReader.java
===
RCS file: /var/cvs/src/org/mmbase/util/transformers/TransformingReader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- TransformingReader.java 23 Mar 2007 14:04:55 - 1.7
+++ TransformingReader.java 29 Apr 2009 07:39:08 - 1.8
@@ -64,6 +64,7 @@
}
+@Override
public synchronized int read() throws IOException {
int result = super.read();
if (result == -1) { // nothing to read any more, wait until
transformation is ready.
@@ -73,6 +74,7 @@
return result;
}
+@Override
public synchronized int read(char cbuf[], int off, int len) throws
IOException {
int result = super.read(cbuf, off, len);
if (result == -1) {
@@ -101,8 +103,9 @@
/**
* {...@inheritdoc}
- * ALso closes the wrapped Reader.
+ * Also closes the wrapped Reader.
*/
+@Override
public void close() throws IOException {
super.close();
in.close();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/logging ChainedLogger.java LoggerAccepter.java
Update of /var/cvs/src/org/mmbase/util/logging
In directory james.mmbase.org:/tmp/cvs-serv3193/util/logging
Modified Files:
ChainedLogger.java LoggerAccepter.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/logging
Index: ChainedLogger.java
===
RCS file: /var/cvs/src/org/mmbase/util/logging/ChainedLogger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ChainedLogger.java 27 Apr 2009 12:03:59 - 1.2
+++ ChainedLogger.java 29 Apr 2009 07:39:08 - 1.3
@@ -15,11 +15,11 @@
import java.util.concurrent.*;
/**
- * Straight forward implemented which simply delegated every log-statement to
a list of other other loggers.
+ * Straight forward implemented which simply delegates every log-statement to
a list of other other loggers.
*
* @author Michiel Meeuwissen
* @since MMBase-1.9.1
- * @version $Id: ChainedLogger.java,v 1.2 2009/04/27 12:03:59 michiel Exp $
+ * @version $Id: ChainedLogger.java,v 1.3 2009/04/29 07:39:08 michiel Exp $
*/
public class ChainedLogger implements Logger {
Index: LoggerAccepter.java
===
RCS file: /var/cvs/src/org/mmbase/util/logging/LoggerAccepter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- LoggerAccepter.java 27 Apr 2009 12:03:59 - 1.2
+++ LoggerAccepter.java 29 Apr 2009 07:39:08 - 1.3
@@ -14,14 +14,14 @@
import java.util.*;
/**
- * A LoggerAccepter is a class with a public 'addLogger' method. The class can
log things to that
- * which may be of interest to the caller of that method.
+ * A LoggerAccepter is a class with a public 'addLogger' method. The class can
log things to the as
+ * such provided {...@link Logger}'s which may be of interest to the caller of
that method.
- * It may well be implemented using {...@ling ChainedLogger}.
+ * It may well be implemented using {...@link ChainedLogger}.
*
* @author Michiel Meeuwissen
* @since MMBase-1.9.1
- * @version $Id: LoggerAccepter.java,v 1.2 2009/04/27 12:03:59 michiel Exp $
+ * @version $Id: LoggerAccepter.java,v 1.3 2009/04/29 07:39:08 michiel Exp $
*/
public interface LoggerAccepter {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/core AbstractDescriptor.java CoreField.java
Update of /var/cvs/src/org/mmbase/core
In directory james.mmbase.org:/tmp/cvs-serv3193/core
Modified Files:
AbstractDescriptor.java CoreField.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/core
Index: AbstractDescriptor.java
===
RCS file: /var/cvs/src/org/mmbase/core/AbstractDescriptor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- AbstractDescriptor.java 27 Aug 2008 17:09:39 - 1.13
+++ AbstractDescriptor.java 29 Apr 2009 07:39:07 - 1.14
@@ -20,7 +20,7 @@
*
* @author Pierre van Rooden
* @since MMBase-1.8
- * @version $Id: AbstractDescriptor.java,v 1.13 2008/08/27 17:09:39 michiel
Exp $
+ * @version $Id: AbstractDescriptor.java,v 1.14 2009/04/29 07:39:07 michiel
Exp $
*/
abstract public class AbstractDescriptor implements Descriptor,
PublicCloneableAbstractDescriptor {
Index: CoreField.java
===
RCS file: /var/cvs/src/org/mmbase/core/CoreField.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- CoreField.java 3 Jan 2009 10:17:24 - 1.35
+++ CoreField.java 29 Apr 2009 07:39:07 - 1.36
@@ -296,7 +296,7 @@
/**
* Finishes this encapsulated DataType with current field.
- * @throw IllegalStateException If the datatype is already finished
+ * @throws IllegalStateException If the datatype is already finished
*/
public void finish() {
if (dataType.isFinished()) throw new IllegalStateException(The
datatype + dataType + is already finished);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util CSVReader.java LocalHttpServletRequest.java LocalizedString.java MultiPartFormOutputStream.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv3193/util
Modified Files:
CSVReader.java LocalHttpServletRequest.java
LocalizedString.java MultiPartFormOutputStream.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: CSVReader.java
===
RCS file: /var/cvs/src/org/mmbase/util/CSVReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CSVReader.java 13 Jan 2009 10:20:26 - 1.4
+++ CSVReader.java 29 Apr 2009 07:39:08 - 1.5
@@ -28,7 +28,7 @@
* @todo Test-cases?
*
* @author Andr\U00e9 vanToly lt;an...@toly.nlgt;
- * @version $Id: CSVReader.java,v 1.4 2009/01/13 10:20:26 michiel Exp $
+ * @version $Id: CSVReader.java,v 1.5 2009/04/29 07:39:08 michiel Exp $
*/
public class CSVReader {
@@ -110,8 +110,8 @@
/**
* Returns the element at the given row and column.
- * @param row the element row
- * @param col the element column
+ * @param r the element row
+ * @param c the element column
* @return the element as a String.
*/
public String getElement(int r, int c) {
Index: LocalHttpServletRequest.java
===
RCS file: /var/cvs/src/org/mmbase/util/LocalHttpServletRequest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- LocalHttpServletRequest.java27 Jan 2009 18:16:55 - 1.2
+++ LocalHttpServletRequest.java29 Apr 2009 07:39:08 - 1.3
@@ -16,11 +16,11 @@
/**
- * This class (and ({...@link LocalHttpServletResponse}, and super classes))
can be use to do requests on
- * the current MMBase without having an actual client, which can be usefull in
cronjobs or so.
+ * This class (and {...@link LocalHttpServletResponse}, and super classes) can
be used to do requests on
+ * the current MMBase without having an actual client, which can be useful in
cronjobs or so.
*
* This is possible because the {...@link javax.servlet.ServetContext} is
known via {...@link
- * org.mmbase.module.core.MMBaseContext#getServletContext}.
+ * org.mmbase.module.core.MMBaseContext#getServletContext()}.
* For example
pre
ServletContext sx = MMBaseContext.getServletContext();
@@ -34,7 +34,7 @@
/pre
*
* @author Michiel Meeuwissen
- * @version $Id: LocalHttpServletRequest.java,v 1.2 2009/01/27 18:16:55
michiel Exp $
+ * @version $Id: LocalHttpServletRequest.java,v 1.3 2009/04/29 07:39:08
michiel Exp $
* @since MMBase-1.9.1
*/
public class LocalHttpServletRequest extends LocalServletRequest implements
HttpServletRequest {
@@ -47,7 +47,7 @@
private final String path;
/**
- * @param s The servlet context. Try {...@link
MMBaseContext.getServletContext()}
+ * @param s The servlet context. Try {...@link
org.mmbase.module.core.MMBaseContext#getServletContext()}
* @param r The body of the request. Normally an empty string
* @param path The ServletPath the do the request on
*/
Index: LocalizedString.java
===
RCS file: /var/cvs/src/org/mmbase/util/LocalizedString.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- LocalizedString.java28 Apr 2009 06:31:22 - 1.38
+++ LocalizedString.java29 Apr 2009 07:39:08 - 1.39
@@ -32,7 +32,7 @@
*/p
*
* @author Michiel Meeuwissen
- * @version $Id: LocalizedString.java,v 1.38 2009/04/28 06:31:22 michiel Exp $
+ * @version $Id: LocalizedString.java,v 1.39 2009/04/29 07:39:08 michiel Exp $
* @since MMBase-1.8
*/
public class LocalizedString implements java.io.Serializable,
PublicCloneableLocalizedString {
@@ -231,10 +231,14 @@
*
* For LocalizedString this returns the String for the default Locale (see
{...@link #getDefault}).
*/
+@Override
public String toString() {
return get((Locale) null);
}
+public String getDebugString() {
+return k: + getKey() + values: + getValues() + b: +
getBundle();
+}
/**
* This utility takes care of reading the xml:lang attribute from an
element
@@ -426,7 +430,7 @@
}
}
-@Overrde
+@Override
public boolean equals(Object o) {
if (o instanceof LocalizedString) {
LocalizedString os = (LocalizedString) o;
Index: MultiPartFormOutputStream.java
===
RCS file: /var/cvs/src/org/mmbase/util/MultiPartFormOutputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MultiPartFormOutputStream.java 28 Apr 2009 17:53:34 - 1.1
+++ MultiPartFormOutputStream.java 29 Apr 2009 07:39:08 - 1.2
@@ -8,7 +8,7 @@
* multipart/form-data to a
[MMBASE CVS] src/org/mmbase/security ActionRepository.java
Update of /var/cvs/src/org/mmbase/security
In directory james.mmbase.org:/tmp/cvs-serv3193/security
Modified Files:
ActionRepository.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/security
Index: ActionRepository.java
===
RCS file: /var/cvs/src/org/mmbase/security/ActionRepository.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ActionRepository.java 1 Oct 2008 16:57:21 - 1.10
+++ ActionRepository.java 29 Apr 2009 07:39:07 - 1.11
@@ -13,12 +13,12 @@
/**
* The defined 'actions' are maintained by the 'action' repository. The
security implementation can
* decide how to persist actions and how to connect rights to it. Every action
is identified by two
- * string; a emnamespace/em (which may be codenull/codeand its name.
Namespaces are likely to correspond with {...@link
+ * strings: a emnamespace/em (which may be codenull/code) and it's
name. Namespaces are likely to correspond with {...@link
* org.mmbase.framework.Component}s.
*
* @see Action
* @author Michiel Meeuwissen
- * @version $Id: ActionRepository.java,v 1.10 2008/10/01 16:57:21 michiel Exp $
+ * @version $Id: ActionRepository.java,v 1.11 2009/04/29 07:39:07 michiel Exp $
* @since MMBase-1.9
*/
public abstract class ActionRepository extends Configurable {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes/handlers Handler.java
Update of /var/cvs/src/org/mmbase/datatypes/handlers
In directory james.mmbase.org:/tmp/cvs-serv3193/datatypes/handlers
Modified Files:
Handler.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes/handlers
Index: Handler.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/handlers/Handler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Handler.java28 Jul 2008 16:47:31 - 1.3
+++ Handler.java29 Apr 2009 07:39:07 - 1.4
@@ -19,8 +19,9 @@
* post and things like that.
*
* @author Michiel Meeuwissen
- * @version $Id: Handler.java,v 1.3 2008/07/28 16:47:31 michiel Exp $
+ * @version $Id: Handler.java,v 1.4 2009/04/29 07:39:07 michiel Exp $
* @since MMBase-1.9.1
+ * @see org.mmbase.datatypes.handlers
*/
public interface HandlerC extends java.io.Serializable {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes/handlers/html BinaryHandler.java TextHandler.java
Update of /var/cvs/src/org/mmbase/datatypes/handlers/html
In directory james.mmbase.org:/tmp/cvs-serv3193/datatypes/handlers/html
Modified Files:
BinaryHandler.java TextHandler.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes/handlers/html
Index: BinaryHandler.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/handlers/html/BinaryHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- BinaryHandler.java 24 Apr 2009 15:10:10 - 1.5
+++ BinaryHandler.java 29 Apr 2009 07:39:07 - 1.6
@@ -22,7 +22,7 @@
* 'input' tag with type 'file'.
*
* @author Michiel Meeuwissen
- * @version $Id: BinaryHandler.java,v 1.5 2009/04/24 15:10:10 michiel Exp $
+ * @version $Id: BinaryHandler.java,v 1.6 2009/04/29 07:39:07 michiel Exp $
* @since MMBase-1.9.1
*/
@@ -32,7 +32,7 @@
/**
* IF this is set it true the value is not set with {...@link
Node#setValue} but with {...@link
- * Node#setInputStreamValue}. The effect of this is that the method
{...@link DataType#cast} is
+ * Node#setInputStreamValue}. The effect of this is that the method
{...@link org.mmbase.datatypes.DataType#cast} is
* avoided. This may be useful if the set-processor expects an
InputStream, and not a
* byte-array (or another type if this Handler is used on a non-binary
field).
*/
Index: TextHandler.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/handlers/html/TextHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- TextHandler.java17 Apr 2009 17:38:13 - 1.3
+++ TextHandler.java29 Apr 2009 07:39:07 - 1.4
@@ -18,15 +18,13 @@
* The most basic HtmlHandler simply produces an input tag with the type
'text'.
*
* @author Michiel Meeuwissen
- * @version $Id: TextHandler.java,v 1.3 2009/04/17 17:38:13 michiel Exp $
+ * @version $Id: TextHandler.java,v 1.4 2009/04/29 07:39:07 michiel Exp $
* @since MMBase-1.9.1
*/
public class TextHandler extends HtmlHandler {
-/**
- * @see TypeHandler#htmlInput(Node, Field, boolean)
- */
+
@Override
public String input(Request request, Node node, Field field, boolean
search) {
StringBuilder show = new StringBuilder(input type=\text\
class=\small );
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/servlet MMBaseServlet.java
Update of /var/cvs/src/org/mmbase/servlet In directory james.mmbase.org:/tmp/cvs-serv3193/servlet Modified Files: MMBaseServlet.java Log Message: javadoc See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/servlet Index: MMBaseServlet.java === RCS file: /var/cvs/src/org/mmbase/servlet/MMBaseServlet.java,v retrieving revision 1.71 retrieving revision 1.72 diff -u -b -r1.71 -r1.72 --- MMBaseServlet.java 28 Nov 2007 17:10:04 - 1.71 +++ MMBaseServlet.java 29 Apr 2009 07:39:07 - 1.72 @@ -37,7 +37,7 @@ * store a MMBase instance for all its descendants, but it can also be used as a serlvet itself, to * show MMBase version information. * - * @version $Id: MMBaseServlet.java,v 1.71 2007/11/28 17:10:04 michiel Exp $ + * @version $Id: MMBaseServlet.java,v 1.72 2009/04/29 07:39:07 michiel Exp $ * @author Michiel Meeuwissen * @since MMBase-1.6 */ @@ -553,7 +553,6 @@ * Increase the reference count of the servlet (for debugging) * and send running servlets to log once every 32 requests * @param req The HttpServletRequest. - * @scope private * @bad-constant 31 should be configurable. */ ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/storage/search FieldValueInQueryConstraint.java
Update of /var/cvs/src/org/mmbase/storage/search
In directory james.mmbase.org:/tmp/cvs-serv3193/storage/search
Modified Files:
FieldValueInQueryConstraint.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/search
Index: FieldValueInQueryConstraint.java
===
RCS file:
/var/cvs/src/org/mmbase/storage/search/FieldValueInQueryConstraint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- FieldValueInQueryConstraint.java25 Nov 2008 12:52:18 - 1.1
+++ FieldValueInQueryConstraint.java29 Apr 2009 07:39:07 - 1.2
@@ -18,7 +18,7 @@
* /p
*
* @author Michiel Meeuwissen
- * @version $Id: FieldValueInQueryConstraint.java,v 1.1 2008/11/25 12:52:18
michiel Exp $
+ * @version $Id: FieldValueInQueryConstraint.java,v 1.2 2009/04/29 07:39:07
michiel Exp $
* @since MMBase-1.9.1
*/
public interface FieldValueInQueryConstraint extends FieldConstraint {
@@ -39,7 +39,7 @@
* liemlt;casesensitivegt;/em is the value returned by
* {...@link FieldConstraint#isCaseSensitive isCaseSensitive()}
* liemlt;valuesgt;/em is the values returned by
- * {...@link #getValues getValues()}
+ * {...@link #getInQuery toString()}
* /ul
*
* @return A string representation of this FieldValueInConstraint.
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes DecimalDataType.java
Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv3193/datatypes
Modified Files:
DecimalDataType.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes
Index: DecimalDataType.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/DecimalDataType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- DecimalDataType.java4 Mar 2009 17:45:21 - 1.6
+++ DecimalDataType.java29 Apr 2009 07:39:07 - 1.7
@@ -36,7 +36,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: DecimalDataType.java,v 1.6 2009/03/04 17:45:21 michiel Exp $
+ * @version $Id: DecimalDataType.java,v 1.7 2009/04/29 07:39:07 michiel Exp $
* @since MMBase-1.9.1
*/
public class DecimalDataType extends NumberDataTypeBigDecimal implements
LengthDataTypeBigDecimal {
@@ -50,9 +50,7 @@
private RoundingMode roundingMode = RoundingMode.UNNECESSARY;
-/**
- * @param primitive indicate if a primitive type should be used
- */
+
public DecimalDataType(String name) {
super(name, BigDecimal.class);
setMin(null, false);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets RelatedContentPortlet.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv3677/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Modified Files:
RelatedContentPortlet.java
Log Message:
CMSC-1167 Add Click to page option to the RelatedContentPortlet
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1167
Index: RelatedContentPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- RelatedContentPortlet.java 12 Jun 2008 15:38:15 - 1.9
+++ RelatedContentPortlet.java 29 Apr 2009 07:48:14 - 1.10
@@ -8,6 +8,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.portlet.ActionRequest;
import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -19,20 +20,29 @@
import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.beans.om.Page;
import com.finalist.cmsc.beans.om.Portlet;
-import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
public class RelatedContentPortlet extends AbstractContentPortlet {
+ protected static final String RELATED_PAGE = relatedPage;
+ protected static final String RELATED_WINDOW = relatedWindow;
+
/**
* This regex pattern is used to match the elementId from a contentURL.
*/
private static final String CONTENTURL_ELEMENTID_PATTERN =
/content/([0-9]+);
@Override
+ protected void saveParameters(ActionRequest request, String portletId) {
+ setPortletParameter(portletId, RELATED_PAGE,
request.getParameter(RELATED_PAGE));
+ setPortletParameter(portletId, RELATED_WINDOW,
request.getParameter(RELATED_WINDOW));
+ }
+
+ @Override
protected void doView(RenderRequest req, RenderResponse res) throws
PortletException, IOException {
- String window = req.getPreferences().getValue(WINDOW, null);
- String elementId = getRelatedElementId(req, window);
+ String relatedPage = req.getPreferences().getValue(RELATED_PAGE, null);
+ String relatedWindow = req.getPreferences().getValue(RELATED_WINDOW,
null);
+ String elementId = getRelatedElementId(req, relatedPage, relatedWindow);
if (StringUtils.isNotEmpty(elementId)) {
setAttribute(req, ELEMENT_ID, elementId);
@@ -42,14 +52,16 @@
@Override
protected void doEditDefaults(RenderRequest req, RenderResponse res) throws
IOException, PortletException {
- Integer pageid = getCurrentPageId(req);
+ String relatedPage = req.getPreferences().getValue(RELATED_PAGE, null);
+ if (StringUtils.isNotEmpty(relatedPage)) {
+ Integer pageid = Integer.valueOf(relatedPage);
String pagepath = SiteManagement.getPath(pageid, true);
-
if (pagepath != null) {
- SetString positions =
SiteManagement.getPagePositions(pageid.toString());
+SetString positions =
SiteManagement.getPagePositions(relatedPage);
ListString orderedPositions = new ArrayListString(positions);
Collections.sort(orderedPositions);
- setAttribute(req, pagepositions, new
ArrayListString(orderedPositions));
+setAttribute(req, relatedpagepositions, new
ArrayListString(orderedPositions));
+ }
}
super.doEditDefaults(req, res);
}
@@ -59,7 +71,6 @@
* tries to retrieve the element in the following order:
*
* ol
-* liFrom the parameter of the current request/li
* liFrom contentelement node parameter of the specified portlet/li
* liFrom a given contentURL (assumes that the elementId we want is
* exactly that elementId)/li
@@ -69,48 +80,31 @@
*
* @param request
* the render request
-* @param window
-* the specified window (might be codenull/code)
+*...@param relatedPage
+* the related page (might be codenull/code)
+* @param relatedWindow
+* the related window (might be codenull/code)
* @return elementId if an elementId could be found, codenull/code
* otherwise.
*/
- protected String getRelatedElementId(RenderRequest request, String window) {
+ protected String getRelatedElementId(RenderRequest request, String
relatedPage, String relatedWindow) {
String elementId = null;
- if (StringUtils.isNotEmpty(window)) {
- elementId = getElementIdFromRequestParameters(request, window);
- if (StringUtils.isEmpty(elementId)) {
-elementId = getElementIdFromScreen(request, window);
+ if (StringUtils.isNotEmpty(relatedPage)
[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets RelatedContentPortlet_zh.properties RelatedContentPortlet_nl.properties RelatedContentPortlet.properties
Update of /var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets In directory james.mmbase.org:/tmp/cvs-serv3731/cmsc/portlets/resources/com/finalist/cmsc/portlets Modified Files: RelatedContentPortlet_zh.properties RelatedContentPortlet_nl.properties RelatedContentPortlet.properties Log Message: CMSC-1167 Add Click to page option to the RelatedContentPortlet See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets See also: http://www.mmbase.org/jira/browse/CMSC-1167 Index: RelatedContentPortlet_zh.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets/RelatedContentPortlet_zh.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- RelatedContentPortlet_zh.properties 25 Jan 2009 15:30:34 - 1.3 +++ RelatedContentPortlet_zh.properties 29 Apr 2009 07:50:37 - 1.4 @@ -7,8 +7,15 @@ edit_defaults.title=设å®å ³èçå 容 edit_defaults.view=æ¥ç + +edit_defaults.relateportlet=å ³èportlet设置 +edit_defaults.erase=å é¤ +edit_defaults.page=é¡µé¢ +edit_defaults.pageselect=éæ© edit_defaults.window=Portlet +edit_defaults.clickpage=页é¢å±æ§è®¾ç½® + edit_defaults.yes=ç¡®å® edit_defaults.no=åæ¶ Index: RelatedContentPortlet_nl.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets/RelatedContentPortlet_nl.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- RelatedContentPortlet_nl.properties 30 Jan 2009 15:20:07 - 1.4 +++ RelatedContentPortlet_nl.properties 29 Apr 2009 07:50:37 - 1.5 @@ -8,7 +8,12 @@ edit_defaults.title=Instelling voor gerelateerde content edit_defaults.view=View +edit_defaults.relateportlet=Relate to portlet settings +edit_defaults.erase=Wis +edit_defaults.page=Pagina +edit_defaults.pageselect=Selecteer edit_defaults.window=Portlet + edit_defaults.clickpage=Doorklik instellingen edit_defaults.yes=Ja Index: RelatedContentPortlet.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets/RelatedContentPortlet.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- RelatedContentPortlet.properties25 Jan 2009 15:30:34 - 1.2 +++ RelatedContentPortlet.properties29 Apr 2009 07:50:37 - 1.3 @@ -7,8 +7,15 @@ edit_defaults.title=Settings for related content edit_defaults.view=View + +edit_defaults.relateportlet=Relate to portlet settings +edit_defaults.erase=Erase +edit_defaults.page=Page +edit_defaults.pageselect=Select edit_defaults.window=Portlet +edit_defaults.clickpage=Click to page settings + edit_defaults.yes=Yes edit_defaults.no=No ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults RelatedContent.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults
In directory
james.mmbase.org:/tmp/cvs-serv3759/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults
Modified Files:
RelatedContent.jsp
Log Message:
CMSC-1167 Add Click to page option to the RelatedContentPortlet
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults
See also: http://www.mmbase.org/jira/browse/CMSC-1167
Index: RelatedContent.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- RelatedContent.jsp 25 Jan 2009 15:30:34 - 1.4
+++ RelatedContent.jsp 29 Apr 2009 07:51:05 - 1.5
@@ -11,16 +11,8 @@
%-- View selector --%
c:import url=sections/viewselector.jsp /
- tr
- td colspan=2fmt:message
key=edit_defaults.window /:/td
- td
- cmsc:select var=window
- c:forEach var=position
items=${pagepositions}
- cmsc:option
value=${position} /
- /c:forEach
- /cmsc:select
- /td
- /tr
+ %-- Relate to portlet options --%
+ c:import url=sections/relatetoportlet.jsp /
%-- Save button --%
c:import url=sections/savebutton.jsp /
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections relatetoportlet.jsp globals.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections
In directory
james.mmbase.org:/tmp/cvs-serv3759/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections
Modified Files:
globals.jsp
Added Files:
relatetoportlet.jsp
Log Message:
CMSC-1167 Add Click to page option to the RelatedContentPortlet
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections
See also: http://www.mmbase.org/jira/browse/CMSC-1167
relatetoportlet.jsp is new
Index: globals.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/globals.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- globals.jsp 23 Jan 2009 09:51:37 - 1.1
+++ globals.jsp 29 Apr 2009 07:51:05 - 1.2
@@ -21,6 +21,20 @@
}
}
+ function selectRelatedpage(relatedPage, relatedPagepath, positions) {
+ document.forms['portlet:namespace /form'].relatedPage.value =
relatedPage;
+ document.forms['portlet:namespace /form'].relatedPagepath.value =
relatedPagepath;
+
+ var selectWindow = document.forms['portlet:namespace
/form'].relatedWindow;
+ for (var i = selectWindow.options.length -1 ; i =0 ; i--) {
+ selectWindow.options[i] = null;
+ }
+ for (var i = 0 ; i positions.length ; i++) {
+ var position = positions[i];
+ selectWindow.options[selectWindow.options.length] = new
Option(position, position);
+ }
+ }
+
function erase(field) {
document.forms['portlet:namespace /form'][field].value = '';
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select selectedpage.jsp selectorpopup.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select
In directory
james.mmbase.org:/tmp/cvs-serv3805/cmsc/sitemanagement/src/webapp/editors/site/select
Modified Files:
selectedpage.jsp selectorpopup.jsp
Log Message:
CMSC-1167 Add Click to page option to the RelatedContentPortlet
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select
See also: http://www.mmbase.org/jira/browse/CMSC-1167
Index: selectedpage.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select/selectedpage.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- selectedpage.jsp5 Sep 2006 11:46:43 - 1.2
+++ selectedpage.jsp29 Apr 2009 07:51:16 - 1.3
@@ -1,6 +1,7 @@
%...@page import=com.finalist.cmsc.services.sitemanagement.SiteManagement %
%...@page import=java.util.ArrayList,java.util.Collections %
%
+String related = request.getParameter(related);
String pageParam = request.getParameter(page);
String path = request.getParameter(path);
ArrayListString positions = new
ArrayListString(SiteManagement.getPagePositions(pageParam));
@@ -11,6 +12,10 @@
% for (String name : positions) { %
positions[positions.length] = '%= name %';
% } %
+ % if (related!=null true.equals(related)) { %
+ opener.selectRelatedpage('%= pageParam %', '%= path %', positions);
+ % } else { %
opener.selectPage('%= pageParam %', '%= path %', positions);
+ % } %
close();
/script
Index: selectorpopup.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select/selectorpopup.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- selectorpopup.jsp 1 Apr 2009 09:15:16 - 1.6
+++ selectorpopup.jsp 29 Apr 2009 07:51:16 - 1.7
@@ -5,6 +5,9 @@
!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
html:html xhtml=true
c:set var=treeUrlmm:url page=SelectorPage.do//c:set
+c:if test=${param.related eq true}
+ c:set var=treeUrlmm:url page=SelectorRelatedpage.do//c:set
+/c:if
c:if test=${not empty param.type}
c:set var=treeUrlmm:url
page=${param.type}.do?method=${param.method}//c:set
/c:if
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF struts-site.xml
Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF
In directory
james.mmbase.org:/tmp/cvs-serv3805/cmsc/sitemanagement/src/webapp/WEB-INF
Modified Files:
struts-site.xml
Log Message:
CMSC-1167 Add Click to page option to the RelatedContentPortlet
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF
See also: http://www.mmbase.org/jira/browse/CMSC-1167
Index: struts-site.xml
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF/struts-site.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- struts-site.xml 25 Mar 2009 08:20:05 - 1.11
+++ struts-site.xml 29 Apr 2009 07:51:16 - 1.12
@@ -105,6 +105,12 @@
set-property property=strictPageOnly value=true /
forward name=success
path=/editors/site/select/selectorpopup.jsp redirect=false/
/action
+action path=/editors/site/select/SelectorRelatedpage
type=com.finalist.cmsc.navigation.select.forms.SelectorAction
+unknown=false
className=com.finalist.cmsc.navigation.select.forms.SelectorPageActionMapping
+set-property property=linkPattern
value=selectedpage.jsp?page={0}amp;path={1}amp;related=true/
+set-property property=strictPageOnly value=true /
+forward name=success
path=/editors/site/select/selectorpopup.jsp?related=true redirect=false/
+/action
!-- Security role management --
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet TagRelatedPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
In directory
james.mmbase.org:/tmp/cvs-serv3840/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
Modified Files:
TagRelatedPortlet.java
Log Message:
CMSC-1167 Add Click to page option to the RelatedContentPortlet
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
See also: http://www.mmbase.org/jira/browse/CMSC-1167
Index: TagRelatedPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- TagRelatedPortlet.java 7 Oct 2008 12:05:00 - 1.5
+++ TagRelatedPortlet.java 29 Apr 2009 07:51:31 - 1.6
@@ -12,9 +12,6 @@
import javax.portlet.PortletPreferences;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.pluto.core.impl.PortletRequestImpl;
import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.beans.om.Page;
@@ -28,14 +25,13 @@
public class TagRelatedPortlet extends RelatedContentPortlet {
- protected static final String RELATED_WINDOW = relatedWindow;
-
@Override
protected void doView(RenderRequest req, RenderResponse res)
throws PortletException, IOException {
- String window = req.getPreferences().getValue(RELATED_WINDOW,
null);
- String elementId = getRelatedElementId(req, window);
+ String relatedPage =
req.getPreferences().getValue(RELATED_PAGE, null);
+ String relatedWindow =
req.getPreferences().getValue(RELATED_WINDOW, null);
+ String elementId = getRelatedElementId(req, relatedPage,
relatedWindow);
if (elementId != null) {
req.setAttribute(elementId, elementId);
@@ -44,7 +40,7 @@
req.setAttribute(tags, tags);
}
} else {
- String channelId = getIdFromScreen(req, window,
contentchannel);
+ String channelId = getIdFromScreen(req, relatedPage,
relatedWindow, contentchannel);
if (channelId != null) {
req.setAttribute(channelId, channelId);
if(req.getAttribute(loadTags) == null ||
req.getAttribute(loadTags).equals(true)) {
@@ -52,10 +48,7 @@
req.setAttribute(tags, tags);
}
} else {
- String tag = getIdFromScreen(req, window,
tag);
- if (tag == null) {
- tag = getTagFromRequestParameters(req,
window);
- }
+ String tag = getIdFromScreen(req, relatedPage,
relatedWindow, tag);
if(tag != null) {
tag = tag.replaceAll(0x8, );
req.setAttribute(tag, tag);
@@ -70,33 +63,12 @@
super.doView(req, res);
}
- private HttpServletRequest getServletRequest(RenderRequest req) {
- return (HttpServletRequest) ((PortletRequestImpl)
req).getRequest();
- }
-
- private String getTagFromRequestParameters(RenderRequest req, String
window) {
- String requestURL =
getServletRequest(req).getRequestURL().toString();
- String paramName = /_rp_ + window + _tag/1_;
- int startIndex = requestURL.indexOf(paramName);
- if (startIndex != -1) {
- String elementId = requestURL.substring(startIndex
- + paramName.length());
- int endIndex = elementId.indexOf(/);
- if (endIndex != -1) {
- elementId = elementId.substring(0, endIndex);
- }
- return elementId;
- }
-
- return null;
- }
-
- private String getIdFromScreen(RenderRequest req, String window, String
var) {
- Integer pageId = getCurrentPageId(req);
+ private String getIdFromScreen(RenderRequest req, String relatedPage,
String relatedWindow, String var) {
+ Integer pageId = Integer.valueOf(relatedPage);
NavigationItem item = SiteManagement.getNavigationItem(pageId);
if (item instanceof Page) {
Page page = (Page) item;
-
[MMBASE CVS] applications/rmmci/assembly client.xml
Update of /var/cvs/applications/rmmci/assembly In directory james.mmbase.org:/tmp/cvs-serv5802/assembly Modified Files: client.xml Log Message: added 'ReadonlyLocalizedString' See also: http://cvs.mmbase.org/viewcvs/applications/rmmci/assembly Index: client.xml === RCS file: /var/cvs/applications/rmmci/assembly/client.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- client.xml 29 Apr 2009 07:11:09 - 1.3 +++ client.xml 29 Apr 2009 09:18:38 - 1.4 @@ -46,6 +46,7 @@ includeorg/mmbase/util/ResourceLoader*.class/include !-- well... -- includeorg/mmbase/util/ResourceWatcher*.class/include !-- -- includeorg/mmbase/util/LocalizedString.class/include !-- returned by bridge -- + includeorg/mmbase/util/ReadonlyLocalizedString.class/include includeorg/mmbase/util/ReplacingLocalizedString*.class/include !-- returned by bridge -- includeorg/mmbase/util/EncodingDetectingOutputStreamWriter.class/include !-- used by resourceloader -- includeorg/mmbase/util/FileWatcher*.class/include !-- used by resourceloader -- ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/rmmci pom.xml
Update of /var/cvs/applications/rmmci
In directory james.mmbase.org:/tmp/cvs-serv5756
Modified Files:
pom.xml
Log Message:
didn't compile any more
See also: http://cvs.mmbase.org/viewcvs/applications/rmmci
Index: pom.xml
===
RCS file: /var/cvs/applications/rmmci/pom.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- pom.xml 29 Apr 2009 07:10:54 - 1.4
+++ pom.xml 29 Apr 2009 09:18:24 - 1.5
@@ -94,6 +94,14 @@
/plugins
/build
+ dependencies
+dependency
+ groupIdjavax.servlet/groupId
+ artifactIdservlet-api/artifactId
+ version${servlet.version}/version
+ scopeprovided/scope
+/dependency
+ /dependencies
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/rmmci/assembly client.xml
Update of /var/cvs/applications/rmmci/assembly In directory james.mmbase.org:/tmp/cvs-serv6551 Modified Files: client.xml Log Message: See also: http://cvs.mmbase.org/viewcvs/applications/rmmci/assembly Index: client.xml === RCS file: /var/cvs/applications/rmmci/assembly/client.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- client.xml 29 Apr 2009 09:18:38 - 1.4 +++ client.xml 29 Apr 2009 09:56:50 - 1.5 @@ -71,6 +71,7 @@ includeorg/mmbase/util/PublicCloneable*/include !-- used by SortedBundle, but is generic tool-- includeorg/mmbase/util/StringSplitter*/include !-- used by Queries-- includeorg/mmbase/util/SerializableInputStream*/include !-- Representation of binaries-- + includeorg/mmbase/util/ThreadPools*/include!-- Representation of binaries-- includeorg/mmbase/storage/Storable.class/include !-- DataTypes uses .. -- includeorg/mmbase/storage/StorageException.class/include !-- -- ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util Casting.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv6613
Modified Files:
Casting.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: Casting.java
===
RCS file: /var/cvs/src/org/mmbase/util/Casting.java,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- Casting.java25 Apr 2009 06:50:53 - 1.132
+++ Casting.java29 Apr 2009 09:58:07 - 1.133
@@ -10,15 +10,6 @@
package org.mmbase.util;
-/**
- * Collects MMBase specific 'cast' information, as static to... functions.
This is used (and used to
- * be implemented) in MMObjectNode. But this functionality is more generic to
MMbase.
- *
- * @author Michiel Meeuwissen
- * @since MMBase-1.6
- * @version $Id: Casting.java,v 1.132 2009/04/25 06:50:53 michiel Exp $
- */
-
import java.util.*;
import java.text.*;
import java.io.*;
@@ -39,6 +30,17 @@
import org.apache.commons.fileupload.FileItem;
+
+/**
+ * Collects MMBase specific 'cast' information, as static to... functions.
This is used (and used to
+ * be implemented) in MMObjectNode. But this functionality is more generic to
MMbase.
+ *
+ * @author Michiel Meeuwissen
+ * @since MMBase-1.6
+ * @version $Id: Casting.java,v 1.133 2009/04/29 09:58:07 michiel Exp $
+ */
+
+
public class Casting {
private static final Logger log = Logging.getLoggerInstance(Casting.class);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Customer Receipt/Purchase Confirmation
Unsubscribe | Your Privacy Rights 2008 Rodale Inc., all rights reserved.Customer Service Department, 33 East Minor Street, Emmaus, PA 18098 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect LanguageRedirectUtil.java
Update of
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect
In directory
james.mmbase.org:/tmp/cvs-serv10319/language-redirect/src/java/com/finalist/cmsc/languageredirect
Modified Files:
Tag: b1_6
LanguageRedirectUtil.java
Log Message:
Catch Node not found exceptions
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect
Index: LanguageRedirectUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect/LanguageRedirectUtil.java,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -u -b -r1.5 -r1.5.6.1
--- LanguageRedirectUtil.java 30 Nov 2007 10:58:09 - 1.5
+++ LanguageRedirectUtil.java 29 Apr 2009 13:14:08 - 1.5.6.1
@@ -6,13 +6,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Field;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeIterator;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.bridge.NodeManager;
-import org.mmbase.bridge.NodeQuery;
+import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.CompositeConstraint;
import org.mmbase.storage.search.Constraint;
@@ -41,6 +35,8 @@
return null;
}
+ try {
+
// Get the node with the id given in the id parameter.
Node pageOrSiteNode = cloud.getNode(id);
NodeManager nodeManager = pageOrSiteNode.getNodeManager();
@@ -119,7 +115,10 @@
log.debug(The current node is a site(id: +
pageOrSiteNode.getNumber() + ).);
return foreignSite.getStringValue(SiteUtil.FRAGMENT_FIELD);
}
-
+ }
+ catch(NotFoundException nfe) {
+ log.debug(The node is not found ( + nfe.getMessage() + ).);
+ }
return null;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect LanguageRedirectUtil.java
Update of
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect
In directory
james.mmbase.org:/tmp/cvs-serv10347/language-redirect/src/java/com/finalist/cmsc/languageredirect
Modified Files:
LanguageRedirectUtil.java
Log Message:
Catch Node not found exceptions
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect
Index: LanguageRedirectUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect/LanguageRedirectUtil.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- LanguageRedirectUtil.java 30 Nov 2007 10:58:09 - 1.5
+++ LanguageRedirectUtil.java 29 Apr 2009 13:14:22 - 1.6
@@ -6,13 +6,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Field;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeIterator;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.bridge.NodeManager;
-import org.mmbase.bridge.NodeQuery;
+import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.CompositeConstraint;
import org.mmbase.storage.search.Constraint;
@@ -41,6 +35,8 @@
return null;
}
+ try {
+
// Get the node with the id given in the id parameter.
Node pageOrSiteNode = cloud.getNode(id);
NodeManager nodeManager = pageOrSiteNode.getNodeManager();
@@ -119,7 +115,10 @@
log.debug(The current node is a site(id: +
pageOrSiteNode.getNumber() + ).);
return foreignSite.getStringValue(SiteUtil.FRAGMENT_FIELD);
}
-
+ }
+ catch(NotFoundException nfe) {
+ log.debug(The node is not found ( + nfe.getMessage() + ).);
+ }
return null;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Order Shipped -- Order #87752
Unsubscribe | Your Privacy Rights 2008 Rodale Inc., all rights reserved.Customer Service Department, 33 East Minor Street, Emmaus, PA 18098 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Sales Order walmart.com
Unsubscribe | Your Privacy Rights 2008 Rodale Inc., all rights reserved.Customer Service Department, 33 East Minor Street, Emmaus, PA 18098 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
