You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2006/11/21 12:00:05 UTC
svn commit: r477620 - in /jackrabbit/trunk: webapp/src/main/webapp/
webapp/src/main/webapp/WEB-INF/ webapp/src/main/webapp/WEB-INF/repository/
webdav/src/main/java/org/apache/jackrabbit/webdav/
webdav/src/main/java/org/apache/jackrabbit/webdav/lock/ we...
Author: angela
Date: Tue Nov 21 03:00:04 2006
New Revision: 477620
URL: http://svn.apache.org/viewvc?view=rev&rev=477620
Log:
JCR-612 : Restructure the Jackrabbit source tree
*ups* copied outdated rev.
Modified:
jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/config.xml
jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/log4j.xml
jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/repository/log4j.properties
jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/repository/repository.xml
jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/web.xml
jackrabbit/trunk/webapp/src/main/webapp/index.jsp
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/lock/LockDiscovery.java
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package.html
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/ObservationConstants.java
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/SubscriptionDiscovery.java
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/package.html
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/ordering/package.html
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/property/package.html
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/search/package.html
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/statuscode.properties
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/transaction/package.html
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/util/package.html
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/package.html
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ExpandPropertyReport.java
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/package.html
jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/xml/package.html
Modified: jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/config.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/config.xml?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/config.xml (original)
+++ jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/config.xml Tue Nov 21 03:00:04 2006
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<!--
<!DOCTYPE config [
<!ELEMENT config (iomanager , propertymanager, (collection | noncollection)? , filter?) >
Modified: jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/log4j.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/log4j.xml?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/log4j.xml (original)
+++ jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/log4j.xml Tue Nov 21 03:00:04 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
Modified: jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/repository/log4j.properties
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/repository/log4j.properties?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/repository/log4j.properties (original)
+++ jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/repository/log4j.properties Tue Nov 21 03:00:04 2006
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# Set root logger level to DEBUG and its only appender to A1.
log4j.rootLogger=INFO, stdout
#log4j.rootLogger=DEBUG, stdout, file
Modified: jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/repository/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/repository/repository.xml?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/repository/repository.xml (original)
+++ jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/repository/repository.xml Tue Nov 21 03:00:04 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<!-- <!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "file://config.dtd"> -->
<!DOCTYPE Repository [
<!--
Modified: jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/web.xml?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ jackrabbit/trunk/webapp/src/main/webapp/WEB-INF/web.xml Tue Nov 21 03:00:04 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
<web-app>
@@ -268,4 +284,4 @@
<servlet-name>JCRWebdavServer</servlet-name>
<url-pattern>/server/*</url-pattern>
</servlet-mapping>
-</web-app>
\ No newline at end of file
+</web-app>
Modified: jackrabbit/trunk/webapp/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webapp/src/main/webapp/index.jsp?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webapp/src/main/webapp/index.jsp (original)
+++ jackrabbit/trunk/webapp/src/main/webapp/index.jsp Tue Nov 21 03:00:04 2006
@@ -2,6 +2,22 @@
org.apache.jackrabbit.j2ee.RepositoryAccessServlet,
org.apache.jackrabbit.j2ee.SimpleWebdavServlet,
javax.jcr.Repository"%><%
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
%><html>
<head>
<title>Jackrabbit JCR-Server</title>
@@ -94,4 +110,4 @@
%><hr size="1"><em>Powered by <a href="<%= rep.getDescriptor(Repository.REP_VENDOR_URL_DESC) %>"><%= rep.getDescriptor(Repository.REP_NAME_DESC)%></a> version <%= rep.getDescriptor(Repository.REP_VERSION_DESC) %>.</em>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java Tue Nov 21 03:00:04 2006
@@ -20,11 +20,12 @@
import org.apache.jackrabbit.webdav.xml.DomUtil;
import org.apache.jackrabbit.webdav.xml.ElementIterator;
import org.apache.jackrabbit.webdav.xml.XmlSerializable;
+import org.apache.commons.collections.map.LinkedMap;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
/**
* MultiStatus representing the content of a multistatus response body and
@@ -36,7 +37,7 @@
* Map collecting the responses for this multistatus, where every href must
* only occure one single time.
*/
- private HashMap responses = new HashMap();
+ private Map responses = new LinkedMap();
/**
* A general response description at the multistatus top level is used to
@@ -59,7 +60,7 @@
public void addResourceProperties(DavResource resource, DavPropertyNameSet propNameSet,
int propFindType, int depth) {
addResponse(new MultiStatusResponse(resource, propNameSet, propFindType));
- if (depth > 0) {
+ if (depth > 0 && resource.isCollection()) {
DavResourceIterator iter = resource.getMembers();
while (iter.hasNext()) {
addResourceProperties(iter.nextResource(), propNameSet, propFindType, depth-1);
@@ -95,7 +96,7 @@
*/
public void addResourceStatus(DavResource resource, int status, int depth) {
addResponse(new MultiStatusResponse(resource.getHref(), status));
- if (depth > 0) {
+ if (depth > 0 && resource.isCollection()) {
DavResourceIterator iter = resource.getMembers();
while (iter.hasNext()) {
addResourceStatus(iter.nextResource(), status, depth-1);
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/lock/LockDiscovery.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/lock/LockDiscovery.java?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/lock/LockDiscovery.java (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/lock/LockDiscovery.java Tue Nov 21 03:00:04 2006
@@ -165,7 +165,7 @@
public String getToken() {
Element ltEl = DomUtil.getChildElement(alElement, XML_LOCKTOKEN, NAMESPACE);
if (ltEl != null) {
- return DomUtil.getChildText(alElement, XML_HREF, NAMESPACE);
+ return DomUtil.getChildText(ltEl, XML_HREF, NAMESPACE);
}
return null;
}
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package.html
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package.html?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package.html (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package.html Tue Nov 21 03:00:04 2006
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<body>
Provides interfaces and classes for locking related issues.
-</body>
\ No newline at end of file
+</body>
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/ObservationConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/ObservationConstants.java?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/ObservationConstants.java (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/ObservationConstants.java Tue Nov 21 03:00:04 2006
@@ -61,6 +61,7 @@
public static final String XML_EVENTDISCOVERY = "eventdiscovery";
public static final String XML_EVENTBUNDLE = "eventbundle";
+ public static final String XML_EVENT_IS_LOCAL = "islocal";
public static final String XML_EVENT = "event";
public static final String XML_EVENTUSERID = "eventuserid";
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/SubscriptionDiscovery.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/SubscriptionDiscovery.java?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/SubscriptionDiscovery.java (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/SubscriptionDiscovery.java Tue Nov 21 03:00:04 2006
@@ -33,7 +33,7 @@
*/
public class SubscriptionDiscovery extends AbstractDavProperty {
- private Subscription[] subscriptions = new Subscription[0];
+ private final Subscription[] subscriptions;
/**
* Create a new <code>SubscriptionDiscovery</code> that lists the given
@@ -45,6 +45,8 @@
super(ObservationConstants.SUBSCRIPTIONDISCOVERY, true);
if (subscriptions != null) {
this.subscriptions = subscriptions;
+ } else {
+ this.subscriptions = new Subscription[0];
}
}
@@ -58,6 +60,8 @@
super(ObservationConstants.SUBSCRIPTIONDISCOVERY, true);
if (subscription != null) {
this.subscriptions = new Subscription[]{subscription};
+ } else {
+ this.subscriptions = new Subscription[0];
}
}
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/package.html
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/package.html?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/package.html (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/observation/package.html Tue Nov 21 03:00:04 2006
@@ -1,4 +1,20 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<body>
Contains interfaces and classes related to observation, which is not covered
by the WebDAV protocol.
-</body>
\ No newline at end of file
+</body>
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/ordering/package.html
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/ordering/package.html?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/ordering/package.html (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/ordering/package.html Tue Nov 21 03:00:04 2006
@@ -1,5 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<body>
Contains interfaces and classes used to cover the functionality defined by the
<a href="http://www.ietf.org/rfc/rfc3648.txt">RFC 3648: Web Distributed Authoring
and Versioning (WebDAV) Ordered Collections Protocol </a>.
-</body>
\ No newline at end of file
+</body>
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/property/package.html
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/property/package.html?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/property/package.html (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/property/package.html Tue Nov 21 03:00:04 2006
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<body>
Interfaces and classes related to WebDAV properties.
-</body>
\ No newline at end of file
+</body>
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/search/package.html
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/search/package.html?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/search/package.html (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/search/package.html Tue Nov 21 03:00:04 2006
@@ -1,5 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<body>
Contains interfaces and classes used to cover the functionality defined by the
<a href="http://greenbytes.de/tech/webdav/draft-reschke-webdav-search-latest.html">Internet
Draft WebDAV Search</a>.
-</body>
\ No newline at end of file
+</body>
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/statuscode.properties
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/statuscode.properties?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/statuscode.properties (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/statuscode.properties Tue Nov 21 03:00:04 2006
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
100=Continue
101=Switching Protocols
102=Processing
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/transaction/package.html
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/transaction/package.html?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/transaction/package.html (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/transaction/package.html Tue Nov 21 03:00:04 2006
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<body>
Contains interfaces and classes related to transaction locks.
-</body>
\ No newline at end of file
+</body>
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/util/package.html
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/util/package.html?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/util/package.html (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/util/package.html Tue Nov 21 03:00:04 2006
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<body>
Common utility classes.
-</body>
\ No newline at end of file
+</body>
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java Tue Nov 21 03:00:04 2006
@@ -107,12 +107,14 @@
hrefList.add(DomUtil.getText(hrefs.nextElement()));
}
source = (String[])hrefList.toArray(new String[hrefList.size()]);
+ type = UPDATE_BY_VERSION;
done = true;
}
// alternatively 'DAV:label-name' elements may be present.
if (!done && DomUtil.hasChildElement(updateElement, XML_LABEL_NAME, NAMESPACE)) {
source = new String[] {DomUtil.getChildText(updateElement, XML_LABEL_NAME, NAMESPACE)};
+ type = UPDATE_BY_LABEL;
done = true;
}
@@ -121,6 +123,7 @@
Element wspElem = DomUtil.getChildElement(updateElement, XML_WORKSPACE, NAMESPACE);
if (wspElem != null) {
source = new String[] {DomUtil.getChildTextTrim(wspElem, DavConstants.XML_HREF, DavConstants.NAMESPACE)};
+ type = UPDATE_BY_WORKSPACE;
} else {
log.warn("DAV:update element must contain either DAV:version, DAV:label-name or DAV:workspace child element.");
throw new DavException(DavServletResponse.SC_BAD_REQUEST);
@@ -228,7 +231,8 @@
DomUtil.addChildElement(elem, XML_LABEL_NAME, NAMESPACE, updateSource[0]);
break;
case UPDATE_BY_WORKSPACE:
- DomUtil.addChildElement(elem, XML_WORKSPACE, NAMESPACE, updateSource[0]);
+ Element wspEl = DomUtil.addChildElement(elem, XML_WORKSPACE, NAMESPACE, updateSource[0]);
+ wspEl.appendChild(DomUtil.hrefToXml(updateSource[0], factory));
break;
// no default.
default:
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/package.html
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/package.html?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/package.html (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/package.html Tue Nov 21 03:00:04 2006
@@ -1,4 +1,20 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<body>
Interfaces and classes used to cover functionality defined by
<a href="http://www.ietf.org/rfc/rfc3253.txt">RFC 3253: Versioning Extensions to WebDAV</a>.
-</body>
\ No newline at end of file
+</body>
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ExpandPropertyReport.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ExpandPropertyReport.java?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ExpandPropertyReport.java (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ExpandPropertyReport.java Tue Nov 21 03:00:04 2006
@@ -166,7 +166,7 @@
private void addResponses(DavResource res, int depth, MultiStatus ms) {
MultiStatusResponse response = getResponse(res, propertyElements);
ms.addResponse(response);
- if (depth > 0) {
+ if (depth > 0 && res.isCollection()) {
DavResourceIterator it = res.getMembers();
while (it.hasNext()) {
addResponses(it.nextResource(), depth-1, ms);
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java Tue Nov 21 03:00:04 2006
@@ -71,9 +71,12 @@
Report report = (Report) reportClass.newInstance();
report.init(resource, info);
return report;
- } catch (Exception e) {
+ } catch (IllegalAccessException e) {
// should never occur
- throw new DavException(DavServletResponse.SC_INTERNAL_SERVER_ERROR, "Failed to register Report.");
+ throw new DavException(DavServletResponse.SC_INTERNAL_SERVER_ERROR, "Failed to create new report (" + reportClass.getName() + ") from class: " + e.getMessage());
+ } catch (InstantiationException e) {
+ // should never occur
+ throw new DavException(DavServletResponse.SC_INTERNAL_SERVER_ERROR, "Failed to create new report (" + reportClass.getName() + ") from class: " + e.getMessage());
}
}
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java Tue Nov 21 03:00:04 2006
@@ -156,7 +156,7 @@
} catch (DavException e) {
log.error(e.toString());
}
- if (depth > 0) {
+ if (depth > 0 && res.isCollection()) {
DavResourceIterator it = res.getMembers();
while (it.hasNext()) {
buildResponse(it.nextResource(), propNameSet, depth-1, ms);
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/package.html
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/package.html?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/package.html (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/package.html Tue Nov 21 03:00:04 2006
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<body>
Report interface and inplementation for default reports defined by RFC 3253.
-</body>
\ No newline at end of file
+</body>
Modified: jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/xml/package.html
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/xml/package.html?view=diff&rev=477620&r1=477619&r2=477620
==============================================================================
--- jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/xml/package.html (original)
+++ jackrabbit/trunk/webdav/src/main/java/org/apache/jackrabbit/webdav/xml/package.html Tue Nov 21 03:00:04 2006
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<body>
Xml utility classes.
-</body>
\ No newline at end of file
+</body>