You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2012/10/31 15:06:13 UTC
svn commit: r1404144 [1/5] - in /jackrabbit/branches/2.2:
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/ jac...
Author: reschke
Date: Wed Oct 31 14:06:06 2012
New Revision: 1404144
URL: http://svn.apache.org/viewvc?rev=1404144&view=rev
Log:
add missing svn:eol-style properties
Modified:
jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitNode.java (props changed)
jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitRepositoryFactory.java (props changed)
jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitValue.java (props changed)
jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/DataStoreGarbageCollector.java (props changed)
jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/MarkEventListener.java (props changed)
jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/RepositoryManager.java (props changed)
jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/JackrabbitEvent.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Query.java (props changed)
jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/QueryBuilder.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/AbstractNodeData.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemData.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitThreadPool.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/LowPriorityTask.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeData.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeDataRef.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyData.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryCopier.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryManagerImpl.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/UserPerWorkspaceSecurityManager.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceEventChannel.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceListener.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceRecord.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ImportConfig.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/UserManagerConfig.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/LazyFileInputStream.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DerbyDataStore.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/FileSystemFactory.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/id/SeededSecureRandom.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/RotatingLogFile.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/PersistenceCopier.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DecimalField.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/ConstraintSplitInfo.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/RowPathComparator.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/AbstractACLTemplate.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/simple/SimpleWorkspaceAccessManager.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserPerWorkspaceUserManager.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/XPathQueryBuilder.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/XPathQueryEvaluator.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/DummyUpdateEventChannel.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/CooperativeFileLock.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/RepositoryLockMechanism.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/RepositoryLockMechanismFactory.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/BinaryValueImpl.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValueFactory.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/ValueFactoryImpl.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InconsistentVersioningState.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersioningLock.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/ClonedInputSource.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/JackrabbitNodeTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/TestAll.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManagerTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/TestAll.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/UserManagerSearchTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentRenameTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentWorkspaceCopyTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveAtRootTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NPEandCMETest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/OverlappingNodeAddTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/SessionGarbageCollectedTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ShareableNodeTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/UserPerWorkspaceSecurityManagerTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/ConcurrentGcTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DataStoreAPITest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/LazyFileInputStreamTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/OpenFilesTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/WriteWhileReadingTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/fs/TestAll.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/id/NodeIdTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/id/TestAll.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/ItemSequenceTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/NodeImplTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/TreeTraverserTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/VersioningTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/benchmark/SimpleBench.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/lock/LockTimeoutTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/AutoFixCorruptNode.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/TestAll.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/JoinTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/LimitedAccessQueryTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SQL2NodeLocalNameTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SQL2OuterJoinTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SQL2TooManyClausesTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/DecimalConvertTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/SQL2IndexingAggregateTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/CryptedSimpleCredentialsTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/NodeCreationTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/UserImporterTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/DefaultISMLockingDeadlockTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/CooperativeFileLockTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/value/InternalValueFactoryTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/value/InternalValueTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/value/PathTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/value/TestAll.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/AnonymousConnection.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/NamespaceHelper.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/BTreeManager.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/ItemSequence.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/NodeSequence.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/PropertySequence.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/Rank.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/Sequence.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/SizedIterator.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/TreeManager.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/TreeTraverser.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/LazyIteratorChain.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/ContentPackage.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/ContentPackageExporter.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/FilterContentPackage.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/qom/Operator.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/SingletonRepositoryFactory.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/visitor/FilteringItemVisitor.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/DocumentViewExporter.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/Exporter.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/ProxyContentHandler.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/SystemViewExporter.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/ToXmlContentHandler.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/XmlnsContentHandler.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/BinaryImpl.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/flat/RankTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/xml/ToXmlContentHandlerTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/commons/xml/XmlnsContentHandlerTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-commons/src/test/java/org/apache/jackrabbit/util/Base64Test.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/SerializableXid.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/SimpleWebdavServlet.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/FilterRepositoryFactory.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/AbstractLoginFilter.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/BasicLoginFilter.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/ContainerLoginFilter.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/NullLoginFilter.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NameTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/PathTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueInputStreamTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/util/InputStreamWrapper.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrLockManager.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockStateManager.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeDefinitionProvider.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/TransientOperationVisitor.java (props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/WorkspaceImport.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMixedTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMoveTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewAndSavedTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewSNSTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderReferenceableSNSTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderSNSTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/version/LabelTest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/conversion/IdentifierResolver.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/BoundedIterator.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Iterators.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Predicate.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Predicates.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Transformer.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/HashCache.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/RegistryNamespaceResolver.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/AbstractNodeType.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/AbstractNodeTypeManager.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeDefinitionImpl.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefinitionImpl.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/PropertyDefinitionImpl.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/StringCache.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/value/AbstractQValue.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/value/AbstractQValueFactory.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/conversion/DummyIdentifierResolver.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/NodeDefinitionTemplateImplTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/PropertyDefinitionTemplateImplTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/TestAll.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/sql2/ParserTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/value/ValueFormatTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-spi/src/test/java/org/apache/jackrabbit/spi/QValueTest.java (props changed)
jackrabbit/branches/2.2/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/cli/core/SetBinaryProperty.java (props changed)
jackrabbit/branches/2.2/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/cli/ext/ConnectToJNDIServer.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/cli/fs/FileToInputStream.java (props changed)
jackrabbit/branches/2.2/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/cli/namespace/SetNamespacePrefix.java (props changed)
jackrabbit/branches/2.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/BootstrapConfig.java (props changed)
jackrabbit/branches/2.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JcrApiNotFoundException.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/bind/BindServletRequest.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/RebindMethod.java (contents, props changed)
jackrabbit/branches/2.2/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/server/RFC4918DestinationHeaderTest.java (contents, props changed)
Propchange: jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitRepositoryFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitValue.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/DataStoreGarbageCollector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/MarkEventListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/RepositoryManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/JackrabbitEvent.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/JackrabbitEvent.java?rev=1404144&r1=1404143&r2=1404144&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/JackrabbitEvent.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/JackrabbitEvent.java Wed Oct 31 14:06:06 2012
@@ -1,35 +1,35 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.api.observation;
-
-import javax.jcr.observation.Event;
-
-/**
- * This is an extension of the event interface which provides
- * a method to detect whether the changes happened on locally
- * or remotely in a clustered environment.
- */
-public interface JackrabbitEvent extends Event {
-
- /**
- * Return a flag indicating whether this is an externally generated event.
- *
- * @return <code>true</code> if this is an external event;
- * <code>false</code> otherwise
- */
- boolean isExternal();
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.api.observation;
+
+import javax.jcr.observation.Event;
+
+/**
+ * This is an extension of the event interface which provides
+ * a method to detect whether the changes happened on locally
+ * or remotely in a clustered environment.
+ */
+public interface JackrabbitEvent extends Event {
+
+ /**
+ * Return a flag indicating whether this is an externally generated event.
+ *
+ * @return <code>true</code> if this is an external event;
+ * <code>false</code> otherwise
+ */
+ boolean isExternal();
+}
Propchange: jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/JackrabbitEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Query.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/QueryBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/AbstractNodeData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitThreadPool.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/LowPriorityTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeDataRef.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryCopier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryManagerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/UserPerWorkspaceSecurityManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceEventChannel.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceEventChannel.java?rev=1404144&r1=1404143&r2=1404144&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceEventChannel.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceEventChannel.java Wed Oct 31 14:06:06 2012
@@ -1,30 +1,30 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.core.cluster;
-
-import org.apache.jackrabbit.core.xml.ClonedInputSource;
-
-/**
- * Event channel for reporting workspace change events.
- */
-public interface WorkspaceEventChannel {
-
- void workspaceCreated(String workspaceName, ClonedInputSource inputSource);
-
- void setListener(WorkspaceListener listener);
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.core.cluster;
+
+import org.apache.jackrabbit.core.xml.ClonedInputSource;
+
+/**
+ * Event channel for reporting workspace change events.
+ */
+public interface WorkspaceEventChannel {
+
+ void workspaceCreated(String workspaceName, ClonedInputSource inputSource);
+
+ void setListener(WorkspaceListener listener);
+
+}
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceEventChannel.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceListener.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceListener.java?rev=1404144&r1=1404143&r2=1404144&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceListener.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceListener.java Wed Oct 31 14:06:06 2012
@@ -1,38 +1,38 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.core.cluster;
-
-import javax.jcr.RepositoryException;
-
-import org.xml.sax.InputSource;
-
-/**
- * Listener for external workspace changes.
- */
-public interface WorkspaceListener {
-
- /**
- * Workspace created on another cluster node.
- *
- * @param workspaceName
- * @param configTemplate
- * @throws RepositoryException
- */
- void externalWorkspaceCreated(String workspaceName,
- InputSource configTemplate) throws RepositoryException;
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.core.cluster;
+
+import javax.jcr.RepositoryException;
+
+import org.xml.sax.InputSource;
+
+/**
+ * Listener for external workspace changes.
+ */
+public interface WorkspaceListener {
+
+ /**
+ * Workspace created on another cluster node.
+ *
+ * @param workspaceName
+ * @param configTemplate
+ * @throws RepositoryException
+ */
+ void externalWorkspaceCreated(String workspaceName,
+ InputSource configTemplate) throws RepositoryException;
+
+}
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceRecord.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceRecord.java?rev=1404144&r1=1404143&r2=1404144&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceRecord.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceRecord.java Wed Oct 31 14:06:06 2012
@@ -1,200 +1,200 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.core.cluster;
-
-import java.io.ByteArrayInputStream;
-import java.io.CharArrayReader;
-
-import org.apache.jackrabbit.core.journal.JournalException;
-import org.apache.jackrabbit.core.journal.Record;
-import org.apache.jackrabbit.core.xml.ClonedInputSource;
-import org.xml.sax.InputSource;
-
-/**
- * Record for propagating workspace modifications across the cluster. Currently
- * only workspace creation is propagated because workspace deletion is not yet
- * implemented.
- */
-public class WorkspaceRecord extends ClusterRecord {
-
- /**
- * Identifier: NAMESPACE.
- */
- static final char IDENTIFIER = 'W';
-
- /**
- * Subtype for determining workspace action.
- */
- public static final int CREATE_WORKSPACE_ACTION_TYPE = 1;
-
- /**
- * Base workspace action
- */
- public abstract static class Action {
- abstract int getType();
-
- abstract void write(Record record) throws JournalException;
-
- abstract void read(Record record) throws JournalException;
- }
-
- /**
- * Action for workspace creation.
- */
- static final class CreateWorkspaceAction extends Action {
- private InputSource inputSource;
- private char[] charArray;
- private byte[] byteArray;
-
- int getType() {
- return CREATE_WORKSPACE_ACTION_TYPE;
- }
-
- CreateWorkspaceAction() {
-
- }
-
- CreateWorkspaceAction(ClonedInputSource inputSource) {
- this.inputSource = inputSource;
- this.charArray = inputSource.getCharacterArray();
- this.byteArray = inputSource.getByteArray();
- }
-
- void write(Record record) throws JournalException {
- // store the input source
- record.writeString(inputSource.getEncoding());
- record.writeString(inputSource.getPublicId());
- record.writeString(inputSource.getSystemId());
-
- // save character array if present
- if (charArray != null) {
- record.writeBoolean(true);
- record.writeString(new String(charArray));
- } else {
- record.writeBoolean(false);
- }
-
- // save the bytearray if present
- if (byteArray != null) {
- record.writeBoolean(true);
- record.writeInt(byteArray.length);
- record.write(byteArray);
- } else {
- record.writeBoolean(false);
- }
- }
-
- void read(Record record) throws JournalException {
- // restore the input source
- inputSource = new InputSource();
- inputSource.setEncoding(record.readString());
- inputSource.setPublicId(record.readString());
- inputSource.setSystemId(record.readString());
-
- if (record.readBoolean()) {
- charArray = record.readString().toCharArray();
- inputSource.setCharacterStream(new CharArrayReader(charArray));
- }
- if (record.readBoolean()) {
- final int size = record.readInt();
- byteArray = new byte[size];
- record.readFully(byteArray);
- inputSource.setByteStream(new ByteArrayInputStream(byteArray));
- }
- }
-
- public InputSource getInputSource() {
- return inputSource;
- }
- }
-
- // current action
- private Action action;
-
- /**
- * Creates a new {@link WorkspaceRecord} for create workspace action.
- *
- * @param workspace
- * workspace name
- * @param inputSource
- * input source with configuration for the workspace
- * @param record
- * journal record
- */
- protected WorkspaceRecord(String workspace, ClonedInputSource inputSource,
- Record record) {
- super(record, workspace);
-
- action = new CreateWorkspaceAction(inputSource);
- }
-
- /**
- * Creates a new empty {@link WorkspaceRecord}.
- *
- * @param record
- */
- protected WorkspaceRecord(Record record) {
- super(record);
- }
-
- protected void doRead() throws JournalException {
-
- workspace = record.readString();
-
- // determine type
- int action = record.readInt();
-
- if (action == CREATE_WORKSPACE_ACTION_TYPE) {
- this.action = new CreateWorkspaceAction();
- }
-
- if (this.action != null) {
- this.action.read(record);
- } else {
- throw new JournalException("Unknown workspace action type");
- }
- }
-
- protected void doWrite() throws JournalException {
-
- record.writeChar(IDENTIFIER);
-
- record.writeString(workspace);
-
- // store the type
- record.writeInt(getActionType());
-
- if (action != null) {
- action.write(record);
- } else {
- throw new JournalException("Can not write empty workspace action");
- }
- }
-
- public int getActionType() {
- return action != null ? action.getType() : -1;
- }
-
- public CreateWorkspaceAction getCreateWorkspaceAction() {
- return (CreateWorkspaceAction) action;
- }
-
- public void process(ClusterRecordProcessor processor) {
- processor.process(this);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.core.cluster;
+
+import java.io.ByteArrayInputStream;
+import java.io.CharArrayReader;
+
+import org.apache.jackrabbit.core.journal.JournalException;
+import org.apache.jackrabbit.core.journal.Record;
+import org.apache.jackrabbit.core.xml.ClonedInputSource;
+import org.xml.sax.InputSource;
+
+/**
+ * Record for propagating workspace modifications across the cluster. Currently
+ * only workspace creation is propagated because workspace deletion is not yet
+ * implemented.
+ */
+public class WorkspaceRecord extends ClusterRecord {
+
+ /**
+ * Identifier: NAMESPACE.
+ */
+ static final char IDENTIFIER = 'W';
+
+ /**
+ * Subtype for determining workspace action.
+ */
+ public static final int CREATE_WORKSPACE_ACTION_TYPE = 1;
+
+ /**
+ * Base workspace action
+ */
+ public abstract static class Action {
+ abstract int getType();
+
+ abstract void write(Record record) throws JournalException;
+
+ abstract void read(Record record) throws JournalException;
+ }
+
+ /**
+ * Action for workspace creation.
+ */
+ static final class CreateWorkspaceAction extends Action {
+ private InputSource inputSource;
+ private char[] charArray;
+ private byte[] byteArray;
+
+ int getType() {
+ return CREATE_WORKSPACE_ACTION_TYPE;
+ }
+
+ CreateWorkspaceAction() {
+
+ }
+
+ CreateWorkspaceAction(ClonedInputSource inputSource) {
+ this.inputSource = inputSource;
+ this.charArray = inputSource.getCharacterArray();
+ this.byteArray = inputSource.getByteArray();
+ }
+
+ void write(Record record) throws JournalException {
+ // store the input source
+ record.writeString(inputSource.getEncoding());
+ record.writeString(inputSource.getPublicId());
+ record.writeString(inputSource.getSystemId());
+
+ // save character array if present
+ if (charArray != null) {
+ record.writeBoolean(true);
+ record.writeString(new String(charArray));
+ } else {
+ record.writeBoolean(false);
+ }
+
+ // save the bytearray if present
+ if (byteArray != null) {
+ record.writeBoolean(true);
+ record.writeInt(byteArray.length);
+ record.write(byteArray);
+ } else {
+ record.writeBoolean(false);
+ }
+ }
+
+ void read(Record record) throws JournalException {
+ // restore the input source
+ inputSource = new InputSource();
+ inputSource.setEncoding(record.readString());
+ inputSource.setPublicId(record.readString());
+ inputSource.setSystemId(record.readString());
+
+ if (record.readBoolean()) {
+ charArray = record.readString().toCharArray();
+ inputSource.setCharacterStream(new CharArrayReader(charArray));
+ }
+ if (record.readBoolean()) {
+ final int size = record.readInt();
+ byteArray = new byte[size];
+ record.readFully(byteArray);
+ inputSource.setByteStream(new ByteArrayInputStream(byteArray));
+ }
+ }
+
+ public InputSource getInputSource() {
+ return inputSource;
+ }
+ }
+
+ // current action
+ private Action action;
+
+ /**
+ * Creates a new {@link WorkspaceRecord} for create workspace action.
+ *
+ * @param workspace
+ * workspace name
+ * @param inputSource
+ * input source with configuration for the workspace
+ * @param record
+ * journal record
+ */
+ protected WorkspaceRecord(String workspace, ClonedInputSource inputSource,
+ Record record) {
+ super(record, workspace);
+
+ action = new CreateWorkspaceAction(inputSource);
+ }
+
+ /**
+ * Creates a new empty {@link WorkspaceRecord}.
+ *
+ * @param record
+ */
+ protected WorkspaceRecord(Record record) {
+ super(record);
+ }
+
+ protected void doRead() throws JournalException {
+
+ workspace = record.readString();
+
+ // determine type
+ int action = record.readInt();
+
+ if (action == CREATE_WORKSPACE_ACTION_TYPE) {
+ this.action = new CreateWorkspaceAction();
+ }
+
+ if (this.action != null) {
+ this.action.read(record);
+ } else {
+ throw new JournalException("Unknown workspace action type");
+ }
+ }
+
+ protected void doWrite() throws JournalException {
+
+ record.writeChar(IDENTIFIER);
+
+ record.writeString(workspace);
+
+ // store the type
+ record.writeInt(getActionType());
+
+ if (action != null) {
+ action.write(record);
+ } else {
+ throw new JournalException("Can not write empty workspace action");
+ }
+ }
+
+ public int getActionType() {
+ return action != null ? action.getType() : -1;
+ }
+
+ public CreateWorkspaceAction getCreateWorkspaceAction() {
+ return (CreateWorkspaceAction) action;
+ }
+
+ public void process(ClusterRecordProcessor processor) {
+ processor.process(this);
+ }
+
+}
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/WorkspaceRecord.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ImportConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/UserManagerConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/LazyFileInputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DerbyDataStore.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/FileSystemFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/FileSystemFactory.java?rev=1404144&r1=1404143&r2=1404144&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/FileSystemFactory.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/FileSystemFactory.java Wed Oct 31 14:06:06 2012
@@ -1,39 +1,39 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.core.fs;
-
-import javax.jcr.RepositoryException;
-
-/**
- * Factory interface for creating {@link FileSystem} instances. Used
- * to decouple the repository internals from the repository configuration
- * mechanism.
- */
-public interface FileSystemFactory {
-
- /**
- * Creates, initializes, and returns a {@link FileSystem} instance
- * for use by the repository. Note that no information is passed from
- * the client, so all required configuration information must be
- * encapsulated in the factory.
- *
- * @return initialized file system
- * @throws RepositoryException if the file system can not be created
- */
- FileSystem getFileSystem() throws RepositoryException;
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.core.fs;
+
+import javax.jcr.RepositoryException;
+
+/**
+ * Factory interface for creating {@link FileSystem} instances. Used
+ * to decouple the repository internals from the repository configuration
+ * mechanism.
+ */
+public interface FileSystemFactory {
+
+ /**
+ * Creates, initializes, and returns a {@link FileSystem} instance
+ * for use by the repository. Note that no information is passed from
+ * the client, so all required configuration information must be
+ * encapsulated in the factory.
+ *
+ * @return initialized file system
+ * @throws RepositoryException if the file system can not be created
+ */
+ FileSystem getFileSystem() throws RepositoryException;
+
+}
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/FileSystemFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/id/SeededSecureRandom.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/id/SeededSecureRandom.java?rev=1404144&r1=1404143&r2=1404144&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/id/SeededSecureRandom.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/id/SeededSecureRandom.java Wed Oct 31 14:06:06 2012
@@ -1,110 +1,110 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.core.id;
-
-import java.security.SecureRandom;
-import java.util.Random;
-
-/**
- * Automatically seeded singleton secure random number generator.
- *
- * @see <a href="https://issues.apache.org/jira/browse/JCR-1206">JCR-1206</a>:
- * UUID generation: SecureRandom should be used by default
- */
-class SeededSecureRandom extends SecureRandom implements Runnable {
-
- /**
- * Maximum number of milliseconds to wait for the seeding.
- */
- private static final int MAX_SEED_TIME = 1000;
-
- /**
- * Singleton instance of this class. Initialized when first accessed.
- */
- private static volatile Random instance = null;
-
- /**
- * Returns the singleton instance of this class. The instance is
- * created and seeded when this method is first called.
- *
- * @return seeded secure random number generator
- */
- public static Random getInstance() {
- if (instance == null) {
- synchronized (SeededSecureRandom.class) {
- if (instance == null) {
- instance = new SeededSecureRandom();
- }
- }
- }
- return instance;
- }
-
- /**
- * Flag to indicate whether seeding is complete.
- */
- private volatile boolean seeded = false;
-
- /**
- * Creates and seeds a secure random number generator.
- */
- private SeededSecureRandom() {
- // Can not do that in a static initializer block, because
- // threads are not started after the initializer block exits
- Thread thread = new Thread(this, "SeededSecureRandom");
- thread.start();
- try {
- thread.join(MAX_SEED_TIME);
- } catch (InterruptedException e) {
- // ignore
- }
-
- if (!seeded) {
- // Alternative seed algorithm if the default is very slow
- setSeed(System.currentTimeMillis());
- setSeed(System.nanoTime());
- setSeed(new Object().hashCode());
- Runtime runtime = Runtime.getRuntime();
- setSeed(runtime.freeMemory());
- setSeed(runtime.maxMemory());
- setSeed(runtime.totalMemory());
- setSeed(System.getProperties().toString().hashCode());
-
- // Thread timing (a second thread is already running)
- for (int j = 0; j < 16; j++) {
- int i = 0;
- long start = System.currentTimeMillis();
- while (start == System.currentTimeMillis()) {
- i++;
- }
- // Supplement the existing seed
- setSeed(i);
- }
- }
- }
-
- /**
- * Seeds this random number generator with 32 bytes of random data.
- * Run in an initializer thread as this may be slow on some systems, see
- * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6202721.
- */
- public void run() {
- setSeed(generateSeed(32));
- seeded = true;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.core.id;
+
+import java.security.SecureRandom;
+import java.util.Random;
+
+/**
+ * Automatically seeded singleton secure random number generator.
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/JCR-1206">JCR-1206</a>:
+ * UUID generation: SecureRandom should be used by default
+ */
+class SeededSecureRandom extends SecureRandom implements Runnable {
+
+ /**
+ * Maximum number of milliseconds to wait for the seeding.
+ */
+ private static final int MAX_SEED_TIME = 1000;
+
+ /**
+ * Singleton instance of this class. Initialized when first accessed.
+ */
+ private static volatile Random instance = null;
+
+ /**
+ * Returns the singleton instance of this class. The instance is
+ * created and seeded when this method is first called.
+ *
+ * @return seeded secure random number generator
+ */
+ public static Random getInstance() {
+ if (instance == null) {
+ synchronized (SeededSecureRandom.class) {
+ if (instance == null) {
+ instance = new SeededSecureRandom();
+ }
+ }
+ }
+ return instance;
+ }
+
+ /**
+ * Flag to indicate whether seeding is complete.
+ */
+ private volatile boolean seeded = false;
+
+ /**
+ * Creates and seeds a secure random number generator.
+ */
+ private SeededSecureRandom() {
+ // Can not do that in a static initializer block, because
+ // threads are not started after the initializer block exits
+ Thread thread = new Thread(this, "SeededSecureRandom");
+ thread.start();
+ try {
+ thread.join(MAX_SEED_TIME);
+ } catch (InterruptedException e) {
+ // ignore
+ }
+
+ if (!seeded) {
+ // Alternative seed algorithm if the default is very slow
+ setSeed(System.currentTimeMillis());
+ setSeed(System.nanoTime());
+ setSeed(new Object().hashCode());
+ Runtime runtime = Runtime.getRuntime();
+ setSeed(runtime.freeMemory());
+ setSeed(runtime.maxMemory());
+ setSeed(runtime.totalMemory());
+ setSeed(System.getProperties().toString().hashCode());
+
+ // Thread timing (a second thread is already running)
+ for (int j = 0; j < 16; j++) {
+ int i = 0;
+ long start = System.currentTimeMillis();
+ while (start == System.currentTimeMillis()) {
+ i++;
+ }
+ // Supplement the existing seed
+ setSeed(i);
+ }
+ }
+ }
+
+ /**
+ * Seeds this random number generator with 32 bytes of random data.
+ * Run in an initializer thread as this may be slow on some systems, see
+ * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6202721.
+ */
+ public void run() {
+ setSeed(generateSeed(32));
+ seeded = true;
+ }
+
+}
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/id/SeededSecureRandom.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/RotatingLogFile.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/PersistenceCopier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DecimalField.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/ConstraintSplitInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/RowPathComparator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/AbstractACLTemplate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/simple/SimpleWorkspaceAccessManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserPerWorkspaceUserManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/XPathQueryBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/XPathQueryEvaluator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/DummyUpdateEventChannel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/CooperativeFileLock.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/RepositoryLockMechanism.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/RepositoryLockMechanismFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/BinaryValueImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValueFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/ValueFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InconsistentVersioningState.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersioningLock.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/ClonedInputSource.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/ClonedInputSource.java?rev=1404144&r1=1404143&r2=1404144&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/ClonedInputSource.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/ClonedInputSource.java Wed Oct 31 14:06:06 2012
@@ -1,168 +1,168 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.core.xml;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.CharArrayReader;
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import javax.jcr.RepositoryException;
-
-import org.xml.sax.InputSource;
-
-/**
- * Input source that clones existing input source. After cloning the existing
- * input source should not be used anymore. To make more copies call
- * {@link #cloneInputSource()} method.
- */
-public class ClonedInputSource extends InputSource {
- private final char[] characterArray;
- private final byte[] byteArray;
-
- /**
- * Clone existing input source.
- *
- * @param input
- * @throws RepositoryException
- */
- public ClonedInputSource(InputSource input) throws RepositoryException {
-
- if (input == null) {
- throw new IllegalArgumentException(
- "Argument 'input' may not be null.");
- }
-
- characterArray = read(input.getCharacterStream());
- byteArray = read(input.getByteStream());
-
- setEncoding(input.getEncoding());
- setPublicId(input.getPublicId());
- setSystemId(input.getSystemId());
- if (characterArray != null) {
- setCharacterStream(new CharArrayReader(characterArray));
- }
- if (byteArray != null) {
- setByteStream(new ByteArrayInputStream(byteArray));
- }
- }
-
- private ClonedInputSource(char[] characterArray, byte[] byteArray) {
- super();
- this.characterArray = characterArray;
- this.byteArray = byteArray;
- }
-
- public char[] getCharacterArray() {
- return characterArray;
- }
-
- public byte[] getByteArray() {
- return byteArray;
- }
-
- /**
- * Make a clone if this input source. The input source being cloned is still
- * valid after cloning.
- *
- * @return input source clone.
- */
- public ClonedInputSource cloneInputSource() {
-
- ClonedInputSource res = new ClonedInputSource(characterArray, byteArray);
-
- res.setEncoding(getEncoding());
- res.setPublicId(getPublicId());
- res.setSystemId(getSystemId());
-
- if (byteArray != null) {
- res.setByteStream(new ByteArrayInputStream(byteArray));
- }
- if (characterArray != null) {
- res.setCharacterStream(new CharArrayReader(characterArray));
- }
-
- return res;
- }
-
- private static byte[] read(InputStream stream) throws RepositoryException {
- if (stream != null) {
- try {
- final int bufferSize = Math.min(stream.available(), 4096);
- ByteArrayOutputStream s = new ByteArrayOutputStream(bufferSize);
-
- byte[] buffer = new byte[bufferSize];
- while (true) {
- int numRead = stream.read(buffer);
- if (numRead > 0) {
- s.write(buffer, 0, numRead);
- }
- if (numRead != bufferSize) {
- break;
- }
- }
-
- return s.toByteArray();
- } catch (IOException e) {
- throw new RepositoryException(e);
- } finally {
- try {
- stream.close();
- } catch (IOException ignore) {
-
- }
- }
- } else {
- return null;
- }
- }
-
- private static char[] read(Reader reader) throws RepositoryException {
- if (reader != null) {
- try {
- final int bufferSize = 4096;
- CharArrayWriter w = new CharArrayWriter(bufferSize);
-
- char[] buffer = new char[bufferSize];
- while (true) {
- int numRead = reader.read(buffer);
- if (numRead > 0) {
- w.write(buffer, 0, numRead);
- }
- if (numRead != bufferSize) {
- break;
- }
- }
- return w.toCharArray();
- } catch (IOException e) {
- throw new RepositoryException(e);
- } finally {
- try {
- reader.close();
- } catch (IOException ignore) {
-
- }
- }
- } else {
- return null;
- }
-
- }
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.core.xml;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.CharArrayReader;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+
+import javax.jcr.RepositoryException;
+
+import org.xml.sax.InputSource;
+
+/**
+ * Input source that clones existing input source. After cloning the existing
+ * input source should not be used anymore. To make more copies call
+ * {@link #cloneInputSource()} method.
+ */
+public class ClonedInputSource extends InputSource {
+ private final char[] characterArray;
+ private final byte[] byteArray;
+
+ /**
+ * Clone existing input source.
+ *
+ * @param input
+ * @throws RepositoryException
+ */
+ public ClonedInputSource(InputSource input) throws RepositoryException {
+
+ if (input == null) {
+ throw new IllegalArgumentException(
+ "Argument 'input' may not be null.");
+ }
+
+ characterArray = read(input.getCharacterStream());
+ byteArray = read(input.getByteStream());
+
+ setEncoding(input.getEncoding());
+ setPublicId(input.getPublicId());
+ setSystemId(input.getSystemId());
+ if (characterArray != null) {
+ setCharacterStream(new CharArrayReader(characterArray));
+ }
+ if (byteArray != null) {
+ setByteStream(new ByteArrayInputStream(byteArray));
+ }
+ }
+
+ private ClonedInputSource(char[] characterArray, byte[] byteArray) {
+ super();
+ this.characterArray = characterArray;
+ this.byteArray = byteArray;
+ }
+
+ public char[] getCharacterArray() {
+ return characterArray;
+ }
+
+ public byte[] getByteArray() {
+ return byteArray;
+ }
+
+ /**
+ * Make a clone if this input source. The input source being cloned is still
+ * valid after cloning.
+ *
+ * @return input source clone.
+ */
+ public ClonedInputSource cloneInputSource() {
+
+ ClonedInputSource res = new ClonedInputSource(characterArray, byteArray);
+
+ res.setEncoding(getEncoding());
+ res.setPublicId(getPublicId());
+ res.setSystemId(getSystemId());
+
+ if (byteArray != null) {
+ res.setByteStream(new ByteArrayInputStream(byteArray));
+ }
+ if (characterArray != null) {
+ res.setCharacterStream(new CharArrayReader(characterArray));
+ }
+
+ return res;
+ }
+
+ private static byte[] read(InputStream stream) throws RepositoryException {
+ if (stream != null) {
+ try {
+ final int bufferSize = Math.min(stream.available(), 4096);
+ ByteArrayOutputStream s = new ByteArrayOutputStream(bufferSize);
+
+ byte[] buffer = new byte[bufferSize];
+ while (true) {
+ int numRead = stream.read(buffer);
+ if (numRead > 0) {
+ s.write(buffer, 0, numRead);
+ }
+ if (numRead != bufferSize) {
+ break;
+ }
+ }
+
+ return s.toByteArray();
+ } catch (IOException e) {
+ throw new RepositoryException(e);
+ } finally {
+ try {
+ stream.close();
+ } catch (IOException ignore) {
+
+ }
+ }
+ } else {
+ return null;
+ }
+ }
+
+ private static char[] read(Reader reader) throws RepositoryException {
+ if (reader != null) {
+ try {
+ final int bufferSize = 4096;
+ CharArrayWriter w = new CharArrayWriter(bufferSize);
+
+ char[] buffer = new char[bufferSize];
+ while (true) {
+ int numRead = reader.read(buffer);
+ if (numRead > 0) {
+ w.write(buffer, 0, numRead);
+ }
+ if (numRead != bufferSize) {
+ break;
+ }
+ }
+ return w.toCharArray();
+ } catch (IOException e) {
+ throw new RepositoryException(e);
+ } finally {
+ try {
+ reader.close();
+ } catch (IOException ignore) {
+
+ }
+ }
+ } else {
+ return null;
+ }
+
+ }
}
\ No newline at end of file
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/ClonedInputSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/JackrabbitNodeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/TestAll.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/TestAll.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/UserManagerSearchTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentRenameTest.java
------------------------------------------------------------------------------
svn:eol-style = native