You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2005/03/29 10:08:28 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav WebdavServlet.java
luetzkendorf 2005/03/29 00:08:28
Modified: src/share/org/apache/slide/common Namespace.java
src/webdav/server/org/apache/slide/webdav WebdavServlet.java
Log:
cosmetics
Revision Changes Path
1.76 +5 -6 jakarta-slide/src/share/org/apache/slide/common/Namespace.java
Index: Namespace.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Namespace.java 28 Feb 2005 17:25:44 -0000 1.75
+++ Namespace.java 29 Mar 2005 08:08:28 -0000 1.76
@@ -854,8 +854,7 @@
getLogger().log("Finish init namespace " + getName() + " configuration",LOG_CHANNEL,Logger.INFO);
// And remove the all permission from the root node
- rootNode =
- (SubjectNode) rootUri.getStore().retrieveObject(rootUri);
+ rootNode = (SubjectNode)rootUri.getStore().retrieveObject(rootUri);
rootUri.getStore().storeObject(rootUri, rootNode);
// end transaction for temp object removal
1.68 +2 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- WebdavServlet.java 8 Nov 2004 10:12:50 -0000 1.67
+++ WebdavServlet.java 29 Mar 2005 08:08:28 -0000 1.68
@@ -226,8 +226,7 @@
// FIXME
// Lookup for the NAT using the servlet context
- token = (NamespaceAccessToken)
- getServletContext().getAttribute(ATTRIBUTE_NAME);
+ token = (NamespaceAccessToken)getServletContext().getAttribute(ATTRIBUTE_NAME);
if (token == null) {
// Dafault initialization
String namespaceName = null;
@@ -259,8 +258,7 @@
namespaceName);
}
- token = Domain.accessNamespace
- (new SecurityToken(this), namespaceName);
+ token = Domain.accessNamespace(new SecurityToken(this), namespaceName);
if (token == null) {
log("Could not access namespace " + namespaceName + ".");
throw new UnavailableException("Namespace " + namespaceName +
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav WebdavServlet.java
Posted by Karl Øie <ka...@gan.no>.
Please commit org.apache.slide.structure.StructureIterator too as i sit
here with a broken build now... in advance thanks.
Mvh Karl
On 29. mar. 2005, at 10.08, luetzkendorf@apache.org wrote:
> luetzkendorf 2005/03/29 00:08:28
>
> Modified: src/share/org/apache/slide/common Namespace.java
> src/webdav/server/org/apache/slide/webdav
> WebdavServlet.java
> Log:
> cosmetics
>
> Revision Changes Path
> 1.76 +5 -6
> jakarta-slide/src/share/org/apache/slide/common/Namespace.java
>
> Index: Namespace.java
> ===================================================================
> RCS file:
> /home/cvs/jakarta-slide/src/share/org/apache/slide/common/
> Namespace.java,v
> retrieving revision 1.75
> retrieving revision 1.76
> diff -u -r1.75 -r1.76
> --- Namespace.java 28 Feb 2005 17:25:44 -0000 1.75
> +++ Namespace.java 29 Mar 2005 08:08:28 -0000 1.76
> @@ -854,8 +854,7 @@
> getLogger().log("Finish init namespace " + getName() +
> " configuration",LOG_CHANNEL,Logger.INFO);
>
> // And remove the all permission from the root node
> - rootNode =
> - (SubjectNode)
> rootUri.getStore().retrieveObject(rootUri);
> + rootNode =
> (SubjectNode)rootUri.getStore().retrieveObject(rootUri);
> rootUri.getStore().storeObject(rootUri, rootNode);
>
> // end transaction for temp object removal
>
>
>
> 1.68 +2 -4
> jakarta-slide/src/webdav/server/org/apache/slide/webdav/
> WebdavServlet.java
>
> Index: WebdavServlet.java
> ===================================================================
> RCS file:
> /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/
> WebdavServlet.java,v
> retrieving revision 1.67
> retrieving revision 1.68
> diff -u -r1.67 -r1.68
> --- WebdavServlet.java 8 Nov 2004 10:12:50 -0000 1.67
> +++ WebdavServlet.java 29 Mar 2005 08:08:28 -0000 1.68
> @@ -226,8 +226,7 @@
> // FIXME
>
> // Lookup for the NAT using the servlet context
> - token = (NamespaceAccessToken)
> - getServletContext().getAttribute(ATTRIBUTE_NAME);
> + token =
> (NamespaceAccessToken)getServletContext().getAttribute(ATTRIBUTE_NAME);
> if (token == null) {
> // Dafault initialization
> String namespaceName = null;
> @@ -259,8 +258,7 @@
> namespaceName);
> }
>
> - token = Domain.accessNamespace
> - (new SecurityToken(this), namespaceName);
> + token = Domain.accessNamespace(new
> SecurityToken(this), namespaceName);
> if (token == null) {
> log("Could not access namespace " +
> namespaceName + ".");
> throw new UnavailableException("Namespace " +
> namespaceName +
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: slide-dev-help@jakarta.apache.org
>
>
- while (!asleep()) sheep++;
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org