From commits-return-9452-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Wed Jan 13 14:38:44 2010 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 2996 invoked from network); 13 Jan 2010 14:38:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Jan 2010 14:38:44 -0000 Received: (qmail 78950 invoked by uid 500); 13 Jan 2010 14:38:44 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 78882 invoked by uid 500); 13 Jan 2010 14:38:44 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 78873 invoked by uid 99); 13 Jan 2010 14:38:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jan 2010 14:38:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jan 2010 14:38:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 78E5D238897F; Wed, 13 Jan 2010 14:38:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r898773 - in /jackrabbit/branches/2.0: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/... Date: Wed, 13 Jan 2010 14:38:22 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100113143822.78E5D238897F@eris.apache.org> Author: jukka Date: Wed Jan 13 14:38:20 2010 New Revision: 898773 URL: http://svn.apache.org/viewvc?rev=898773&view=rev Log: 2.0: Merged revisions 898267, 898325, 898540 and 898701 (JCR-2463, JCR-97 and JCR-2436) Added: jackrabbit/branches/2.0/jackrabbit-standalone/src/main/resources/META-INF/ jackrabbit/branches/2.0/jackrabbit-standalone/src/main/resources/META-INF/services/ Modified: jackrabbit/branches/2.0/ (props changed) jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/FileDataStore.java jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/util/DbNameIndex.java jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/util/PostgreSQLNameIndex.java jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java jackrabbit/branches/2.0/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/PropertyDefinitionImpl.java jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java jackrabbit/branches/2.0/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java jackrabbit/branches/2.0/jackrabbit-standalone/pom.xml Propchange: jackrabbit/branches/2.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 14:38:20 2010 @@ -2,4 +2,4 @@ /jackrabbit/sandbox/JCR-1456:774917-886178 /jackrabbit/sandbox/JCR-2170:812417-816332 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863 -/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992,898042,898677,898699,898715 +/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992-897993,897996,898002,898042,898267,898325,898540,898677,898699,898701,898715 Modified: jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/FileDataStore.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/FileDataStore.java?rev=898773&r1=898772&r2=898773&view=diff ============================================================================== --- jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/FileDataStore.java (original) +++ jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/FileDataStore.java Wed Jan 13 14:38:20 2010 @@ -104,7 +104,7 @@ /** * All data identifiers that are currently in use are in this set until they are garbage collected. */ - protected Map> inUse = + protected Map> inUse = Collections.synchronizedMap(new WeakHashMap>()); /** @@ -128,7 +128,7 @@ directory = new File(path); directory.mkdirs(); } - + /** * {@inheritDoc} */ @@ -147,7 +147,7 @@ return new FileDataRecord(identifier, file); } } - + /** * Returns the record with the given identifier. Note that this method * performs no sanity checks on the given identifier. It is up to the @@ -312,7 +312,7 @@ for (File f: file.listFiles()) { count += deleteOlderRecursive(f, min); } - + // JCR-1396: FileDataStore Garbage Collector and empty directories // Automatic removal of empty directories (but not the root!) synchronized (this) { Modified: jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java?rev=898773&r1=898772&r2=898773&view=diff ============================================================================== --- jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java (original) +++ jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java Wed Jan 13 14:38:20 2010 @@ -192,7 +192,7 @@ /** * Synchronize contents from journal. May be overridden by subclasses. * - * @param startRevision start point (exlusive) + * @param startRevision start point (exclusive) * @throws JournalException if an error occurs */ protected void doSync(long startRevision) throws JournalException { Modified: jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java?rev=898773&r1=898772&r2=898773&view=diff ============================================================================== --- jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java (original) +++ jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java Wed Jan 13 14:38:20 2010 @@ -761,9 +761,9 @@ if (uuids == null) { // get all node bundles in the database with a single sql statement, - // which is (probably) faster than loading each bundle and traversing the tree + // which is (probably) faster than loading each bundle and traversing the tree ResultSet rs = null; - try { + try { String sql = "select count(*) from " + schemaObjectPrefix + "BUNDLE"; rs = conHelper.exec(sql, new Object[0], false, 0); try { @@ -828,7 +828,7 @@ } } catch (Exception e) { log.error("Error loading bundle", e); - } finally { + } finally { DbUtility.close(rs); total = count; } @@ -1435,13 +1435,13 @@ throws Exception { ResultSet rs = null; boolean exists; - try { - rs = conHelper.exec(blobSelectExistSQL, new Object[]{blobId}, false, 0); - // a BLOB exists if the result has at least one entry - exists = rs.next(); - } finally { - DbUtility.close(rs); - } + try { + rs = conHelper.exec(blobSelectExistSQL, new Object[]{blobId}, false, 0); + // a BLOB exists if the result has at least one entry + exists = rs.next(); + } finally { + DbUtility.close(rs); + } String sql = (exists) ? blobUpdateSQL : blobInsertSQL; Object[] params = new Object[]{new StreamWrapper(in, size), blobId}; conHelper.exec(sql, params); Modified: jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/util/DbNameIndex.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/util/DbNameIndex.java?rev=898773&r1=898772&r2=898773&view=diff ============================================================================== --- jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/util/DbNameIndex.java (original) +++ jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/util/DbNameIndex.java Wed Jan 13 14:38:20 2010 @@ -142,7 +142,7 @@ ise.initCause(e); throw ise; } finally { - DbUtility.close(rs); + DbUtility.close(rs); } if (result != -1) { return result; @@ -172,7 +172,7 @@ ise.initCause(e); throw ise; } finally { - DbUtility.close(rs); + DbUtility.close(rs); } } @@ -187,7 +187,7 @@ String result = null; ResultSet rs = null; try { - rs = conHelper.exec(nameSelectSQL, new Object[] { Integer.valueOf(index) }, false, 0); + rs = conHelper.exec(nameSelectSQL, new Object[] { Integer.valueOf(index) }, false, 0); if (rs.next()) { result = rs.getString(1); } @@ -197,7 +197,7 @@ ise.initCause(e); throw ise; } finally { - DbUtility.close(rs); + DbUtility.close(rs); } if (result == null) { throw new IllegalArgumentException("Index not found: " + index); Modified: jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/util/PostgreSQLNameIndex.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/util/PostgreSQLNameIndex.java?rev=898773&r1=898772&r2=898773&view=diff ============================================================================== --- jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/util/PostgreSQLNameIndex.java (original) +++ jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/util/PostgreSQLNameIndex.java Wed Jan 13 14:38:20 2010 @@ -65,7 +65,7 @@ try { conHelper.exec(nameInsertSQL, new Object[]{string}); return getGeneratedKey(); - } catch (Exception e) { + } catch (Exception e) { IllegalStateException ise = new IllegalStateException("Unable to insert index for string: " + string); ise.initCause(e); throw ise; Modified: jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java?rev=898773&r1=898772&r2=898773&view=diff ============================================================================== --- jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java (original) +++ jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java Wed Jan 13 14:38:20 2010 @@ -29,41 +29,42 @@ */ public class RestoreAndCheckoutTest extends AbstractJCRTest { - private static final int NODES_COUNT = 10; + private static final int NODES_COUNT = 10; - public void testRestoreAndCheckout() throws RepositoryException { - Session session = getHelper().getSuperuserSession(); - - Node rootNode = session.getRootNode(); - Node myRoot = rootNode.addNode("myRoot"); - myRoot.addMixin("mix:versionable"); - rootNode.save(); - myRoot.checkin(); - - // create n child and grandchild versionable nodes - for (int i = 0; i < NODES_COUNT; i++) { - myRoot.checkout(); - Node childNode = myRoot.addNode("child" + i); - childNode.addMixin("mix:versionable"); - Node grandChildNode = childNode.addNode("grandChild"); - grandChildNode.addMixin("mix:versionable"); - myRoot.save(); - grandChildNode.checkin(); - childNode.checkin(); - myRoot.checkin(); - } - - // restore child, then restore/checkout grandchild nodes - for (int i = 0; i < NODES_COUNT; i++) { - Node childNode = myRoot.getNode("child" + i); - childNode.restore("1.0", false); - Node grandChildNode = childNode.getNode("grandChild"); - grandChildNode.restore("1.0", false); - // critical location regarding item state manager caching (see JCR-1197) - grandChildNode.checkout(); - grandChildNode.checkin(); - } + public void testRestoreAndCheckout() throws RepositoryException { + Session session = getHelper().getSuperuserSession(); - session.logout(); - } + Node rootNode = session.getRootNode(); + Node myRoot = rootNode.addNode("myRoot"); + myRoot.addMixin("mix:versionable"); + rootNode.save(); + myRoot.checkin(); + + // create n child and grandchild versionable nodes + for (int i = 0; i < NODES_COUNT; i++) { + myRoot.checkout(); + Node childNode = myRoot.addNode("child" + i); + childNode.addMixin("mix:versionable"); + Node grandChildNode = childNode.addNode("grandChild"); + grandChildNode.addMixin("mix:versionable"); + myRoot.save(); + grandChildNode.checkin(); + childNode.checkin(); + myRoot.checkin(); + } + + // restore child, then restore/checkout grandchild nodes + for (int i = 0; i < NODES_COUNT; i++) { + Node childNode = myRoot.getNode("child" + i); + childNode.restore("1.0", false); + Node grandChildNode = childNode.getNode("grandChild"); + grandChildNode.restore("1.0", false); + // critical location regarding item state manager caching (see + // JCR-1197) + grandChildNode.checkout(); + grandChildNode.checkin(); + } + + session.logout(); + } } Modified: jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java?rev=898773&r1=898772&r2=898773&view=diff ============================================================================== --- jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java (original) +++ jackrabbit/branches/2.0/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java Wed Jan 13 14:38:20 2010 @@ -63,7 +63,7 @@ String[] names = new String[coll.size()]; Iterator wspIt = coll.iterator(); for (int i = 0; wspIt.hasNext(); i++) { - WorkspaceConfig wsc = (WorkspaceConfig) wspIt.next(); + WorkspaceConfig wsc = wspIt.next(); names[i] = wsc.getName(); } Modified: jackrabbit/branches/2.0/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/PropertyDefinitionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/PropertyDefinitionImpl.java?rev=898773&r1=898772&r2=898773&view=diff ============================================================================== --- jackrabbit/branches/2.0/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/PropertyDefinitionImpl.java (original) +++ jackrabbit/branches/2.0/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/PropertyDefinitionImpl.java Wed Jan 13 14:38:20 2010 @@ -163,6 +163,7 @@ DomUtil.setText(opElem, qops[i]); qopElem.appendChild(opElem); } + elem.appendChild(qopElem); return elem; } Modified: jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java?rev=898773&r1=898772&r2=898773&view=diff ============================================================================== --- jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java (original) +++ jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java Wed Jan 13 14:38:20 2010 @@ -16,10 +16,6 @@ */ package org.apache.jackrabbit.jcr2spi.hierarchy; -import javax.jcr.InvalidItemStateException; -import javax.jcr.ItemNotFoundException; -import javax.jcr.RepositoryException; - import org.apache.jackrabbit.jcr2spi.operation.Operation; import org.apache.jackrabbit.jcr2spi.operation.SetPropertyValue; import org.apache.jackrabbit.jcr2spi.state.ItemState; @@ -29,6 +25,10 @@ import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.PropertyId; +import javax.jcr.InvalidItemStateException; +import javax.jcr.ItemNotFoundException; +import javax.jcr.RepositoryException; + /** * PropertyEntryImpl implements a reference to a property state. */ @@ -122,12 +122,15 @@ } switch (operation.getStatus()) { case Operation.STATUS_PERSISTED: - /* - NOTE: Property can only be the changelog target, if it was - existing and has been modified. removal, add and implicit modification - of protected properties must be persisted by save on parent. - */ - op.getPropertyState().setStatus(Status.EXISTING); + // Property can only be the change log target if it was existing and has + // been modified. This includes the case where a property was changed and + // then removed by removing its parent. See JCR-2462. + // Removal, add and implicit modification of protected + // properties must be persisted by save on parent. + PropertyState state = op.getPropertyState(); + if (state.getStatus() != Status.REMOVED) { + state.setStatus(Status.EXISTING); + } break; case Operation.STATUS_UNDO: revert(); Modified: jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java?rev=898773&r1=898772&r2=898773&view=diff ============================================================================== --- jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java (original) +++ jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java Wed Jan 13 14:38:20 2010 @@ -16,10 +16,8 @@ */ package org.apache.jackrabbit.jcr2spi; -import org.apache.jackrabbit.test.AbstractJCRTest; -import org.apache.jackrabbit.test.NotExecutableException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.Arrays; +import java.util.List; import javax.jcr.InvalidItemStateException; import javax.jcr.ItemNotFoundException; @@ -29,8 +27,11 @@ import javax.jcr.Property; import javax.jcr.RepositoryException; import javax.jcr.Session; -import java.util.Arrays; -import java.util.List; + +import org.apache.jackrabbit.test.AbstractJCRTest; +import org.apache.jackrabbit.test.NotExecutableException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * UpdateTest... @@ -208,6 +209,18 @@ } } + /** + * See JCR-2462 + */ + public void testSetSamePropertyTwice() throws RepositoryException { + Node node = this.testRootNode.addNode( "test" ); + Session session = node.getSession(); + node.setProperty( "prop", "value1"); + node.setProperty( "prop", "value2"); + node.remove(); + session.save(); + } + private String getAnotherWorkspace() throws NotExecutableException, RepositoryException { String srcWorkspace = getHelper().getProperty("org.apache.jackrabbit.jcr2spi.workspace2.name");; if (srcWorkspace == null || srcWorkspace.equals(currentWorkspace)) { Modified: jackrabbit/branches/2.0/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?rev=898773&r1=898772&r2=898773&view=diff ============================================================================== --- jackrabbit/branches/2.0/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java (original) +++ jackrabbit/branches/2.0/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Wed Jan 13 14:38:20 2010 @@ -1474,7 +1474,7 @@ /** * @see RepositoryService#checkout(SessionInfo, NodeId, NodeId) */ - public void checkout(SessionInfo sessionInfo, NodeId nodeId, NodeId activityOd) throws UnsupportedRepositoryOperationException, LockException, RepositoryException { + public void checkout(SessionInfo sessionInfo, NodeId nodeId, NodeId activityId) throws UnsupportedRepositoryOperationException, LockException, RepositoryException { // TODO throw new UnsupportedOperationException("JCR-2104: JSR 283 Versioning. Implementation missing"); } Modified: jackrabbit/branches/2.0/jackrabbit-standalone/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-standalone/pom.xml?rev=898773&r1=898772&r2=898773&view=diff ============================================================================== --- jackrabbit/branches/2.0/jackrabbit-standalone/pom.xml (original) +++ jackrabbit/branches/2.0/jackrabbit-standalone/pom.xml Wed Jan 13 14:38:20 2010 @@ -81,6 +81,11 @@ jar + org.apache.jackrabbit + jackrabbit-jcr2dav + 2.0-SNAPSHOT + + org.mortbay.jetty jetty