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 2024/10/14 08:04:03 UTC
(jackrabbit) branch 2.22 updated: JCR-5088: remove warnings about missing @deprecated annotations (#207)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch 2.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git
The following commit(s) were added to refs/heads/2.22 by this push:
new c6cf44fa2 JCR-5088: remove warnings about missing @deprecated annotations (#207)
c6cf44fa2 is described below
commit c6cf44fa2836d33aa7e38a898b6bbb4446301d6d
Author: Julian Reschke <re...@apache.org>
AuthorDate: Thu Jul 18 16:02:25 2024 +0200
JCR-5088: remove warnings about missing @deprecated annotations (#207)
---
.../src/main/java/org/apache/jackrabbit/core/HierarchyManager.java | 1 +
.../src/main/java/org/apache/jackrabbit/core/ItemManager.java | 2 ++
.../src/main/java/org/apache/jackrabbit/core/NodeImpl.java | 2 ++
.../main/java/org/apache/jackrabbit/core/cluster/LockRecord.java | 1 +
.../java/org/apache/jackrabbit/core/config/RepositoryConfig.java | 3 +++
.../org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java | 1 +
.../java/org/apache/jackrabbit/core/journal/DatabaseJournal.java | 2 ++
.../org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java | 1 +
.../core/persistence/pool/BundleDbPersistenceManager.java | 2 ++
.../java/org/apache/jackrabbit/core/query/AbstractQueryHandler.java | 1 +
.../java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java | 5 +++++
.../java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java | 3 +++
.../java/org/apache/jackrabbit/core/security/AccessManager.java | 5 +++++
.../core/security/authentication/AbstractLoginModule.java | 4 ++++
.../core/security/authentication/CryptedSimpleCredentials.java | 1 +
.../security/authentication/token/TokenBasedAuthentication.java | 1 +
.../core/security/authorization/AbstractCompiledPermissions.java | 2 ++
.../jackrabbit/core/security/authorization/CompiledPermissions.java | 1 +
.../jackrabbit/core/security/authorization/PrivilegeRegistry.java | 6 ++++++
.../org/apache/jackrabbit/core/security/user/UserConstants.java | 2 ++
.../org/apache/jackrabbit/core/security/user/UserManagerImpl.java | 1 +
.../main/java/org/apache/jackrabbit/core/util/RepositoryLock.java | 1 +
.../jackrabbit/core/version/InternalFrozenVersionHistory.java | 1 +
.../apache/jackrabbit/core/virtual/VirtualItemStateProvider.java | 1 +
.../main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java | 4 +++-
.../org/apache/jackrabbit/core/fs/RandomAccessOutputStream.java | 1 +
.../java/org/apache/jackrabbit/commons/flat/FilterIterator.java | 1 +
.../main/java/org/apache/jackrabbit/commons/flat/SizedIterator.java | 1 +
.../main/java/org/apache/jackrabbit/webdav/jcr/JcrValueType.java | 1 +
.../org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeType.java | 1 +
.../src/main/java/org/apache/jackrabbit/spi/commons/EventImpl.java | 1 +
.../main/java/org/apache/jackrabbit/spi/commons/ItemInfoImpl.java | 1 +
.../main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java | 1 +
.../main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java | 1 +
.../java/org/apache/jackrabbit/spi/commons/PropertyInfoImpl.java | 1 +
.../java/org/apache/jackrabbit/spi/commons/iterator/Iterators.java | 1 +
.../java/org/apache/jackrabbit/spi/commons/iterator/Predicate.java | 1 +
.../java/org/apache/jackrabbit/spi/commons/iterator/Predicates.java | 1 +
.../main/java/org/apache/jackrabbit/spi/commons/lock/Locked.java | 1 +
.../jackrabbit/spi/commons/namespace/AbstractNamespaceResolver.java | 1 +
.../apache/jackrabbit/spi/commons/namespace/NamespaceListener.java | 1 +
.../org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java | 3 +++
.../apache/jackrabbit/spi/commons/query/TextsearchQueryNode.java | 2 ++
.../apache/jackrabbit/spi/commons/query/sql/SimpleCharStream.java | 4 ++--
.../java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java | 1 +
.../apache/jackrabbit/spi/commons/query/xpath/SimpleCharStream.java | 4 ++--
.../src/main/java/org/apache/jackrabbit/spi/NodeInfo.java | 1 +
.../src/main/java/org/apache/jackrabbit/spi/RepositoryService.java | 2 ++
.../java/org/apache/jackrabbit/webdav/property/PropContainer.java | 1 +
.../org/apache/jackrabbit/webdav/version/WorkspaceResource.java | 1 +
.../src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java | 1 +
51 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java
index 7ba4245b5..f5b3c222a 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java
@@ -49,6 +49,7 @@ public interface HierarchyManager {
* if there's no item at <code>path</code>.
* @throws RepositoryException if an error occurs
*/
+ @Deprecated
ItemId resolvePath(Path path) throws RepositoryException;
/**
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
index dbd40a4c8..322e9d699 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
@@ -467,6 +467,7 @@ public class ItemManager implements ItemStateListener {
* @param path path to the item to be checked
* @return true if the specified item exists
*/
+ @Deprecated
public boolean itemExists(Path path) {
try {
sanityCheck();
@@ -544,6 +545,7 @@ public class ItemManager implements ItemStateListener {
* @throws AccessDeniedException
* @throws RepositoryException
*/
+ @Deprecated
public ItemImpl getItem(Path path) throws PathNotFoundException,
AccessDeniedException, RepositoryException {
ItemId id = hierMgr.resolvePath(path);
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java
index 3519d9211..7f59ef4bb 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java
@@ -565,6 +565,7 @@ public class NodeImpl extends ItemImpl implements Node, JackrabbitNode {
* @throws RepositoryException
* @deprecated use #renameChildNode(NodeId, Name, boolean)
*/
+ @Deprecated
protected void renameChildNode(Name oldName, int index, NodeId id,
Name newName)
throws RepositoryException {
@@ -3072,6 +3073,7 @@ public class NodeImpl extends ItemImpl implements Node, JackrabbitNode {
* @throws RepositoryException if some other error occurs
* @deprecated
*/
+ @Deprecated
protected void checkLock() throws LockException, RepositoryException {
if (isNew()) {
// a new node needs no check
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/LockRecord.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/LockRecord.java
index e29c3cf7f..94dd49ca1 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/LockRecord.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/LockRecord.java
@@ -166,6 +166,7 @@ public class LockRecord extends ClusterRecord {
* @return user id
* @deprecated User {@link #getOwner()} instead.
*/
+ @Deprecated
public String getUserId() {
return lockOwner;
}
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
index 7801c01da..d0c78d617 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
@@ -933,6 +933,7 @@ public class RepositoryConfig
* @return repository name
* @deprecated Use {@link SecurityConfig#getAppName()} instead.
*/
+ @Deprecated
public String getAppName() {
return sec.getAppName();
}
@@ -943,6 +944,7 @@ public class RepositoryConfig
* @return access manager configuration
* @deprecated Use {@link SecurityConfig#getAccessManagerConfig()} instead.
*/
+ @Deprecated
public AccessManagerConfig getAccessManagerConfig() {
return sec.getAccessManagerConfig();
}
@@ -954,6 +956,7 @@ public class RepositoryConfig
* JAAS mechanism should be used.
* @deprecated Use {@link SecurityConfig#getLoginModuleConfig()} instead.
*/
+ @Deprecated
public LoginModuleConfig getLoginModuleConfig() {
return sec.getLoginModuleConfig();
}
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java
index 7d21a066f..93eb6698c 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java
@@ -35,6 +35,7 @@ import javax.sql.DataSource;
* for the entire lifetime of the file system instance. The configured data
* source should be prepared for this.
*/
+@Deprecated
public class JNDIDatabaseFileSystem extends DatabaseFileSystem {
/**
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
index 786c92c1e..2a0b71d74 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
@@ -651,6 +651,7 @@ public class DatabaseJournal extends AbstractJournal implements DatabaseAware {
*
* @return the database type
*/
+ @Deprecated
public String getSchema() {
return databaseType;
}
@@ -706,6 +707,7 @@ public class DatabaseJournal extends AbstractJournal implements DatabaseAware {
*
* @param databaseType the database type
*/
+ @Deprecated
public void setSchema(String databaseType) {
this.databaseType = databaseType;
}
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java
index fa4a0d247..48b149fae 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java
@@ -38,6 +38,7 @@ import javax.sql.DataSource;
* for the entire lifetime of the journal instance. The configured data
* source should be prepared for this.
*/
+@Deprecated
public class JNDIDatabaseJournal extends DatabaseJournal {
/**
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java
index 8d5a6cd0d..86fdc7304 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java
@@ -296,6 +296,7 @@ public class BundleDbPersistenceManager
*
* @return the database type name.
*/
+ @Deprecated
public String getSchema() {
return databaseType;
}
@@ -317,6 +318,7 @@ public class BundleDbPersistenceManager
*
* @param databaseType database type name
*/
+ @Deprecated
public void setSchema(String databaseType) {
this.databaseType = databaseType;
}
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/AbstractQueryHandler.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/AbstractQueryHandler.java
index 40502b033..7fc6088e8 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/AbstractQueryHandler.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/AbstractQueryHandler.java
@@ -183,6 +183,7 @@ public abstract class AbstractQueryHandler implements QueryHandler {
*
* @param idleTime the query handler idle time.
*/
+ @Deprecated
public void setIdleTime(String idleTime) {
log.warn("Parameter 'idleTime' is not supported anymore. "
+ "Please use 'maxIdleTime' in the repository configuration.");
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
index efc3c253a..47d76cb40 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
@@ -665,6 +665,7 @@ public class NodeIndexer {
* @deprecated Use {@link #addStringValue(Document, String, String, boolean)
* addStringValue(Document, String, Object, boolean)} instead.
*/
+ @Deprecated
protected void addStringValue(Document doc, String fieldName, String internalValue) {
addStringValue(doc, fieldName, internalValue, true, true, DEFAULT_BOOST, true);
}
@@ -702,6 +703,7 @@ public class NodeIndexer {
* @param boost the boost value for this string field.
* @deprecated use {@link #addStringValue(Document, String, String, boolean, boolean, float, boolean)} instead.
*/
+ @Deprecated
protected void addStringValue(Document doc, String fieldName,
String internalValue, boolean tokenized,
boolean includeInNodeIndex, float boost) {
@@ -791,6 +793,7 @@ public class NodeIndexer {
* @return a lucene field.
* @deprecated use {@link #createFulltextField(String, boolean, boolean, boolean)} instead.
*/
+ @Deprecated
protected Field createFulltextField(String value) {
return createFulltextField(value, supportHighlighting, supportHighlighting);
}
@@ -804,6 +807,7 @@ public class NodeIndexer {
* @return a lucene field.
* @deprecated use {@link #createFulltextField(String, boolean, boolean, boolean)} instead.
*/
+ @Deprecated
protected Field createFulltextField(String value,
boolean store,
boolean withOffsets) {
@@ -855,6 +859,7 @@ public class NodeIndexer {
* @return a lucene field.
* @deprecated use {@link #createFulltextField(InternalValue, Metadata, boolean)} instead.
*/
+ @Deprecated
protected Fieldable createFulltextField(
InternalValue value, Metadata metadata) {
return createFulltextField(value, metadata, true);
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
index 6baef1fdb..8e4db22cc 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
@@ -177,6 +177,7 @@ public class SearchIndex extends AbstractQueryHandler {
* @deprecated this value is not used anymore. Instead the default value
* is calculated as follows: 2 * Runtime.getRuntime().availableProcessors().
*/
+ @Deprecated
public static final int DEFAULT_EXTRACTOR_POOL_SIZE = 0;
/**
@@ -2101,6 +2102,7 @@ public class SearchIndex extends AbstractQueryHandler {
* @param filterClasses comma separated list of class names
* @deprecated
*/
+ @Deprecated
public void setTextFilterClasses(String filterClasses) {
log.warn("The textFilterClasses configuration parameter has"
+ " been deprecated, and the configured value will"
@@ -2114,6 +2116,7 @@ public class SearchIndex extends AbstractQueryHandler {
* @return class names of the text filters in use.
* @deprecated
*/
+ @Deprecated
public String getTextFilterClasses() {
return "deprectated";
}
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AccessManager.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AccessManager.java
index 3343bafe4..cc3f5cb6c 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AccessManager.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AccessManager.java
@@ -36,18 +36,21 @@ public interface AccessManager {
* READ permission constant
* @deprecated
*/
+ @Deprecated
int READ = 1;
/**
* WRITE permission constant
* @deprecated
*/
+ @Deprecated
int WRITE = 2;
/**
* REMOVE permission constant
* @deprecated
*/
+ @Deprecated
int REMOVE = 4;
/**
@@ -102,6 +105,7 @@ public interface AccessManager {
* @throws RepositoryException it an error occurs
* @deprecated
*/
+ @Deprecated
void checkPermission(ItemId id, int permissions)
throws AccessDeniedException, ItemNotFoundException, RepositoryException;
@@ -145,6 +149,7 @@ public interface AccessManager {
* @throws RepositoryException if another error occurs
* @deprecated
*/
+ @Deprecated
boolean isGranted(ItemId id, int permissions)
throws ItemNotFoundException, RepositoryException;
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/AbstractLoginModule.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/AbstractLoginModule.java
index d2b5237d4..767c3da6b 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/AbstractLoginModule.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/AbstractLoginModule.java
@@ -77,6 +77,7 @@ public abstract class AbstractLoginModule implements LoginModule {
* deprecated and will no longer be supported in a subsequent release.
* See also <a href="https://issues.apache.org/jira/browse/JCR-3293">JCR-3293</a>
*/
+ @Deprecated
private static final String PRE_AUTHENTICATED_ATTRIBUTE_OPTION = "trust_credentials_attribute";
private String principalProviderClassName;
@@ -95,6 +96,7 @@ public abstract class AbstractLoginModule implements LoginModule {
* has been deprecated and will no longer be available in a subsequent release.
* See also <a href="https://issues.apache.org/jira/browse/JCR-3293">JCR-3293</a>
*/
+ @Deprecated
private String preAuthAttributeName;
@@ -759,6 +761,7 @@ public abstract class AbstractLoginModule implements LoginModule {
* has been deprecated and will no longer be available in a subsequent release.
* See also <a href="https://issues.apache.org/jira/browse/JCR-3293">JCR-3293</a>
*/
+ @Deprecated
protected final String getPreAuthAttributeName() {
return preAuthAttributeName;
}
@@ -783,6 +786,7 @@ public abstract class AbstractLoginModule implements LoginModule {
* has been deprecated and will no longer be available in a subsequent release.
* See also <a href="https://issues.apache.org/jira/browse/JCR-3293">JCR-3293</a>
*/
+ @Deprecated
protected boolean isPreAuthenticated(final Credentials creds) {
final String preAuthAttrName = getPreAuthAttributeName();
boolean isPreAuth = preAuthAttrName != null
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/CryptedSimpleCredentials.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/CryptedSimpleCredentials.java
index c4370edb0..8d5bd0483 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/CryptedSimpleCredentials.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/CryptedSimpleCredentials.java
@@ -51,6 +51,7 @@ public class CryptedSimpleCredentials implements Credentials {
* @throws UnsupportedEncodingException
* @deprecated
*/
+ @Deprecated
public CryptedSimpleCredentials(SimpleCredentials credentials)
throws NoSuchAlgorithmException, UnsupportedEncodingException {
userId = credentials.getUserID();
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/token/TokenBasedAuthentication.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/token/TokenBasedAuthentication.java
index d578d2177..60409e1d9 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/token/TokenBasedAuthentication.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/token/TokenBasedAuthentication.java
@@ -58,6 +58,7 @@ public class TokenBasedAuthentication implements Authentication {
* behavior of the {@code TokenBasedAuthentication}. Note that as of OAK 1.0
* this flag will no be supported.
*/
+ @Deprecated
public static final String PARAM_COMPAT = "TokenCompatMode";
private final TokenInfo tokenInfo;
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/AbstractCompiledPermissions.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/AbstractCompiledPermissions.java
index fcb6d3d5c..939c5bed5 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/AbstractCompiledPermissions.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/AbstractCompiledPermissions.java
@@ -159,6 +159,7 @@ public abstract class AbstractCompiledPermissions implements CompiledPermissions
/**
* @deprecated
*/
+ @Deprecated
public Result(int allows, int denies, int allowPrivileges, int denyPrivileges) {
this(allows, denies, PrivilegeBits.getInstance(allowPrivileges), PrivilegeBits.getInstance(denyPrivileges));
}
@@ -178,6 +179,7 @@ public abstract class AbstractCompiledPermissions implements CompiledPermissions
/**
* @deprecated jackrabbit 2.3 (throws UnsupportedOperationException, use getPrivilegeBits instead)
*/
+ @Deprecated
public int getPrivileges() {
throw new UnsupportedOperationException("use #getPrivilegeBits instead.");
}
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/CompiledPermissions.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/CompiledPermissions.java
index 57b9e92dd..cad868392 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/CompiledPermissions.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/CompiledPermissions.java
@@ -62,6 +62,7 @@ public interface CompiledPermissions {
* @throws RepositoryException if an error occurs
* @deprecated Use {@link #getPrivilegeSet(Path)} instead.
*/
+ @Deprecated
int getPrivileges(Path absPath) throws RepositoryException;
/**
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/PrivilegeRegistry.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/PrivilegeRegistry.java
index 0114df4fe..8aa0d7127 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/PrivilegeRegistry.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/PrivilegeRegistry.java
@@ -183,6 +183,7 @@ public final class PrivilegeRegistry implements PrivilegeEventListener {
* @deprecated Use {@link org.apache.jackrabbit.api.security.authorization.PrivilegeManager} instead.
* @see org.apache.jackrabbit.api.JackrabbitWorkspace#getPrivilegeManager()
*/
+ @Deprecated
public PrivilegeRegistry(NameResolver resolver) {
cacheDefinitions(createBuiltInPrivilegeDefinitions());
@@ -225,6 +226,7 @@ public final class PrivilegeRegistry implements PrivilegeEventListener {
* @return all registered privileges.
* @deprecated Use {@link org.apache.jackrabbit.api.security.authorization.PrivilegeManager#getRegisteredPrivileges()} instead.
*/
+ @Deprecated
public Privilege[] getRegisteredPrivileges() {
try {
return new PrivilegeManagerImpl(this, resolver).getRegisteredPrivileges();
@@ -243,6 +245,7 @@ public final class PrivilegeRegistry implements PrivilegeEventListener {
* @throws RepositoryException If another error occurs.
* @deprecated Use {@link org.apache.jackrabbit.api.security.authorization.PrivilegeManager#getPrivilege(String)} instead.
*/
+ @Deprecated
public Privilege getPrivilege(String privilegeName) throws AccessControlException, RepositoryException {
return new PrivilegeManagerImpl(this, resolver).getPrivilege(privilegeName);
}
@@ -258,6 +261,7 @@ public final class PrivilegeRegistry implements PrivilegeEventListener {
* @see #getBits(Privilege[])
* @deprecated Use {@link PrivilegeManagerImpl#getPrivileges(PrivilegeBits)} instead.
*/
+ @Deprecated
public Privilege[] getPrivileges(int bits) {
Set<Privilege> prvs = new PrivilegeManagerImpl(this, resolver).getPrivileges(PrivilegeBits.getInstance(bits));
return prvs.toArray(new Privilege[prvs.size()]);
@@ -274,6 +278,7 @@ public final class PrivilegeRegistry implements PrivilegeEventListener {
* @see #getPrivileges(int)
* @deprecated Use {@link PrivilegeManagerImpl#getBits(javax.jcr.security.Privilege...)} instead.
*/
+ @Deprecated
public static int getBits(Privilege[] privileges) throws AccessControlException {
if (privileges == null || privileges.length == 0) {
throw new AccessControlException("Privilege array is empty or null.");
@@ -346,6 +351,7 @@ public final class PrivilegeRegistry implements PrivilegeEventListener {
* @return the permissions granted evaluating the given privileges.
* @deprecated Use {@link #calculatePermissions(PrivilegeBits, PrivilegeBits, boolean, boolean)} instead.
*/
+ @Deprecated
public static int calculatePermissions(int privs, int parentPrivs, boolean isAllow, boolean protectsPolicy) {
return calculatePermissions((long) privs, (long) parentPrivs, isAllow, protectsPolicy);
}
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserConstants.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserConstants.java
index a5d994d27..7eecd91db 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserConstants.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserConstants.java
@@ -52,6 +52,7 @@ interface UserConstants {
* rep:userId property redundant. It has been removed from the node type
* definition.
*/
+ @Deprecated
Name P_USERID = NF.create(Name.NS_REP_URI, "userId");
Name P_PASSWORD = NF.create(Name.NS_REP_URI, "password");
Name P_DISABLED = NF.create(Name.NS_REP_URI, "disabled");
@@ -60,6 +61,7 @@ interface UserConstants {
* @deprecated As of 2.0 group membership is stored with the group node.
* @see #P_MEMBERS
*/
+ @Deprecated
Name P_GROUPS = NF.create(Name.NS_REP_URI, "groups");
Name P_MEMBERS = NF.create(Name.NS_REP_URI, "members");
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java
index cc50a886f..7c415683f 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java
@@ -190,6 +190,7 @@ public class UserManagerImpl extends ProtectedItemModifier
/**
* @deprecated Use {@link #PARAM_COMPATIBLE_JR16} instead.
*/
+ @Deprecated
public static final String PARAM_COMPATIBILE_JR16 = "compatibleJR16";
/**
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/RepositoryLock.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/RepositoryLock.java
index d9268a7c5..5f100a291 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/RepositoryLock.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/RepositoryLock.java
@@ -98,6 +98,7 @@ public class RepositoryLock implements RepositoryLockMechanism {
* @throws RepositoryException if the canonical path of the directory
* can not be determined
*/
+ @Deprecated
public RepositoryLock(String path) throws RepositoryException {
init(path);
}
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVersionHistory.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVersionHistory.java
index 05d3c22ff..df812e925 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVersionHistory.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVersionHistory.java
@@ -55,6 +55,7 @@ public interface InternalFrozenVersionHistory extends InternalFreeze {
/**
* @deprecated use {@link #getBaseVersion()} instead
*/
+ @Deprecated
InternalVersion getBaseVesion() throws VersionException;
/**
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java
index 26bdc9c90..c2339f045 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java
@@ -45,6 +45,7 @@ public interface VirtualItemStateProvider extends ItemStateManager {
* @return the id of the root node of the virtual tree.
* @deprecated use {@link #getVirtualRootIds()} instead.
*/
+ @Deprecated
NodeId getVirtualRootId();
/**
diff --git a/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java b/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java
index be80f83e3..fff2cb8d8 100644
--- a/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java
+++ b/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java
@@ -930,6 +930,7 @@ public class DbDataStore extends AbstractDataStore
* @deprecated
* @return the maximum number of connections.
*/
+ @Deprecated
public int getMaxConnections() {
return -1;
}
@@ -938,9 +939,10 @@ public class DbDataStore extends AbstractDataStore
* Set the maximum number of concurrent connections in the pool.
* At least 3 connections are required if the garbage collection process is used.
*
- *@deprecated
+ * @deprecated
* @param maxConnections the new value
*/
+ @Deprecated
public void setMaxConnections(int maxConnections) {
// no effect
}
diff --git a/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/fs/RandomAccessOutputStream.java b/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/fs/RandomAccessOutputStream.java
index fd7c7bedd..b54090867 100644
--- a/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/fs/RandomAccessOutputStream.java
+++ b/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/fs/RandomAccessOutputStream.java
@@ -26,6 +26,7 @@ import java.io.OutputStream;
*
* @deprecated this class should no longer be used
*/
+@Deprecated
public abstract class RandomAccessOutputStream extends OutputStream {
/**
diff --git a/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/FilterIterator.java b/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/FilterIterator.java
index 8b18b423a..417b0e44d 100644
--- a/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/FilterIterator.java
+++ b/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/FilterIterator.java
@@ -26,6 +26,7 @@ import java.util.NoSuchElementException;
* @param <T>
* @deprecated use {@link org.apache.jackrabbit.commons.iterator.FilterIterator}
*/
+@Deprecated
public class FilterIterator<T> extends org.apache.jackrabbit.commons.iterator.FilterIterator<T> {
/**
diff --git a/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/SizedIterator.java b/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/SizedIterator.java
index da083efcd..364f17019 100644
--- a/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/SizedIterator.java
+++ b/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/SizedIterator.java
@@ -23,5 +23,6 @@ package org.apache.jackrabbit.commons.flat;
* @param <T> the type of elements of this iterator
* @deprecated use {@link org.apache.jackrabbit.commons.iterator.SizedIterator}
*/
+@Deprecated
public interface SizedIterator<T> extends org.apache.jackrabbit.commons.iterator.SizedIterator<T> {
}
diff --git a/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JcrValueType.java b/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JcrValueType.java
index 9d941c551..5f119377e 100644
--- a/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JcrValueType.java
+++ b/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JcrValueType.java
@@ -20,6 +20,7 @@ package org.apache.jackrabbit.webdav.jcr;
*
* @deprecated As of Jackrabbit 2.2. Please Use {@link org.apache.jackrabbit.commons.webdav.JcrValueType} instead.
*/
+@Deprecated
public final class JcrValueType extends org.apache.jackrabbit.commons.webdav.JcrValueType {
}
\ No newline at end of file
diff --git a/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeType.java b/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeType.java
index 210c11ee1..5c551656e 100644
--- a/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeType.java
+++ b/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeType.java
@@ -106,6 +106,7 @@ public interface EffectiveNodeType {
* @deprecated Use {@link #hasRemoveNodeConstraint(Name)} and
* {@link #hasRemovePropertyConstraint(Name)} respectively.
*/
+ @Deprecated
public void checkRemoveItemConstraints(Name name) throws ConstraintViolationException;
/**
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventImpl.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventImpl.java
index 2baa3c8ba..8edd58bf3 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventImpl.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventImpl.java
@@ -81,6 +81,7 @@ public class EventImpl implements Event, Serializable {
* Creates a new serializable event.
* @deprecated
*/
+ @Deprecated
public EventImpl(int type, Path path, ItemId itemId, NodeId parentId,
Name primaryNodeTypeName, Name[] mixinTypeNames,
String userId) {
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoImpl.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoImpl.java
index 0c8b0edef..4ba735b13 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoImpl.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoImpl.java
@@ -50,6 +50,7 @@ public abstract class ItemInfoImpl implements ItemInfo, Serializable {
* parentId is not used any more and the corresponding getter has been
* removed.
*/
+ @Deprecated
public ItemInfoImpl(NodeId parentId, Name name, Path path, boolean isNode) {
this(path, isNode);
}
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java
index 04906cad5..c9f5c161f 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java
@@ -72,6 +72,7 @@ public class LockInfoImpl implements LockInfo, Serializable {
* @param nodeId the node id of the locked node.
* @deprecated Use {@link #LockInfoImpl(String, String, boolean, boolean, long, boolean, NodeId)} instaed.
*/
+ @Deprecated
public LockInfoImpl(String lockToken, String lockOwner, boolean isDeep,
boolean isSessionScoped, NodeId nodeId) {
this(lockToken, lockOwner, isDeep, isSessionScoped, Long.MAX_VALUE, lockToken != null, nodeId);
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java
index c4c0f8319..1d4ab8c32 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java
@@ -149,6 +149,7 @@ public class NodeInfoImpl extends ItemInfoImpl implements NodeInfo {
* @deprecated Use {@link #NodeInfoImpl(Path, NodeId, int, Name, Name[], Iterator, Iterator, Iterator)}
* instead. The parentId is not used any more.
*/
+ @Deprecated
public NodeInfoImpl(NodeId parentId, Name name, Path path, NodeId id,
int index, Name primaryTypeName, Name[] mixinNames,
Iterator<PropertyId> references, Iterator<PropertyId> propertyIds,
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/PropertyInfoImpl.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/PropertyInfoImpl.java
index 8abf38b66..fd78d4b3b 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/PropertyInfoImpl.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/PropertyInfoImpl.java
@@ -87,6 +87,7 @@ public class PropertyInfoImpl extends ItemInfoImpl implements PropertyInfo {
* @deprecated Use {@link #PropertyInfoImpl(Path, PropertyId, int, boolean, QValue[])}
* instead. The parentId is not used any more.
*/
+ @Deprecated
public PropertyInfoImpl(NodeId parentId, Name name, Path path,
PropertyId id, int type, boolean isMultiValued,
QValue[] values) {
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Iterators.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Iterators.java
index 88301d098..4acdf65fa 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Iterators.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Iterators.java
@@ -121,6 +121,7 @@ public final class Iterators {
* @return
* @deprecated use {@link #filterIterator(Iterator, java.util.function.Predicate)} instead
*/
+ @Deprecated
public static <T> Iterator<T> filterIterator(Iterator<? extends T> iterator,
final Predicate<? super T> predicate) {
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Predicate.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Predicate.java
index b94bcbd3b..18c788bd2 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Predicate.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Predicate.java
@@ -22,6 +22,7 @@ package org.apache.jackrabbit.spi.commons.iterator;
* @param <T> type of values this predicate is defined on
* @deprecated use {@link java.util.function.Predicate} instead
*/
+@Deprecated
public interface Predicate<T> {
/**
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Predicates.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Predicates.java
index be81d1110..b6880a282 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Predicates.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Predicates.java
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.spi.commons.iterator;
* Utility class containing pre defined {@link Predicate}s
* @deprecated use instances of {@link java.util.function.Predicate} instead
*/
+@Deprecated
public final class Predicates {
/**
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/lock/Locked.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/lock/Locked.java
index b9447957c..29e0ae124 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/lock/Locked.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/lock/Locked.java
@@ -78,6 +78,7 @@ import javax.jcr.lock.LockException;
*
* @deprecated Use org.apache.jackrabbit.util.Locked instead.
*/
+@Deprecated
public abstract class Locked {
/**
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/AbstractNamespaceResolver.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/AbstractNamespaceResolver.java
index bdcb95227..6b74d0157 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/AbstractNamespaceResolver.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/AbstractNamespaceResolver.java
@@ -35,6 +35,7 @@ import java.util.Iterator;
*
* @deprecated https://issues.apache.org/jira/browse/JCR-1700
*/
+@Deprecated
public abstract class AbstractNamespaceResolver implements NamespaceResolver {
private final Set listeners;
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceListener.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceListener.java
index a3ee219e5..e3203996b 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceListener.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceListener.java
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.spi.commons.namespace;
*
* @deprecated https://issues.apache.org/jira/browse/JCR-1700
*/
+@Deprecated
public interface NamespaceListener {
/**
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java
index f5a1d2440..542d1933b 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java
@@ -135,6 +135,7 @@ public class OrderQueryNode extends QueryNode {
* ordered ascending; descending if <code>false</code>.
* @deprecated use {@link #addOrderSpec(Path , boolean)} instead.
*/
+ @Deprecated
public void addOrderSpec(Name property, boolean ascending) {
addOrderSpec(createPath(property), ascending);
}
@@ -232,6 +233,7 @@ public class OrderQueryNode extends QueryNode {
* ascending, otherwise descending.
* @deprecated use {@link OrderSpec#OrderSpec(Path, boolean)} instead.
*/
+ @Deprecated
public OrderSpec(Name property, boolean ascending) {
this(createPath(property), ascending);
}
@@ -254,6 +256,7 @@ public class OrderQueryNode extends QueryNode {
* @return the name of the property.
* @deprecated use {@link #getPropertyPath()} instead.
*/
+ @Deprecated
public Name getProperty() {
return property.getName();
}
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/TextsearchQueryNode.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/TextsearchQueryNode.java
index 15d1686e6..3c2fe14ce 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/TextsearchQueryNode.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/TextsearchQueryNode.java
@@ -98,6 +98,7 @@ public class TextsearchQueryNode extends QueryNode {
* @return property name or <code>null</code>.
* @deprecated Use {@link #getRelativePath()} instead.
*/
+ @Deprecated
public Name getPropertyName() {
return relPath == null ? null : relPath.getName();
}
@@ -108,6 +109,7 @@ public class TextsearchQueryNode extends QueryNode {
* @param property the name of the property.
* @deprecated Use {@link #setRelativePath(Path)} instead.
*/
+ @Deprecated
public void setPropertyName(Name property) {
PathBuilder builder = new PathBuilder();
builder.addLast(property);
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/SimpleCharStream.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/SimpleCharStream.java
index 2e085993b..9df5d7424 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/SimpleCharStream.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/SimpleCharStream.java
@@ -218,7 +218,7 @@ public class SimpleCharStream
* @deprecated
* @see #getEndColumn
*/
-
+ @Deprecated
public int getColumn() {
return bufcolumn[bufpos];
}
@@ -227,7 +227,7 @@ public class SimpleCharStream
* @deprecated
* @see #getEndLine
*/
-
+ @Deprecated
public int getLine() {
return bufline[bufpos];
}
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java
index d8603db61..22500e701 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java
@@ -25,6 +25,7 @@ import javax.jcr.query.qom.QueryObjectModelFactory;
* @deprecated use {@link org.apache.jackrabbit.commons.query.sql2.Parser}
* instead.
*/
+@Deprecated
public class Parser extends org.apache.jackrabbit.commons.query.sql2.Parser {
diff --git a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/SimpleCharStream.java b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/SimpleCharStream.java
index 1547afa8c..1d7f294d0 100644
--- a/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/SimpleCharStream.java
+++ b/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/SimpleCharStream.java
@@ -202,7 +202,7 @@ public class SimpleCharStream
* @deprecated
* @see #getEndColumn
*/
-
+ @Deprecated
public int getColumn() {
return bufcolumn[bufpos];
}
@@ -211,7 +211,7 @@ public class SimpleCharStream
* @deprecated
* @see #getEndLine
*/
-
+ @Deprecated
public int getLine() {
return bufline[bufpos];
}
diff --git a/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java b/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java
index da56567d5..13c454b3c 100644
--- a/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java
+++ b/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java
@@ -71,6 +71,7 @@ public interface NodeInfo extends ItemInfo {
* @see PropertyInfo#getId()
* @deprecated Use {@link RepositoryService#getReferences(SessionInfo, NodeId, Name, boolean)} instead.
*/
+ @Deprecated
public PropertyId[] getReferences();
/**
diff --git a/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java b/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
index a01385bec..09e684176 100644
--- a/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
+++ b/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
@@ -302,6 +302,7 @@ public interface RepositoryService {
* @see javax.jcr.version.Version#getContainingHistory()
* @deprecated Use {@link #getItemInfos(SessionInfo, ItemId)}
*/
+ @Deprecated
public NodeInfo getNodeInfo(SessionInfo sessionInfo, NodeId nodeId) throws ItemNotFoundException, RepositoryException;
/**
@@ -382,6 +383,7 @@ public interface RepositoryService {
* @see javax.jcr.Node#getProperty(String)
* @deprecated Use {@link #getItemInfos(SessionInfo, ItemId)}
*/
+ @Deprecated
public PropertyInfo getPropertyInfo(SessionInfo sessionInfo, PropertyId propertyId) throws ItemNotFoundException, RepositoryException;
//-----------------------------------------------< general modification >---
diff --git a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/PropContainer.java b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/PropContainer.java
index a86e55fea..63d3b81be 100644
--- a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/PropContainer.java
+++ b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/PropContainer.java
@@ -42,6 +42,7 @@ public abstract class PropContainer implements XmlSerializable, DavConstants {
* @return true if the object could be added; false otherwise
* @deprecated Use {@link #addContent(PropEntry)} instead.
*/
+ @Deprecated
public boolean addContent(Object contentEntry) {
if (contentEntry instanceof PropEntry) {
return addContent((PropEntry) contentEntry);
diff --git a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/WorkspaceResource.java b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/WorkspaceResource.java
index bfbbe5ff6..a5e6e309e 100644
--- a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/WorkspaceResource.java
+++ b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/WorkspaceResource.java
@@ -56,6 +56,7 @@ public interface WorkspaceResource extends DeltaVResource {
/**
* @deprecated Use {@link #CURRENT_ACTIVITY_SET} instead.
*/
+ @Deprecated
public static final DavPropertyName CUURENT_ACTIVITY_SET = DavPropertyName.create("current-activity-set", DeltaVConstants.NAMESPACE);
/**
diff --git a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
index 07a603fa5..86d19133a 100644
--- a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
+++ b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
@@ -736,6 +736,7 @@ public class DomUtil {
* is called <code>Expanded Name</code>.
*
*/
+ @Deprecated
public static String getQualifiedName(String localName, Namespace namespace) {
return getExpandedName(localName, namespace);
}