You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/10/13 09:25:11 UTC
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/...
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)