incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1511692 - in /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl: dea/ jobs/ jobs/console/ jobs/deprecated/ jobs/jmx/ jobs/timed/
Date Thu, 08 Aug 2013 11:05:35 GMT
Author: cziegeler
Date: Thu Aug  8 11:05:35 2013
New Revision: 1511692

URL: http://svn.apache.org/r1511692
Log:
Remove propertyIsPrivate for properties where no metatype is generated

Modified:
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventAdminConfiguration.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventReceiver.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventSender.java
    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/console/WebConsolePlugin.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/deprecated/EventAdminBridge.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventConfiguration.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventReceiver.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventSender.java

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventAdminConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventAdminConfiguration.java?rev=1511692&r1=1511691&r2=1511692&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventAdminConfiguration.java
(original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventAdminConfiguration.java
Thu Aug  8 11:05:35 2013
@@ -40,13 +40,13 @@ public class DistributedEventAdminConfig
     private static final String DEFAULT_REPOSITORY_PATH = "/var/eventing/distribution";
 
     /** The path where all jobs are stored. */
-    @Property(value=DEFAULT_REPOSITORY_PATH, propertyPrivate=true)
+    @Property(value=DEFAULT_REPOSITORY_PATH)
     private static final String CONFIG_PROPERTY_REPOSITORY_PATH = "repository.path";
 
     /** Default clean up time is 15 minutes. */
     private static final int DEFAULT_CLEANUP_PERIOD = 15;
 
-    @Property(intValue=DEFAULT_CLEANUP_PERIOD, propertyPrivate=true)
+    @Property(intValue=DEFAULT_CLEANUP_PERIOD)
     private static final String CONFIG_PROPERTY_CLEANUP_PERIOD = "cleanup.period";
 
     /** We remove everything which is older than 15min by default. */

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventReceiver.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventReceiver.java?rev=1511692&r1=1511691&r2=1511692&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventReceiver.java
(original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventReceiver.java
Thu Aug  8 11:05:35 2013
@@ -67,10 +67,10 @@ import aQute.bnd.annotation.component.De
 @Component(immediate=true)
 @Service(value={EventHandler.class, Runnable.class, TopologyEventListener.class})
 @Properties({
-    @Property(name=EventConstants.EVENT_TOPIC, value="*", propertyPrivate=true),
-    @Property(name=EventConstants.EVENT_FILTER, value="(event.distribute=*)", propertyPrivate=true),
-    @Property(name="scheduler.period", longValue=1800, propertyPrivate=true),
-    @Property(name="scheduler.concurrent", boolValue=false, propertyPrivate=true)
+    @Property(name=EventConstants.EVENT_TOPIC, value="*"),
+    @Property(name=EventConstants.EVENT_FILTER, value="(event.distribute=*)"),
+    @Property(name="scheduler.period", longValue=1800),
+    @Property(name="scheduler.concurrent", boolValue=false)
 })
 public class DistributedEventReceiver
     implements EventHandler, Runnable, TopologyEventListener {

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventSender.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventSender.java?rev=1511692&r1=1511691&r2=1511692&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventSender.java
(original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/dea/DistributedEventSender.java
Thu Aug  8 11:05:35 2013
@@ -25,7 +25,6 @@ import java.util.concurrent.LinkedBlocki
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
@@ -54,9 +53,7 @@ import aQute.bnd.annotation.component.De
  */
 @Component(immediate=true)
 @Service(value={EventHandler.class})
-@Properties({
-    @Property(name=EventConstants.EVENT_TOPIC, value=SlingConstants.TOPIC_RESOURCE_ADDED,
propertyPrivate=true)
-})
+@Property(name=EventConstants.EVENT_TOPIC, value=SlingConstants.TOPIC_RESOURCE_ADDED)
 public class DistributedEventSender
     implements EventHandler {
 

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=1511692&r1=1511691&r2=1511692&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
Thu Aug  8 11:05:35 2013
@@ -95,11 +95,10 @@ import org.slf4j.LoggerFactory;
 @Service(value={JobManager.class, EventHandler.class, TopologyEventListener.class, Runnable.class})
 @Properties({
     @Property(name=JobManagerConfiguration.CONFIG_PROPERTY_REPOSITORY_PATH,
-          value=JobManagerConfiguration.DEFAULT_REPOSITORY_PATH,
-          propertyPrivate=true),
-    @Property(name="scheduler.period", longValue=60, propertyPrivate=true),
-    @Property(name="scheduler.concurrent", boolValue=false, propertyPrivate=true),
-    @Property(name=EventConstants.EVENT_TOPIC, propertyPrivate=true,
+          value=JobManagerConfiguration.DEFAULT_REPOSITORY_PATH),
+    @Property(name="scheduler.period", longValue=60),
+    @Property(name="scheduler.concurrent", boolValue=false),
+    @Property(name=EventConstants.EVENT_TOPIC,
               value={SlingConstants.TOPIC_RESOURCE_ADDED,
                      "org/apache/sling/event/notification/job/*",
                      ResourceHelper.BUNDLE_EVENT_STARTED,

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java?rev=1511692&r1=1511691&r2=1511692&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java
(original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java
Thu Aug  8 11:05:35 2013
@@ -64,11 +64,10 @@ import org.slf4j.LoggerFactory;
 @Component
 @Service(value={javax.servlet.Servlet.class, EventHandler.class})
 @Properties({
-    @Property(name="felix.webconsole.label", value="slingevent", propertyPrivate=true),
-    @Property(name="felix.webconsole.title", value="Jobs", propertyPrivate=true),
-    @Property(name="felix.webconsole.category", value="Sling", propertyPrivate=true),
-    @Property(name="event.topics",propertyPrivate=true,
-              value={"sling/webconsole/test"})
+    @Property(name="felix.webconsole.label", value="slingevent"),
+    @Property(name="felix.webconsole.title", value="Jobs"),
+    @Property(name="felix.webconsole.category", value="Sling"),
+    @Property(name="event.topics", value={"sling/webconsole/test"})
 })
 public class WebConsolePlugin extends HttpServlet implements EventHandler {
 

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/deprecated/EventAdminBridge.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/deprecated/EventAdminBridge.java?rev=1511692&r1=1511691&r2=1511692&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/deprecated/EventAdminBridge.java
(original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/deprecated/EventAdminBridge.java
Thu Aug  8 11:05:35 2013
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
 @Component(immediate=true)
 @Service(value={EventHandler.class, JobConsumer.class})
 @Properties({
-    @Property(name=EventConstants.EVENT_TOPIC, value=JobUtil.TOPIC_JOB, propertyPrivate=true),
+    @Property(name=EventConstants.EVENT_TOPIC, value=JobUtil.TOPIC_JOB),
     @Property(name=JobConsumer.PROPERTY_TOPICS, value="/")
 })
 public class EventAdminBridge

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java?rev=1511692&r1=1511691&r2=1511692&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
(original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
Thu Aug  8 11:05:35 2013
@@ -46,7 +46,7 @@ import org.osgi.framework.ServiceRegistr
 
 @Component
 @Service(value = { QueuesMBean.class })
-@Property(name = "jmx.objectname", propertyPrivate = true, value = "org.apache.sling:type=queues,name=QueueNames")
+@Property(name = "jmx.objectname", value = "org.apache.sling:type=queues,name=QueueNames")
 public class QueuesMBeanImpl extends StandardEmitterMBean implements QueuesMBean {
 
     private static final String QUEUE_NOTIFICATION = "org.apache.sling.event.queue";

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventConfiguration.java?rev=1511692&r1=1511691&r2=1511692&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventConfiguration.java
(original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventConfiguration.java
Thu Aug  8 11:05:35 2013
@@ -22,7 +22,6 @@ import java.util.Map;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
@@ -36,11 +35,8 @@ import org.apache.sling.event.impl.Envir
  */
 @Component(immediate=true)
 @Service(value={TimedEventConfiguration.class})
-@Properties({
-     @Property(name=TimedEventConfiguration.CONFIG_PROPERTY_REPOSITORY_PATH,
-               value=TimedEventConfiguration.DEFAULT_REPOSITORY_PATH,
-               propertyPrivate=true)
-})
+@Property(name=TimedEventConfiguration.CONFIG_PROPERTY_REPOSITORY_PATH,
+          value=TimedEventConfiguration.DEFAULT_REPOSITORY_PATH)
 public class TimedEventConfiguration {
 
     /** Default repository path. */

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventReceiver.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventReceiver.java?rev=1511692&r1=1511691&r2=1511692&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventReceiver.java
(original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventReceiver.java
Thu Aug  8 11:05:35 2013
@@ -28,7 +28,6 @@ import java.util.concurrent.LinkedBlocki
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
@@ -53,10 +52,7 @@ import org.slf4j.LoggerFactory;
  */
 @Component(immediate=true)
 @Service(EventHandler.class)
-@Properties({
-     @Property(name=EventConstants.EVENT_TOPIC, propertyPrivate=true,
-               value=EventUtil.TOPIC_TIMED_EVENT)
-})
+@Property(name=EventConstants.EVENT_TOPIC, value=EventUtil.TOPIC_TIMED_EVENT)
 public class TimedEventReceiver implements EventHandler {
 
     public static final String RESOURCE_PROPERTY_TE_EXPRESSION = "slingevent:expression";

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventSender.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventSender.java?rev=1511692&r1=1511691&r2=1511692&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventSender.java
(original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/timed/TimedEventSender.java
Thu Aug  8 11:05:35 2013
@@ -37,7 +37,6 @@ import java.util.concurrent.LinkedBlocki
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
@@ -77,14 +76,12 @@ import org.slf4j.LoggerFactory;
  */
 @Component(immediate=true)
 @Service(value={TimedEventStatusProvider.class, EventHandler.class, TopologyEventListener.class})
-@Properties({
-     @Property(name=EventConstants.EVENT_TOPIC, propertyPrivate=true,
-               value={SlingConstants.TOPIC_RESOURCE_ADDED,
-                      SlingConstants.TOPIC_RESOURCE_REMOVED,
-                      SlingConstants.TOPIC_RESOURCE_CHANGED,
-                      ResourceHelper.BUNDLE_EVENT_STARTED,
-                      ResourceHelper.BUNDLE_EVENT_UPDATED})
-})
+@Property(name=EventConstants.EVENT_TOPIC,
+          value={SlingConstants.TOPIC_RESOURCE_ADDED,
+                 SlingConstants.TOPIC_RESOURCE_REMOVED,
+                 SlingConstants.TOPIC_RESOURCE_CHANGED,
+                 ResourceHelper.BUNDLE_EVENT_STARTED,
+                 ResourceHelper.BUNDLE_EVENT_UPDATED})
 public class TimedEventSender
     implements Job, TimedEventStatusProvider, EventHandler, TopologyEventListener {
 



Mime
View raw message