incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1519670 - in /sling/trunk/contrib/extensions/healthcheck: ./ core/ it/ it/src/test/java/org/apache/sling/hc/it/core/ jmx/ samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/ support/ support/src/main/java/org/apache/sling/hc/hea...
Date Tue, 03 Sep 2013 12:54:22 GMT
Author: bdelacretaz
Date: Tue Sep  3 12:54:21 2013
New Revision: 1519670

URL: http://svn.apache.org/r1519670
Log:
SLING-3034 - rename modules: api to core and healthchecks to support

Added:
    sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.support.DefaultLoginsHealthCheck-1.json
    sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.support.SlingRequestStatusHealthCheck-1.json
    sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/
    sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/
      - copied from r1519667, sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/healthchecks/impl/
Removed:
    sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.DefaultLoginsHealthCheck-1.json
    sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.SlingRequestStatusHealthCheck-1.json
    sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/healthchecks/impl/
Modified:
    sling/trunk/contrib/extensions/healthcheck/core/pom.xml
    sling/trunk/contrib/extensions/healthcheck/it/pom.xml
    sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
    sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml
    sling/trunk/contrib/extensions/healthcheck/pom.xml
    sling/trunk/contrib/extensions/healthcheck/support/pom.xml
    sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/DefaultLoginsHealthCheck.java
    sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/InternalRequest.java
    sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/InternalResponse.java
    sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/SlingRequestStatusHealthCheck.java
    sling/trunk/contrib/extensions/healthcheck/support/src/test/java/org/apache/sling/hc/healthchecks/DefaultLoginsHealthCheckTest.java
    sling/trunk/contrib/extensions/healthcheck/webconsole/pom.xml

Modified: sling/trunk/contrib/extensions/healthcheck/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/core/pom.xml?rev=1519670&r1=1519669&r2=1519670&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/core/pom.xml Tue Sep  3 12:54:21 2013
@@ -14,15 +14,15 @@
     </parent>
 
     <groupId>org.apache.sling</groupId>
-    <artifactId>org.apache.sling.hc.api</artifactId>
+    <artifactId>org.apache.sling.hc.core</artifactId>
     <packaging>bundle</packaging>
     <version>0.0.2-SNAPSHOT</version>
 
-    <name>Sling Health Check API</name>
+    <name>Sling Health Check Core</name>
     <inceptionYear>2013</inceptionYear>
     
     <description>
-        The Sling Health Check API
+        The Sling Health Check Core
     </description>
 
     <properties>

Modified: sling/trunk/contrib/extensions/healthcheck/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/pom.xml?rev=1519670&r1=1519669&r2=1519670&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/it/pom.xml Tue Sep  3 12:54:21 2013
@@ -37,7 +37,7 @@
                 <configuration>
                     <systemProperties>
                         <org.ops4j.pax.logging.DefaultServiceLog.level>${org.ops4j.pax.logging.DefaultServiceLog.level}</org.ops4j.pax.logging.DefaultServiceLog.level>
-                        <sling.hc.api.version>${project.version}</sling.hc.api.version>
+                        <sling.hc.core.version>${project.version}</sling.hc.core.version>
                         <felix.shell>${felix.shell}</felix.shell>
                     </systemProperties>
                 </configuration>
@@ -48,7 +48,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.hc.api</artifactId>
+            <artifactId>org.apache.sling.hc.core</artifactId>
             <version>0.0.2-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>

Modified: sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java?rev=1519670&r1=1519669&r2=1519670&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
(original)
+++ sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
Tue Sep  3 12:54:21 2013
@@ -30,7 +30,7 @@ import org.ops4j.pax.exam.Option;
 public class U {
     
     static Option[] config() {
-        final String coreVersion = System.getProperty("sling.hc.api.version");
+        final String coreVersion = System.getProperty("sling.hc.core.version");
         final String localRepo = System.getProperty("maven.repo.local", "");
         final boolean felixShell = "true".equals(System.getProperty("felix.shell", "false"));
 
@@ -48,7 +48,7 @@ public class U {
             ),
             provision(
                     mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
-                    mavenBundle("org.apache.sling", "org.apache.sling.hc.api", coreVersion),
+                    mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion),
                     mavenBundle("org.apache.sling", "org.apache.sling.commons.osgi", "2.2.0"),
                     mavenBundle("org.apache.sling", "org.apache.sling.jcr.jcr-wrapper", "2.0.0"),
                     mavenBundle("org.apache.sling", "org.apache.sling.api", "2.4.2"),

Modified: sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml?rev=1519670&r1=1519669&r2=1519670&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/jmx/pom.xml Tue Sep  3 12:54:21 2013
@@ -57,7 +57,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.hc.api</artifactId>
+            <artifactId>org.apache.sling.hc.core</artifactId>
             <version>0.0.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
@@ -66,12 +66,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.hc.healthchecks</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
          <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

Modified: sling/trunk/contrib/extensions/healthcheck/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/pom.xml?rev=1519670&r1=1519669&r2=1519670&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/pom.xml Tue Sep  3 12:54:21 2013
@@ -26,9 +26,9 @@
     </prerequisites>
     
     <modules>
-        <module>api</module>
+        <module>core</module>
         <module>samples</module>
-        <module>healthchecks</module>
+        <module>support</module>
         <module>jmx</module>
         <module>webconsole</module>
         <module>it</module>

Added: sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.support.DefaultLoginsHealthCheck-1.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.support.DefaultLoginsHealthCheck-1.json?rev=1519670&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.support.DefaultLoginsHealthCheck-1.json
(added)
+++ sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.support.DefaultLoginsHealthCheck-1.json
Tue Sep  3 12:54:21 2013
@@ -0,0 +1,7 @@
+{
+    "jcr:primaryType" : "sling:OsgiConfig",
+    "logins" : ["admin:admin","foo:bar"],
+    "hc.name" : "Default logins should fail", 
+    "hc.tags" : [security],
+    "hc.mbean.name" : "DefaultLoginsFail"
+}

Added: sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.support.SlingRequestStatusHealthCheck-1.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.support.SlingRequestStatusHealthCheck-1.json?rev=1519670&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.support.SlingRequestStatusHealthCheck-1.json
(added)
+++ sling/trunk/contrib/extensions/healthcheck/samples/src/main/resources/SLING-CONTENT/apps/hc/demo/install/org.apache.sling.hc.support.SlingRequestStatusHealthCheck-1.json
Tue Sep  3 12:54:21 2013
@@ -0,0 +1,12 @@
+{
+    "jcr:primaryType" : "sling:OsgiConfig",
+    "path" : [
+        "index.html",
+        "index.html.json",
+        "apps/hc.tidy.json",
+        "some/non/existent/path:404"
+    ],
+    "hc.name" : "Initial content is present", 
+    "hc.tags" : [request, sling],
+    "hc.mbean.name" : "InitialContentPresent"
+}

Modified: sling/trunk/contrib/extensions/healthcheck/support/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/support/pom.xml?rev=1519670&r1=1519669&r2=1519670&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/support/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/support/pom.xml Tue Sep  3 12:54:21 2013
@@ -14,15 +14,15 @@
     </parent>
 
     <groupId>org.apache.sling</groupId>
-    <artifactId>org.apache.sling.hc.healthchecks</artifactId>
+    <artifactId>org.apache.sling.hc.support</artifactId>
     <packaging>bundle</packaging>
     <version>0.0.2-SNAPSHOT</version>
 
-    <name>Sling Health Check Services</name>
+    <name>Sling Health Check Support Components</name>
     <inceptionYear>2013</inceptionYear>
     
     <description>
-        Default Sling Health Check Services
+        Default Sling Health Check Support Components
     </description>
 
     <properties>
@@ -54,7 +54,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.hc.api</artifactId>
+            <artifactId>org.apache.sling.hc.core</artifactId>
             <version>0.0.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>

Modified: sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/DefaultLoginsHealthCheck.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/DefaultLoginsHealthCheck.java?rev=1519670&r1=1519667&r2=1519670&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/DefaultLoginsHealthCheck.java
(original)
+++ sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/DefaultLoginsHealthCheck.java
Tue Sep  3 12:54:21 2013
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.sling.hc.healthchecks.impl;
+package org.apache.sling.hc.support.impl;
 
 import java.util.Arrays;
 import java.util.List;
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
 /** {@link HealthCheck} that checks that Sling default logins fail.
  *  Used to verify that those logins are disabled on production systems */
 @Component(
-        name="org.apache.sling.hc.DefaultLoginsHealthCheck",
+        name="org.apache.sling.hc.support.DefaultLoginsHealthCheck",
         configurationFactory=true,
         policy=ConfigurationPolicy.REQUIRE,
         metatype=true)

Modified: sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/InternalRequest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/InternalRequest.java?rev=1519670&r1=1519667&r2=1519670&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/InternalRequest.java
(original)
+++ sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/InternalRequest.java
Tue Sep  3 12:54:21 2013
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.sling.hc.healthchecks.impl;
+package org.apache.sling.hc.support.impl;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Modified: sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/InternalResponse.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/InternalResponse.java?rev=1519670&r1=1519667&r2=1519670&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/InternalResponse.java
(original)
+++ sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/InternalResponse.java
Tue Sep  3 12:54:21 2013
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.sling.hc.healthchecks.impl;
+package org.apache.sling.hc.support.impl;
 
 import java.io.IOException;
 import java.io.PrintWriter;

Modified: sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/SlingRequestStatusHealthCheck.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/SlingRequestStatusHealthCheck.java?rev=1519670&r1=1519667&r2=1519670&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/SlingRequestStatusHealthCheck.java
(original)
+++ sling/trunk/contrib/extensions/healthcheck/support/src/main/java/org/apache/sling/hc/support/impl/SlingRequestStatusHealthCheck.java
Tue Sep  3 12:54:21 2013
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.sling.hc.healthchecks.impl;
+package org.apache.sling.hc.support.impl;
 
 import java.util.Arrays;
 
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
  *  Typically used to check that a freshly installed Sling-based system
  *  is in good shape, contains all required content etc. */
 @Component(
-        name="org.apache.sling.hc.SlingRequestStatusHealthCheck",
+        name="org.apache.sling.hc.support.SlingRequestStatusHealthCheck",
         configurationFactory=true,
         policy=ConfigurationPolicy.REQUIRE,
         metatype=true)

Modified: sling/trunk/contrib/extensions/healthcheck/support/src/test/java/org/apache/sling/hc/healthchecks/DefaultLoginsHealthCheckTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/support/src/test/java/org/apache/sling/hc/healthchecks/DefaultLoginsHealthCheckTest.java?rev=1519670&r1=1519669&r2=1519670&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/support/src/test/java/org/apache/sling/hc/healthchecks/DefaultLoginsHealthCheckTest.java
(original)
+++ sling/trunk/contrib/extensions/healthcheck/support/src/test/java/org/apache/sling/hc/healthchecks/DefaultLoginsHealthCheckTest.java
Tue Sep  3 12:54:21 2013
@@ -28,7 +28,7 @@ import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 
 import org.apache.sling.hc.api.Result;
-import org.apache.sling.hc.healthchecks.impl.DefaultLoginsHealthCheck;
+import org.apache.sling.hc.support.impl.DefaultLoginsHealthCheck;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.junit.Test;
 import org.mockito.Matchers;

Modified: sling/trunk/contrib/extensions/healthcheck/webconsole/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/webconsole/pom.xml?rev=1519670&r1=1519669&r2=1519670&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/webconsole/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/webconsole/pom.xml Tue Sep  3 12:54:21 2013
@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.hc.api</artifactId>
+            <artifactId>org.apache.sling.hc.core</artifactId>
             <version>0.0.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>



Mime
View raw message