You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by th...@apache.org on 2006/03/13 16:46:26 UTC
svn commit: r385576 -
/lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java
Author: thorsten
Date: Mon Mar 13 07:46:24 2006
New Revision: 385576
URL: http://svn.apache.org/viewcvs?rev=385576&view=rev
Log:
Bug 38913
WebDav module displays empty directories (collections)
Reporter: renaud richardet
Patch: Jonathan Addison
Patch applied, thx Jonathan.
Modified:
lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java
Modified: lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java?rev=385576&r1=385575&r2=385576&view=diff
==============================================================================
--- lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java (original)
+++ lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java Mon Mar 13 07:46:24 2006
@@ -122,26 +122,6 @@
checkedOut.add(entry);
else
checkedOut.add(null);
- // get additional language documents
- String[] langs = documents[i].getLanguages();
- for (int j = 0; j < langs.length; j++) {
- if (!(langs[j].equals(documents[i].getLanguage()))) {
- String url = documents[i].getCanonicalWebappURL()
- .replaceFirst(".html$", "_" + langs[j] + ".html");
- DocumentIdentifier identifier = docBuilder.getIdentitfier(url);
- Document langDoc = docBuilder.buildDocument(documents[i].getIdentityMap(),
- identifier);
- docs.add(langDoc);
-
- filename = langDoc.getFile().getCanonicalPath();
- filename = filename.substring(publicationPath.length());
- entry = rc.getRCML(filename).getLatestEntry();
- if ((entry != null) && (entry.getType() == RCML.co))
- checkedOut.add(entry);
- else
- checkedOut.add(null);
- }
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org
Re: svn commit: r385576 - /lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java
Posted by Andreas Hartmann <an...@apache.org>.
Thorsten Scherler wrote:
> El lun, 13-03-2006 a las 17:45 +0100, Andreas Hartmann escribió:
>> Hi Thorsten,
>>
>> thorsten@apache.org wrote:
>>> Author: thorsten
>>> Date: Mon Mar 13 07:46:24 2006
>>> New Revision: 385576
>>>
>>> URL: http://svn.apache.org/viewcvs?rev=385576&view=rev
>>> Log:
>>> Bug 38913
>>> WebDav module displays empty directories (collections)
>>> Reporter: renaud richardet
>>> Patch: Jonathan Addison
>>> Patch applied, thx Jonathan.
>>>
>>> Modified:
>>> lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java
>>>
>>> Modified: lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java
>>> URL: http://svn.apache.org/viewcvs/lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java?rev=385576&r1=385575&r2=385576&view=diff
>>> ==============================================================================
>>> --- lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java (original)
>>> +++ lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java Mon Mar 13 07:46:24 2006
>>> @@ -122,26 +122,6 @@
>>> checkedOut.add(entry);
>>> else
>>> checkedOut.add(null);
>>> - // get additional language documents
>>> - String[] langs = documents[i].getLanguages();
>>> - for (int j = 0; j < langs.length; j++) {
>>> - if (!(langs[j].equals(documents[i].getLanguage()))) {
>>> - String url = documents[i].getCanonicalWebappURL()
>>> - .replaceFirst(".html$", "_" + langs[j] + ".html");
>> I'm not that familiar with the WebDAV implementation, but doesn't
>> this interfere with custom DocumentBuilders?
>
> No, not as I am aware of it, since it was duplicate code which produced
> a bug in the file listing.
My bad - sorry, I just saw the lines and not the "-" signs :)
-- Andreas
--
Andreas Hartmann
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
andreas.hartmann@wyona.com andreas@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r385576 -
/lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java
Posted by Thorsten Scherler <th...@apache.org>.
El lun, 13-03-2006 a las 17:45 +0100, Andreas Hartmann escribió:
> Hi Thorsten,
>
> thorsten@apache.org wrote:
> > Author: thorsten
> > Date: Mon Mar 13 07:46:24 2006
> > New Revision: 385576
> >
> > URL: http://svn.apache.org/viewcvs?rev=385576&view=rev
> > Log:
> > Bug 38913
> > WebDav module displays empty directories (collections)
> > Reporter: renaud richardet
> > Patch: Jonathan Addison
> > Patch applied, thx Jonathan.
> >
> > Modified:
> > lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java
> >
> > Modified: lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java
> > URL: http://svn.apache.org/viewcvs/lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java?rev=385576&r1=385575&r2=385576&view=diff
> > ==============================================================================
> > --- lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java (original)
> > +++ lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java Mon Mar 13 07:46:24 2006
> > @@ -122,26 +122,6 @@
> > checkedOut.add(entry);
> > else
> > checkedOut.add(null);
> > - // get additional language documents
> > - String[] langs = documents[i].getLanguages();
> > - for (int j = 0; j < langs.length; j++) {
> > - if (!(langs[j].equals(documents[i].getLanguage()))) {
> > - String url = documents[i].getCanonicalWebappURL()
> > - .replaceFirst(".html$", "_" + langs[j] + ".html");
>
> I'm not that familiar with the WebDAV implementation, but doesn't
> this interfere with custom DocumentBuilders?
No, not as I am aware of it, since it was duplicate code which produced
a bug in the file listing.
Thx
salu2
--
thorsten
"Together we stand, divided we fall!"
Hey you (Pink Floyd)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r385576 - /lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java
Posted by Andreas Hartmann <an...@apache.org>.
Hi Thorsten,
thorsten@apache.org wrote:
> Author: thorsten
> Date: Mon Mar 13 07:46:24 2006
> New Revision: 385576
>
> URL: http://svn.apache.org/viewcvs?rev=385576&view=rev
> Log:
> Bug 38913
> WebDav module displays empty directories (collections)
> Reporter: renaud richardet
> Patch: Jonathan Addison
> Patch applied, thx Jonathan.
>
> Modified:
> lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java
>
> Modified: lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java
> URL: http://svn.apache.org/viewcvs/lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java?rev=385576&r1=385575&r2=385576&view=diff
> ==============================================================================
> --- lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java (original)
> +++ lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Propfind.java Mon Mar 13 07:46:24 2006
> @@ -122,26 +122,6 @@
> checkedOut.add(entry);
> else
> checkedOut.add(null);
> - // get additional language documents
> - String[] langs = documents[i].getLanguages();
> - for (int j = 0; j < langs.length; j++) {
> - if (!(langs[j].equals(documents[i].getLanguage()))) {
> - String url = documents[i].getCanonicalWebappURL()
> - .replaceFirst(".html$", "_" + langs[j] + ".html");
I'm not that familiar with the WebDAV implementation, but doesn't
this interfere with custom DocumentBuilders?
-- Andreas
--
Andreas Hartmann
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
andreas.hartmann@wyona.com andreas@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org