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/02/25 15:04:42 UTC

(jackrabbit) branch 2.20 updated (4c08e0422 -> 612102e22)

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a change to branch 2.20
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git


    from 4c08e0422 JCR-4979 Adjust email vote template after migration to Git (#165)
     new b0652f415 JCR-5024: webapp: un-deprecate BootstrapConfig.getJndiConfig and RepositoryAccessServlet.getRepositoryByJNDI
     new 612102e22 JCR-5024: webapp: un-deprecate RepositoryAccessServlet.getRepositoryByJNDI (#160)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/org/apache/jackrabbit/j2ee/BootstrapConfig.java    | 5 +----
 .../java/org/apache/jackrabbit/j2ee/RepositoryAccessServlet.java     | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)


(jackrabbit) 01/02: JCR-5024: webapp: un-deprecate BootstrapConfig.getJndiConfig and RepositoryAccessServlet.getRepositoryByJNDI

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch 2.20
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git

commit b0652f41518e4276c1f35453f46f4a12f8c4e562
Author: Julian Reschke <re...@apache.org>
AuthorDate: Fri Feb 9 15:44:13 2024 +0100

    JCR-5024: webapp: un-deprecate BootstrapConfig.getJndiConfig and RepositoryAccessServlet.getRepositoryByJNDI
---
 .../src/main/java/org/apache/jackrabbit/j2ee/BootstrapConfig.java    | 5 +----
 1 file changed, 1 insertion(+), 4 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..6ecab2cf7 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
@@ -107,10 +107,7 @@ public class BootstrapConfig extends AbstractConfig {
         this.repositoryName = repositoryName;
     }
 
-    /**
-     * @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() {
+    public JNDIConfig getJndiConfig() {
         return jndiConfig;
     }
 


(jackrabbit) 02/02: JCR-5024: webapp: un-deprecate RepositoryAccessServlet.getRepositoryByJNDI (#160)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch 2.20
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git

commit 612102e22b436b7a92fc2ff2568277f511439751
Author: Julian Reschke <re...@apache.org>
AuthorDate: Fri Feb 9 16:15:22 2024 +0100

    JCR-5024: webapp: un-deprecate RepositoryAccessServlet.getRepositoryByJNDI (#160)
---
 .../main/java/org/apache/jackrabbit/j2ee/RepositoryAccessServlet.java   | 2 --
 1 file changed, 2 deletions(-)

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..5bce47bde 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
@@ -195,8 +195,6 @@ public class RepositoryAccessServlet extends HttpServlet {
     }
 
     /**
-     * @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.
-     * <p>
      * Checks if the repository is available via JNDI and returns it.
      * @return the repository or <code>null</code>
      * @throws ServletException if this servlet is not properly configured.