You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2014/06/17 09:47:01 UTC
svn commit: r1603078 - in /jackrabbit/oak/trunk:
oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/
oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/
oak-commons/s...
Author: reschke
Date: Tue Jun 17 07:46:59 2014
New Revision: 1603078
URL: http://svn.apache.org/r1603078
Log:
javadoc fix ("* <p/>" -> "* <p>")
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/UnboundLdapConnectionPool.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/IOUtils.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentRepository.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionConstants.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/WorkspaceInitializer.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/Importer.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedNodeImporter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java
jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/AbstractMicroKernelIT.java
jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/util/TestInputStream.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/BufferedStringValue.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionableTest.java
jackrabbit/oak/trunk/oak-mk-api/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Commit.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Id.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/Persistence.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/IdFactory.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NameFilter.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NodeFilter.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfiguration.java
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java Tue Jun 17 07:46:59 2014
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
/**
* {@code DefaultSyncHandler} implements an sync handler that synchronizes users and groups from an external identity
* provider with the repository users.
- * <p/>
+ * <p>
* Please refer to {@link DefaultSyncConfig} for configuration options.
*/
@Component(
Modified: jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/UnboundLdapConnectionPool.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/UnboundLdapConnectionPool.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/UnboundLdapConnectionPool.java (original)
+++ jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/UnboundLdapConnectionPool.java Tue Jun 17 07:46:59 2014
@@ -21,7 +21,7 @@ import org.apache.directory.ldap.client.
/**
* A pool implementation for LdapConnection objects.
- * <p/>
+ * <p>
* This class is just a wrapper around the commons GenericObjectPool, and has
* a more meaningful name to represent the pool type.
*/
Modified: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/IOUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/IOUtils.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/IOUtils.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/IOUtils.java Tue Jun 17 07:46:59 2014
@@ -289,7 +289,7 @@ public final class IOUtils {
/**
* Unconditionally close a {@code Closeable}.
- * <p/>
+ * <p>
* Equivalent to {@link Closeable#close()}, except any exceptions will be ignored.
* This is typically used in finally blocks.
*
@@ -307,7 +307,7 @@ public final class IOUtils {
/**
* Unconditionally close a {@code Socket}.
- * <p/>
+ * <p>
* Equivalent to {@link Socket#close()}, except any exceptions will be ignored.
* This is typically used in finally blocks.
*
@@ -326,7 +326,7 @@ public final class IOUtils {
/**
* Copy bytes from an {@code InputStream} to an
* {@code OutputStream}.
- * <p/>
+ * <p>
* This method buffers the input internally, so there is no need to use a
* {@code BufferedInputStream}.
*
Modified: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java Tue Jun 17 07:46:59 2014
@@ -25,7 +25,7 @@ import javax.annotation.Nonnull;
/**
* Utility methods to parse a path.
- * <p/>
+ * <p>
* Each method validates the input, except if the system property
* {packageName}.SKIP_VALIDATION is set, in which case only minimal validation
* takes place within this function, so when the parameter is an illegal path,
@@ -103,7 +103,7 @@ public final class PathUtils {
/**
* Get the nth ancestor of a path. The 1st ancestor is the parent path,
* 2nd ancestor the grandparent path, and so on...
- * <p/>
+ * <p>
* If nth <= 0, the path argument is returned as is.
*
* @param path the path
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java Tue Jun 17 07:46:59 2014
@@ -575,11 +575,11 @@ public class Oak {
* Creates a content repository with the given configuration
* and logs in to the default workspace with no credentials,
* returning the resulting content session.
- * <p/>
+ * <p>
* This method exists mostly as a convenience for one-off tests,
* as there's no way to create other sessions for accessing the
* same repository.
- * <p/>
+ * <p>
* There is typically no need to explicitly close the returned
* session unless the repository has explicitly been configured
* to reserve some resources until all sessions have been closed.
@@ -602,11 +602,11 @@ public class Oak {
* Creates a content repository with the given configuration
* and returns a {@link Root} instance after logging in to the
* default workspace with no credentials.
- * <p/>
+ * <p>
* This method exists mostly as a convenience for one-off tests, as
* the returned root is the only way to access the session or the
* repository.
- * <p/>
+ * <p>
* Note that since there is no way to close the underlying content
* session, this method should only be used when no components that
* require sessions to be closed have been configured. The repository
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentRepository.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentRepository.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentRepository.java Tue Jun 17 07:46:59 2014
@@ -25,17 +25,17 @@ import javax.security.auth.login.LoginEx
/**
* Oak content repository. The repository may be local or remote, or a cluster
* of any size. These deployment details are all hidden behind this interface.
- * <p/>
+ * <p>
* All access to the repository happens through authenticated
* {@link ContentSession} instances acquired through the
* {@link #login(Credentials, String)} method, which is why that is the only
* method of this interface.
- * <p/>
+ * <p>
* Starting and stopping ContentRepository instances is the responsibility
* of each particular deployment and not covered by this interface.
* Repository clients should use a deployment-specific mechanism (JNDI,
* OSGi service, etc.) to acquire references to ContentRepository instances.
- * <p/>
+ * <p>
* This interface is thread-safe.
*/
public interface ContentRepository {
@@ -45,16 +45,16 @@ public interface ContentRepository {
* out-of-band information and, if successful, returns a
* {@link ContentSession} instance for accessing repository content
* inside the specified workspace as the authenticated user.
- * <p/>
+ * <p>
* TODO clarify workspace handling once multiple workspaces are
* supported. See OAK-118.
- * <p/>
+ * <p>
* The exact type of access credentials is undefined, as this method
* simply acts as a generic messenger between clients and pluggable
* login modules that take care of the actual authentication. See
* the documentation of relevant login modules for the kind of access
* credentials they expect.
- * <p/>
+ * <p>
* The client must explicitly {@link ContentSession#close()} the
* returned session once it is no longer used. The recommended access
* pattern is:
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java Tue Jun 17 07:46:59 2014
@@ -262,7 +262,7 @@ public interface Tree {
/**
* Changes the nature of this tree such that the order of the children
* is kept stable. The expected behavior is as follows:
- * <p/>
+ * <p>
* <ol>
* <li>Calling {@code setOrderableChildren(true)} on a tree
* the first time will stabilize the order of existing children. Any
@@ -277,7 +277,7 @@ public interface Tree {
* list stable. The order of children upon {@link #getChildren()} is
* subsequently undefined.</li>
* </ol>
- * <p/>
+ * <p>
* Calling {@link #orderBefore(String)} on a tree, implicitly enables
* orderable children on the parent tree.
*
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java Tue Jun 17 07:46:59 2014
@@ -372,7 +372,7 @@ class MutableRoot implements Root {
* The last entry in the list is always an empty slot to be filled in by calling
* {@code setMove()}. This fills the slot with the source and destination of the move
* and links this move to the next one which will be the new empty slot.
- * <p/>
+ * <p>
* Moves can be applied to {@code MutableTree} instances by calling {@code apply()},
* which will execute all moves in the list on the passed tree instance
*/
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java Tue Jun 17 07:46:59 2014
@@ -73,7 +73,7 @@ public abstract class ReadWriteNodeTypeM
* {@link #unregisterNodeType(String)} and {@link #unregisterNodeTypes(String[])}
* to acquire a fresh {@link Root} instance that can be used to persist the
* requested node type changes (and nothing else).
- * <p/>
+ * <p>
* This default implementation throws an {@link UnsupportedOperationException}.
*
* @return fresh {@link Root} instance.
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java Tue Jun 17 07:46:59 2014
@@ -28,7 +28,7 @@ import org.apache.jackrabbit.util.ISO860
/**
* <i>Inspired by Jackrabbit 2.x</i>
- * <p/>
+ * <p>
* This Class implements a version selector that selects a version by creation
* date. The selected version is the latest that is older or equal than the
* given date. If no version could be found {@code null} is returned
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionConstants.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionConstants.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionConstants.java Tue Jun 17 07:46:59 2014
@@ -79,7 +79,7 @@ public interface VersionConstants extend
/**
* Quote from JSR 283 Section "15.12.3 Activity Storage"<p/>
- * <p/>
+ * <p>
* Activities are persisted as nodes of type nt:activity under system-generated
* node names in activity storage below /jcr:system/jcr:activities.<br>
* Similar to the /jcr:system/jcr:versionStorage subgraph, the activity storage
@@ -89,7 +89,7 @@ public interface VersionConstants extend
/**
* Quote from JSR 283 Section "15.13.2 Configuration Proxy Nodes"<p/>
- * <p/>
+ * <p>
* Each configuration in a given workspace is represented by a distinct proxy
* node of type nt:configuration located in configuration storage within the
* same workspace under /jcr:system/jcr:configurations/. The configuration
@@ -101,7 +101,7 @@ public interface VersionConstants extend
/**
* Quote from JSR 283 Section "3.13.8 Version Storage"<p/>
- * <p/>
+ * <p>
* Version histories are stored in a single, repository-wide version storage
* mutable and readable through the versioning API.
* Under full versioning the version storage data must, additionally, be
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java Tue Jun 17 07:46:59 2014
@@ -26,21 +26,21 @@ import org.apache.jackrabbit.oak.spi.sta
/**
* <i>Inspired by Jackrabbit 2.x</i>
- * <p/>
+ * <p>
* This Interface defines the version selector that needs to provide a version,
* given some hints and a version history. the selector is used in the various
* restore methods in order to select the correct version of previously versioned
* OPV=Version children upon restore. JSR170 states: <em>"This determination
* [of the version] depends on the configuration of the workspace and is outside
* the scope of this specification."</em>
- * <p/>
+ * <p>
* The version selection in jackrabbit works as follows:<br/>
* The {@code Node.restore()} methods uses the
* {@link DateVersionSelector} which is initialized with the creation date of
* the parent version. This selector selects the latest version that is equal
* or older than the given date. if no such version exists, the initial one
* is restored.<br/>
- * <p/>
+ * <p>
*
* @see DateVersionSelector
* @see javax.jcr.version.VersionManager#restore
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImpl.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImpl.java Tue Jun 17 07:46:59 2014
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.spi.whi
/**
* Default implementation of the {@link CallbackHandler} interface. It currently
* supports the following {@code Callback} implementations:
- * <p/>
+ * <p>
* <ul>
* <li>{@link CredentialsCallback}</li>
* <li>{@link NameCallback}</li>
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java Tue Jun 17 07:46:59 2014
@@ -72,7 +72,7 @@ import static org.apache.jackrabbit.oak.
* management implementation must provide paths for all
* {@link org.apache.jackrabbit.api.security.user.User users} that refer to
* a valid {@link Tree} in the content repository.
- * <p/>
+ * <p>
* <h3>Backwards compatibility with Jackrabbit 2.x</h3>
* For security reasons the nodes storing the token information now have a
* dedicated node type (rep:Token) which has the following definition:
@@ -86,7 +86,7 @@ import static org.apache.jackrabbit.oak.
* Consequently the hash of the token and the expiration time of tokens generated
* by this provider can no longer be manipulated using regular JCR item
* modifications.<p>
- * <p/>
+ * <p>
* Existing login tokens generated by Jackrabbit 2.x which are migrated to
* OAK will still be valid (unless they expire) due to the fact that
* {@link #getTokenInfo(String)} and the implementation of the {@link TokenInfo}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java Tue Jun 17 07:46:59 2014
@@ -35,7 +35,7 @@ import static com.google.common.base.Pre
* more wildcard characters ("{@code *}") according to the glob matching
* defined by {@link javax.jcr.Node#getNodes(String[])}. In contrast to that
* method the {@code GlobPattern} operates on path (not only names).
- * <p/>
+ * <p>
*
* <p>
* Please note the following special cases:
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java Tue Jun 17 07:46:59 2014
@@ -142,7 +142,7 @@ class PrivilegeValidator extends Default
/**
* Validation of the privilege definition including the following steps:
- * <p/>
+ * <p>
* - privilege bits must not collide with an existing privilege
* - next bits must have been adjusted in case of a non-aggregate privilege
* - all aggregates must have been registered before
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java Tue Jun 17 07:46:59 2014
@@ -70,13 +70,13 @@ import static org.apache.jackrabbit.oak.
* {@code UserImporter} implements both {@code ode>ProtectedPropertyImporter}
* and {@code ProtectedNodeImporter} and provides import facilities for protected
* user and group content defined and used by this user management implementation.<p/>
- * <p/>
+ * <p>
* The importer is intended to be used by applications that import user content
* extracted from another repository instance and immediately persist the
* imported content using {@link javax.jcr.Session#save()}. Omitting the
* save call will lead to transient, semi-validated user content and eventually
* to inconsistencies.
- * <p/>
+ * <p>
* Note the following restrictions:
* <ul>
* <li>The importer will only be initialized if the user manager exposed by
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java Tue Jun 17 07:46:59 2014
@@ -52,9 +52,9 @@ import static com.google.common.base.Pre
* Creates initial set of users to be present in a given workspace. This
* implementation uses the {@code UserManager} such as defined by the
* user configuration.
- * <p/>
+ * <p>
* Currently the following users are created:
- * <p/>
+ * <p>
* <ul>
* <li>An administrator user using {@link UserConstants#PARAM_ADMIN_ID}
* or {@link UserConstants#DEFAULT_ADMIN_ID} if the config option is missing.</li>
@@ -62,10 +62,10 @@ import static com.google.common.base.Pre
* or {@link UserConstants#DEFAULT_ANONYMOUS_ID} if the config option is
* missing.</li>
* </ul>
- * <p/>
+ * <p>
* In addition this initializer sets up index definitions for the following
* user related properties:
- * <p/>
+ * <p>
* <ul>
* <li>{@link UserConstants#REP_AUTHORIZABLE_ID}</li>
* <li>{@link UserConstants#REP_PRINCIPAL_NAME}</li>
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java Tue Jun 17 07:46:59 2014
@@ -51,9 +51,9 @@ import static org.apache.jackrabbit.oak.
/**
* User provider implementation and manager for group memberships with the
* following characteristics:
- * <p/>
+ * <p>
* <h1>UserProvider</h1>
- * <p/>
+ * <p>
* <h2>User and Group Creation</h2>
* This implementation creates the JCR nodes corresponding the a given
* authorizable ID with the following behavior:
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/WorkspaceInitializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/WorkspaceInitializer.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/WorkspaceInitializer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/WorkspaceInitializer.java Tue Jun 17 07:46:59 2014
@@ -21,7 +21,7 @@ import org.apache.jackrabbit.oak.spi.sta
/**
* Initializer of a workspace and it's initial content. A module that needs
* to add content to a workspace can implement this interface.
- * <p/>
+ * <p>
* TODO: define if/how runtime configuration changes may affect the workspace content.
* TODO: review params of initialize()
*/
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java Tue Jun 17 07:46:59 2014
@@ -58,11 +58,11 @@ import org.slf4j.LoggerFactory;
* Abstract implementation of the {@link LoginModule} interface that can act
* as base class for login modules that aim to authenticate subjects against
* information stored in the content repository.
- * <p/>
+ * <p>
* <h2>LoginModule Methods</h2>
* This base class provides a simple implementation for the following methods
* of the {@code LoginModule} interface:
- * <p/>
+ * <p>
* <ul>
* <li>{@link LoginModule#initialize(Subject, CallbackHandler, Map, Map) Initialize}:
* Initialization of this abstract module sets the following protected instance
@@ -84,19 +84,19 @@ import org.slf4j.LoggerFactory;
* to {@code null}. Subclasses are in charge of releasing their own state
* information by either overriding {@link #clearState()}.</li>
* </ul>
- * <p/>
+ * <p>
* <h2>Utility Methods</h2>
* The following methods are provided in addition:
- * <p/>
+ * <p>
* <ul>
* <li>{@link #clearState()}: Clears all private state information that has
* be created during login. This method in called in {@link #abort()} and
* subclasses are expected to override this method.</li>
- * <p/>
+ * <p>
* <li>{@link #getSupportedCredentials()}: Abstract method used by
* {@link #getCredentials()} that reveals which credential implementations
* are supported by the {@code LoginModule}.</li>
- * <p/>
+ * <p>
* <li>{@link #getCredentials()}: Tries to retrieve valid (supported)
* Credentials in the following order:
* <ol>
@@ -105,31 +105,31 @@ import org.slf4j.LoggerFactory;
* state (see also {@link #getSharedCredentials()} and finally by</li>
* <li>searching for valid credentials in the subject.</li>
* </ol></li>
- * <p/>
+ * <p>
* <li>{@link #getSharedCredentials()}: This method returns credentials
* passed to the login module with the share state. The key to share credentials
* with a another module extending from this base class is
* {@link #SHARED_KEY_CREDENTIALS}. Note, that this method does not verify
* if the credentials provided by the shared state are
* {@link #getSupportedCredentials() supported}.</li>
- * <p/>
+ * <p>
* <li>{@link #getSharedLoginName()}: If the shared state contains an entry
* for {@link #SHARED_KEY_LOGIN_NAME} this method returns the value as login name.</li>
- * <p/>
+ * <p>
* <li>{@link #getSecurityProvider()}: Returns the configured security
* provider or {@code null}.</li>
- * <p/>
+ * <p>
* <li>{@link #getRoot()}: Provides access to the latest state of the
* repository in order to retrieve user or principal information required to
* authenticate the subject as well as to write back information during
* {@link #commit()}.</li>
- * <p/>
+ * <p>
* <li>{@link #getUserManager()}: Returns an instance of the configured
* {@link UserManager} or {@code null}.</li>
- * <p/>
+ * <p>
* <li>{@link #getPrincipalProvider()}: Returns an instance of the configured
* principal provider or {@code null}.</li>
- * <p/>
+ * <p>
* <li>{@link #getPrincipals(String)}: Utility that returns all principals
* associated with a given user id. This method might be be called after
* successful authentication in order to be able to populate the subject
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java Tue Jun 17 07:46:59 2014
@@ -54,7 +54,7 @@ public interface PrincipalProvider {
* principal is either direct or indirect member of. Thus for any principal
* returned in the iterator {@link java.security.acl.Group#isMember(Principal)}
* must return {@code true}.
- * <p/>
+ * <p>
* Example:<br>
* If Principal is member of Group A, and Group A is member of
* Group B, this method will return Group A and Group B.
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/Importer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/Importer.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/Importer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/Importer.java Tue Jun 17 07:46:59 2014
@@ -55,7 +55,7 @@ public interface Importer {
* a {@link #startNode(NodeInfo, List)} call with the same node
* information and after all the possible child nodes have been
* imported with respective startNode/endNode calls.
- * <p/>
+ * <p>
* Just like XML elements, the startNode/endNode calls are guaranteed
* to be properly nested and complete.
*
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedNodeImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedNodeImporter.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedNodeImporter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedNodeImporter.java Tue Jun 17 07:46:59 2014
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.api.Tre
/**
* {@code ProtectedNodeImporter} provides means to import protected
* {@code Node}s and the subtree defined below such nodes.
- * <p/>
+ * <p>
* The import of a protected tree is started by the {@code Importer} by
* calling {@link #start(Tree)}. If the {@code ProtectedNodeImporter}
* is able to deal with that type of protected node, it is in charge of dealing
@@ -82,7 +82,7 @@ public interface ProtectedNodeImporter e
* whole import fails.<p/>
* In case this importer deals with multiple levels of nodes, it is in
* charge of maintaining the hierarchical structure (see also {#link endChildInfo()}.
- * <p/>
+ * <p>
* If {@link #start(Tree)} hasn't been called before, this method returns
* silently.
*
@@ -99,7 +99,7 @@ public interface ProtectedNodeImporter e
/**
* Informs this importer about the end of a child info.
- * <p/>
+ * <p>
* If {@link #start(Tree)} hasn't been called before, this method returns
* silently.
*
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java Tue Jun 17 07:46:59 2014
@@ -134,7 +134,7 @@ public class NodeUtil {
/**
* TODO: clean up. workaround for OAK-426
- * <p/>
+ * <p>
* Create the tree at the specified relative path including all missing
* intermediate trees using the specified {@code primaryTypeName}. This
* method treats ".." parent element and "." as current element and
Modified: jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/AbstractMicroKernelIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/AbstractMicroKernelIT.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/AbstractMicroKernelIT.java (original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/AbstractMicroKernelIT.java Tue Jun 17 07:46:59 2014
@@ -144,7 +144,7 @@ public abstract class AbstractMicroKerne
/**
* Returns a {@code JSONParser} instance for parsing JSON format data.
* This method returns a cached instance.
- * <p/>
+ * <p>
* {@code JSONParser} instances are <i>not</i> thread-safe. Multi-threaded
* unit tests should therefore override this method and return a fresh
* instance on every invocation.
Modified: jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/util/TestInputStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/util/TestInputStream.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/util/TestInputStream.java (original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/util/TestInputStream.java Tue Jun 17 07:46:59 2014
@@ -22,7 +22,7 @@ import java.util.Random;
/**
* An {@code InputStream} based on pseudo-random data useful for testing.
- * <p/>
+ * <p>
* Instances created with identical parameter values do produce identical byte
* sequences.
*/
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/BufferedStringValue.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/BufferedStringValue.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/BufferedStringValue.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/BufferedStringValue.java Tue Jun 17 07:46:59 2014
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
* {@code BufferedStringValue} represents an appendable
* serialized value that is either buffered in-memory or backed
* by a temporary file if its size exceeds a certain limit.
- * <p/>
+ * <p>
* <b>Important:</b> Note that in order to free resources
* {@code {@link #dispose()}} should be called as soon as
* {@code BufferedStringValue} instance is not used anymore.
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java Tue Jun 17 07:46:59 2014
@@ -214,7 +214,7 @@ class DocViewImportHandler extends Targe
/**
* {@inheritDoc}
- * <p/>
+ * <p>
* See also {@link org.apache.jackrabbit.commons.xml.Exporter#exportProperties(Node)}
* regarding special handling of multi-valued properties on export.
*/
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java Tue Jun 17 07:46:59 2014
@@ -41,12 +41,12 @@ import org.xml.sax.helpers.DefaultHandle
* data in System View XML or Document View XML. Processing of the XML is
* handled by specialized {@code ContentHandler}s
* (i.e. {@code SysViewImportHandler} and {@code DocViewImportHandler}).
- * <p/>
+ * <p>
* The actual task of importing though is delegated to the implementation of
* the {@code {@link Importer}} interface.
- * <p/>
+ * <p>
* <b>Important Note:</b>
- * <p/>
+ * <p>
* These SAX Event Handlers expect that Namespace URI's and local names are
* reported in the {@code start/endElement} events and that
* {@code start/endPrefixMapping} events are reported
@@ -128,7 +128,7 @@ public class ImportHandler extends Defau
* namespace context. The local namespace context is instantiated
* in {@link #startElement(String, String, String, Attributes)} using
* all the the namespace mappings recorded for the current XML element.
- * <p/>
+ * <p>
* The namespace is also recorded in the persistent namespace registry
* unless it is already known.
*
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionableTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionableTest.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionableTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionableTest.java Tue Jun 17 07:46:59 2014
@@ -69,7 +69,7 @@ public class VersionableTest extends Abs
/**
* Test from Jackrabbit: JCR-3635 (OAK-940)
- * <p/>
+ * <p>
* Tests the case when a node already has a manual set
* JcrConstants.JCR_FROZENUUID property and is versioned. The manual set
* frozenUuid will overwrite the one that is automatically assigned by the
Modified: jackrabbit/oak/trunk/oak-mk-api/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-api/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-api/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java (original)
+++ jackrabbit/oak/trunk/oak-mk-api/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java Tue Jun 17 07:46:59 2014
@@ -101,7 +101,7 @@ public interface MicroKernel {
* Returns a list of all currently available (historical) head revisions in
* chronological order since a specific point. <i>Private</i> branch
* revisions won't be included in the result.
- * <p/>
+ * <p>
* Format:
* <pre>
* [
@@ -116,7 +116,7 @@ public interface MicroKernel {
* The {@code path} parameter allows to filter the revisions by path, i.e.
* only those revisions that affected the subtree rooted at {@code path}
* will be included.
- * <p/>
+ * <p>
* The {@code maxEntries} parameter allows to limit the number of revisions
* returned. if {@code maxEntries < 0} no limit will be applied. otherwise,
* if the number of revisions satisfying the specified {@code since} and
@@ -137,16 +137,16 @@ public interface MicroKernel {
/**
* Waits for a commit to occur that is more recent than {@code oldHeadRevisionId}.
- * <p/>
+ * <p>
* This method allows for efficient polling for new revisions. The method
* will return the id of the current head revision if it is more recent than
* {@code oldHeadRevisionId}, or waits if either the specified amount of time
* has elapsed or a new head revision has become available.
- * <p/>
+ * <p>
* if a zero or negative {@code timeout} value has been specified the method
* will return immediately, i.e. calling {@code waitForCommit(oldHeadRevisionId, 0)} is
* equivalent to calling {@code getHeadRevision()}.
- * <p/>
+ * <p>
* Note that commits on a <i>private</i> branch will be ignored.
*
* @param oldHeadRevisionId id of earlier head revision
@@ -161,7 +161,7 @@ public interface MicroKernel {
/**
* Returns a revision journal, starting with {@code fromRevisionId}
* and ending with {@code toRevisionId} in chronological order.
- * <p/>
+ * <p>
* Format:
* <pre>
* [
@@ -176,19 +176,19 @@ public interface MicroKernel {
* </pre>
* If {@code fromRevisionId} and {@code toRevisionId} are not in chronological
* order the returned journal will be empty (i.e. {@code []})
- * <p/>
+ * <p>
* The {@code path} parameter allows to filter the revisions by path, i.e.
* only those revisions that affected the subtree rooted at {@code path}
* will be included. The filter will also be applied to the JSON diff, i.e.
* the diff will include only those changes that affected the subtree rooted
* at {@code path}.
- * <p/>
+ * <p>
* A {@code MicroKernelException} is thrown if either {@code fromRevisionId}
* or {@code toRevisionId} doesn't exist, if {@code fromRevisionId} denotes
* a <i>private</i> branch revision <i>and</i> {@code toRevisionId} denotes
* either a head revision or a revision on a different <i>private</i> branch,
* or if another error occurs.
- * <p/>
+ * <p>
* If the journal includes <i>private</i> branch revisions, those entries
* will include a {@code "branchRootId"} denoting the head revision the
* <i>private</i> branch is based on.
@@ -211,11 +211,11 @@ public interface MicroKernel {
* revisions. The changes will be consolidated if the specified range
* covers intermediary revisions. {@code fromRevisionId} and {@code toRevisionId}
* don't need not be in a specific chronological order.
- * <p/>
+ * <p>
* The {@code path} parameter allows to filter the changes included in the
* JSON diff, i.e. only those changes that affected the subtree rooted at
* {@code path} will be included.
- * <p/>
+ * <p>
* The {@code depth} limit applies to the subtree rooted at {@code path}.
* It allows to limit the depth of the diff, i.e. only changes up to the
* specified depth will be included in full detail. changes at paths exceeding
@@ -266,7 +266,7 @@ public interface MicroKernel {
/**
* Returns the number of child nodes of the specified node.
- * <p/>
+ * <p>
* This is a convenience method since the number of child nodes can be also
* determined by calling {@code getNodes(path, revisionId, 0, 0, 0, null)}
* and evaluating the {@code :childNodeCount} property.
@@ -299,7 +299,7 @@ public interface MicroKernel {
* <td>[and so on...]</td>
* </tr>
* </table>
- * <p/>
+ * <p>
* Example (depth=0):
* <pre>
* {
@@ -337,20 +337,20 @@ public interface MicroKernel {
* The {@code offset} parameter is only applied to the direct child nodes
* of the root of the returned node tree. {@code maxChildNodes} however
* is applied on all hierarchy levels.
- * <p/>
+ * <p>
* An {@code IllegalArgumentException} is thrown if both an {@code offset}
* greater than zero and a {@code filter} on node names (see below) have been
* specified.
- * <p/>
+ * <p>
* The order of the child nodes is stable for any given {@code revisionId},
* i.e. calling {@code getNodes} repeatedly with the same {@code revisionId}
* is guaranteed to return the child nodes in the same order, but the
* specific order used is implementation-dependent and may change across
* different revisions of the same node.
- * <p/>
+ * <p>
* The optional {@code filter} parameter allows to specify glob patterns for names of
* nodes and/or properties to be included or excluded.
- * <p/>
+ * <p>
* Example:
* <pre>
* {
@@ -361,7 +361,7 @@ public interface MicroKernel {
* In the above example all child nodes with names starting with "foo" will
* be included, except for nodes named "foo1"; similarly, all properties will
* be included except for the ":childNodeCount" metadata property (see below).
- * <p/>
+ * <p>
* Glob Syntax:
* <ul>
* <li>a {@code nodes} or {@code properties} filter consists of one or more <i>globs</i>.</li>
@@ -378,7 +378,7 @@ public interface MicroKernel {
* </ul>
* If no filter is specified the implicit default filter is assumed:
* {@code {"nodes":["*"],"properties":["*"]}}
- * <p/>
+ * <p>
* System-provided metadata properties:
* <ul>
* <li>{@code :childNodeCount} provides the actual number of direct child nodes; this property
@@ -461,7 +461,7 @@ public interface MicroKernel {
/**
* Creates a <i>private</i> branch revision off the specified <i>public</i>
* trunk revision.
- * <p/>
+ * <p>
* A {@code MicroKernelException} is thrown if {@code trunkRevisionId} doesn't
* exist, if it's not a <i>trunk</i> revision (i.e. it's not reachable
* by traversing the revision history in reverse chronological order starting
@@ -481,7 +481,7 @@ public interface MicroKernel {
/**
* Merges the specified <i>private</i> branch revision with the current
* head revision.
- * <p/>
+ * <p>
* A {@code MicroKernelException} is thrown if {@code branchRevisionId} doesn't
* exist, if it's not a branch revision, if the merge fails because of
* conflicting changes or if another error occurs.
@@ -501,16 +501,16 @@ public interface MicroKernel {
/**
* Rebases the specified <i>private</i> branch revision on top of specified new base
* revision.
- * <p/>
+ * <p>
* A {@code MicroKernelException} is thrown if {@code branchRevisionId} doesn't
* exist, if it's not a branch revision, if {@code newBaseRevisionId} doesn't exist,
* if it's a branch revision or if another error occurs.
- * <p/>
+ * <p>
* If rebasing results in a conflict, conflicting nodes are annotated with a conflict
* marker denoting the type of the conflict and the value(s) before the rebase operation.
* The conflict marker is an internal node with the name {@link #CONFLICT} and is added
* to the node whose properties or child nodes are in conflict.
- * <p/>
+ * <p>
* type of conflicts:
* <dl>
* <dt>addExistingProperty:</dt>
@@ -539,7 +539,7 @@ public interface MicroKernel {
* In this context a node is regarded as changed if a property was added, a property was removed,
* a property was set to a different value, a child node was added, a child node was removed or
* a child node was changed.
- * <p/>
+ * <p>
* On conflict the conflict marker node carries the conflicting value of the branch while the rebased
* value in the branch itself will be set to the conflicting value of the trunk. In the case of conflicting
* properties, the conflicting value is the property value from the branch. In the case of conflicting
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Commit.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Commit.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Commit.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Commit.java Tue Jun 17 07:46:59 2014
@@ -35,7 +35,7 @@ public interface Commit {
/**
* Returns {@code null} if this commit does not represent a branch.
- * <p/>
+ * <p>
* Otherwise, returns the id of the branch root commit
* (i.e. the <i>public</i> commit that this <i>private</i> branch is based upon).
*
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Id.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Id.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Id.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Id.java Tue Jun 17 07:46:59 2014
@@ -23,11 +23,11 @@ import java.util.Arrays;
/**
* Represents an internal identifier, uniquely identifying
* a {@link Node} or a {@link Commit}.
- * <p/>
+ * <p>
* This implementation aims at minimizing the in-memory footprint
* of an identifier instance. therefore it doesn't cache e.g. the hashCode
* or the string representation.
- * <p/>
+ * <p>
* <b>Important Note:</b><p/>
* An {@link Id} is considered immutable. The {@code byte[]}
* passed to {@link Id#Id(byte[])} must not be reused or modified, the same
@@ -40,7 +40,7 @@ public class Id implements Comparable<Id
/**
* Creates a new instance based on the passed {@code byte[]}.
- * <p/>
+ * <p>
* The passed {@code byte[]} mus not be reused, it's assumed
* to be owned by the new {@code Id} instance.
*
@@ -54,7 +54,7 @@ public class Id implements Comparable<Id
/**
* Creates an {@code Id} instance from its
* string representation as returned by {@link #toString()}.
- * <p/>
+ * <p>
* The following condition holds true:
* <pre>
* Id someId = ...;
@@ -123,7 +123,7 @@ public class Id implements Comparable<Id
/**
* Returns the raw byte representation of this identifier.
- * <p/>
+ * <p>
* The returned {@code byte[]} <i>MUST NOT</i> be modified!
*
* @return the raw byte representation
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java Tue Jun 17 07:46:59 2014
@@ -103,7 +103,7 @@ public class StagedNodeTree {
* and <i>their</i> tree (identified by {@code newBaseRevisionId}),
* using the common ancestor revision {@code commonAncestorRevisionId} as
* base reference.
- * <p/>
+ * <p>
* <I>This</I> instance will be initially reset to {@code newBaseRevisionId}, discarding
* all currently staged changes.
*
@@ -175,7 +175,7 @@ public class StagedNodeTree {
/**
* Creates or updates the property named {@code propName} of the specified node.
- * <p/>
+ * <p>
* if {@code propValue == null} the specified property will be removed.
*
* @param nodePath node path
@@ -292,7 +292,7 @@ public class StagedNodeTree {
* If a {@code StagedNode} representation doesn't exist yet a new
* {@code StagedNode} instance will be returned if {@code createIfNotStaged == true},
* otherwise {@code null} will be returned.
- * <p/>
+ * <p>
* A {@code NotFoundException} will be thrown if there's no node at {@code path}.
*
* @param path node path
@@ -619,7 +619,7 @@ public class StagedNodeTree {
* If a {@code StagedNode} representation doesn't exist yet a new
* {@code StagedNode} instance will be returned if {@code createIfNotStaged == true},
* otherwise {@code null} will be returned.
- * <p/>
+ * <p>
* A {@code NotFoundException} will be thrown if there's no child node
* with the given name.
*
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/Persistence.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/Persistence.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/Persistence.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/Persistence.java Tue Jun 17 07:46:59 2014
@@ -40,7 +40,7 @@ public interface Persistence extends Clo
* Return an array of ids, where the first is the head id (as stored
* with {@link #writeHead(Id)}) and the second is the highest commit
* id found or {@code null}.
- * <p/>
+ * <p>
* This method is not guaranteed to deliver "live" results, after
* something is written to the storage, so it should better be used
* once after initialization.
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java Tue Jun 17 07:46:59 2014
@@ -610,7 +610,7 @@ public class DefaultRevisionStore implem
* Mark all commits and nodes in a garbage collection cycle. Can be
* customized by subclasses. The default implementation preserves all
* commits that were created within 60 minutes of the current head commit.
- * <p/>
+ * <p>
* If this method throws an exception, the cycle will be stopped without
* sweeping.
*
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/IdFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/IdFactory.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/IdFactory.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/IdFactory.java Tue Jun 17 07:46:59 2014
@@ -25,9 +25,9 @@ public abstract class IdFactory {
/**
* Creates a new id based on the specified serialized data.
- * <p/>
+ * <p>
* The general contract of {@code createContentId} is:
- * <p/>
+ * <p>
* {@code createId(data1).equals(createId(data2)) == Arrays.equals(data1, data2)}
*
* @param serialized serialized data
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java Tue Jun 17 07:46:59 2014
@@ -82,7 +82,7 @@ public interface RevisionStore extends R
/**
* Store a new commit.
- * <p/>
+ * <p>
* Unlike {@code putHeadCommit(MutableCommit)}, this method
* does not affect the current head commit and therefore doesn't
* require a lock on the head.
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NameFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NameFilter.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NameFilter.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NameFilter.java Tue Jun 17 07:46:59 2014
@@ -35,12 +35,12 @@ import java.util.List;
* none of the exclusion patterns</li>
* </ul>
* Examples:
- * <p/>
+ * <p>
* {@code ["foo*", "-foo99"]} matches {@code "foo"} and {@code "foo bar"}
* but not {@code "foo99"}.
- * <p/>
+ * <p>
* {@code ["foo\*"]} matches {@code "foo*"} but not {@code "foo99"}.
- * <p/>
+ * <p>
* {@code ["\-blah"]} matches {@code "-blah"}.
*/
public class NameFilter {
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NodeFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NodeFilter.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NodeFilter.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NodeFilter.java Tue Jun 17 07:46:59 2014
@@ -25,7 +25,7 @@ import java.util.List;
* A {@code NodeFilter} represents a filter on property and/or node names specified
* in JSON format. It allows to specify glob patterns for names of nodes and/or
* properties to be included or excluded.
- * <p/>
+ * <p>
* Example:
* <pre>
* {
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfiguration.java?rev=1603078&r1=1603077&r2=1603078&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfiguration.java Tue Jun 17 07:46:59 2014
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.spi.sta
* For each of the supported properties a default is provided if either the
* property doesn't exist in the node or if the value is <code>null</code> or
* empty <code>String</code>.
- * <p/>
+ * <p>
* Subclasses of this should at least provide the {@link org.apache.jackrabbit.oak.spi.state.NodeState} which holds
* the configuration.
*/