Author: bdelacretaz
Date: Mon Apr 15 13:48:08 2013
New Revision: 1468072
URL: http://svn.apache.org/r1468072
Log:
SLING-2822 - add resource type on individual rules definitions, so they can be
run individually
Modified:
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/RepositoryPresentTest.json
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/ResourcesExistTest-checkAppsExist.json
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/ResourcesExistTest.json
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/admin-foo.json
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/admin-login.json
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/groovy-bundle.json
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/junit-sling-all.json
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/non-existent-bundle.json
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/sling-api-bundle.json
Modified:
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/RepositoryPresentTest.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/RepositoryPresentTest.json?rev=1468072&r1=1468071&r2=1468072&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/RepositoryPresentTest.json
(original)
+++
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/RepositoryPresentTest.json
Mon Apr 15 13:48:08 2013
@@ -1,7 +1,8 @@
{
+ "sling:resourceType" : "sling/muppet.rules",
"expression": "ALL_TESTS_PASSED",
"ruleName": "junit",
"namespace": "sling",
"jcr:primaryType": "nt:unstructured",
"qualifier": "org.apache.sling.muppet.demo.tests.RepositoryPresentTest"
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/ResourcesExistTest-checkAppsExist.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/ResourcesExistTest-checkAppsExist.json?rev=1468072&r1=1468071&r2=1468072&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/ResourcesExistTest-checkAppsExist.json
(original)
+++
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/ResourcesExistTest-checkAppsExist.json
Mon Apr 15 13:48:08 2013
@@ -1,7 +1,8 @@
{
+ "sling:resourceType" : "sling/muppet.rules",
"expression": "ALL_TESTS_PASSED",
"ruleName": "junit",
"namespace": "sling",
"jcr:primaryType": "nt:unstructured",
"qualifier":
"org.apache.sling.muppet.demo.tests.ResourcesExistTest#checkAppsExist"
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/ResourcesExistTest.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/ResourcesExistTest.json?rev=1468072&r1=1468071&r2=1468072&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/ResourcesExistTest.json
(original)
+++
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/ResourcesExistTest.json
Mon Apr 15 13:48:08 2013
@@ -1,7 +1,8 @@
{
+ "sling:resourceType" : "sling/muppet.rules",
"expression": "ALL_TESTS_PASSED",
"ruleName": "junit",
"namespace": "sling",
"jcr:primaryType": "nt:unstructured",
"qualifier": "org.apache.sling.muppet.demo.tests.ResourcesExistTest"
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/admin-foo.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/admin-foo.json?rev=1468072&r1=1468071&r2=1468072&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/admin-foo.json
(original)
+++
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/admin-foo.json
Mon Apr 15 13:48:08 2013
@@ -1,7 +1,8 @@
{
+ "sling:resourceType" : "sling/muppet.rules",
"expression": "LOGIN_FAILED",
"ruleName": "login",
"namespace": "sling",
"jcr:primaryType": "nt:unstructured",
"qualifier": "admin#foo"
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/admin-login.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/admin-login.json?rev=1468072&r1=1468071&r2=1468072&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/admin-login.json
(original)
+++
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/admin-login.json
Mon Apr 15 13:48:08 2013
@@ -1,7 +1,8 @@
{
+ "sling:resourceType" : "sling/muppet.rules",
"expression": "LOGIN_OK",
"ruleName": "login",
"namespace": "sling",
"jcr:primaryType": "nt:unstructured",
"qualifier": "admin#admin"
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/groovy-bundle.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/groovy-bundle.json?rev=1468072&r1=1468071&r2=1468072&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/groovy-bundle.json
(original)
+++
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/groovy-bundle.json
Mon Apr 15 13:48:08 2013
@@ -1,7 +1,8 @@
{
+ "sling:resourceType" : "sling/muppet.rules",
"expression": "active",
"ruleName": "bundle.state",
"namespace": "osgi",
"jcr:primaryType": "nt:unstructured",
"qualifier": "groovy-all"
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/junit-sling-all.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/junit-sling-all.json?rev=1468072&r1=1468071&r2=1468072&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/junit-sling-all.json
(original)
+++
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/junit-sling-all.json
Mon Apr 15 13:48:08 2013
@@ -1,7 +1,8 @@
{
+ "sling:resourceType" : "sling/muppet.rules",
"expression": "ALL_TESTS_PASSED",
"ruleName": "junit",
"namespace": "sling",
"jcr:primaryType": "nt:unstructured",
"qualifier": "org.apache.sling.muppet.demo.tests"
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/non-existent-bundle.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/non-existent-bundle.json?rev=1468072&r1=1468071&r2=1468072&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/non-existent-bundle.json
(original)
+++
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/non-existent-bundle.json
Mon Apr 15 13:48:08 2013
@@ -1,7 +1,8 @@
{
+ "sling:resourceType" : "sling/muppet.rules",
"expression": "BUNDLE_NOT_FOUND",
"ruleName": "bundle.state",
"namespace": "osgi",
"jcr:primaryType": "nt:unstructured",
"qualifier": "non.existent.bundle"
-}
\ No newline at end of file
+}
Modified:
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/sling-api-bundle.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/sling-api-bundle.json?rev=1468072&r1=1468071&r2=1468072&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/sling-api-bundle.json
(original)
+++
sling/trunk/contrib/extensions/muppet/sling-demo/src/main/resources/SLING-CONTENT/apps/muppet/demo/sling-api-bundle.json
Mon Apr 15 13:48:08 2013
@@ -1,7 +1,8 @@
{
+ "sling:resourceType" : "sling/muppet.rules",
"expression": "active",
"ruleName": "bundle.state",
"namespace": "osgi",
"jcr:primaryType": "nt:unstructured",
"qualifier": "org.apache.sling.api"
-}
\ No newline at end of file
+}