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/01/16 16:43:37 UTC
(jackrabbit) 01/01: JCR-5020: jackrabbit-webapp: deprecate RMI support "for removal"
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch JCR-5020
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git
commit a80549f753cd99e940b340ce496d2157b89034bc
Author: Julian Reschke <re...@apache.org>
AuthorDate: Tue Jan 16 17:43:15 2024 +0100
JCR-5020: jackrabbit-webapp: deprecate RMI support "for removal"
---
.../java/org/apache/jackrabbit/j2ee/BootstrapConfig.java | 6 +++---
.../main/java/org/apache/jackrabbit/j2ee/RMIConfig.java | 2 +-
.../apache/jackrabbit/j2ee/RepositoryAccessServlet.java | 6 +++---
.../apache/jackrabbit/j2ee/RepositoryStartupServlet.java | 14 +++++++-------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/BootstrapConfig.java b/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/BootstrapConfig.java
index dfff9fd4f..e34795e1d 100644
--- a/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/BootstrapConfig.java
+++ b/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/BootstrapConfig.java
@@ -46,7 +46,7 @@ public class BootstrapConfig extends AbstractConfig {
private JNDIConfig jndiConfig = new JNDIConfig(this);
- @Deprecated private RMIConfig rmiConfig = new RMIConfig(this);
+ @Deprecated(forRemoval = true) private RMIConfig rmiConfig = new RMIConfig(this);
public void init(Properties props) throws ServletException {
String property = props.getProperty("repository.home");;
@@ -110,14 +110,14 @@ public class BootstrapConfig extends AbstractConfig {
/**
* @deprecated RMI support is deprecated and will be removed in a future version of Jackrabbit; see <a href=https://issues.apache.org/jira/browse/JCR-4972 target=_blank>Jira ticket JCR-4972</a> for more information.
*/
- @Deprecated public JNDIConfig getJndiConfig() {
+ @Deprecated(forRemoval = true) public JNDIConfig getJndiConfig() {
return jndiConfig;
}
/**
* @deprecated RMI support is deprecated and will be removed in a future version of Jackrabbit; see <a href=https://issues.apache.org/jira/browse/JCR-4972 target=_blank>Jira ticket JCR-4972</a> for more information.
*/
- @Deprecated public RMIConfig getRmiConfig() {
+ @Deprecated(forRemoval = true) public RMIConfig getRmiConfig() {
return rmiConfig;
}
diff --git a/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RMIConfig.java b/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RMIConfig.java
index e82351bf3..8e2390fc8 100644
--- a/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RMIConfig.java
+++ b/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RMIConfig.java
@@ -45,7 +45,7 @@ import javax.servlet.ServletException;
* +-------------------+--------------------+
* </pre>
*/
-@Deprecated public class RMIConfig extends AbstractConfig {
+@Deprecated(forRemoval = true) public class RMIConfig extends AbstractConfig {
/**
* default logger
diff --git a/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryAccessServlet.java b/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryAccessServlet.java
index a8e383c6f..38feeb36c 100644
--- a/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryAccessServlet.java
+++ b/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryAccessServlet.java
@@ -229,7 +229,7 @@ public class RepositoryAccessServlet extends HttpServlet {
* @return the repository or <code>null</code>
* @throws ServletException if this servlet is not properly configured.
*/
- @Deprecated private Repository getRepositoryByRMI() throws ServletException {
+ @Deprecated(forRemoval = true) private Repository getRepositoryByRMI() throws ServletException {
BootstrapConfig config = getConfig();
if (!config.getRmiConfig().isValid() || !config.getRmiConfig().enabled()) {
return null;
@@ -345,7 +345,7 @@ public class RepositoryAccessServlet extends HttpServlet {
* <p>
* optional class for RMI, will only be used, if RMI client is present
*/
- @Deprecated protected static abstract class ClientFactoryDelegater {
+ @Deprecated(forRemoval = true) protected static abstract class ClientFactoryDelegater {
public abstract Repository getRepository(String uri)
throws RemoteException, MalformedURLException, NotBoundException;
@@ -356,7 +356,7 @@ public class RepositoryAccessServlet extends HttpServlet {
* <p>
* optional class for RMI, will only be used, if RMI server is present
*/
- @Deprecated protected static class RMIClientFactoryDelegater extends ClientFactoryDelegater {
+ @Deprecated(forRemoval = true) protected static class RMIClientFactoryDelegater extends ClientFactoryDelegater {
// only used to enforce linking upon Class.forName()
static String FactoryClassName = ClientRepositoryFactory.class.getName();
diff --git a/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java b/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
index b2041b0c9..109416285 100644
--- a/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
+++ b/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
@@ -177,7 +177,7 @@ public class RepositoryStartupServlet extends AbstractRepositoryServlet {
*/
private InitialContext jndiContext;
- @Deprecated private Registry rmiRegistry = null;
+ @Deprecated(forRemoval = true) private Registry rmiRegistry = null;
/**
* @deprecated RMI support is deprecated and will be removed in a future version of Jackrabbit; see <a href=https://issues.apache.org/jira/browse/JCR-4972 target=_blank>Jira ticket JCR-4972</a> for more information.
@@ -192,7 +192,7 @@ public class RepositoryStartupServlet extends AbstractRepositoryServlet {
* @see #registerRMI()
* @see #unregisterRMI()
*/
- @Deprecated private Remote rmiRepository;
+ @Deprecated(forRemoval = true) private Remote rmiRepository;
/**
* the file to the bootstrap config
@@ -498,7 +498,7 @@ public class RepositoryStartupServlet extends AbstractRepositoryServlet {
* the repository with an RMI registry.
* @throws ServletException if an error occurs.
*/
- @Deprecated private void registerRMI() {
+ @Deprecated(forRemoval = true) private void registerRMI() {
RMIConfig rc = config.getRmiConfig();
if (!rc.isValid() || !rc.enabled()) {
return;
@@ -597,7 +597,7 @@ public class RepositoryStartupServlet extends AbstractRepositoryServlet {
* Unregisters the repository from the RMI registry, if it has previously
* been registered.
*/
- @Deprecated private void unregisterRMI() {
+ @Deprecated(forRemoval = true) private void unregisterRMI() {
if (rmiRepository != null) {
// Forcibly unexport the repository;
try {
@@ -668,7 +668,7 @@ public class RepositoryStartupServlet extends AbstractRepositoryServlet {
* creating <code>java.net.ServerSocket</code> instances bound to
* the <code>rmiHost</code>.
*/
- @Deprecated protected RMIServerSocketFactory getRMIServerSocketFactory(
+ @Deprecated(forRemoval = true) protected RMIServerSocketFactory getRMIServerSocketFactory(
final InetAddress hostAddress) {
return new RMIServerSocketFactory() {
public ServerSocket createServerSocket(int port) throws IOException {
@@ -682,7 +682,7 @@ public class RepositoryStartupServlet extends AbstractRepositoryServlet {
* <p>
* optional class for RMI, will only be used, if RMI server is present
*/
- @Deprecated protected static abstract class RemoteFactoryDelegater {
+ @Deprecated(forRemoval = true) protected static abstract class RemoteFactoryDelegater {
public abstract Remote createRemoteRepository(Repository repository)
throws RemoteException;
@@ -693,7 +693,7 @@ public class RepositoryStartupServlet extends AbstractRepositoryServlet {
* <p>
* optional class for RMI, will only be used, if RMI server is present
*/
- @Deprecated protected static class RMIRemoteFactoryDelegater extends RemoteFactoryDelegater {
+ @Deprecated(forRemoval = true) protected static class RMIRemoteFactoryDelegater extends RemoteFactoryDelegater {
private static final RemoteAdapterFactory FACTORY =
new ServerAdapterFactory();