jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1853208 - in /jackrabbit/branches/2.18: ./ jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/Installer.java jackrabbit-webapp/src/main/webapp/bootstrap/missing.jsp
Date Fri, 08 Feb 2019 11:04:43 GMT
Author: reschke
Date: Fri Feb  8 11:04:43 2019
New Revision: 1853208

URL: http://svn.apache.org/viewvc?rev=1853208&view=rev
Log:
JCR-4410: jackrabbit-webapp: cleanup left over Oak references (ported to 2.18)

Modified:
    jackrabbit/branches/2.18/   (props changed)
    jackrabbit/branches/2.18/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/Installer.java
    jackrabbit/branches/2.18/jackrabbit-webapp/src/main/webapp/bootstrap/missing.jsp

Propchange: jackrabbit/branches/2.18/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  8 11:04:43 2019
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1851953
+/jackrabbit/trunk:1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1851953,1851961

Modified: jackrabbit/branches/2.18/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/Installer.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.18/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/Installer.java?rev=1853208&r1=1853207&r2=1853208&view=diff
==============================================================================
--- jackrabbit/branches/2.18/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/Installer.java
(original)
+++ jackrabbit/branches/2.18/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/Installer.java
Fri Feb  8 11:04:43 2019
@@ -125,7 +125,6 @@ public class Installer {
     public int installRepository(HttpServletRequest req)
             throws ServletException, IOException {
         String repHome = req.getParameter("repository_home");
-        String repType = req.getParameter("repository_type");
         String repXml = req.getParameter("repository_xml");
         String mode = req.getParameter("mode");
 
@@ -135,10 +134,7 @@ public class Installer {
         File home = new File(repHome);
 
         File config;
-        if ("oak".equals(repType)) {
-            config = null;
-            repXml = null;
-        } else if (repXml == null || repXml.length() == 0) {
+        if (repXml == null || repXml.length() == 0) {
             config = new File(home, "repository.xml");
             repXml = config.getPath();
         } else {

Modified: jackrabbit/branches/2.18/jackrabbit-webapp/src/main/webapp/bootstrap/missing.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.18/jackrabbit-webapp/src/main/webapp/bootstrap/missing.jsp?rev=1853208&r1=1853207&r2=1853208&view=diff
==============================================================================
--- jackrabbit/branches/2.18/jackrabbit-webapp/src/main/webapp/bootstrap/missing.jsp (original)
+++ jackrabbit/branches/2.18/jackrabbit-webapp/src/main/webapp/bootstrap/missing.jsp Fri Feb
 8 11:04:43 2019
@@ -40,15 +40,6 @@ request.setAttribute("title", "Content R
       <input size="40" type="text" name="repository_home" value="jackrabbit">
     </label>
   </p>
-  <p>
-    Repository type:
-    <label>
-      <input type="radio" name="repository_type" value="classic" checked> Classic
-    </label>
-    <label>
-      <input type="radio" name="repository_type" value="oak"> Oak
-    </label>
-  </p>
   <p><input type="submit" value="Create Content Repository"></p>
 </form>
 



Mime
View raw message