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 2023/08/02 13:13:13 UTC
svn commit: r1911410 - in /jackrabbit/trunk: jackrabbit-standalone-components/src/main/resources/WEB-INF/ jackrabbit-webapp/src/main/webapp/ jackrabbit-webapp/src/main/webapp/WEB-INF/ jackrabbit-webapp/src/main/webapp/WEB-INF/templates/
Author: reschke
Date: Wed Aug 2 13:13:12 2023
New Revision: 1911410
URL: http://svn.apache.org/viewvc?rev=1911410&view=rev
Log:
JCR-4960: disable RMI by default
Modified:
jackrabbit/trunk/jackrabbit-standalone-components/src/main/resources/WEB-INF/web.xml
jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/templates/bootstrap.properties
jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml
jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/remote.jsp
Modified: jackrabbit/trunk/jackrabbit-standalone-components/src/main/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone-components/src/main/resources/WEB-INF/web.xml?rev=1911410&r1=1911409&r2=1911410&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone-components/src/main/resources/WEB-INF/web.xml (original)
+++ jackrabbit/trunk/jackrabbit-standalone-components/src/main/resources/WEB-INF/web.xml Wed Aug 2 13:13:12 2023
@@ -170,10 +170,10 @@
<!-- ====================================================================== -->
<!-- R M I B I N D I N G S E R V L E T -->
<!-- ====================================================================== -->
- <servlet>
- <servlet-name>RMI</servlet-name>
- <servlet-class>org.apache.jackrabbit.servlet.remote.RemoteBindingServlet</servlet-class>
- </servlet>
+<!-- <servlet>-->
+<!-- <servlet-name>RMI</servlet-name>-->
+<!-- <servlet-class>org.apache.jackrabbit.servlet.remote.RemoteBindingServlet</servlet-class>-->
+<!-- </servlet>-->
<!-- ====================================================================== -->
<!-- S E R V L E T M A P P I N G -->
@@ -186,10 +186,10 @@
<servlet-name>JCRWebdavServer</servlet-name>
<url-pattern>/server/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>RMI</servlet-name>
- <url-pattern>/rmi</url-pattern>
- </servlet-mapping>
+<!-- <servlet-mapping>-->
+<!-- <servlet-name>RMI</servlet-name>-->
+<!-- <url-pattern>/rmi</url-pattern>-->
+<!-- </servlet-mapping>-->
<!-- ====================================================================== -->
<!-- W E L C O M E F I L E S -->
Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/templates/bootstrap.properties
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/templates/bootstrap.properties?rev=1911410&r1=1911409&r2=1911410&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/templates/bootstrap.properties (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/templates/bootstrap.properties Wed Aug 2 13:13:12 2023
@@ -23,9 +23,10 @@ repository.home=jackrabbit/repository
repository.name=jackrabbit.repository
# RMI Settings
-rmi.enabled=true
-rmi.port=0
-rmi.host=localhost
+rmi.enabled=false
+
+#rmi.port=0
+#rmi.host=localhost
# If the URI is not specified, it's composed as follows:
#rmi.uri=//${rmi.host}:${rmi.port}/${repository.name}
Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml?rev=1911410&r1=1911409&r2=1911410&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml Wed Aug 2 13:13:12 2023
@@ -363,10 +363,10 @@
<!-- ====================================================================== -->
<!-- R M I B I N D I N G S E R V L E T -->
<!-- ====================================================================== -->
- <servlet>
- <servlet-name>RMI</servlet-name>
- <servlet-class>org.apache.jackrabbit.servlet.remote.RemoteBindingServlet</servlet-class>
- </servlet>
+<!-- <servlet>-->
+<!-- <servlet-name>RMI</servlet-name>-->
+<!-- <servlet-class>org.apache.jackrabbit.servlet.remote.RemoteBindingServlet</servlet-class>-->
+<!-- </servlet>-->
<!-- ====================================================================== -->
<!-- S E R V L E T M A P P I N G -->
@@ -383,10 +383,10 @@
<servlet-name>JCRWebdavServer</servlet-name>
<url-pattern>/server/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>RMI</servlet-name>
- <url-pattern>/rmi</url-pattern>
- </servlet-mapping>
+<!-- <servlet-mapping>-->
+<!-- <servlet-name>RMI</servlet-name>-->
+<!-- <url-pattern>/rmi</url-pattern>-->
+<!-- </servlet-mapping>-->
<!-- ====================================================================== -->
<!-- W E L C O M E F I L E S -->
Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/remote.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/remote.jsp?rev=1911410&r1=1911409&r2=1911410&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/remote.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/remote.jsp Wed Aug 2 13:13:12 2023
@@ -23,15 +23,21 @@ String base =
base = Text.encodeIllegalXMLCharacters(base);
%><jsp:include page="header.jsp"/>
<p>
- The content repository within this web application is made available
+ The content repository within this web application may be made available
to remote clients through
<a href="http://java.sun.com/javase/technologies/core/basic/rmi/">RMI</a>
and the <em>jackrabbit-jcr-rmi</em> component.
<p>
<p>
- The remote repository stub is available both in the RMI registry
- (one is started automatically by this web application if not already running)
- and as a direct HTTP download. The default URLs for accessing the remote
+ To access a remote repository stub, it needs to be registered in the RMI registry.
+ By default, this is not started automatically by this web application. To change that,
+ use the related properties in the bootstrap.properties file which are commented out
+ in the template file.
+ You can also make the stub available as a direct HTTP download by enabling the
+ RemoteBindingServlet and the corresponding servlet mapping, which are commented out
+ in the web.xml template.
+
+ The default URLs for accessing the remote
repository are:
</p>
<ul>