You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by le...@apache.org on 2013/02/04 14:42:47 UTC
svn commit: r1442115 - in /incubator/streams/trunk:
streams-eip-routes/src/main/java/org/apache/streams/messaging/processors/
streams-osgi-components/activity-registration/
streams-osgi-components/activity-registration/src/main/java/org/apache/streams/...
Author: letourneau
Date: Mon Feb 4 13:42:46 2013
New Revision: 1442115
URL: http://svn.apache.org/viewvc?rev=1442115&view=rev
Log:
adding subscriber config classes
Added:
incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java
incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java
incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java
incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionFilterImpl.java
incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java
Removed:
incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriberConfiguration.java
Modified:
incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/processors/ActivityStreamsSubscriberRegistrationProcessor.java
incubator/streams/trunk/streams-osgi-components/activity-registration/pom.xml
incubator/streams/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java
incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java
incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java
incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java
Modified: incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/processors/ActivityStreamsSubscriberRegistrationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/processors/ActivityStreamsSubscriberRegistrationProcessor.java?rev=1442115&r1=1442114&r2=1442115&view=diff
==============================================================================
--- incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/processors/ActivityStreamsSubscriberRegistrationProcessor.java (original)
+++ incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/processors/ActivityStreamsSubscriberRegistrationProcessor.java Mon Feb 4 13:42:46 2013
@@ -2,17 +2,9 @@ package org.apache.streams.messaging.pro
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriberConfiguration;
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
+import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscription;
import org.codehaus.jackson.map.ObjectMapper;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-
public class ActivityStreamsSubscriberRegistrationProcessor implements Processor{
@@ -40,7 +32,7 @@ public class ActivityStreamsSubscriberRe
try {
// read from file, convert it to user class
- ActivityStreamsSubscriberConfiguration configuration = mapper.readValue(body, ActivityStreamsSubscriberConfiguration.class);
+ ActivityStreamsSubscription configuration = mapper.readValue(body, ActivityStreamsSubscription.class);
exchange.getOut().setBody(configuration);
} catch (Exception e) {
Modified: incubator/streams/trunk/streams-osgi-components/activity-registration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/activity-registration/pom.xml?rev=1442115&r1=1442114&r2=1442115&view=diff
==============================================================================
--- incubator/streams/trunk/streams-osgi-components/activity-registration/pom.xml (original)
+++ incubator/streams/trunk/streams-osgi-components/activity-registration/pom.xml Mon Feb 4 13:42:46 2013
@@ -69,7 +69,7 @@
<Bundle-Version>${pom.version}</Bundle-Version>
<Export-Package>${bundle.namespace};version="${pom.version}"</Export-Package>
<Private-Package>${bundle.namespace}.impl.*</Private-Package>
- <Import-Package>org.apache.streams.osgi.components.activityconsumer.impl,org.apache.streams.osgi.components.activitysubscriber.impl,org.apache.commons.logging</Import-Package>
+ <Import-Package>org.apache.streams.osgi.components.activityconsumer.impl,org.apache.streams.osgi.components.activitysubscriber,org.apache.streams.osgi.components.activitysubscriber.impl,org.apache.commons.logging</Import-Package>
<Include-Resource>src/main/resources</Include-Resource>
</instructions>
</configuration>
Modified: incubator/streams/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java?rev=1442115&r1=1442114&r2=1442115&view=diff
==============================================================================
--- incubator/streams/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java (original)
+++ incubator/streams/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java Mon Feb 4 13:42:46 2013
@@ -3,12 +3,9 @@ package org.apache.streams.osgi.componen
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.streams.osgi.components.ActivityStreamsSubscriberRegistration;
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriberConfiguration;
+import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscription;
import org.apache.streams.osgi.components.activitysubscriber.impl.ActivityStreamsSubscriberDelegate;
-import java.util.Date;
-import java.util.HashMap;
-
public class ActivityStreamsSubscriberRegistrationImpl implements ActivityStreamsSubscriberRegistration {
private static final transient Log LOG = LogFactory.getLog(ActivityStreamsSubscriberRegistrationImpl.class);
private boolean verbose = true;
@@ -21,7 +18,7 @@ public class ActivityStreamsSubscriberRe
//using the URI supplied to set it up...
//return the consumer for addition to the consumer warehouse
- ActivityStreamsSubscriberConfiguration configuration = (ActivityStreamsSubscriberConfiguration)body;
+ ActivityStreamsSubscription configuration = (ActivityStreamsSubscription)body;
return new ActivityStreamsSubscriberDelegate(configuration);
}
Modified: incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java?rev=1442115&r1=1442114&r2=1442115&view=diff
==============================================================================
--- incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java (original)
+++ incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java Mon Feb 4 13:42:46 2013
@@ -1,16 +1,13 @@
package org.apache.streams.osgi.components.activitysubscriber;
-import java.util.ArrayList;
-import java.util.HashMap;
-
public interface ActivityStreamsSubscriber {
public void receive(String activity);
public String getStream();
public void init();
public void setInRoute(String route);
public String getInRoute();
- public void setActivityStreamsSubscriberConfiguration(ActivityStreamsSubscriberConfiguration config);
- public void updateActivityStreamsSubscriberConfiguration(ActivityStreamsSubscriberConfiguration config);
+ public void setActivityStreamsSubscriberConfiguration(ActivityStreamsSubscription config);
+ public void updateActivityStreamsSubscriberConfiguration(ActivityStreamsSubscription config);
}
Added: incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java?rev=1442115&view=auto
==============================================================================
--- incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java (added)
+++ incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java Mon Feb 4 13:42:46 2013
@@ -0,0 +1,13 @@
+package org.apache.streams.osgi.components.activitysubscriber;
+
+import java.util.ArrayList;
+
+public interface ActivityStreamsSubscription {
+
+ public ArrayList<ActivityStreamsSubscriptionFilter> getActivityStreamsSubscriptionFilters();
+ public void setActivityStreamsSubscriptionFilters(ArrayList<ActivityStreamsSubscriptionFilter> filters);
+
+ public ArrayList<ActivityStreamsSubscriptionOutput> getActivityStreamsSubscriptionOutputs();
+ public void setActivityStreamsSubscriptionOutputs(ArrayList<ActivityStreamsSubscriptionOutput> outputs);
+
+}
Added: incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java?rev=1442115&view=auto
==============================================================================
--- incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java (added)
+++ incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java Mon Feb 4 13:42:46 2013
@@ -0,0 +1,15 @@
+package org.apache.streams.osgi.components.activitysubscriber;
+
+
+public interface ActivityStreamsSubscriptionFilter {
+
+ public String[] getFields();
+ public void setFields(String[] fields);
+
+ public String getComparisonOperator();
+ public void setComparisonOperator(String comparisonOperator);
+
+ public String[] getValueSet();
+ public void setValueSet(String[] valueSet);
+
+}
Added: incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java?rev=1442115&view=auto
==============================================================================
--- incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java (added)
+++ incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java Mon Feb 4 13:42:46 2013
@@ -0,0 +1,29 @@
+package org.apache.streams.osgi.components.activitysubscriber;
+
+public interface ActivityStreamsSubscriptionOutput {
+
+ public String getOutputType();
+ public void setOutputType(String outputType);
+
+ public String getMethod();
+ public void setMethod(String method);
+
+ public String getUrl();
+ public void setUrl(String url);
+
+ public String getDeliveryFrequency();
+ public void setDeliveryFrequency(String deliveryFrequency);
+
+ public String getMaxSize();
+ public void setMaxSize(int maxSize);
+
+ public String getAuthType();
+ public void setAuthType(String authType);
+
+ public String getUsername();
+ public void setUsername(String username);
+
+ public String getPassword();
+ public void setPassword(String password);
+
+}
Modified: incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java?rev=1442115&r1=1442114&r2=1442115&view=diff
==============================================================================
--- incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java (original)
+++ incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java Mon Feb 4 13:42:46 2013
@@ -3,18 +3,16 @@ package org.apache.streams.osgi.componen
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriber;
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriberConfiguration;
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriberWarehouse;
+import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscription;
import java.util.ArrayList;
-import java.util.HashMap;
public class ActivityStreamsSubscriberDelegate implements ActivityStreamsSubscriber {
private static final transient Log LOG = LogFactory.getLog(ActivityStreamsSubscriberDelegate.class);
- private ActivityStreamsSubscriberConfiguration activityStreamsSubscriberConfiguration;
+ private ActivityStreamsSubscription activityStreamsSubscriberConfiguration;
private String inRoute;
@@ -22,21 +20,21 @@ public class ActivityStreamsSubscriberDe
private ArrayList<String> stream;
- public ActivityStreamsSubscriberDelegate(ActivityStreamsSubscriberConfiguration configuration){
+ public ActivityStreamsSubscriberDelegate(ActivityStreamsSubscription configuration){
setActivityStreamsSubscriberConfiguration(configuration);
stream = new ArrayList<String>();
}
- public ActivityStreamsSubscriberConfiguration getActivityStreamsSubscriberConfiguration() {
+ public ActivityStreamsSubscription getActivityStreamsSubscriberConfiguration() {
return activityStreamsSubscriberConfiguration;
}
- public void setActivityStreamsSubscriberConfiguration(ActivityStreamsSubscriberConfiguration activityStreamsSubscriberConfiguration) {
+ public void setActivityStreamsSubscriberConfiguration(ActivityStreamsSubscription activityStreamsSubscriberConfiguration) {
this.activityStreamsSubscriberConfiguration = activityStreamsSubscriberConfiguration;
}
- public void updateActivityStreamsSubscriberConfiguration(ActivityStreamsSubscriberConfiguration activityStreamsSubscriberConfiguration) {
+ public void updateActivityStreamsSubscriberConfiguration(ActivityStreamsSubscription activityStreamsSubscriberConfiguration) {
this.activityStreamsSubscriberConfiguration = activityStreamsSubscriberConfiguration;
}
Modified: incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java?rev=1442115&r1=1442114&r2=1442115&view=diff
==============================================================================
--- incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java (original)
+++ incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java Mon Feb 4 13:42:46 2013
@@ -27,7 +27,8 @@ public class ActivityStreamsSubscriberWa
}
- public ArrayList<ActivityStreamsSubscriber> findSubscribersByFilter(String src){
+ //the warehouse can do some interesting things to make the filtering efficient i think...
+ public ArrayList<ActivityStreamsSubscriber> findSubscribersByFilters(String src){
return null;
}
Added: incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionFilterImpl.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionFilterImpl.java?rev=1442115&view=auto
==============================================================================
--- incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionFilterImpl.java (added)
+++ incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionFilterImpl.java Mon Feb 4 13:42:46 2013
@@ -0,0 +1,41 @@
+package org.apache.streams.osgi.components.activitysubscriber.impl;
+
+
+import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriptionFilter;
+
+public class ActivityStreamsSubscriptionFilterImpl implements ActivityStreamsSubscriptionFilter{
+
+ private String[] fields;
+ private String comparisonOperator;
+ private String[] valueSet;
+
+ @Override
+ public String[] getFields() {
+ return fields;
+ }
+
+ @Override
+ public void setFields(String[] fields) {
+ this.fields=fields;
+ }
+
+ @Override
+ public String getComparisonOperator() {
+ return comparisonOperator;
+ }
+
+ @Override
+ public void setComparisonOperator(String comparisonOperator) {
+ this.comparisonOperator=comparisonOperator;
+ }
+
+ @Override
+ public String[] getValueSet() {
+ return valueSet;
+ }
+
+ @Override
+ public void setValueSet(String[] valueSet) {
+ this.valueSet = valueSet;
+ }
+}
Added: incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java?rev=1442115&view=auto
==============================================================================
--- incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java (added)
+++ incubator/streams/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java Mon Feb 4 13:42:46 2013
@@ -0,0 +1,34 @@
+package org.apache.streams.osgi.components.activitysubscriber.impl;
+
+
+import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscription;
+import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriptionFilter;
+import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriptionOutput;
+
+import java.util.ArrayList;
+
+public class ActivityStreamsSubscriptionImpl implements ActivityStreamsSubscription {
+
+ private ArrayList<ActivityStreamsSubscriptionFilter> activityStreamsSubscriptionFilters;
+ private ArrayList<ActivityStreamsSubscriptionOutput> activityStreamsSubscriptionOutputs;
+
+ @Override
+ public ArrayList<ActivityStreamsSubscriptionFilter> getActivityStreamsSubscriptionFilters() {
+ return activityStreamsSubscriptionFilters;
+ }
+
+ @Override
+ public void setActivityStreamsSubscriptionFilters(ArrayList<ActivityStreamsSubscriptionFilter> filters) {
+ this.activityStreamsSubscriptionFilters = filters;
+ }
+
+ @Override
+ public ArrayList<ActivityStreamsSubscriptionOutput> getActivityStreamsSubscriptionOutputs() {
+ return activityStreamsSubscriptionOutputs;
+ }
+
+ @Override
+ public void setActivityStreamsSubscriptionOutputs(ArrayList<ActivityStreamsSubscriptionOutput> outputs) {
+ this.activityStreamsSubscriptionOutputs = outputs;
+ }
+}