Author: cziegeler
Date: Wed May 15 15:42:21 2013
New Revision: 1482913
URL: http://svn.apache.org/r1482913
Log:
SLING-2868 : Improve and cleanup implementation : Set sling:resourceType for
lock resources
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/MaintenanceTask.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java?rev=1482913&r1=1482912&r2=1482913&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
Wed May 15 15:42:21 2013
@@ -1144,6 +1144,8 @@ public class JobManagerImpl
final Map<String, Object> props = new HashMap<String,
Object>();
props.put(Utility.PROPERTY_LOCK_CREATED,
Calendar.getInstance());
props.put(Utility.PROPERTY_LOCK_CREATED_APP,
Environment.APPLICATION_ID);
+ props.put(ResourceResolver.PROPERTY_RESOURCE_TYPE,
Utility.RESOURCE_TYPE_LOCK);
+
lockResource = ResourceHelper.getOrCreateResource(resolver,
path,
props);
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/MaintenanceTask.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/MaintenanceTask.java?rev=1482913&r1=1482912&r2=1482913&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/MaintenanceTask.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/MaintenanceTask.java
Wed May 15 15:42:21 2013
@@ -365,6 +365,10 @@ public class MaintenanceTask {
final StringBuilder buf = new StringBuilder(64);
buf.append("//element(*)[@");
+
buf.append(ISO9075.encode(ResourceResolver.PROPERTY_RESOURCE_TYPE));
+ buf.append(" = '");
+ buf.append(Utility.RESOURCE_TYPE_LOCK);
+ buf.append("' and @");
buf.append(ISO9075.encode(Utility.PROPERTY_LOCK_CREATED));
buf.append(" < xs:dateTime('");
buf.append(ISO8601.format(startDate));
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java?rev=1482913&r1=1482912&r2=1482913&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java
Wed May 15 15:42:21 2013
@@ -35,6 +35,7 @@ public abstract class Utility {
public static final String PROPERTY_LOCK_CREATED = "lock.created";
public static final String PROPERTY_LOCK_CREATED_APP = "lock.created.app";
+ public static final String RESOURCE_TYPE_LOCK = "slingevent:Lock";
/**
* Check the job topic.
