[Bedework-commit] bwwebapps r87 - in trunk: webadmin/war/docs/system webcommon/src/org/bedework/webcommon/system

[svnadmin at bedework.org]

Author: douglm
Date: 2012-04-27 15:55:17 -0400 (Fri, 27 Apr 2012)
New Revision: 87

Modified:
   trunk/webadmin/war/docs/system/modSyspars.jsp
   trunk/webcommon/src/org/bedework/webcommon/system/UpdateSysparsAction.java
Log:
Allow enabling of solr as public events indexer.

Requires the jboss data directory to be set up correctly and an appropriately configured solr to be deployed.

Modified: trunk/webadmin/war/docs/system/modSyspars.jsp
===================================================================
--- trunk/webadmin/war/docs/system/modSyspars.jsp	2012-04-27 19:55:15 UTC (rev 86)
+++ trunk/webadmin/war/docs/system/modSyspars.jsp	2012-04-27 19:55:17 UTC (rev 87)
@@ -55,6 +55,10 @@
   <bw:emitText name="systemParams" property="directoryBrowsingDisallowed"/>
 
   <bw:emitText name="systemParams" property="indexRoot"/>
+  <bw:emitText name="systemParams" property="useSolr"/>
+  <bw:emitText name="systemParams" property="solrURL"/>
+  <bw:emitText name="systemParams" property="solrCoreAdmin"/>
+  <bw:emitText name="systemParams" property="solrDefaultCore"/>
 
   <bw:emitText name="systemParams" property="localeList"/>
 

Modified: trunk/webcommon/src/org/bedework/webcommon/system/UpdateSysparsAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/system/UpdateSysparsAction.java	2012-04-27 19:55:15 UTC (rev 86)
+++ trunk/webcommon/src/org/bedework/webcommon/system/UpdateSysparsAction.java	2012-04-27 19:55:17 UTC (rev 87)
@@ -6,9 +6,9 @@
     Version 2.0 (the "License"); you may not use this file
     except in compliance with the License. You may obtain a
     copy of the License at:
-        
+
     http://www.apache.org/licenses/LICENSE-2.0
-        
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on
     an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -78,68 +78,6 @@
       return forwardCancelled;
     }
 
-    /*
-    str = request.getReqPar("admingroupsClass");
-    if (str != null) {
-      syspars.setAdmingroupsClass(str);
-      changed = true;
-    }
-
-    str = request.getReqPar("usergroupsClass");
-    if (str != null) {
-      syspars.setUsergroupsClass(str);
-      changed = true;
-    }
-
-    str = request.getReqPar("defaultUserViewName");
-    if (str != null) {
-      syspars.setDefaultUserViewName(str);
-      changed = true;
-    }
-
-    int intVal = request.getIntReqPar("httpConnectionsPerUser", -1);
-    if (intVal >= 0) {
-      syspars.setHttpConnectionsPerUser(intVal);
-      changed = true;
-    }
-
-    intVal = request.getIntReqPar("httpConnectionsPerHost", -1);
-    if (intVal >= 0) {
-      syspars.setHttpConnectionsPerHost(intVal);
-      changed = true;
-    }
-
-    intVal = request.getIntReqPar("httpConnections", -1);
-    if (intVal >= 0) {
-      syspars.setHttpConnections(intVal);
-      changed = true;
-    }
-
-    intVal = request.getIntReqPar("maxPublicDescriptionLength", -1);
-    if (intVal >= 0) {
-      syspars.setMaxPublicDescriptionLength(intVal);
-      changed = true;
-    }
-
-    intVal = request.getIntReqPar("maxUserDescriptionLength", -1);
-    if (intVal >= 0) {
-      syspars.setMaxUserDescriptionLength(intVal);
-      changed = true;
-    }
-
-    intVal = request.getIntReqPar("maxUserEntitySize", -1);
-    if (intVal >= 0) {
-      syspars.setMaxUserEntitySize(intVal);
-      changed = true;
-    }
-
-    long longVal = getLongReqPar(request, "defaultUserQuota", -1);
-    if (longVal >= 0) {
-      syspars.setDefaultUserQuota(longVal);
-      changed = true;
-    }
-    */
-
     changed = changedString(request, form, syspars, "tzid", changed);
     if (changed == null) {
       return forwardBadRequest;
@@ -313,6 +251,26 @@
       return forwardBadRequest;
     }
 
+    changed = changedBoolean(request, form, syspars, "useSolr", changed);
+    if (changed == null) {
+      return forwardBadRequest;
+    }
+
+    changed = changedString(request, form, syspars, "solrURL", changed);
+    if (changed == null) {
+      return forwardBadRequest;
+    }
+
+    changed = changedString(request, form, syspars, "solrCoreAdmin", changed);
+    if (changed == null) {
+      return forwardBadRequest;
+    }
+
+    changed = changedString(request, form, syspars, "solrDefaultCore", changed);
+    if (changed == null) {
+      return forwardBadRequest;
+    }
+
     changed = changedString(request, form, syspars, "localeList", changed);
     if (changed == null) {
       return forwardBadRequest;