jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject svn commit: r161660 [1/7] - in incubator/jackrabbit/trunk/contrib/jcr-server: ./ client/ client/src/java/org/apache/jackrabbit/webdav/ client/src/java/org/apache/jackrabbit/webdav/client/ client/src/java/org/apache/jackrabbit/webdav/client/methods/ server/ server/src/java/org/apache/jackrabbit/ server/src/java/org/apache/jackrabbit/server/ server/src/java/org/apache/jackrabbit/server/io/ server/src/java/org/apache/jackrabbit/server/jcr/ server/src/java/org/apache/jackrabbit/server/simple/ server/src/java/org/apache/jackrabbit/server/simple/dav/ server/src/java/org/apache/jackrabbit/webdav/simple/ server/src/java/org/apache/jackrabbit/webdav/spi/ server/src/java/org/apache/jackrabbit/webdav/spi/lock/ server/src/java/org/apache/jackrabbit/webdav/spi/nodetype/ server/src/java/org/apache/jackrabbit/webdav/spi/observation/ server/src/java/org/apache/jackrabbit/webdav/spi/property/ server/src/java/org/apache/jackrabbit/webdav/spi/search/ server/src/java/org/apache/jackrabbit/webdav/spi/transaction/ server/src/java/org/apache/jackrabbit/webdav/spi/version/ server/src/java/org/apache/jackrabbit/webdav/spi/version/report/ webapp/ webapp/src/webapp/WEB-INF/ webdav/ webdav/src/java/org/apache/jackrabbit/ webdav/src/java/org/apache/jackrabbit/webdav/ webdav/src/java/org/apache/jackrabbit/webdav/header/ webdav/src/java/org/apache/jackrabbit/webdav/jcr/ webdav/src/java/org/apache/jackrabbit/webdav/jcr/lock/ webdav/src/java/org/apache/jackrabbit/webdav/jcr/nodetype/ webdav/src/java/org/apache/jackrabbit/webdav/jcr/observation/ webdav/src/java/org/apache/jackrabbit/webdav/jcr/property/ webdav/src/java/org/apache/jackrabbit/webdav/jcr/search/ webdav/src/java/org/apache/jackrabbit/webdav/jcr/transaction/ webdav/src/java/org/apache/jackrabbit/webdav/jcr/version/ webdav/src/java/org/apache/jackrabbit/webdav/jcr/version/report/ webdav/src/java/org/apache/jackrabbit/webdav/lock/ webdav/src/java/org/apache/jackrabbit/webdav/search/
Date Sun, 17 Apr 2005 14:52:14 GMT
Author: tripod
Date: Sun Apr 17 07:51:59 2005
New Revision: 161660

URL: http://svn.apache.org/viewcvs?view=rev&rev=161660
Log:
[JCR-000] Adjusting to spec 0.16.4 changes
[JCR-107] Typos in jcr-server io package javadocs
[JCR-104] Contrib/Jcr-Server: Improve package structure

Added:
    incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/
    incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/
    incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/
    incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/DavMethodBase.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/OptionsMethod.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/PropFindMethod.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportResourceChain.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportResourceChain.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/jcr/
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/jcr/JCRWebdavServer.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/jcr/JCRWebdavServerServlet.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/DavSessionImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/DavSessionProviderImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/LocatorFactoryImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/NodeResource.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/ResourceFactoryImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/JcrConstants.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/header/CodedUrlHeader.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/header/IfHeader.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/AbstractItemResource.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/AbstractResource.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/DavLocatorFactoryImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/DavResourceFactoryImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/DefaultItemResource.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/ItemResourceConstants.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/JcrDavException.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/RootCollection.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/RootItemCollection.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/VersionControlledItemCollection.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/lock/
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/lock/SessionScopedLockEntry.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/nodetype/
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/nodetype/ItemDefinitionImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeDefinitionImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeTypeConstants.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeTypeElement.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeTypeProperty.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/nodetype/PropertyDefinitionImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/observation/
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionManagerImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/package.html   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/property/
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/property/LengthsProperty.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/property/ValuesProperty.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/search/
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/search/SearchResourceImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/search/SearchResultProperty.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/transaction/
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/transaction/TxLockManagerImpl.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/version/
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/version/VersionHistoryItemCollection.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/version/VersionItemCollection.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/version/package.html   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/version/report/
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/version/report/ExportViewReport.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/version/report/LocateByUuidReport.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/version/report/NodeTypesReport.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/version/report/RegisteredNamespacesReport.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/jcr/version/report/package.html   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/lock/SimpleLockManager.java   (with props)
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/search/SearchInfo.java   (with props)
Removed:
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/JCRConstants.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/JCRWebdavServer.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/JCRWebdavServerServlet.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportNCResourceChain.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportNCResourceChain.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/simple/dav/DavResourceImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/simple/dav/DavSessionImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/simple/dav/DavSessionProviderImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/simple/dav/LocatorFactoryImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/simple/dav/NodeResource.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/simple/dav/ResourceFactoryImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/AbstractItemResource.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/AbstractResource.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/DavLocatorFactoryImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/DavResourceFactoryImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/DefaultItemCollection.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/DefaultItemResource.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/ItemResourceConstants.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/JcrDavException.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/RootCollection.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/RootItemCollection.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/VersionControlledItemCollection.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/lock/JcrActiveLock.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/lock/SessionScopedLockEntry.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/nodetype/ItemDefImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/nodetype/NodeDefImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/nodetype/NodeTypeConstants.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/nodetype/NodeTypeElement.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/nodetype/NodeTypeProperty.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/nodetype/PropertyDefImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/observation/SubscriptionImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/observation/SubscriptionManagerImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/package.html
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/property/LengthsProperty.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/property/ValuesProperty.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/search/SearchResourceImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/search/SearchResultProperty.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/transaction/TxLockManagerImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/version/VersionHistoryItemCollection.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/version/VersionItemCollection.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/version/package.html
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/version/report/ExportViewReport.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/version/report/LocateByUuidReport.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/version/report/NodeTypesReport.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/version/report/RegisteredNamespacesReport.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/spi/version/report/package.html
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/IfHeader.java
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/search/SearchRequest.java
Modified:
    incubator/jackrabbit/trunk/contrib/jcr-server/client/project.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/project.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/server/project.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/AbstractWebdavServlet.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AbstractExportCommand.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AbstractImportCommand.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AddMixinCommand.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AddNodeCommand.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/DirListingExportCommand.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportCollectionChain.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportContext.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/FileExportCommand.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/FileImportCommand.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportCollectionChain.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/XMLExportCommand.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/XMLImportCommand.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ZIPImportCommand.java
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/package.html
    incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/simple/WebdavServlet.java
    incubator/jackrabbit/trunk/contrib/jcr-server/webapp/project.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/webapp/src/webapp/WEB-INF/catalog.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/webapp/src/webapp/WEB-INF/simple_catalog.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/webapp/src/webapp/WEB-INF/web.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/project.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/MultiStatus.java
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/MultiStatusResponse.java
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/header/DepthHeader.java
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/search/QueryGrammerSet.java
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/search/SearchConstants.java
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/search/SearchResource.java

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/client/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/client/project.xml?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/client/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/client/project.xml Sun Apr 17 07:51:59 2005
@@ -23,7 +23,7 @@
     <id>jcr-client</id>
     <groupId>jcr-server</groupId>
     <type>jar</type>
-    <name>JCRWebdavServer Client Library</name>
+    <name>Client Library</name>
 
     <!-- ====================================================================== -->
     <!-- D E P E N D E N C I E S                                                -->
@@ -34,16 +34,19 @@
             <groupId>jcr-server</groupId>
             <version>${pom.currentVersion}</version>
         </dependency>
-
         <dependency>
             <groupId>jsr170</groupId>
             <artifactId>jcr</artifactId>
-            <version>0.16.2</version>
-            <url>http://www.day.com/maven/jsr170/jars/jcr-0.16.2.jar</url>
+            <version>0.16.4</version>
+            <url>http://www.day.com/maven/jsr170/jars/jcr-0.16.4.jar</url>
         </dependency>
         <dependency>
             <id>jackrabbit</id>
-            <version>0.16.2-dev</version>
+            <version>0.16.4-dev</version>
+        </dependency>
+        <dependency>
+            <id>jcr-rmi</id>
+            <version>0.16.4</version>
         </dependency>
         <dependency>
             <id>jdom</id>
@@ -58,50 +61,13 @@
             <version>2.3</version>
         </dependency>
         <dependency>
-            <id>jcr-rmi</id>
-            <version>0.16.2</version>
-        </dependency>
-        <!-- dependencies of jackrabbit -->
-        <!--
-        <dependency>
-          <id>concurrent</id>
-          <version>1.3.4</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
+          <id>commons-httpclient</id>
+          <version>2.0.2</version>
         </dependency>
         <dependency>
           <id>commons-collections</id>
           <version>2.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-          <groupId>geronimo-spec</groupId>
-          <artifactId>geronimo-spec-jta</artifactId>
-          <version>1.0-M1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-          <groupId>lucene</groupId>
-          <artifactId>lucene</artifactId>
-          <version>1.4.3</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-          <version>2.6.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
         </dependency>
-        -->
     </dependencies>
 
     <!-- ====================================================================== -->

Added: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/DavMethodBase.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/DavMethodBase.java?view=auto&rev=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/DavMethodBase.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/DavMethodBase.java Sun Apr 17 07:51:59 2005
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.jackrabbit.webdav.client.methods;
+
+import org.apache.log4j.Logger;
+import org.apache.commons.httpclient.methods.EntityEnclosingMethod;
+import org.apache.jackrabbit.webdav.DavConstants;
+import org.apache.jackrabbit.webdav.DavException;
+import org.apache.jackrabbit.webdav.DavServletResponse;
+import org.apache.jackrabbit.webdav.MultiStatus;
+import org.jdom.input.SAXBuilder;
+import org.jdom.Document;
+import org.jdom.JDOMException;
+import org.jdom.output.XMLOutputter;
+import org.jdom.output.Format;
+import org.xml.sax.ContentHandler;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * <code>DavMethodBase</code>...
+ */
+public abstract class DavMethodBase extends EntityEnclosingMethod implements DavConstants {
+
+    private static Logger log = Logger.getLogger(DavMethodBase.class);
+
+    public DavMethodBase(String uri) {
+	super(uri);
+    }
+
+    public void setRequestBody(Document bodyDocument) {
+	String reqBody = new XMLOutputter(Format.getRawFormat()).outputString(bodyDocument);
+	setRequestBody(reqBody);
+    }
+
+    public Document getReponseBodyAsDocument() throws IOException, JDOMException {
+	SAXBuilder builder = new SAXBuilder();
+	return builder.build(getResponseBodyAsStream());
+    }
+
+    /**
+     *
+     * @return
+     * @throws IOException
+     */
+    public DavException getResponseException() throws IOException {
+	checkUsed();
+	if (getStatusCode() < DavServletResponse.SC_BAD_REQUEST) {
+	    log.warn("Cannot retrieve exception from successful response.");
+	    return null;
+	}
+	InputStream in = this.getResponseBodyAsStream();
+	if (in != null) {
+	    try {
+		SAXBuilder builder = new SAXBuilder(false);
+		Document responseDocument = builder.build(in);
+		return new DavException(getStatusCode(), getStatusText(), responseDocument.getRootElement());
+	    } catch (JDOMException e) {
+		log.error(e.getMessage());
+	    }
+	}
+	// no or unparsable response body
+	return new DavException(getStatusCode(), getStatusText());
+    }
+
+    public void parseResponse(ContentHandler contentHandler) throws IOException, DavException {
+        // todo
+    }
+
+    public MultiStatus getResponseBodyAsMultiStatus() throws IOException, DavException {
+        checkUsed();
+        if (getStatusCode() == DavServletResponse.SC_MULTI_STATUS) {
+            try {
+                return MultiStatus.createFromXml(getReponseBodyAsDocument());
+            } catch (JDOMException e) {
+                log.error(e.getMessage());
+                return null;
+            }
+        } else {
+            throw new DavException(getStatusCode(), getName() + " resulted with unexpected status code: " + getStatusCode());
+        }
+    }
+
+    public void parseMultiStatus(ContentHandler contentHandler) throws IOException, DavException {
+        checkUsed();
+        if (getStatusCode() == DavServletResponse.SC_MULTI_STATUS) {
+            /// todo...
+        } else {
+            throw new DavException(getStatusCode(), getName() + " resulted with unexpected status code: " + getStatusCode());
+        }
+    }
+}
\ No newline at end of file

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/DavMethodBase.java
------------------------------------------------------------------------------
    svn = 

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/DavMethodBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/OptionsMethod.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/OptionsMethod.java?view=auto&rev=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/OptionsMethod.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/OptionsMethod.java Sun Apr 17 07:51:59 2005
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.jackrabbit.webdav.client.methods;
+
+import org.apache.log4j.Logger;
+import org.apache.jackrabbit.webdav.DavMethods;
+
+/**
+ * <code>OptionsMethod</code>...
+ */
+public class OptionsMethod extends DavMethodBase {
+
+    private static Logger log = Logger.getLogger(OptionsMethod.class);
+
+    public OptionsMethod(String uri) {
+	super(uri);
+    }
+
+    public String getName() {
+	return DavMethods.METHOD_OPTIONS;
+    }
+}
\ No newline at end of file

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/OptionsMethod.java
------------------------------------------------------------------------------
    svn = 

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/OptionsMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/PropFindMethod.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/PropFindMethod.java?view=auto&rev=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/PropFindMethod.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/PropFindMethod.java Sun Apr 17 07:51:59 2005
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.jackrabbit.webdav.client.methods;
+
+import org.apache.log4j.Logger;
+import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
+import org.apache.jackrabbit.webdav.property.DavPropertyName;
+import org.apache.jackrabbit.webdav.DavMethods;
+import org.apache.jackrabbit.webdav.DavException;
+import org.apache.jackrabbit.webdav.DavServletResponse;
+import org.apache.jackrabbit.webdav.MultiStatus;
+import org.apache.jackrabbit.webdav.header.DepthHeader;
+import org.jdom.Element;
+import org.jdom.Document;
+import org.jdom.JDOMException;
+import org.xml.sax.ContentHandler;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+/**
+ * <code>PropFindMethod</code>...
+ */
+public class PropFindMethod extends DavMethodBase {
+
+    private static Logger log = Logger.getLogger(PropFindMethod.class);
+
+    public PropFindMethod(String uri) {
+	this(uri, PROPFIND_ALL_PROP, new DavPropertyNameSet(), DEPTH_INFINITY);
+    }
+
+    public PropFindMethod(String uri, DavPropertyNameSet propNameSet, int depth) {
+	this(uri, PROPFIND_BY_PROPERTY, propNameSet, depth);
+    }
+
+    public PropFindMethod(String uri, int propfindType, int depth) {
+	this(uri, propfindType, new DavPropertyNameSet(), depth);
+    }
+
+    private PropFindMethod(String uri, int propfindType, DavPropertyNameSet propNameSet, int depth) {
+        super(uri);
+
+	DepthHeader dh = new DepthHeader(depth);
+	setRequestHeader(dh.getHeaderName(), dh.getHeaderValue());
+	setRequestHeader("Content-Type","text/xml; charset=UTF-8");
+
+	// build the request body
+	Element propfind = new Element(XML_PROPFIND, NAMESPACE);
+	switch (propfindType) {
+	    case PROPFIND_ALL_PROP:
+		propfind.addContent(new Element(XML_ALLPROP, NAMESPACE));
+		break;
+	    case PROPFIND_PROPERTY_NAMES:
+		propfind.addContent(new Element(XML_PROPNAME, NAMESPACE));
+		break;
+	    default:
+		Element prop = new Element(XML_PROP, NAMESPACE);
+		propfind.addContent(prop);
+		Iterator it = propNameSet.iterator();
+		while (it.hasNext()) {
+		    prop.addContent(((DavPropertyName)it.next()).toXml());
+		}
+		break;
+	}
+	Document propfindBody = new Document(propfind);
+	setRequestBody(propfindBody);
+    }
+
+    public String getName() {
+	return DavMethods.METHOD_PROPFIND;
+    }
+}
\ No newline at end of file

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/PropFindMethod.java
------------------------------------------------------------------------------
    svn = 

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/PropFindMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java?view=auto&rev=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java Sun Apr 17 07:51:59 2005
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.jackrabbit.webdav.client.methods;
+
+import org.apache.log4j.Logger;
+import org.apache.jackrabbit.webdav.version.report.ReportInfo;
+import org.apache.jackrabbit.webdav.header.DepthHeader;
+import org.apache.jackrabbit.webdav.DavMethods;
+import org.jdom.Document;
+
+/**
+ * <code>ReportMethod</code>...
+ */
+public class ReportMethod extends DavMethodBase {
+
+    private static Logger log = Logger.getLogger(ReportMethod.class);
+
+    public ReportMethod(String uri, ReportInfo reportInfo) {
+	super(uri);
+	DepthHeader dh = new DepthHeader(reportInfo.getDepth());
+	setRequestHeader(dh.getHeaderName(), dh.getHeaderValue());
+	setRequestHeader("Content-Type","text/xml; charset=UTF-8");
+
+	Document reportBody = new Document(reportInfo.getReportElement());
+	setRequestBody(reportBody);
+    }
+
+    public String getName() {
+	return DavMethods.METHOD_REPORT;
+    }
+}
\ No newline at end of file

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java
------------------------------------------------------------------------------
    svn = 

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java?view=auto&rev=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java Sun Apr 17 07:51:59 2005
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.jackrabbit.webdav.client.methods;
+
+import org.apache.log4j.Logger;
+import org.apache.jackrabbit.webdav.search.SearchInfo;
+import org.apache.jackrabbit.webdav.DavMethods;
+import org.jdom.Namespace;
+
+/**
+ * <code>SearchMethod</code>...
+ */
+public class SearchMethod extends DavMethodBase {
+
+    private static Logger log = Logger.getLogger(SearchMethod.class);
+
+    public SearchMethod(String uri, String statement, String language) {
+        this(uri, statement, language, Namespace.NO_NAMESPACE);
+    }
+
+    public SearchMethod(String uri, String statement, String language, Namespace languageNamespace) {
+        super(uri);
+        if (language != null && statement != null) {
+            // build the request body
+            SearchInfo sInfo = new SearchInfo(language, languageNamespace, statement);
+            setRequestBody(sInfo.toXml());
+        }
+    }
+    
+    public String getName() {
+        return DavMethods.METHOD_SEARCH;
+    }
+}
\ No newline at end of file

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java
------------------------------------------------------------------------------
    svn = 

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/client/src/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/project.xml?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/project.xml Sun Apr 17 07:51:59 2005
@@ -23,7 +23,7 @@
     <groupId>jcr-server</groupId>
 
     <name>Jackrabbit-Server</name>
-    <currentVersion>0.16.2</currentVersion>
+    <currentVersion>0.16.4</currentVersion>
     <inceptionYear>2005</inceptionYear>
     <package>org.apache.jackrabbit.server.*</package>
     <description>

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/project.xml?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/project.xml Sun Apr 17 07:51:59 2005
@@ -45,12 +45,12 @@
         <dependency>
             <groupId>jsr170</groupId>
             <artifactId>jcr</artifactId>
-            <version>0.16.2</version>
-            <url>http://www.day.com/maven/jsr170/jars/jcr-0.16.2.jar</url>
+            <version>0.16.4</version>
+            <url>http://www.day.com/maven/jsr170/jars/jcr-0.16.4.jar</url>
         </dependency>
         <dependency>
             <id>jackrabbit</id>
-            <version>0.16.2-dev</version>
+            <version>0.16.4-dev</version>
         </dependency>
         <dependency>
             <id>jdom</id>
@@ -66,7 +66,7 @@
         </dependency>
         <dependency>
             <id>jcr-rmi</id>
-            <version>0.16.2</version>
+            <version>0.16.4</version>
         </dependency>
         <dependency>
             <id>commons-chain</id>
@@ -80,47 +80,6 @@
             <id>commons-beanutils</id>
             <version>1.7.0</version>
         </dependency>
-        <!-- dependencies of jackrabbit -->
-        <!--
-        <dependency>
-          <id>concurrent</id>
-          <version>1.3.4</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-          <id>commons-collections</id>
-          <version>2.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-          <groupId>geronimo-spec</groupId>
-          <artifactId>geronimo-spec-jta</artifactId>
-          <version>1.0-M1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-          <groupId>lucene</groupId>
-          <artifactId>lucene</artifactId>
-          <version>1.4.3</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-          <version>2.6.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        -->
     </dependencies>
 
     <!-- ====================================================================== -->

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/AbstractWebdavServlet.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/AbstractWebdavServlet.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/AbstractWebdavServlet.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/AbstractWebdavServlet.java Sun Apr 17 07:51:59 2005
@@ -33,7 +33,7 @@
 import org.apache.jackrabbit.webdav.property.*;
 import org.apache.jackrabbit.webdav.search.SearchResource;
 import org.apache.jackrabbit.webdav.search.SearchConstants;
-import org.apache.jackrabbit.webdav.search.SearchRequest;
+import org.apache.jackrabbit.webdav.search.SearchInfo;
 
 import org.jdom.Document;
 
@@ -814,7 +814,7 @@
         try {
             Document doc = request.getRequestDocument();
             if (doc != null) {
-                SearchRequest sR = new SearchRequest(doc);
+                SearchInfo sR = new SearchInfo(doc);
                 response.sendMultiStatusResponse(((SearchResource)resource).search(sR));
             } else {
                 // request without request body is valid if requested resource

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AbstractExportCommand.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AbstractExportCommand.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AbstractExportCommand.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AbstractExportCommand.java Sun Apr 17 07:51:59 2005
@@ -18,7 +18,7 @@
 
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
-import org.apache.jackrabbit.JCRConstants;
+import org.apache.jackrabbit.JcrConstants;
 
 import javax.jcr.Node;
 
@@ -35,7 +35,7 @@
  * <li>jcr:mimeType
  * <ul>
  */
-public abstract class AbstractExportCommand implements Command, JCRConstants {
+public abstract class AbstractExportCommand implements Command, JcrConstants {
 
     /**
      * Executes this command by calling {@link #execute(ExportContext)} if
@@ -101,12 +101,14 @@
 
     /**
      * Returns the default content type of this export
-     * @return
+     *
+     * @return default content type
      */
     public abstract String getDefaultContentType();
 
     /**
      * Checks if this export command can handle the given node.
+     * 
      * @param node
      * @return <code>true</code> if it can handle the export;
      *         <code>false</code> otherwise.

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AbstractImportCommand.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AbstractImportCommand.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AbstractImportCommand.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AbstractImportCommand.java Sun Apr 17 07:51:59 2005
@@ -18,7 +18,7 @@
 
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
-import org.apache.jackrabbit.JCRConstants;
+import org.apache.jackrabbit.JcrConstants;
 
 import javax.jcr.Node;
 import java.io.InputStream;
@@ -26,7 +26,7 @@
 /**
  * This Class implements an abstract import command for a nc-resource.
  */
-public abstract class AbstractImportCommand implements Command, JCRConstants {
+public abstract class AbstractImportCommand implements Command, JcrConstants {
 
     /**
      * Executes this command by calling {@link #importResource} if
@@ -72,6 +72,7 @@
 
     /**
      * Imports the resource contained in the import context.
+     *
      * @param ctx
      * @param parentNode
      * @param in
@@ -83,6 +84,7 @@
 
     /**
      * Returns true, if this command handles the given content type.
+     * 
      * @param contentType
      * @return <code>true</code> if this command handles the given content type;
      *         <code>false</code> otherwise.

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AddMixinCommand.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AddMixinCommand.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AddMixinCommand.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AddMixinCommand.java Sun Apr 17 07:51:59 2005
@@ -18,7 +18,7 @@
 
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
-import org.apache.jackrabbit.JCRConstants;
+import org.apache.jackrabbit.JcrConstants;
 
 import javax.jcr.Node;
 
@@ -26,7 +26,7 @@
  * This Class implements a import command that adds a mixin node type to the
  * current node.
  */
-public class AddMixinCommand implements Command, JCRConstants {
+public class AddMixinCommand implements Command, JcrConstants {
 
     /**
      * the mixin node type to add
@@ -41,6 +41,7 @@
 
     /**
      * Creates a new AddMixinCommand with the given node type.
+     *
      * @param nodeType the node type to add as mixin.
      */
     public AddMixinCommand(String nodeType) {
@@ -49,6 +50,7 @@
 
     /**
      * Returns the node type parameter
+     *
      * @return the node type.
      */
     public String getNodeType() {
@@ -57,6 +59,7 @@
 
     /**
      * Sets the node type that is to be added to the current node.
+     *
      * @param nodeType the mixin node type
      */
     public void setNodeType(String nodeType) {
@@ -66,6 +69,7 @@
     /**
      * Executes this command by delegating to {@link #execute(ImportContext)} if
      * the context has the correct class.
+     *
      * @param context the (import) context.
      * @return <code>false</code>.
      * @throws Exception if an error occurrs.
@@ -80,6 +84,7 @@
 
     /**
      * Adds the mixin nodetype to the current import node.
+     * 
      * @param context the import context.
      * @return <code>false</code>
      * @throws Exception if an error occurrs.

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AddNodeCommand.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AddNodeCommand.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AddNodeCommand.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/AddNodeCommand.java Sun Apr 17 07:51:59 2005
@@ -18,7 +18,7 @@
 
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
-import org.apache.jackrabbit.JCRConstants;
+import org.apache.jackrabbit.JcrConstants;
 
 import javax.jcr.Node;
 
@@ -26,7 +26,7 @@
  * This Class implements a import command that adds a mixin node type to the
  * current node.
  */
-public class AddNodeCommand implements Command, JCRConstants {
+public class AddNodeCommand implements Command, JcrConstants {
 
     /**
      * the nodetype to be added.
@@ -41,6 +41,7 @@
 
     /**
      * Creates a new AddNodeCommand with the given node type.
+     *
      * @param nodeType the node type of the node to be added.
      */
     public AddNodeCommand(String nodeType) {
@@ -49,6 +50,7 @@
 
     /**
      * Returns the node type of the new node to be added.
+     *
      * @return the node type
      */
     public String getNodeType() {
@@ -57,6 +59,7 @@
 
     /**
      * Sets the node type of the new node to be added.
+     *
      * @param nodeType the node type
      */
     public void setNodeType(String nodeType) {
@@ -66,6 +69,7 @@
     /**
      * Executes this command by delegating to {@link #execute(ImportContext)} if
      * the context has the correct class.
+     *
      * @param context the (import) context.
      * @return <code>false</code>.
      * @throws Exception if an error occurrs.
@@ -87,7 +91,6 @@
      * @param context the import context
      * @return <code>false</code>
      * @throws Exception in an error occurrs
-     *
      * @see ImportContext#getSystemId()
      * @see ImportContext#getNode()
      */

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/DirListingExportCommand.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/DirListingExportCommand.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/DirListingExportCommand.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/DirListingExportCommand.java Sun Apr 17 07:51:59 2005
@@ -19,7 +19,7 @@
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
 import org.apache.jackrabbit.webdav.util.Text;
-import org.apache.jackrabbit.JCRConstants;
+import org.apache.jackrabbit.JcrConstants;
 
 import javax.jcr.Node;
 import javax.jcr.Repository;
@@ -34,7 +34,7 @@
  * directory listing of all child nodes. All child nodes having the
  * {@link #getCollectionNodeType()} result in a directory link.
  */
-public class DirListingExportCommand implements Command, JCRConstants {
+public class DirListingExportCommand implements Command, JcrConstants {
 
     /**
      * the node type of a collection
@@ -49,6 +49,7 @@
 
     /**
      * Creates a DirListingExportCommand with the given collection node type.
+     *
      * @param collectionNodeType
      */
     public DirListingExportCommand(String collectionNodeType) {
@@ -57,6 +58,7 @@
 
     /**
      * Returns the node type of a collection node.
+     *
      * @return the node type of a collection node.
      */
     public String getCollectionNodeType() {
@@ -76,6 +78,7 @@
     /**
      * Executes this command by delegating to {@link #execute(ExportContext)} if
      * the context has the correct class.
+     *
      * @param context the (import) context.
      * @return <code>false</code>.
      * @throws Exception if an error occurrs.
@@ -149,5 +152,4 @@
 
         return true;
     }
-
 }

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportCollectionChain.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportCollectionChain.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportCollectionChain.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportCollectionChain.java Sun Apr 17 07:51:59 2005
@@ -20,7 +20,7 @@
 import org.apache.commons.chain.impl.CatalogFactoryBase;
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Catalog;
-import org.apache.jackrabbit.JCRConstants;
+import org.apache.jackrabbit.JcrConstants;
 
 /**
  * This Class implements a default chain for exporting collection resources.
@@ -29,7 +29,7 @@
  * <li>{@link DirListingExportCommand}("nt:folder").
  * </ul>
  */
-public class ExportCollectionChain extends ChainBase implements JCRConstants {
+public class ExportCollectionChain extends ChainBase implements JcrConstants {
 
     /**
      * the name of this chain
@@ -48,6 +48,7 @@
      * Returns an export chain. It first tries to lookup the command
      * in the default catalog. If this failes, a new instance of this class
      * is returned.
+     *
      * @return an export chain.
      */
     public static Command getChain() {
@@ -59,5 +60,4 @@
         }
         return exportChain;
     }
-
 }

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportContext.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportContext.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportContext.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportContext.java Sun Apr 17 07:51:59 2005
@@ -64,6 +64,7 @@
 
     /**
      * Creates a new ExportContext for the given node
+     *
      * @param node
      */
     public ExportContext(Node node) {
@@ -72,6 +73,7 @@
 
     /**
      * Returns the input stream
+     *
      * @return the input stream
      */
     public InputStream getInputStream() {
@@ -81,6 +83,7 @@
     /**
      * Sets a the inpurt stream to the data to be exported. A successfull
      * export command must set this memeber.
+     *
      * @param inputStream
      */
     public void setInputStream(InputStream inputStream) {
@@ -89,6 +92,7 @@
 
     /**
      * Returns the node to be exported
+     *
      * @return
      */
     public Node getNode() {
@@ -97,6 +101,7 @@
 
     /**
      * Returns the length of the data to be exported
+     *
      * @return the content length
      */
     public long getContentLength() {
@@ -106,6 +111,7 @@
     /**
      * Sets the length of the data to be exported. A successfull export command
      * must set this memeber.
+     *
      * @param contentLength the content length
      */
     public void setContentLength(long contentLength) {
@@ -114,6 +120,7 @@
 
     /**
      * Returns the last modification time.
+     *
      * @return the last modification time.
      */
     public long getModificationTime() {
@@ -123,6 +130,7 @@
     /**
      * Sets the last modification time. A successfull export command may set
      * this member.
+     *
      * @param modificationTime the last modification time
      */
     public void setModificationTime(long modificationTime) {
@@ -131,6 +139,7 @@
 
     /**
      * Returns the creation time of the resource.
+     *
      * @return the creation time
      */
     public long getCreationTime() {
@@ -140,6 +149,7 @@
     /**
      * Sets the creation time of the resource. A successfull export command may
      * set this member.
+     *
      * @param creationTime the creation time
      */
     public void setCreationTime(long creationTime) {
@@ -148,6 +158,7 @@
 
     /**
      * Returns the content type of the resource.
+     *
      * @return the content type
      */
     public String getContentType() {
@@ -157,6 +168,7 @@
     /**
      * Sets the content type of the resource. A successfull export command
      * may set this member.
+     * 
      * @param contentType the content type
      */
     public void setContentType(String contentType) {

Added: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportResourceChain.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportResourceChain.java?view=auto&rev=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportResourceChain.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportResourceChain.java Sun Apr 17 07:51:59 2005
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed 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.
+ */
+package org.apache.jackrabbit.server.io;
+
+import org.apache.commons.chain.impl.ChainBase;
+import org.apache.commons.chain.impl.CatalogFactoryBase;
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Catalog;
+
+/**
+ * This Class implements a default chain for exporting non collection resources.
+ * It adds the following commands:
+ * <ul>
+ * <li>{@link FileExportCommand}().
+ * <li>{@link XMLExportCommand}({@link XMLExportCommand#MODE_DOCVIEW).
+ * </ul>
+ */
+public class ExportResourceChain extends ChainBase {
+
+    /**
+     * default name of this chain
+     */
+    public static final String NAME = "export-resource";
+
+    /**
+     * Creats a new command chain for exporting non collection resources.
+     */
+    public ExportResourceChain() {
+        super();
+        addCommand(new FileExportCommand());
+        addCommand(new XMLExportCommand(XMLExportCommand.MODE_DOCVIEW));
+    }
+
+    /**
+     * Returns an export chain. It first tries to lookup the command
+     * in the default catalog. If this failes, a new instance of this class
+     * is returned.
+     *
+     * @return an export chain.
+     */
+    public static Command getChain() {
+        Catalog catalog = CatalogFactoryBase.getInstance().getCatalog();
+        Command exportChain = catalog.getCommand(NAME);
+        if (exportChain == null) {
+            // generate default import chain
+            exportChain = new ExportResourceChain();
+        }
+        return exportChain;
+    }
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportResourceChain.java
------------------------------------------------------------------------------
    svn = 

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ExportResourceChain.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/FileExportCommand.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/FileExportCommand.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/FileExportCommand.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/FileExportCommand.java Sun Apr 17 07:51:59 2005
@@ -29,6 +29,7 @@
     /**
      * Exports the node by returning the content of the jcr:data property of
      * the content node.
+     *
      * @param context the export context
      * @param content the content node
      * @return <code>true</code>
@@ -37,7 +38,8 @@
     public boolean exportNode(ExportContext context, Node content) throws Exception {
         if (content.hasProperty(JCR_ENCODING)) {
             String encoding = content.getProperty(JCR_ENCODING).getString();
-            if (!encoding.equals("")) {
+            // ignore "" encodings (although this is avoided during import)
+            if (!"".equals(encoding)) {
                 context.setContentType(context.getContentType() + "; charset=\"" + encoding + "\"");
             }
         }
@@ -54,6 +56,7 @@
 
     /**
      * Returns the default content type
+     *
      * @return "application/octet-stream".
      */
     public String getDefaultContentType() {
@@ -64,6 +67,7 @@
      * Checks if the given node can be handled by this export command. This is
      * the case, if the node contains a 'jcr:content' node which is of node type
      * 'nt:resource'.
+     * 
      * @param node the node to be exported
      * @return <code>true</code> if the correct node is passed;
      *         <code>false</code> otherwise.

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/FileImportCommand.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/FileImportCommand.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/FileImportCommand.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/FileImportCommand.java Sun Apr 17 07:51:59 2005
@@ -25,7 +25,6 @@
  * the current node and a add the resource data as binary property. It further
  * sets the following properties:
  * <ul>
- * <li>jcr:encoding (to "")
  * <li>jcr:mimeType (from {@link ImportContext#getContentType()})
  * <li>jcr:lastModified (from current time)
  * <li>jcr:data (from {@link ImportContext#getInputStream()})
@@ -48,8 +47,6 @@
         Node content = parentNode.hasNode(JCR_CONTENT)
                 ? parentNode.getNode(JCR_CONTENT)
                 : parentNode.addNode(JCR_CONTENT, NT_RESOURCE);
-        // todo: to be removed with spec. 0.16.4 where jcr:encoding is not mandatory any more...
-        content.setProperty(JCR_ENCODING, "");
         content.setProperty(JCR_MIMETYPE, ctx.getContentType());
         content.setProperty(JCR_DATA, in);
         Calendar lastMod = Calendar.getInstance();
@@ -62,6 +59,7 @@
 
     /**
      * Can handle all content type thus returning <code>true</code>.
+     * 
      * @param contentType
      * @return <code>true</code>
      */

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportCollectionChain.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportCollectionChain.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportCollectionChain.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportCollectionChain.java Sun Apr 17 07:51:59 2005
@@ -20,7 +20,7 @@
 import org.apache.commons.chain.impl.CatalogFactoryBase;
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Catalog;
-import org.apache.jackrabbit.JCRConstants;
+import org.apache.jackrabbit.JcrConstants;
 
 /**
  * This Class implements a default chain for importing collection resources.
@@ -29,7 +29,7 @@
  * <li>{@link AddNodeCommand}("nt:folder").
  * </ul>
  */
-public class ImportCollectionChain extends ChainBase implements JCRConstants {
+public class ImportCollectionChain extends ChainBase implements JcrConstants {
 
     /**
      * The default name of this chain.
@@ -48,6 +48,7 @@
      * Returns an import chain. It first tries to lookup the command
      * in the default catalog. If this failes, a new instance of this class
      * is returned.
+     *
      * @return an import chain.
      */
     public static Command getChain() {
@@ -59,5 +60,4 @@
         }
         return importChain;
     }
-
 }

Added: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportResourceChain.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportResourceChain.java?view=auto&rev=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportResourceChain.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportResourceChain.java Sun Apr 17 07:51:59 2005
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed 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.
+ */
+package org.apache.jackrabbit.server.io;
+
+import org.apache.commons.chain.impl.ChainBase;
+import org.apache.commons.chain.impl.CatalogFactoryBase;
+import org.apache.commons.chain.Catalog;
+import org.apache.commons.chain.Command;
+import org.apache.jackrabbit.JcrConstants;
+
+/**
+ * This Class implements a default chain for importing non-collection resources.
+ * It adds the following commands:
+ * <ul>
+ * <li>{@link SetContentTypeCommand}().
+ * <li>{@link AddNodeCommand}("nt:file").
+ * <li>{@link AddMixinCommand}("mix:versionable").
+ * <li>{@link FileImportCommand}()
+ * </ul>
+ */
+public class ImportResourceChain extends ChainBase implements JcrConstants {
+
+    /**
+     * the name of this chain
+     */
+    public static final String NAME = "import-resource";
+
+    /**
+     * Creates a new default import chain for importing non collection resource.
+     */
+    public ImportResourceChain() {
+        super();
+        addCommand(new SetContentTypeCommand());
+        addCommand(new AddNodeCommand(NT_FILE));
+        addCommand(new AddMixinCommand(MIX_VERSIONABLE));
+        addCommand(new FileImportCommand());
+    }
+
+    /**
+     * Returns an import chain. It first tries to lookup the command
+     * in the default catalog. If this failes, a new instance of this class
+     * is returned.
+     *
+     * @return an import chain.
+     */
+    public static Command getChain() {
+        Catalog catalog = CatalogFactoryBase.getInstance().getCatalog();
+        Command importChain = catalog.getCommand(NAME);
+        if (importChain == null) {
+            // generate default import chain
+            importChain = new ImportResourceChain();
+        }
+        return importChain;
+    }
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportResourceChain.java
------------------------------------------------------------------------------
    svn = 

Propchange: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ImportResourceChain.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/XMLExportCommand.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/XMLExportCommand.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/XMLExportCommand.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/XMLExportCommand.java Sun Apr 17 07:51:59 2005
@@ -94,9 +94,9 @@
         File tmpfile = File.createTempFile("__webdav", ".xml");
         FileOutputStream out = new FileOutputStream(tmpfile);
         if (mode.equals(MODE_DOCVIEW)) {
-            content.getSession().exportDocView(content.getPath(), out, true, false);
+            content.getSession().exportDocumentView(content.getPath(), out, true, false);
         } else {
-            content.getSession().exportSysView(content.getPath(), out, true, false);
+            content.getSession().exportSystemView(content.getPath(), out, true, false);
         }
         out.close();
         context.setInputStream(new FileInputStream(tmpfile));

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/XMLImportCommand.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/XMLImportCommand.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/XMLImportCommand.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/XMLImportCommand.java Sun Apr 17 07:51:59 2005
@@ -17,12 +17,13 @@
 package org.apache.jackrabbit.server.io;
 
 import javax.jcr.Node;
+import javax.jcr.ImportUUIDBehavior;
 import java.io.InputStream;
 import java.util.Calendar;
 
 /**
  * This Class implements an import command that deserializes the xml contained
- * in the import stream, using {@link javax.jcr.Session#importXML(String, java.io.InputStream)}.
+ * in the import stream, using {@link javax.jcr.Session#importXML(String, java.io.InputStream, int)}.
  * It further sets the following properties:
  * <ul>
  * <li>jcr:mimeType (from {@link ImportContext#getContentType()})
@@ -56,7 +57,7 @@
             lastMod.setTimeInMillis(ctx.getModificationTime());
         }
         content.setProperty(JCR_LASTMODIFIED, lastMod);
-        parentNode.getSession().importXML(content.getPath(), in);
+        parentNode.getSession().importXML(content.getPath(), in, ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW);
         return true;
     }
 

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ZIPImportCommand.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ZIPImportCommand.java?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ZIPImportCommand.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/ZIPImportCommand.java Sun Apr 17 07:51:59 2005
@@ -18,7 +18,7 @@
 
 import org.apache.log4j.Logger;
 import org.apache.jackrabbit.webdav.util.Text;
-import org.apache.jackrabbit.JCRConstants;
+import org.apache.jackrabbit.JcrConstants;
 import org.apache.commons.chain.Context;
 import org.apache.commons.chain.Command;
 
@@ -32,7 +32,7 @@
  * This Class implements an import command that reads entries from a zip input
  * stream and delegates the extracted file back to the import chain.
  */
-public class ZIPImportCommand implements Command, JCRConstants {
+public class ZIPImportCommand implements Command, JcrConstants {
 
     /** the default logger */
     private static final Logger log = Logger.getLogger(ZIPImportCommand.class);
@@ -116,7 +116,7 @@
                 subctx.setInputStream(bin);
                 subctx.setSystemId(Text.getLabel(path));
                 subctx.setModificationTime(entry.getTime());
-                ImportNCResourceChain.getChain().execute(subctx);
+                ImportResourceChain.getChain().execute(subctx);
                 zin.closeEntry();
             }
         }

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/package.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/package.html?view=diff&r1=161659&r2=161660
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/package.html (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/server/io/package.html Sun Apr 17 07:51:59 2005
@@ -6,12 +6,12 @@
 <li><b>import-collection</b><br>
     commands that import a collection, eg. create a folder node in the
     repository.
-<li><b>import-nc-resource</b><br>
+<li><b>import-resource</b><br>
     commands that import a non-collection resource, eg. importing a file, deserializing
     an xml document. etc.
 <li><b>export-collection</b><br>
     commands that export a collection, eg. create a dir-listing
-<li><b>export-nc-resource</b><br>
+<li><b>export-resource</b><br>
     commands that export a non-collection resource, eg. spool a file, generate a docview response
 </ul>
 
@@ -23,7 +23,7 @@
         <command id="add-node" className="org.apache.jackrabbit.server.io.AddNodeCommand" nodeType="nt:folder" />
     </chain>
 
-    <chain name="import-nc-resource">
+    <chain name="import-resource">
         <command id="add-node"  className="org.apache.jackrabbit.server.io.AddNodeCommand" nodeType="nt:file" />
         <command id="add-mixin" className="org.apache.jackrabbit.server.io.AddMixinCommand" nodeType="mix:versionable"/>
         <command id="import-file" className="org.apache.jackrabbit.server.io.FileImportCommand" />
@@ -32,7 +32,7 @@
     <chain name="export-collection">
         <command id="export-dirlisting" className="org.apache.jackrabbit.server.io.DirListingExportCommand"  collectionNodeType="nt:folder"/>
     </chain>
-    <chain name="export-nc-resource">
+    <chain name="export-resource">
         <command id="export-file" className="org.apache.jackrabbit.server.io.FileExportCommand" />
     </chain>
 </catalog>



Mime
View raw message