incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r912648 - in /sling/trunk: ./ bundles/engine/src/main/java/org/apache/sling/engine/ bundles/engine/src/main/java/org/apache/sling/engine/impl/ bundles/extensions/systemstatus/ launchpad/builder/src/main/bundles/
Date Mon, 22 Feb 2010 16:44:33 GMT
Author: bdelacretaz
Date: Mon Feb 22 16:44:32 2010
New Revision: 912648

URL: http://svn.apache.org/viewvc?rev=912648&view=rev
Log:
SLING-1402 - remove systemstatus module

Removed:
    sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SystemStatus.java
    sling/trunk/bundles/extensions/systemstatus/
Modified:
    sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
    sling/trunk/launchpad/builder/src/main/bundles/list.xml
    sling/trunk/pom.xml

Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java?rev=912648&r1=912647&r2=912648&view=diff
==============================================================================
--- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
(original)
+++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
Mon Feb 22 16:44:32 2010
@@ -60,7 +60,6 @@
 import org.apache.sling.commons.mime.MimeTypeService;
 import org.apache.sling.commons.osgi.OsgiUtil;
 import org.apache.sling.engine.ResponseUtil;
-import org.apache.sling.engine.SystemStatus;
 import org.apache.sling.engine.impl.filter.RequestSlingFilterChain;
 import org.apache.sling.engine.impl.filter.SlingComponentFilterChain;
 import org.apache.sling.engine.impl.filter.SlingFilterChainHelper;
@@ -169,9 +168,6 @@
     private AdapterManager adapterManager;
 
     /** @scr.reference cardinality="0..1" policy="dynamic" */
-    private SystemStatus systemStatus;
-
-    /** @scr.reference cardinality="0..1" policy="dynamic" */
     private AuthenticationSupport authenticationSupport;
 
     private SlingFilterChainHelper requestFilterChain = new SlingFilterChainHelper();
@@ -289,15 +285,6 @@
                 errorMessage = "Missing ResourceResolver";
             }
 
-            // system ready?
-            if(errorMessage == null && systemStatus != null) {
-                try {
-                    systemStatus.checkSystemReady();
-                } catch(Exception e) {
-                    errorMessage = e.toString();
-                }
-            }
-
             if (errorMessage != null) {
                 final int status = HttpServletResponse.SC_SERVICE_UNAVAILABLE;
                 log.error("{} , sending status {}", errorMessage, status);
@@ -305,12 +292,6 @@
                 return;
             }
 
-            // status request?
-            if(SystemStatus.STATUS_PATH.equals(request.getPathInfo()) && systemStatus
!= null) {
-                systemStatus.doGet(request, response);
-                return;
-            }
-
             // initialize the request data - resolve resource and servlet
             Resource resource = requestData.initResource(resolver);
             requestData.initServlet(resource);

Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=912648&r1=912647&r2=912648&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Feb 22 16:44:32 2010
@@ -55,11 +55,6 @@
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.systemstatus</artifactId>
-            <version>0.9.0-SNAPSHOT</version>
-        </bundle>
-        <bundle>
-            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.httpauth</artifactId>
             <version>2.0.5-SNAPSHOT</version>
         </bundle>

Modified: sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=912648&r1=912647&r2=912648&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Mon Feb 22 16:44:32 2010
@@ -122,7 +122,6 @@
         <module>bundles/extensions/httpauth</module>
         <module>bundles/extensions/openidauth</module>
         <module>bundles/extensions/threaddump</module>
-        <module>bundles/extensions/systemstatus</module>
         <module>bundles/extensions/webconsolebranding</module>
         <module>bundles/extensions/groovy</module>
 



Mime
View raw message