From commits-return-6442-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Mon Oct 13 07:25:32 2008 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 60850 invoked from network); 13 Oct 2008 07:25:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Oct 2008 07:25:32 -0000 Received: (qmail 80691 invoked by uid 500); 13 Oct 2008 07:25:32 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 80666 invoked by uid 500); 13 Oct 2008 07:25:32 -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 80657 invoked by uid 99); 13 Oct 2008 07:25:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Oct 2008 00:25:32 -0700 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; Mon, 13 Oct 2008 07:24:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 44542238889D; Mon, 13 Oct 2008 00:25:11 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r703933 - in /jackrabbit/branches/1.5: ./ jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/ jackrabbit-api/src/main/resources/META-INF/ jackrabbit-classloader/src/main/resources/META-INF/ jackrabbit-core/src/main/java/org/... Date: Mon, 13 Oct 2008 07:25:11 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081013072511.44542238889D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Mon Oct 13 00:25:09 2008 New Revision: 703933 URL: http://svn.apache.org/viewvc?rev=703933&view=rev Log: 1.5: Preparing svn merge tracking Modified: jackrabbit/branches/1.5/ (props changed) jackrabbit/branches/1.5/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/JackrabbitEvent.java (props changed) jackrabbit/branches/1.5/jackrabbit-api/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-api/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-classloader/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-classloader/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/StringIndex.java (props changed) jackrabbit/branches/1.5/jackrabbit-core/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-core/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jca/src/main/rar/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-benchmark/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-benchmark/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-commons/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-commons/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-rmi/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-rmi/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-server/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-server/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-server/src/main/resources/org/apache/jackrabbit/server/io/mimetypes.properties (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-servlet/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-servlet/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-tests/src/main/resources/META-INF/ (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-tests/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr-tests/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr2spi/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-jcr2spi/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-ocm-nodemanagement/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-ocm-nodemanagement/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-ocm/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-ocm/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-spi-commons/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-spi-commons/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-spi/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-spi/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-spi2jcr/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-spi2jcr/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-text-extractors/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-text-extractors/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-webapp/src/main/webapp/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-webdav/src/main/resources/META-INF/LICENSE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-webdav/src/main/resources/META-INF/NOTICE.txt (props changed) jackrabbit/branches/1.5/jackrabbit-webdav/src/main/resources/org/apache/jackrabbit/webdav/statuscode.properties (props changed) Propchange: jackrabbit/branches/1.5/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 13 00:25:09 2008 @@ -1 +1,2 @@ /jackrabbit/branches/1.3:631261 +/jackrabbit/trunk:703928 Propchange: jackrabbit/branches/1.5/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/JackrabbitEvent.java ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-api/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-api/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-classloader/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-classloader/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/StringIndex.java ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-core/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-core/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jca/src/main/rar/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-benchmark/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-benchmark/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-commons/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-commons/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-rmi/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-rmi/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-server/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-server/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-server/src/main/resources/org/apache/jackrabbit/server/io/mimetypes.properties ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-servlet/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-servlet/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-tests/src/main/resources/META-INF/ ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-tests/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr-tests/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr2spi/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-jcr2spi/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-ocm-nodemanagement/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-ocm-nodemanagement/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-ocm/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-ocm/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-spi-commons/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-spi-commons/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-spi/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-spi/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-spi2jcr/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-spi2jcr/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-text-extractors/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-text-extractors/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-webapp/src/main/webapp/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-webdav/src/main/resources/META-INF/LICENSE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-webdav/src/main/resources/META-INF/NOTICE.txt ('svn:mergeinfo' removed) Propchange: jackrabbit/branches/1.5/jackrabbit-webdav/src/main/resources/org/apache/jackrabbit/webdav/statuscode.properties ('svn:mergeinfo' removed)