You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2016/10/12 14:59:15 UTC
[1/4] incubator-streams git commit: resolves STREAMS-410
Repository: incubator-streams
Updated Branches:
refs/heads/master f1e1e114b -> f14a25ced
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/configuration/EipConfigurator.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/configuration/EipConfigurator.java b/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/configuration/EipConfigurator.java
deleted file mode 100644
index 460c43a..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/configuration/EipConfigurator.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.configuration;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class EipConfigurator {
-
-
-
- @Value("${consumer.inRouteHost}")
- private String consumerInRouteHost;
-
- @Value("${consumer.inRoutePort}")
- private String consumerInRoutePort;
-
- @Value("${subscriber.inRouteHost}")
- private String subscriberInRouteHost;
-
- @Value("${subscriber.inRoutePort}")
- private String subscriberInRoutePort;
-
-
- @Value("${consumer.activityQUri}")
- private String consumerActivityQUri;
-
- @Value("${consumer.publisherEndpointProtocol}")
- private String publisherEndpointProtocol;
-
- @Value("${consumer.publisherEndpointUrlResource}")
- private String publisherEndpointUrlResource;
-
- @Value("${consumer.receiveMethod}")
- private String consumerReceiveMethod;
-
- @Value("${consumer.splitMethod}")
- private String consumerSplitMethod;
-
- @Value("${subscriber.subscriberEndpointProtocol}")
- private String subscriberEndpointProtocol;
-
- @Value("${subscriber.subscriberEndpointUrlResource}")
- private String subscriberEndpointUrlResource;
-
- @Value("${subscriber.receiveMethod}")
- private String subscriberReceiveMethod;
-
- @Value("${subscriber.postMethod}")
- private String subscriberPostMethod;
-
- @Value("${subscriber.getMethod}")
- private String subscriberGetMethod;
-
-
- @Value("${servlet.baseUrlPath}")
- private String baseUrlPath;
-
-
- public static String ENDPOINT_PROTOCOL_JETTY="jetty:http://";
- public static String ENDPOINT_PROTOCOL_SERVLET="servlet:///";
-
- public String getConsumerInRouteHost() {
- return consumerInRouteHost;
- }
-
- public String getConsumerInRoutePort() {
- return consumerInRoutePort;
- }
-
- public String getConsumerActivityQUri() {
- return consumerActivityQUri;
- }
-
- public void setConsumerActivityQUri(String consumerActivityQUri) {
- this.consumerActivityQUri = consumerActivityQUri;
- }
-
- public void setConsumerInRoutePort(String consumerInRoutePort) {
- this.consumerInRoutePort = consumerInRoutePort;
- }
-
- public void setConsumerInRouteHost(String consumerInRouteHost) {
- this.consumerInRouteHost = consumerInRouteHost;
- }
-
- public String getSubscriberInRouteHost() {
- return subscriberInRouteHost;
- }
-
- public void setSubscriberInRouteHost(String subscriberInRouteHost) {
- this.subscriberInRouteHost = subscriberInRouteHost;
- }
-
- public String getSubscriberInRoutePort() {
- return subscriberInRoutePort;
- }
-
- public void setSubscriberInRoutePort(String subscriberInRoutePort) {
- this.subscriberInRoutePort = subscriberInRoutePort;
- }
-
- public String getPublisherEndpointProtocol() {
- return publisherEndpointProtocol;
- }
-
- public void setPublisherEndpointProtocol(String publisherEndpointProtocol) {
- this.publisherEndpointProtocol = publisherEndpointProtocol;
- }
-
- public String getPublisherEndpointUrlResource() {
- return publisherEndpointUrlResource;
- }
-
- public void setPublisherEndpointUrlResource(String publisherEndpointUrlResource) {
- this.publisherEndpointUrlResource = publisherEndpointUrlResource;
- }
-
- public String getConsumerReceiveMethod() {
- return consumerReceiveMethod;
- }
-
- public void setConsumerReceiveMethod(String consumerReceiveMethod) {
- this.consumerReceiveMethod = consumerReceiveMethod;
- }
-
- public String getConsumerSplitMethod() {
- return consumerSplitMethod;
- }
-
- public void setConsumerSplitMethod(String consumerSplitMethod) {
- this.consumerSplitMethod = consumerSplitMethod;
- }
-
- public String getSubscriberEndpointProtocol() {
- return subscriberEndpointProtocol;
- }
-
- public void setSubscriberEndpointProtocol(String subscriberEndpointProtocol) {
- this.subscriberEndpointProtocol = subscriberEndpointProtocol;
- }
-
- public String getSubscriberEndpointUrlResource() {
- return subscriberEndpointUrlResource;
- }
-
- public void setSubscriberEndpointUrlResource(String subscriberEndpointUrlResource) {
- this.subscriberEndpointUrlResource = subscriberEndpointUrlResource;
- }
-
- public String getSubscriberReceiveMethod() {
- return subscriberReceiveMethod;
- }
-
- public void setSubscriberReceiveMethod(String subscriberReceiveMethod) {
- this.subscriberReceiveMethod = subscriberReceiveMethod;
- }
-
- public String getSubscriberPostMethod() {
- return subscriberPostMethod;
- }
-
- public void setSubscriberPostMethod(String subscriberPostMethod) {
- this.subscriberPostMethod = subscriberPostMethod;
- }
-
- public String getSubscriberGetMethod() {
- return subscriberGetMethod;
- }
-
- public void setSubscriberGetMethod(String subscriberGetMethod) {
- this.subscriberGetMethod = subscriberGetMethod;
- }
-
- public String getBaseUrlPath() {
- return baseUrlPath;
- }
-
- public void setBaseUrlPath(String baseUrlPath) {
- this.baseUrlPath = baseUrlPath;
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/processors/ActivityPublisherRegistrationProcessor.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/processors/ActivityPublisherRegistrationProcessor.java b/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/processors/ActivityPublisherRegistrationProcessor.java
deleted file mode 100644
index 741a63c..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/processors/ActivityPublisherRegistrationProcessor.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.processors;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.streams.osgi.components.activityconsumer.ActivityConsumer;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-
-
-public class ActivityPublisherRegistrationProcessor implements Processor{
- private static final transient Log LOG = LogFactory.getLog(ActivityStreamsSubscriberRegistrationProcessor.class);
- public void process(Exchange exchange){
- //add the necessary headers to the message so that the activity registration component
- //can do a lookup to either make a new processor and endpoint, or pass the message to the right one
- String httpMethod = exchange.getIn().getHeader("CamelHttpMethod").toString();
-
- if (!httpMethod.equals("POST")){
- //reject anything that isn't a post...Camel 2.10 solves needing this check, however, SM 4.4 doesn't have the latest
- exchange.getOut().setFault(true);
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE,405);
- } else {
-
- //for now...just expect a post with a uri in the body...should have some checking here with http response codes
- // authentication, all that good stuff...happens in the registration module
-
- String body = exchange.getIn().getBody(String.class);
- ObjectMapper mapper = new ObjectMapper();
- mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES,false);
-
- try {
-
- // read from file, convert it to user class
- ActivityConsumer configuration = mapper.readValue(body, ActivityConsumer.class);
- if (configuration.getSrc()==null){
- LOG.info("configuration src is null");
- throw new Exception();
- }
-
- exchange.getOut().setBody(configuration);
-
- } catch (Exception e) {
- LOG.info("error: " + e);
- exchange.getOut().setFault(true);
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE,400);
- exchange.getOut().setBody("POST should contain a valid JSON configuration for registering as an Activity Publisher (check that src element is valid).");
- }
- }
-
-
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/processors/ActivityStreamsSubscriberRegistrationProcessor.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/processors/ActivityStreamsSubscriberRegistrationProcessor.java b/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/processors/ActivityStreamsSubscriberRegistrationProcessor.java
deleted file mode 100644
index 201eebd..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/processors/ActivityStreamsSubscriberRegistrationProcessor.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.processors;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.streams.messaging.service.SubscriptionService;
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscription;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-
-
-public class ActivityStreamsSubscriberRegistrationProcessor implements Processor{
- private static final transient Log LOG = LogFactory.getLog(ActivityStreamsSubscriberRegistrationProcessor.class);
- private SubscriptionService subscriptionService;
-
- public ActivityStreamsSubscriberRegistrationProcessor(SubscriptionService subscriptionService){
- this.subscriptionService = subscriptionService;
- }
-
- public void process(Exchange exchange){
- LOG.info("processing the subscriber...");
- //add the necessary headers to the message so that the activity registration component
- //can do a lookup to either make a new processor and endpoint, or pass the message to the right one
- String httpMethod = exchange.getIn().getHeader("CamelHttpMethod").toString();
-
- if (!httpMethod.equals("POST")){
- //reject anything that isn't a post...Camel 2.10 solves needing this check, however, SM 4.4 doesn't have the latest
- exchange.getOut().setFault(true);
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE,405);
- } else {
-
- //for now...just expect a post with a uri in the body...should have some checking here with http response codes
- // authentication, all that good stuff...happens in the registration module
-
-
- String body = exchange.getIn().getBody(String.class);
-
- LOG.info("receiving the subscriber: "+body);
- //OAuth token? What does subscriber post to init a subscription URL?
- //maybe its a list of URLs to subscribe to subscriptions=1,2,3,4&auth_token=XXXX
-
- ObjectMapper mapper = new ObjectMapper();
- mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES,false);
-
- try {
-
- // read from file, convert it to user class
- ActivityStreamsSubscription configuration = mapper.readValue(body, ActivityStreamsSubscription.class);
- if(configuration.getFilters() == null){
- configuration.setFilters(subscriptionService.getFilters(configuration.getAuthToken()));
- }else{
- subscriptionService.saveFilters(configuration);
- }
- exchange.getOut().setBody(configuration);
-
- } catch (Exception e) {
- LOG.info("exception" + e);
- exchange.getOut().setFault(true);
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE,400);
- exchange.getOut().setBody("POST should contain a valid Subscription configuration object.");
- }
-
-
-
- //just pass this on to the route creator, body will be the dedicated URL for this subscriber
-
- }
-
-
-
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/ActivityConsumerRouteBuilder.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/ActivityConsumerRouteBuilder.java b/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/ActivityConsumerRouteBuilder.java
deleted file mode 100644
index dea8781..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/ActivityConsumerRouteBuilder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.routers;
-
-
-
-import org.apache.camel.Exchange;
-import org.apache.streams.osgi.components.activityconsumer.ActivityConsumer;
-
-
-public interface ActivityConsumerRouteBuilder {
-
-
- void createNewRouteForConsumer(Exchange exchange, ActivityConsumer activityConsumer);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/ActivityStreamsSubscriberRouteBuilder.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/ActivityStreamsSubscriberRouteBuilder.java b/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/ActivityStreamsSubscriberRouteBuilder.java
deleted file mode 100644
index 6947722..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/ActivityStreamsSubscriberRouteBuilder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.routers;
-
-
-
-import org.apache.camel.Exchange;
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriber;
-
-
-public interface ActivityStreamsSubscriberRouteBuilder {
-
-
- void createNewRouteForSubscriber(Exchange exchange, ActivityStreamsSubscriber activityStreamsSubscriber);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/impl/ActivityConsumerRouter.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/impl/ActivityConsumerRouter.java b/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/impl/ActivityConsumerRouter.java
deleted file mode 100644
index 20b8246..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/impl/ActivityConsumerRouter.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.routers.impl;
-
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.streams.messaging.routers.ActivityConsumerRouteBuilder;
-
-
-import org.apache.streams.osgi.components.activityconsumer.ActivityConsumerWarehouse;
-import org.apache.streams.osgi.components.activityconsumer.ActivityConsumer;
-import org.apache.streams.messaging.configuration.EipConfigurator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.apache.camel.Exchange;
-import org.apache.camel.CamelContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.UUID;
-
-
-public class ActivityConsumerRouter extends RouteBuilder implements ActivityConsumerRouteBuilder {
- private static final transient Log LOG = LogFactory.getLog(ActivityConsumerRouter.class);
-
- @Autowired
- private EipConfigurator configuration;
-
- protected CamelContext camelContext;
-
- private ActivityConsumerWarehouse activityConsumerWarehouse;
-
- public void setCamelContext(CamelContext camelContext) {
- this.camelContext = camelContext;
- }
-
- public void setActivityConsumerWarehouse(ActivityConsumerWarehouse activityConsumerWarehouse) {
- this.activityConsumerWarehouse = activityConsumerWarehouse;
- }
-
-
- public void createNewRouteForConsumer(Exchange exchange, ActivityConsumer activityConsumer){
-
- //todo: add some better scheme then getCount for URL...
- //todo: make the route again if consumer exists...and context doesn't have route
- if (activityConsumer.isAuthenticated()){
- ActivityConsumer existingConsumer = activityConsumerWarehouse.findConsumerBySrc(activityConsumer.getSrc().toASCIIString());
-
- if (existingConsumer==null){
-
- try{
-
- if (configuration.getPublisherEndpointProtocol().equals(EipConfigurator.ENDPOINT_PROTOCOL_JETTY)){
- activityConsumer.setInRoute(configuration.getConsumerInRouteHost()+ ":" + configuration.getConsumerInRoutePort() +"/" + configuration.getPublisherEndpointUrlResource() + "/" + UUID.randomUUID());
- //set the body to the url the producer should post to
- exchange.getOut().setBody("http://" + activityConsumer.getInRoute());
- }else if (configuration.getPublisherEndpointProtocol().equals(EipConfigurator.ENDPOINT_PROTOCOL_SERVLET)){
- activityConsumer.setInRoute( configuration.getPublisherEndpointUrlResource() + "/" + UUID.randomUUID());
- //set the body to the url the producer should post to
- exchange.getOut().setBody(configuration.getBaseUrlPath() + activityConsumer.getInRoute());
- } else{
- throw new Exception("No supported endpoint protocol is configured.");
- }
-
-
- //setup a message queue for this consumer.getInRoute()
- camelContext.addRoutes(new DynamicConsumerRouteBuilder(configuration,camelContext, configuration.getPublisherEndpointProtocol() + activityConsumer.getInRoute(), activityConsumer));
-
-
- LOG.info("all messages sent from " + activityConsumer.getSrc() + " must be posted to " + activityConsumer.getInRoute());
- //only add the route to the warehouse after its been created in messaging system...
- activityConsumerWarehouse.register(activityConsumer);
- }catch (Exception e){
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE,500);
- exchange.getOut().setBody("error creating route: " + e);
- LOG.error("error creating route: " + e);
- }
-
- } else{
-
- exchange.getOut().setBody(configuration.getBaseUrlPath() + existingConsumer.getInRoute());
- }
-
- }else{
- exchange.getOut().setFault(true);
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE,401);
- exchange.getOut().setBody("Authentication failed.");
- }
-
- }
-
-
- public void configure() throws java.lang.Exception{
- //nothing...set the context?
-
- }
-
- /**
- * This route builder is a skeleton to add new routes at runtime
- */
- private static final class DynamicConsumerRouteBuilder extends RouteBuilder {
- private final String from;
- private ActivityConsumer activityConsumer;
-
-
- private EipConfigurator configuration;
-
- private DynamicConsumerRouteBuilder(EipConfigurator configuration, CamelContext context, String from, ActivityConsumer activityConsumer) {
- super(context);
- this.from = from;
- this.activityConsumer = activityConsumer;
- this.configuration = configuration;
- }
-
- @Override
- public void configure() throws Exception {
-
-
- from(from)
- .bean(activityConsumer, configuration.getConsumerReceiveMethod()).setBody(body())
- .split()
- .method(activityConsumer, configuration.getConsumerSplitMethod())
- .to(configuration.getConsumerActivityQUri());
-
-
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/impl/ActivityStreamsSubscriberRouter.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/impl/ActivityStreamsSubscriberRouter.java b/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/impl/ActivityStreamsSubscriberRouter.java
deleted file mode 100644
index 68ef0a5..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/routers/impl/ActivityStreamsSubscriberRouter.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.routers.impl;
-
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.streams.messaging.aggregation.ActivityAggregator;
-import org.apache.streams.messaging.configuration.EipConfigurator;
-import org.apache.streams.messaging.routers.ActivityStreamsSubscriberRouteBuilder;
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriber;
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriberWarehouse;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.UUID;
-
-
-public class ActivityStreamsSubscriberRouter extends RouteBuilder implements ActivityStreamsSubscriberRouteBuilder {
- private static final transient Log LOG = LogFactory.getLog(ActivityStreamsSubscriberRouter.class);
-
- @Autowired
- private EipConfigurator configuration;
-
- protected CamelContext camelContext;
-
- @Autowired
- private ActivityAggregator activityAggregator;
-
- private ActivityStreamsSubscriberWarehouse activityStreamsSubscriberWarehouse;
-
- public void setCamelContext(CamelContext camelContext) {
- this.camelContext = camelContext;
- }
-
- public void setActivityStreamsSubscriberWarehouse(ActivityStreamsSubscriberWarehouse activityStreamsSubscriberWarehouse) {
- this.activityStreamsSubscriberWarehouse = activityStreamsSubscriberWarehouse;
- }
-
-
- public void createNewRouteForSubscriber(Exchange exchange, ActivityStreamsSubscriber activityStreamsSubscriber){
-
- //todo: add some better scheme then getCount for URL...
- //todo: make the route again if subscriber exists...and context doesn't have route
- if (activityStreamsSubscriber.isAuthenticated()){
-
- try{
-
- if (configuration.getSubscriberEndpointProtocol().equals(EipConfigurator.ENDPOINT_PROTOCOL_JETTY)){
- activityStreamsSubscriber.setInRoute(configuration.getSubscriberInRouteHost()+ ":" + configuration.getSubscriberInRoutePort() +"/" + configuration.getSubscriberEndpointUrlResource() + "/" + UUID.randomUUID());
- //set the body to the url the producer should post to
- exchange.getOut().setBody("http://" + activityStreamsSubscriber.getInRoute());
- }else if (configuration.getSubscriberEndpointProtocol().equals(EipConfigurator.ENDPOINT_PROTOCOL_SERVLET)){
- activityStreamsSubscriber.setInRoute( configuration.getSubscriberEndpointUrlResource() + "/" + UUID.randomUUID());
- //set the body to the url the producer should post to
- exchange.getOut().setBody(configuration.getBaseUrlPath() + activityStreamsSubscriber.getInRoute());
- } else{
- throw new Exception("No supported endpoint protocol is configured.");
- }
-
- //setup a message queue for this consumer.getInRoute()
- camelContext.addRoutes(new DynamicSubscriberRouteBuilder(configuration,camelContext, configuration.getSubscriberEndpointProtocol() + activityStreamsSubscriber.getInRoute(), activityStreamsSubscriber));
-
- activityAggregator.updateSubscriber(activityStreamsSubscriber);
- activityStreamsSubscriberWarehouse.register(activityStreamsSubscriber);
- }catch (Exception e){
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE,500);
- exchange.getOut().setBody("error creating route: " + e);
- LOG.error("error creating route: " + e);
- }
-
- }else{
- exchange.getOut().setFault(true);
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE,401);
- exchange.getOut().setBody("Authentication failed.");
- }
-
- }
-
-
-
-
- public void configure() throws Exception{
- //nothing...set the context?
-
- }
-
- /**
- * This route builder is a skeleton to add new routes at runtime
- */
- private static final class DynamicSubscriberRouteBuilder extends RouteBuilder {
- private final String from;
- private ActivityStreamsSubscriber activityStreamsSubscriber;
-
-
- private EipConfigurator configuration;
-
- private DynamicSubscriberRouteBuilder(EipConfigurator configuration, CamelContext context, String from, ActivityStreamsSubscriber activityStreamsSubscriber) {
- super(context);
- this.from = from;
- this.activityStreamsSubscriber = activityStreamsSubscriber;
- this.configuration = configuration;
- }
-
- @Override
- public void configure() throws Exception {
-
-
- from(from)
- .choice()
- .when(header("CamelHttpMethod").isEqualTo("POST"))
- //when its a post...it goes to adding a new src
- .bean(activityStreamsSubscriber, configuration.getSubscriberPostMethod()).setBody(body())
- .when(header("CamelHttpMethod").isEqualTo("GET"))
- // when its a GET it goes to getStream()
- .bean(activityStreamsSubscriber, configuration.getSubscriberGetMethod()) ;
-
-
-
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/ActivityService.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/ActivityService.java b/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/ActivityService.java
deleted file mode 100644
index 0c85974..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/ActivityService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.service;
-
-import org.apache.camel.Exchange;
-
-import java.util.Date;
-import java.util.List;
-
-public interface ActivityService {
-
- void receiveExchange(Exchange exchange);
-
- List<String> getActivitiesForFilters(List<String> filters, Date lastUpdated);
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/SubscriptionService.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/SubscriptionService.java b/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/SubscriptionService.java
deleted file mode 100644
index 98f585d..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/SubscriptionService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.service;
-
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscription;
-
-import java.util.List;
-
-public interface SubscriptionService {
-
- List<String> getFilters(String authToken);
- void saveFilters(ActivityStreamsSubscription subscription);
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/impl/CassandraActivityService.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/impl/CassandraActivityService.java b/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/impl/CassandraActivityService.java
deleted file mode 100644
index 89f71ab..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/impl/CassandraActivityService.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.service.impl;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.camel.Exchange;
-import org.apache.rave.model.ActivityStreamsEntry;
-import org.apache.streams.cassandra.model.CassandraActivityStreamsEntry;
-import org.apache.streams.cassandra.repository.impl.CassandraActivityStreamsRepository;
-import org.apache.streams.messaging.service.ActivityService;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-public class CassandraActivityService implements ActivityService {
-
- private static final transient Log LOG = LogFactory.getLog(CassandraActivityService.class);
-
- private CassandraActivityStreamsRepository cassandraActivityStreamsRepository;
- private ObjectMapper mapper;
-
- @Autowired
- public CassandraActivityService(CassandraActivityStreamsRepository cassandraActivityStreamsRepository, ObjectMapper mapper) {
- this.cassandraActivityStreamsRepository = cassandraActivityStreamsRepository;
- this.mapper = mapper;
- mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
- }
-
- @Override
- public void receiveExchange(Exchange exchange) {
-
- //receive the exchange as a list
- List<Exchange> grouped = exchange.getProperty(Exchange.GROUPED_EXCHANGE, List.class);
-
- for (Exchange e : grouped) {
- //get activity off of exchange
- LOG.info("Exchange: " + e);
-
- //extract the ActivityStreamsEntry object and save it in the database
- LOG.info("About to preform the translation to JSON Object");
- String activityJson = e.getIn().getBody(String.class);
-
- try {
- ActivityStreamsEntry streamsEntry = mapper.readValue(activityJson, CassandraActivityStreamsEntry.class);
- streamsEntry.setPublished(new Date());
- cassandraActivityStreamsRepository.save(streamsEntry);
- } catch (IOException err) {
- LOG.error("there was an error while converting the json string to an object and saving to the database", err);
- }
-
- }
- }
-
- @Override
- public List<String> getActivitiesForFilters(List<String> filters, Date lastUpdated) {
- List<CassandraActivityStreamsEntry> activityObjects = cassandraActivityStreamsRepository.getActivitiesForFilters(filters, lastUpdated);
- Collections.sort(activityObjects, Collections.reverseOrder());
- //TODO: make the number of streams returned configurable
- return getJsonList(activityObjects.subList(0,Math.min(activityObjects.size(),10)));
- }
-
- private List<String> getJsonList(List<CassandraActivityStreamsEntry> activities) {
- List<String> jsonList = new ArrayList<String>();
- for (ActivityStreamsEntry entry : activities) {
- try {
- jsonList.add(mapper.writeValueAsString(entry));
- } catch (IOException e) {
- LOG.error("There was an error while trying to convert the java object to a string: " + entry, e);
- }
- }
- return jsonList;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/impl/CassandraSubscriptionService.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/impl/CassandraSubscriptionService.java b/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/impl/CassandraSubscriptionService.java
deleted file mode 100644
index 8972d1e..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/service/impl/CassandraSubscriptionService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.service.impl;
-
-import org.apache.streams.cassandra.repository.impl.CassandraSubscriptionRepository;
-import org.apache.streams.messaging.service.SubscriptionService;
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscription;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class CassandraSubscriptionService implements SubscriptionService {
-
- private CassandraSubscriptionRepository repository;
-
- public CassandraSubscriptionService(CassandraSubscriptionRepository repository){
- this.repository = repository;
- }
-
- public List<String> getFilters(String authToken){
- return Arrays.asList(repository.getFilters(authToken).split(" "));
- }
-
- public void saveFilters(ActivityStreamsSubscription subscription){
- repository.save(subscription);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/propertiesLoader.xml
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/propertiesLoader.xml b/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/propertiesLoader.xml
deleted file mode 100644
index 60a3f1f..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/propertiesLoader.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<!--<beans-->
- <!--xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"-->
- <!--xmlns="http://www.springframework.org/schema/beans"-->
- <!--xmlns:context="http://www.springframework.org/schema/context"-->
- <!--xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd-->
- <!--http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">-->
-
-
-
- <!--<context:component-scan base-package="org.apache.streams.messaging" annotation-config="true"/>-->
-
- <!--<context:property-placeholder location="/META-INF/streams.properties"/>-->
-
- <!--<bean id="configuration" class="org.apache.streams.messaging.configuration.EipConfigurator" />-->
-
-
-<!--</beans>-->
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml b/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml
deleted file mode 100644
index a9b97a7..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<beans
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:task="http://www.springframework.org/schema/task"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
-
-
- <bean id="activityConsumerRouter" class="org.apache.streams.messaging.routers.impl.ActivityConsumerRouter">
- <property name="activityConsumerWarehouse" ref="activityConsumerWarehouse"/>
- <property name="camelContext" ref="context"/>
- </bean>
-
- <bean id="activityRegistrationProcessor"
- class="org.apache.streams.messaging.processors.ActivityPublisherRegistrationProcessor"/>
-
-
- <bean id="activityStreamsSubscriberRouter"
- class="org.apache.streams.messaging.routers.impl.ActivityStreamsSubscriberRouter">
- <property name="activityStreamsSubscriberWarehouse" ref="activityStreamsSubscriberWarehouse"/>
- <property name="camelContext" ref="context"/>
- </bean>
-
- <bean id="subscriberRegistrationProcessor"
- class="org.apache.streams.messaging.processors.ActivityStreamsSubscriberRegistrationProcessor">
- <constructor-arg ref="subscriptionService"/>
- </bean>
-
- <bean id="cassandraKeyspace" class="org.apache.streams.cassandra.repository.impl.CassandraKeyspace">
- <constructor-arg ref="cassandraConfig"/>
- </bean>
-
- <bean id="cassandraActivityStreamsRepository"
- class="org.apache.streams.cassandra.repository.impl.CassandraActivityStreamsRepository">
- <constructor-arg ref="cassandraKeyspace"/>
- <constructor-arg ref="cassandraConfig"/>
- </bean>
-
- <bean id="cassandraSubscriptionRepository"
- class="org.apache.streams.cassandra.repository.impl.CassandraSubscriptionRepository">
- <constructor-arg ref="cassandraKeyspace"/>
- <constructor-arg ref="cassandraConfig"/>
- </bean>
-
- <bean id="objectMapper" class="org.codehaus.jackson.map.ObjectMapper"/>
-
- <bean id="subscriptionService" class="org.apache.streams.messaging.service.impl.CassandraSubscriptionService">
- <constructor-arg ref="cassandraSubscriptionRepository"/>
- </bean>
-
- <bean id="activityService" class="org.apache.streams.messaging.service.impl.CassandraActivityService">
- <constructor-arg ref="cassandraActivityStreamsRepository"/>
- <constructor-arg ref="objectMapper"/>
- </bean>
-
- <!--<bean id="stromActivityAggregator" class="org.apache.streams.messaging.storm.StormActivityAggregator">-->
- <!--<constructor-arg ref="bolt"/>-->
- <!--<constructor-arg ref="spout"/>-->
- <!--</bean>-->
-
- <!--<bean id="bolt" class="org.apache.streams.messaging.storm.StormSubscriberBolt"/>-->
- <!--<bean id="spout" class="org.apache.streams.messaging.storm.StormSubscriberSpout"/>-->
-
- <bean id="activityAggregator" class="org.apache.streams.messaging.aggregation.ActivityAggregator">
- <property name="activityService" ref="activityService"/>
- <property name="activityStreamsSubscriberWarehouse" ref="activityStreamsSubscriberWarehouse"/>
- </bean>
-
- <task:annotation-driven/>
-
- <bean id="jmsConnectionFactory"
- class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="${activemq.jmsConnectionFactoryUrl}"/>
- </bean>
-
- <bean id="pooledConnectionFactory"
- class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop">
- <property name="maxConnections" value="8"/>
- <property name="connectionFactory" ref="jmsConnectionFactory"/>
- </bean>
-
- <bean id="jmsConfig"
- class="org.apache.camel.component.jms.JmsConfiguration">
- <property name="connectionFactory" ref="pooledConnectionFactory"/>
- <property name="concurrentConsumers" value="10"/>
- </bean>
-
- <bean id="activemq"
- class="org.apache.activemq.camel.component.ActiveMQComponent">
- <property name="configuration" ref="jmsConfig"/>
- </bean>
-
-
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/streams-eip-osgi-component-import.xml
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/streams-eip-osgi-component-import.xml b/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/streams-eip-osgi-component-import.xml
deleted file mode 100644
index 9066206..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/streams-eip-osgi-component-import.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-
- <osgi:reference id="activityPublisherRegistration" interface="org.apache.streams.osgi.components.ActivityPublisherRegistration" />
- <osgi:reference id="activityConsumerWarehouse" interface="org.apache.streams.osgi.components.activityconsumer.ActivityConsumerWarehouse" />
-
- <osgi:reference id="activityStreamsSubscriberRegistration" interface="org.apache.streams.osgi.components.ActivityStreamsSubscriberRegistration" />
- <osgi:reference id="activityStreamsSubscriberWarehouse" interface="org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriberWarehouse" />
-
-
-
-
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/streamsCamelContext.xml
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/streamsCamelContext.xml b/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/streamsCamelContext.xml
deleted file mode 100644
index 4360f39..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/spring/streamsCamelContext.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring-2.0.0.xsd
- http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
-
-
-
- <camelContext id="context" xmlns="http://camel.apache.org/schema/spring">
-
- <endpoint id="consumerRegistrationEndpoint" uri="${consumer.registrationEndpoint}"/>
- <endpoint id="subscriberRegistrationEndpoint" uri="${subscriber.registrationEndpoint}"/>
- <!--publisher registration route setup -->
- <route>
- <from uri="ref:consumerRegistrationEndpoint"/>
- <bean ref="activityRegistrationProcessor" />
- <to uri="direct:publisher-register"/>
- </route>
-
- <route>
- <from uri="direct:publisher-register"/>
- <bean ref="activityPublisherRegistration" method="register"/>
- <to uri="direct:add-publisher-route"/>
- </route>
-
- <route>
- <from uri="direct:add-publisher-route"/>
- <bean ref="activityConsumerRouter" method="createNewRouteForConsumer"/>
- <to uri="log:ExampleLog"/>
- </route>
-
- <!--split activities on Q, waiting for aggregation -->
- <route>
- <from uri="direct:activityQ"/>
- <inOnly uri="activemq:queue:activities"/>
- </route>
-
- <route>
- <from uri="activemq:queue:activities"/>
- <aggregate completionInterval="500" groupExchanges="true">
- <correlationExpression>
- <constant>true</constant>
- </correlationExpression>
- <bean ref="activityService" method="receiveExchange"/>
- </aggregate>
- </route>
-
-
- <!-- register as a subscriber - returned the endpoint to poll and add to subscription sources - GET/POST -->
- <route>
- <from uri="ref:subscriberRegistrationEndpoint"/>
- <bean ref="subscriberRegistrationProcessor" />
- <to uri="direct:subscriber-register"/>
- </route>
-
- <route>
- <from uri="direct:subscriber-register"/>
- <bean ref="activityStreamsSubscriberRegistration" method="register"/>
- <to uri="direct:add-subscriber-route"/>
- </route>
-
- <route>
- <from uri="direct:add-subscriber-route"/>
- <bean ref="activityStreamsSubscriberRouter" method="createNewRouteForSubscriber"/>
- <to uri="log:ExampleLog"/>
- </route>
-
-
- </camelContext>
-
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/streams.properties
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/streams.properties b/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/streams.properties
deleted file mode 100644
index b7bbfce..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/resources/META-INF/streams.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-servlet.baseUrlPath=http://localhost:8080/streams-web/
-
-consumer.inRouteHost=localhost
-consumer.inRoutePort=8000
-consumer.activityQUri = direct:activityQ
-
-consumer.publisherEndpointProtocol=jetty:http://
-consumer.publisherEndpointUrlResource=streams/publish
-consumer.receiveMethod=receive
-consumer.splitMethod=split
-
-consumer.registrationEndpoint=jetty:http://localhost:8000/streams/publisher/register
-
-subscriber.inRouteHost=localhost
-subscriber.inRoutePort=8000
-subscriber.subscriberEndpointUrlResource=streams/subscriber
-subscriber.receiveMethod=receive
-subscriber.postMethod=updateActivityStreamsSubscriberConfiguration
-subscriber.getMethod=getStream
-subscriber.registrationEndpoint=jetty:http://localhost:8000/streams/subscriber/register
-subscriber.subscriberEndpointProtocol=jetty:http://
-
-activemq.jmsConnectionFactoryUrl=tcp://localhost:61616
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/test/java/org/apache/streams/messaging/service/impl/CassandraActivityServiceTest.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/test/java/org/apache/streams/messaging/service/impl/CassandraActivityServiceTest.java b/streams-runtimes/streams-runtime-webapp/src/test/java/org/apache/streams/messaging/service/impl/CassandraActivityServiceTest.java
deleted file mode 100644
index 0812c47..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/test/java/org/apache/streams/messaging/service/impl/CassandraActivityServiceTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.service.impl;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.easymock.EasyMock.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-public class CassandraActivityServiceTest {
-
- private CassandraActivityService cassandraActivityService;
-
- @Before
- public void setup(){
-// cassandraActivityService = new CassandraActivityService();
- }
-
- @Ignore
- @Test
- public void getActivititiesForFilterTest(){
- List<String> activities = cassandraActivityService.getActivitiesForFilters(Arrays.asList("r501"), new Date(0));
- }
-
- @Ignore
- @Test
- public void receiveExchangeTest(){
- Exchange e = createMock(Exchange.class);
- List<Exchange> grouped = new ArrayList<Exchange>();
- Exchange e2 = createMock(Exchange.class);
- grouped.add(e2);
- Message m = createMock(Message.class);
-
- String activityJson = "{\n" +
- "\"id\":\"id2\",\n" +
- "\"verb\":\"verb2\",\n" +
- "\"displayName\":\"displayname2\",\n" +
- "\"target\":{\n" +
- "\t\"id\":\"targetid2\",\n" +
- "\t\"displayName\":\"targetname2\"\n" +
- "\t},\n" +
- "\t\"object\":{\n" +
- "\t\"id\":\"objectid2\",\n" +
- "\t\"displayName\":\"objectname2\"\n" +
- "\t},\n" +
- "\t\"actor\":{\n" +
- "\t\"id\":\"actorid2\",\n" +
- "\t\"displayName\":\"actorname2\"\n" +
- "\t}\n" +
- "\t\n" +
- "\t}";
-
- expect(e.getProperty(Exchange.GROUPED_EXCHANGE, List.class)).andReturn(grouped);
- expect(e2.getIn()).andReturn(m);
- expect(m.getBody(String.class)).andReturn(activityJson);
-
- replay(e, e2, m);
-
- cassandraActivityService.receiveExchange(e);
- //List<String> myTest = cassandraActivityService.getActivitiesForQuery("select * from coltest");
- }
-}
[4/4] incubator-streams git commit: Merge remote-tracking branch
'eponvert/STREAMS-410'
Posted by sb...@apache.org.
Merge remote-tracking branch 'eponvert/STREAMS-410'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/f14a25ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/f14a25ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/f14a25ce
Branch: refs/heads/master
Commit: f14a25cedc6c41f1331fb8783cce1c59f4eb1961
Parents: f1e1e11 ce7aa24
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Authored: Wed Oct 12 09:58:57 2016 -0500
Committer: Steve Blackmon @steveblackmon <sb...@apache.org>
Committed: Wed Oct 12 09:58:57 2016 -0500
----------------------------------------------------------------------
pom.xml | 1 -
.../streams-processor-lucene/pom.xml | 163 ---------
.../lucene/LuceneSimpleTaggingProcessor.java | 355 -------------------
.../lucene/LuceneTaggerConfiguration.json | 29 --
.../lucene/TestLucenSimpleTaggingProcessor.java | 171 ---------
.../src/test/resources/TestTags.tsv | 2 -
streams-contrib/streams-processor-tika/pom.xml | 162 ---------
.../org/apache/streams/tika/CategoryParser.java | 114 ------
.../org/apache/streams/tika/TikaProcessor.java | 139 --------
.../apache/streams/tika/BoilerPipeArticle.json | 76 ----
.../apache/streams/tika/TestCategoryParser.java | 30 --
.../apache/streams/tika/TestTikaProcessor.java | 29 --
.../activity-consumer/osgi.bnd | 9 -
.../activity-consumer/pom.xml | 171 ---------
.../activityconsumer/ActivityConsumer.java | 39 --
.../ActivityConsumerWarehouse.java | 31 --
.../impl/ActivityConsumerWarehouseImpl.java | 57 ---
.../impl/PushActivityConsumer.java | 106 ------
.../spring/activity-consumer-context.xml | 28 --
.../META-INF/spring/activity-consumer-osgi.xml | 29 --
.../src/main/resources/readme.txt | 1 -
.../activity-registration/osgi.bnd | 9 -
.../activity-registration/pom.xml | 130 -------
.../ActivityPublisherRegistration.java | 29 --
.../ActivityStreamsSubscriberRegistration.java | 29 --
.../impl/ActivityPublisherRegistrationImpl.java | 67 ----
...tivityStreamsSubscriberRegistrationImpl.java | 67 ----
.../activity-registration-context-osgi.xml | 30 --
.../spring/activity-registration-context.xml | 29 --
.../src/main/resources/readme.txt | 1 -
.../activity-subscriber/osgi.bnd | 9 -
.../activity-subscriber/pom.xml | 134 -------
.../ActivityStreamsSubscriber.java | 38 --
.../ActivityStreamsSubscriberWarehouse.java | 34 --
.../ActivityStreamsSubscription.java | 38 --
.../ActivityStreamsSubscriptionFilter.java | 34 --
.../ActivityStreamsSubscriptionOutput.java | 47 ---
.../impl/ActivityStreamsSubscriberDelegate.java | 126 -------
.../ActivityStreamsSubscriberWarehouseImpl.java | 60 ----
...yStreamsSubscriptionCassandraFilterImpl.java | 42 ---
.../impl/ActivityStreamsSubscriptionImpl.java | 74 ----
...vityStreamsSubscriptionLuceneFilterImpl.java | 43 ---
.../spring/activity-subscriber-context.xml | 28 --
.../spring/activity-subscriber-osgi.xml | 29 --
.../src/main/resources/readme.txt | 1 -
.../src/site/resources/readme.txt | 1 -
streams-osgi-components/pom.xml | 43 ---
streams-runtimes/pom.xml | 1 -
.../jsonschema/SparkRuntimeConfiguration.json | 27 --
.../streams-runtime-webapp/README.md | 8 -
streams-runtimes/streams-runtime-webapp/pom.xml | 250 -------------
.../aggregation/ActivityAggregator.java | 59 ---
.../configuration/EipConfigurator.java | 201 -----------
.../ActivityPublisherRegistrationProcessor.java | 72 ----
...yStreamsSubscriberRegistrationProcessor.java | 93 -----
.../routers/ActivityConsumerRouteBuilder.java | 32 --
.../ActivityStreamsSubscriberRouteBuilder.java | 32 --
.../routers/impl/ActivityConsumerRouter.java | 144 --------
.../impl/ActivityStreamsSubscriberRouter.java | 141 --------
.../messaging/service/ActivityService.java | 31 --
.../messaging/service/SubscriptionService.java | 29 --
.../service/impl/CassandraActivityService.java | 96 -----
.../impl/CassandraSubscriptionService.java | 43 ---
.../META-INF/spring/propertiesLoader.xml | 35 --
.../spring/streams-eip-applicationContext.xml | 113 ------
.../streams-eip-osgi-component-import.xml | 38 --
.../META-INF/spring/streamsCamelContext.xml | 96 -----
.../main/resources/META-INF/streams.properties | 41 ---
.../impl/CassandraActivityServiceTest.java | 86 -----
69 files changed, 4582 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-streams git commit: resolves STREAMS-410
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-context.xml
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-context.xml b/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-context.xml
deleted file mode 100644
index f12ab82..0000000
--- a/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-context.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <!-- regular spring configuration file defining the beans for this
-bundle. The configuration of OSGi definitions is kept in a separate
-configuration file so that this file can easily be used
-for integration testing outside of an OSGi environment -->
- <bean id="activityConsumerWarehouse" class="org.apache.streams.osgi.components.activityconsumer.impl.ActivityConsumerWarehouseImpl"/>
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-osgi.xml
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-osgi.xml b/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-osgi.xml
deleted file mode 100644
index 408ce95..0000000
--- a/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-osgi.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <osgi:service ref="activityConsumerWarehouse" interface="org.apache.streams.osgi.components.activityconsumer.ActivityConsumerWarehouse"/>
-
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-consumer/src/main/resources/readme.txt
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-consumer/src/main/resources/readme.txt b/streams-osgi-components/activity-consumer/src/main/resources/readme.txt
deleted file mode 100644
index 5774586..0000000
--- a/streams-osgi-components/activity-consumer/src/main/resources/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Bundle resources go here
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-registration/osgi.bnd
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-registration/osgi.bnd b/streams-osgi-components/activity-registration/osgi.bnd
deleted file mode 100644
index 53f60f9..0000000
--- a/streams-osgi-components/activity-registration/osgi.bnd
+++ /dev/null
@@ -1,9 +0,0 @@
-#--------------------------------------------------------------------------------
-# Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
-#--------------------------------------------------------------------------------
-
-#-----------------------------------------------------------------
-# Use this file to add customized Bnd instructions for the bundle
-#-----------------------------------------------------------------
-
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-registration/pom.xml
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-registration/pom.xml b/streams-osgi-components/activity-registration/pom.xml
deleted file mode 100644
index 7871a0e..0000000
--- a/streams-osgi-components/activity-registration/pom.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.streams.osgi.components</groupId>
- <artifactId>streams-osgi-components</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
- </parent>
-
- <artifactId>activity-registration</artifactId>
-
- <name>${bundle.symbolicName} [${bundle.namespace}]</name>
-
- <packaging>bundle</packaging>
-
- <properties>
- <bundle.symbolicName>activity-registration-bundle</bundle.symbolicName>
- <bundle.namespace>org.apache.streams.osgi.components</bundle.namespace>
- <commons.log>1.1</commons.log>
- </properties>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <!--
- | example additional resource entries, useful when building Eclipse RCP applications
- -->
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin.xml</include>
- <include>plugin.properties</include>
- <include>icons/**</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.ops4j</groupId>
- <artifactId>maven-pax-plugin</artifactId>
- <!--
- | enable improved OSGi compilation support for the bundle life-cycle.
- | to switch back to the standard bundle life-cycle, move this setting
- | down to the maven-bundle-plugin section
- -->
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <!--
- | the following instructions build a simple set of public/private classes into an OSGi bundle
- -->
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>${bundle.namespace};version="${project.version}"</Export-Package>
- <Private-Package>${bundle.namespace}.impl.*</Private-Package>
- <Import-Package>org.apache.streams.osgi.components.activityconsumer.impl,org.apache.streams.osgi.components.activityconsumer,org.apache.streams.osgi.components.activitysubscriber,org.apache.streams.osgi.components.activitysubscriber.impl,org.apache.commons.logging, org.codehaus.jackson.map</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>${commons.log}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.streams.osgi.components</groupId>
- <artifactId>activity-consumer</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streams.osgi.components</groupId>
- <artifactId>activity-subscriber</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-testing</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityPublisherRegistration.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityPublisherRegistration.java b/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityPublisherRegistration.java
deleted file mode 100644
index fd590a1..0000000
--- a/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityPublisherRegistration.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components;
-
-/**
- * Public API representing an example OSGi service
- */
-public interface ActivityPublisherRegistration {
-
- public Object register(Object obj);
-
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityStreamsSubscriberRegistration.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityStreamsSubscriberRegistration.java b/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityStreamsSubscriberRegistration.java
deleted file mode 100644
index bd400d8..0000000
--- a/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityStreamsSubscriberRegistration.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components;
-
-/**
- * Public API representing an example OSGi service
- */
-public interface ActivityStreamsSubscriberRegistration {
-
- public Object register(Object obj);
-
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityPublisherRegistrationImpl.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityPublisherRegistrationImpl.java b/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityPublisherRegistrationImpl.java
deleted file mode 100644
index e621f43..0000000
--- a/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityPublisherRegistrationImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.impl;
-
-import java.util.Date;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.streams.osgi.components.ActivityPublisherRegistration;
-import org.apache.streams.osgi.components.activityconsumer.ActivityConsumer;
-import org.apache.streams.osgi.components.activityconsumer.impl.PushActivityConsumer;
-
-public class ActivityPublisherRegistrationImpl implements ActivityPublisherRegistration {
- private static final transient Log LOG = LogFactory.getLog(ActivityPublisherRegistrationImpl.class);
- private boolean verbose = true;
- private String prefix = "Activity Publisher Registration";
-
- public Object register(Object body) {
-
- //authorize this producer based on some rule set...
- //create a new ActivityConsumer...
- //using the URI supplied to set it up...
- //return the consumer for addition to the consumer warehouse
-
- String answer = prefix + " set body: " + body + " " + new Date();
- LOG.info(">> call >>" + answer);
-
-
- ActivityConsumer activityConsumer =(ActivityConsumer)body;
- //authenticate..
- activityConsumer.setAuthenticated(true);
- return activityConsumer;
- }
-
-
- public boolean isVerbose() {
- return verbose;
- }
-
- public void setVerbose(boolean verbose) {
- this.verbose = verbose;
- }
-
- public String getPrefix() {
- return prefix;
- }
-
- public void setPrefix(String prefix) {
- this.prefix = prefix;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java b/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java
deleted file mode 100644
index 6a270d6..0000000
--- a/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.impl;
-
-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.ActivityStreamsSubscription;
-import org.apache.streams.osgi.components.activitysubscriber.impl.ActivityStreamsSubscriberDelegate;
-
-public class ActivityStreamsSubscriberRegistrationImpl implements ActivityStreamsSubscriberRegistration {
- private static final transient Log LOG = LogFactory.getLog(ActivityStreamsSubscriberRegistrationImpl.class);
- private boolean verbose = true;
- private String prefix = "Activity Subscriber Registration";
-
- public Object register(Object body) {
-
- //authorize this subscriber based on some rule set...
- //create a new SubscriberDelegate...
- //using the URI supplied to set it up...
- //return the consumer for addition to the consumer warehouse
-
- ActivityStreamsSubscription configuration = (ActivityStreamsSubscription)body;
-
- ActivityStreamsSubscriberDelegate delegate = new ActivityStreamsSubscriberDelegate(configuration);
- //authenticate
- delegate.setAuthenticated(true);
-
-
-
- return delegate;
- }
-
-
-
- public boolean isVerbose() {
- return verbose;
- }
-
- public void setVerbose(boolean verbose) {
- this.verbose = verbose;
- }
-
- public String getPrefix() {
- return prefix;
- }
-
- public void setPrefix(String prefix) {
- this.prefix = prefix;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context-osgi.xml
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context-osgi.xml b/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context-osgi.xml
deleted file mode 100644
index af9e3b7..0000000
--- a/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context-osgi.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <osgi:service ref="activityPublisherRegistration" interface="org.apache.streams.osgi.components.ActivityPublisherRegistration"/>
- <osgi:service ref="activityStreamsSubscriberRegistration" interface="org.apache.streams.osgi.components.ActivityStreamsSubscriberRegistration"/>
-
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context.xml
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context.xml b/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context.xml
deleted file mode 100644
index 4e58ace..0000000
--- a/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <!-- regular spring configuration file defining the beans for this
-bundle. The configuration of OSGi definitions is kept in a separate
-configuration file so that this file can easily be used
-for integration testing outside of an OSGi environment -->
- <bean id="activityPublisherRegistration" class="org.apache.streams.osgi.components.impl.ActivityPublisherRegistrationImpl"/>
- <bean id="activityStreamsSubscriberRegistration" class="org.apache.streams.osgi.components.impl.ActivityStreamsSubscriberRegistrationImpl"/>
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-registration/src/main/resources/readme.txt
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-registration/src/main/resources/readme.txt b/streams-osgi-components/activity-registration/src/main/resources/readme.txt
deleted file mode 100644
index 5774586..0000000
--- a/streams-osgi-components/activity-registration/src/main/resources/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Bundle resources go here
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/osgi.bnd
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/osgi.bnd b/streams-osgi-components/activity-subscriber/osgi.bnd
deleted file mode 100644
index 53f60f9..0000000
--- a/streams-osgi-components/activity-subscriber/osgi.bnd
+++ /dev/null
@@ -1,9 +0,0 @@
-#--------------------------------------------------------------------------------
-# Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
-#--------------------------------------------------------------------------------
-
-#-----------------------------------------------------------------
-# Use this file to add customized Bnd instructions for the bundle
-#-----------------------------------------------------------------
-
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/pom.xml
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/pom.xml b/streams-osgi-components/activity-subscriber/pom.xml
deleted file mode 100644
index 5b5c30a..0000000
--- a/streams-osgi-components/activity-subscriber/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.streams.osgi.components</groupId>
- <artifactId>streams-osgi-components</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
- </parent>
-
- <artifactId>activity-subscriber</artifactId>
-
- <name>${bundle.symbolicName} [${bundle.namespace}]</name>
-
- <packaging>bundle</packaging>
-
- <properties>
- <bundle.symbolicName>activity-subscriber-bundle</bundle.symbolicName>
- <bundle.namespace>org.apache.streams.osgi.components.activitysubscriber</bundle.namespace>
- <commons.log>1.1</commons.log>
- <jackson.version>1.9.11</jackson.version>
- </properties>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <!--
- | example additional resource entries, useful when building Eclipse RCP applications
- -->
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin.xml</include>
- <include>plugin.properties</include>
- <include>icons/**</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.ops4j</groupId>
- <artifactId>maven-pax-plugin</artifactId>
- <!--
- | enable improved OSGi compilation support for the bundle life-cycle.
- | to switch back to the standard bundle life-cycle, move this setting
- | down to the maven-bundle-plugin section
- -->
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <!--
- | the following instructions build a simple set of public/private classes into an OSGi bundle
- -->
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>${bundle.namespace};version="${project.version}",org.apache.streams.osgi.components.activitysubscriber.impl</Export-Package>
- <Private-Package>${bundle.namespace}.impl.*</Private-Package>
- <Import-Package>org.apache.streams.osgi.components.activitysubscriber,org.apache.commons.logging,org.codehaus.jackson.*;version="${jackson.version}",javax.xml.datatype, javax.xml.namespace, javax.xml.parsers, org.joda.time, org.joda.time.format, org.w3c.dom, org.w3c.dom.bootstrap, org.w3c.dom.ls, org.xml.sax</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mrbean</artifactId>
- <version>${jackson.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>${commons.log}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-testing</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java b/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java
deleted file mode 100644
index 8852843..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activitysubscriber;
-
-
-import java.util.Date;
-import java.util.List;
-
-public interface ActivityStreamsSubscriber {
- public void receive(List<String> activity);
- public String getStream();
- public void init();
- public void setInRoute(String route);
- public String getInRoute();
- public void setActivityStreamsSubscriberConfiguration(ActivityStreamsSubscription config);
- public void updateActivityStreamsSubscriberConfiguration(String config);
- public boolean isAuthenticated();
- public void setAuthenticated(boolean authenticated);
- public ActivityStreamsSubscription getActivityStreamsSubscriberConfiguration();
- Date getLastUpdated();
- void setLastUpdated(Date lastUpdated);
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriberWarehouse.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriberWarehouse.java b/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriberWarehouse.java
deleted file mode 100644
index f6e0223..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriberWarehouse.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activitysubscriber;
-
-import java.util.ArrayList;
-
-/**
- * Public API representing an example OSGi service
- */
-public interface ActivityStreamsSubscriberWarehouse {
-
- public void register(ActivityStreamsSubscriber activitySubscriber);
-
- public ArrayList<ActivityStreamsSubscriber> findSubscribersByFilters(String src);
-
- public ArrayList<ActivityStreamsSubscriber> getAllSubscribers();
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java b/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java
deleted file mode 100644
index 19cc107..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activitysubscriber;
-
-import org.codehaus.jackson.annotate.JsonTypeInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonTypeInfo(use= JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="@class")
-public interface ActivityStreamsSubscription {
-
- public void setFilters(List<String> filters);
- public List<String> getFilters();
-
- public List<ActivityStreamsSubscriptionOutput> getActivityStreamsSubscriptionOutputs();
- public void setActivityStreamsSubscriptionOutputs(List<ActivityStreamsSubscriptionOutput> outputs);
-
- public String getAuthToken();
- public void setAuthToken(String token);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java b/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java
deleted file mode 100644
index 5900e76..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activitysubscriber;
-
-import org.codehaus.jackson.annotate.JsonTypeInfo;
-
-@JsonTypeInfo(use= JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="@class")
-public interface ActivityStreamsSubscriptionFilter {
-
-
-
- public void setQuery(String query);
-
- public String getQuery();
-
- public boolean evaluate(String activity);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java b/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java
deleted file mode 100644
index b6ca484..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-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);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java b/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java
deleted file mode 100644
index b575ba3..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activitysubscriber.impl;
-
-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.ActivityStreamsSubscription;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class ActivityStreamsSubscriberDelegate implements ActivityStreamsSubscriber {
-
- private static final transient Log LOG = LogFactory.getLog(ActivityStreamsSubscriberDelegate.class);
-
- private boolean authenticated;
-
- private ActivityStreamsSubscription activityStreamsSubscriberConfiguration;
-
- private String inRoute;
-
- //an individual subscriber gets ONE stream which is an aggregation of all its SRCs
- private List<String> stream;
-
- private Date lastUpdated;
-
-
- public ActivityStreamsSubscriberDelegate(ActivityStreamsSubscription configuration){
- setActivityStreamsSubscriberConfiguration(configuration);
- stream = new ArrayList<String>();
- lastUpdated = new Date(0);
- }
-
-
- public ActivityStreamsSubscription getActivityStreamsSubscriberConfiguration() {
- return activityStreamsSubscriberConfiguration;
- }
-
- public void setActivityStreamsSubscriberConfiguration(ActivityStreamsSubscription activityStreamsSubscriberConfiguration) {
- this.activityStreamsSubscriberConfiguration = activityStreamsSubscriberConfiguration;
- }
-
- public void updateActivityStreamsSubscriberConfiguration(String activityStreamsSubscriberConfiguration) {
- ObjectMapper mapper = new ObjectMapper();
- mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES,false);
-
- try {
- // read from file, convert it to user class
- ActivityStreamsSubscription configuration = mapper.readValue(activityStreamsSubscriberConfiguration, ActivityStreamsSubscriptionImpl.class);
- this.activityStreamsSubscriberConfiguration = configuration;
-
- } catch (Exception e) {
- LOG.info("exception" + e);
-
- }
-
- }
-
- public boolean isAuthenticated() {
- return authenticated;
- }
-
- public void setAuthenticated(boolean authenticated) {
- this.authenticated = authenticated;
- }
-
- public String getInRoute() {
- return inRoute;
- }
-
- public void setInRoute(String inRoute) {
- this.inRoute = inRoute;
- }
-
- public void receive (List<String> activity){
- //add new activities to stream
- LOG.info("adding activities to subscription stream");
- stream.addAll(0,activity);
- }
-
- //return the list of activities (stream) as a json string
- public String getStream() {
-
- return stream.toString();
- }
-
- public Date getLastUpdated() {
- return lastUpdated;
- }
-
- public void setLastUpdated(Date lastUpdated) {
- this.lastUpdated = lastUpdated;
- }
-
- public void init(){
- //any initialization... gets called directly after registration
-
-
-
- }
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java b/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java
deleted file mode 100644
index 80f94cf..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activitysubscriber.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-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.ActivityStreamsSubscriberWarehouse;
-
-
-public class ActivityStreamsSubscriberWarehouseImpl implements ActivityStreamsSubscriberWarehouse {
- private static final transient Log LOG = LogFactory.getLog(ActivityStreamsSubscriberWarehouseImpl.class);
-
- private ArrayList<ActivityStreamsSubscriber> subscribers;
-
- public ActivityStreamsSubscriberWarehouseImpl(){
- subscribers = new ArrayList<ActivityStreamsSubscriber>();
- }
-
- public void register(ActivityStreamsSubscriber activitySubscriber) {
-
- if (!subscribers.contains(activitySubscriber)){
- subscribers.add(activitySubscriber);
- activitySubscriber.init();
- }
-
- }
-
-
- //the warehouse can do some interesting things to make the filtering efficient i think...
- public ArrayList<ActivityStreamsSubscriber> findSubscribersByFilters(String src){
- return subscribers;
- }
-
-
- public ArrayList<ActivityStreamsSubscriber> getAllSubscribers(){
- return subscribers;
- }
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionCassandraFilterImpl.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionCassandraFilterImpl.java b/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionCassandraFilterImpl.java
deleted file mode 100644
index f1a9f9d..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionCassandraFilterImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activitysubscriber.impl;
-
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriptionFilter;
-
-import java.util.List;
-
-public class ActivityStreamsSubscriptionCassandraFilterImpl implements ActivityStreamsSubscriptionFilter {
- private String query;
- private List<String> filters;
-
- public ActivityStreamsSubscriptionCassandraFilterImpl(){}
-
- public void setQuery(String query) {
- this.query=query;
- }
-
- public String getQuery() {
- return query;
- }
-
- public boolean evaluate(String activity){
- return true;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java b/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java
deleted file mode 100644
index 32dfdc3..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activitysubscriber.impl;
-
-
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscription;
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriptionOutput;
-
-import org.codehaus.jackson.map.annotate.JsonDeserialize;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ActivityStreamsSubscriptionImpl implements ActivityStreamsSubscription {
-
- @JsonDeserialize(as=ArrayList.class)
- private List<String> filters;
-
- @JsonDeserialize(as=ArrayList.class)
- private List<ActivityStreamsSubscriptionOutput> outputs;
-
- private String authToken;
-
- public void setFilters(List<String> filters) {
- this.filters = filters;
- }
-
- @Override
- public List<ActivityStreamsSubscriptionOutput> getActivityStreamsSubscriptionOutputs() {
- return outputs;
- }
-
- @Override
- public void setActivityStreamsSubscriptionOutputs(List<ActivityStreamsSubscriptionOutput> outputs) {
- this.outputs = outputs;
- }
-
- @Override
- public List<String> getFilters(){
- return filters;
-
- }
-
- @Override
- public String getAuthToken() {
- return authToken;
- }
-
- @Override
- public void setAuthToken(String auth_token) {
- this.authToken = auth_token;
- }
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionLuceneFilterImpl.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionLuceneFilterImpl.java b/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionLuceneFilterImpl.java
deleted file mode 100644
index c738e0e..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionLuceneFilterImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activitysubscriber.impl;
-
-
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriptionFilter;
-
-public class ActivityStreamsSubscriptionLuceneFilterImpl implements ActivityStreamsSubscriptionFilter{
-
- private String query;
-
-
-
- public void setQuery(String query) {
- this.query=query;
- }
-
- public String getQuery() {
- return query;
- }
-
- public boolean evaluate(String activity){
- return true;
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-context.xml
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-context.xml b/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-context.xml
deleted file mode 100644
index 65c58bd..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-context.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <!-- regular spring configuration file defining the beans for this
-bundle. The configuration of OSGi definitions is kept in a separate
-configuration file so that this file can easily be used
-for integration testing outside of an OSGi environment -->
- <bean id="activitySubscriberWarehouse" class="org.apache.streams.osgi.components.activitysubscriber.impl.ActivityStreamsSubscriberWarehouseImpl"/>
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-osgi.xml
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-osgi.xml b/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-osgi.xml
deleted file mode 100644
index 8988824..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-osgi.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <osgi:service ref="activitySubscriberWarehouse" interface="org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriberWarehouse"/>
-
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/main/resources/readme.txt
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/main/resources/readme.txt b/streams-osgi-components/activity-subscriber/src/main/resources/readme.txt
deleted file mode 100644
index 5774586..0000000
--- a/streams-osgi-components/activity-subscriber/src/main/resources/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Bundle resources go here
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-subscriber/src/site/resources/readme.txt
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-subscriber/src/site/resources/readme.txt b/streams-osgi-components/activity-subscriber/src/site/resources/readme.txt
deleted file mode 100644
index 5774586..0000000
--- a/streams-osgi-components/activity-subscriber/src/site/resources/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Bundle resources go here
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/pom.xml
----------------------------------------------------------------------
diff --git a/streams-osgi-components/pom.xml b/streams-osgi-components/pom.xml
deleted file mode 100644
index 44d0f44..0000000
--- a/streams-osgi-components/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-<modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-project</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.streams.osgi.components</groupId>
- <artifactId>streams-osgi-components</artifactId>
-
- <name>Apache Streams OSGI Components</name>
-
- <packaging>pom</packaging>
-
-
- <modules>
- <module>activity-registration</module>
- <module>activity-consumer</module>
- <module>activity-subscriber</module>
- </modules>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/pom.xml
----------------------------------------------------------------------
diff --git a/streams-runtimes/pom.xml b/streams-runtimes/pom.xml
index 21c2a15..0194b45 100644
--- a/streams-runtimes/pom.xml
+++ b/streams-runtimes/pom.xml
@@ -38,6 +38,5 @@
<module>streams-runtime-local</module>
<module>streams-runtime-pig</module>
<module>streams-runtime-storm</module>
- <!--<module>streams-runtime-webapp</module>-->
</modules>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-spark/src/main/jsonschema/SparkRuntimeConfiguration.json
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-spark/src/main/jsonschema/SparkRuntimeConfiguration.json b/streams-runtimes/streams-runtime-spark/src/main/jsonschema/SparkRuntimeConfiguration.json
deleted file mode 100644
index 5a9cf69..0000000
--- a/streams-runtimes/streams-runtime-spark/src/main/jsonschema/SparkRuntimeConfiguration.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "type": "object",
- "javaType" : "org.apache.streams.spark.SparkRuntimeConfiguration",
- "extends": {
- "$ref": "../../../../../streams-config/src/main/jsonschema/StreamsConfiguration.json"
- },
- "javaInterfaces": ["java.io.Serializable"],
- "properties": {
- "inputPath": {
- "type": "string",
- "description": "Input Path"
- },
- "outputPath": {
- "type": "string",
- "description": "Output Path"
- },
- "outputPartitions": {
- "type": "integer",
- "description": "Partitions",
- "default": 0
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/README.md
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/README.md b/streams-runtimes/streams-runtime-webapp/README.md
deleted file mode 100644
index 94ffeff..0000000
--- a/streams-runtimes/streams-runtime-webapp/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Streams (incubating)
-Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
---------------------------------------------------------------------------------
-
-org.apache.streams:streams-runtime-webapp
-=========================================
-
-[README.md](src/site/markdown/index.md "README")
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/pom.xml b/streams-runtimes/streams-runtime-webapp/pom.xml
deleted file mode 100644
index 7c97dae..0000000
--- a/streams-runtimes/streams-runtime-webapp/pom.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-runtimes</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
- </parent>
-
- <artifactId>streams-runtime-webapp</artifactId>
-
- <name>${bundle.symbolicName} [${bundle.namespace}]</name>
-
- <description>Apache Streams Runtimes</description>
-
- <properties>
- <bundle.symbolicName>streams-eip-routes</bundle.symbolicName>
- <bundle.namespace>org.apache.streams</bundle.namespace>
- <jackson.old.version>1.9.11</jackson.old.version>
- </properties>
-
- <packaging>bundle</packaging>
-
- <repositories>
- <repository>
- <id>clojars.org</id>
- <url>http://clojars.org/repo</url>
- </repository>
- </repositories>
-
- <build>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <!--
- | example additional resource entries, useful when building Eclipse RCP applications
- -->
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin.xml</include>
- <include>plugin.properties</include>
- <include>icons/**</include>
- <include>META-INF/*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.ops4j</groupId>
- <artifactId>maven-pax-plugin</artifactId>
- <!--
- | enable improved OSGi compilation support for the bundle life-cycle.
- | to switch back to the standard bundle life-cycle, move this setting
- | down to the maven-bundle-plugin section
- -->
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <!--
- | the following instructions build a simple set of public/private classes into an OSGi bundle
- -->
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>${bundle.namespace};version="${project.version}",org.apache.streams.messaging.configuration,org.apache.streams.messaging.routers,org.apache.streams.messaging.rules,org.apache.streams.messaging.processors,org.apache.streams.messaging.aggregation,org.apache.streams.messaging.service, org.apache.streams.messaging.storm,org.apache.activemq,org.codehaus.jackson.*;version="${jackson.version}"</Export-Package>
- <Private-Package>${bundle.namespace}.messaging.routers.impl.*,${bundle.namespace}.messaging.rules.impl.*, ${bundle.namespace}.messaging.service.impl.*</Private-Package>
- <Import-Package>org.apache.camel.*;version="2.8.5",org.apache.streams.messaging.configuration,org.apache.activemq.camel.component,org.apache.activemq,org.apache.activemq.pool,org.apache.camel.component.jms,org.springframework.*;version="3.0.6.RELEASE",org.apache.commons.logging,org.apache.streams.*,org.apache.streams.osgi.components,org.apache.streams.osgi.components.activityconsumer,org.apache.streams.osgi.components.activityconsumer.impl,org.apache.streams.osgi.components.activitysubscriber,org.apache.streams.osgi.components.activitysubscriber.impl,org.apache.streams.messaging.processors,org.apache.streams.messaging.aggregation,javax.jms, javax.net.ssl, javax.transaction.xa, org.apache.activemq.advisory, org.apache.activemq.blob, org.apache.activemq.broker, org.apache.activemq.broker.region, org.apache.activemq.command, org.apache.activemq.filter, org.apache.activemq.jndi, org.apache.activemq.management, org.apache.activemq.selector, org.apache.activemq.sta
te, org.apache.activemq.thread, org.apache.activemq.transaction, org.apache.activemq.transport, org.apache.activemq.transport.failover, org.apache.activemq.transport.tcp, org.apache.activemq.usage, org.apache.activemq.util, org.slf4j,org.codehaus.jackson;version="${jackson.version}",javax.xml.datatype, javax.xml.namespace, javax.xml.parsers, org.joda.time, org.joda.time.format, org.w3c.dom, org.w3c.dom.bootstrap, org.w3c.dom.ls, org.xml.sax, org.apache.rave.model, org.apache.rave.portal.model.impl, backtype.storm, backtype.storm.coordination, backtype.storm.generated, backtype.storm.spout, backtype.storm.task, backtype.storm.topology, backtype.storm.topology.base, backtype.storm.tuple, javax.annotation, backtype.storm.utils</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>2.9.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-camel</artifactId>
- <version>5.5.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-pool</artifactId>
- <version>5.5.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>3.0.6.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>3.0.6.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mrbean</artifactId>
- <version>${jackson.old.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.old.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.streams.osgi.components</groupId>
- <artifactId>activity-registration</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.streams.osgi.components</groupId>
- <artifactId>activity-consumer</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.streams.osgi.components</groupId>
- <artifactId>activity-subscriber</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-persist-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-core</artifactId>
- <version>${rave.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-core-api</artifactId>
- <version>${rave.version}</version>
- </dependency>
-
- <dependency>
- <groupId>storm</groupId>
- <artifactId>storm</artifactId>
- <version>0.8.2</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-testing</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/aggregation/ActivityAggregator.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/aggregation/ActivityAggregator.java b/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/aggregation/ActivityAggregator.java
deleted file mode 100644
index dc7ba0c..0000000
--- a/streams-runtimes/streams-runtime-webapp/src/main/java/org/apache/streams/messaging/aggregation/ActivityAggregator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.messaging.aggregation;
-
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.streams.messaging.service.impl.CassandraActivityService;
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriber;
-import org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriberWarehouse;
-import org.springframework.scheduling.annotation.Scheduled;
-
-import java.util.*;
-
-public class ActivityAggregator {
-
- private ActivityStreamsSubscriberWarehouse activityStreamsSubscriberWarehouse;
- private CassandraActivityService activityService;
- private static final transient Log LOG = LogFactory.getLog(ActivityAggregator.class);
-
- public void setActivityStreamsSubscriberWarehouse(ActivityStreamsSubscriberWarehouse activityStreamsSubscriberWarehouse) {
- this.activityStreamsSubscriberWarehouse = activityStreamsSubscriberWarehouse;
- }
-
- public void setActivityService(CassandraActivityService activityService) {
- this.activityService = activityService;
- }
-
- @Scheduled(fixedRate=30000)
- public void distributeToSubscribers() {
- for (ActivityStreamsSubscriber subscriber : activityStreamsSubscriberWarehouse.getAllSubscribers()) {
- updateSubscriber(subscriber);
- }
- }
-
- public void updateSubscriber(ActivityStreamsSubscriber subscriber){
- Set<String> activities = new TreeSet<String>();
- activities.addAll(activityService.getActivitiesForFilters(subscriber.getActivityStreamsSubscriberConfiguration().getFilters(), subscriber.getLastUpdated()));
- //TODO: an activity posted in between the cql query and setting the lastUpdated field will be lost
- subscriber.setLastUpdated(new Date());
- subscriber.receive(new ArrayList<String>(activities));
- }
-}
[3/4] incubator-streams git commit: resolves STREAMS-410
Posted by sb...@apache.org.
resolves STREAMS-410
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/ce7aa24d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/ce7aa24d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/ce7aa24d
Branch: refs/heads/master
Commit: ce7aa24dab5a417a0470a0ce8e0f7cd2f3520271
Parents: a726b3c
Author: Elias Ponvert <ep...@gmail.com>
Authored: Tue Oct 11 17:02:40 2016 -0500
Committer: Elias Ponvert <ep...@gmail.com>
Committed: Tue Oct 11 17:02:40 2016 -0500
----------------------------------------------------------------------
pom.xml | 1 -
.../streams-processor-lucene/pom.xml | 163 ---------
.../lucene/LuceneSimpleTaggingProcessor.java | 355 -------------------
.../lucene/LuceneTaggerConfiguration.json | 29 --
.../lucene/TestLucenSimpleTaggingProcessor.java | 171 ---------
.../src/test/resources/TestTags.tsv | 2 -
streams-contrib/streams-processor-tika/pom.xml | 162 ---------
.../org/apache/streams/tika/CategoryParser.java | 114 ------
.../org/apache/streams/tika/TikaProcessor.java | 139 --------
.../apache/streams/tika/BoilerPipeArticle.json | 76 ----
.../apache/streams/tika/TestCategoryParser.java | 30 --
.../apache/streams/tika/TestTikaProcessor.java | 29 --
.../activity-consumer/osgi.bnd | 9 -
.../activity-consumer/pom.xml | 171 ---------
.../activityconsumer/ActivityConsumer.java | 39 --
.../ActivityConsumerWarehouse.java | 31 --
.../impl/ActivityConsumerWarehouseImpl.java | 57 ---
.../impl/PushActivityConsumer.java | 106 ------
.../spring/activity-consumer-context.xml | 28 --
.../META-INF/spring/activity-consumer-osgi.xml | 29 --
.../src/main/resources/readme.txt | 1 -
.../activity-registration/osgi.bnd | 9 -
.../activity-registration/pom.xml | 130 -------
.../ActivityPublisherRegistration.java | 29 --
.../ActivityStreamsSubscriberRegistration.java | 29 --
.../impl/ActivityPublisherRegistrationImpl.java | 67 ----
...tivityStreamsSubscriberRegistrationImpl.java | 67 ----
.../activity-registration-context-osgi.xml | 30 --
.../spring/activity-registration-context.xml | 29 --
.../src/main/resources/readme.txt | 1 -
.../activity-subscriber/osgi.bnd | 9 -
.../activity-subscriber/pom.xml | 134 -------
.../ActivityStreamsSubscriber.java | 38 --
.../ActivityStreamsSubscriberWarehouse.java | 34 --
.../ActivityStreamsSubscription.java | 38 --
.../ActivityStreamsSubscriptionFilter.java | 34 --
.../ActivityStreamsSubscriptionOutput.java | 47 ---
.../impl/ActivityStreamsSubscriberDelegate.java | 126 -------
.../ActivityStreamsSubscriberWarehouseImpl.java | 60 ----
...yStreamsSubscriptionCassandraFilterImpl.java | 42 ---
.../impl/ActivityStreamsSubscriptionImpl.java | 74 ----
...vityStreamsSubscriptionLuceneFilterImpl.java | 43 ---
.../spring/activity-subscriber-context.xml | 28 --
.../spring/activity-subscriber-osgi.xml | 29 --
.../src/main/resources/readme.txt | 1 -
.../src/site/resources/readme.txt | 1 -
streams-osgi-components/pom.xml | 43 ---
streams-runtimes/pom.xml | 1 -
.../jsonschema/SparkRuntimeConfiguration.json | 27 --
.../streams-runtime-webapp/README.md | 8 -
streams-runtimes/streams-runtime-webapp/pom.xml | 250 -------------
.../aggregation/ActivityAggregator.java | 59 ---
.../configuration/EipConfigurator.java | 201 -----------
.../ActivityPublisherRegistrationProcessor.java | 72 ----
...yStreamsSubscriberRegistrationProcessor.java | 93 -----
.../routers/ActivityConsumerRouteBuilder.java | 32 --
.../ActivityStreamsSubscriberRouteBuilder.java | 32 --
.../routers/impl/ActivityConsumerRouter.java | 144 --------
.../impl/ActivityStreamsSubscriberRouter.java | 141 --------
.../messaging/service/ActivityService.java | 31 --
.../messaging/service/SubscriptionService.java | 29 --
.../service/impl/CassandraActivityService.java | 96 -----
.../impl/CassandraSubscriptionService.java | 43 ---
.../META-INF/spring/propertiesLoader.xml | 35 --
.../spring/streams-eip-applicationContext.xml | 113 ------
.../streams-eip-osgi-component-import.xml | 38 --
.../META-INF/spring/streamsCamelContext.xml | 96 -----
.../main/resources/META-INF/streams.properties | 41 ---
.../impl/CassandraActivityServiceTest.java | 86 -----
69 files changed, 4582 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d51b25f..466e94b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,6 @@
<module>streams-contrib</module>
<module>streams-components</module>
<module>streams-monitoring</module>
- <!--<module>streams-osgi-components</module>-->
<module>streams-pojo</module>
<module>streams-pojo-extensions</module>
<module>streams-runtimes</module>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-contrib/streams-processor-lucene/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-lucene/pom.xml b/streams-contrib/streams-processor-lucene/pom.xml
deleted file mode 100644
index d8dba13..0000000
--- a/streams-contrib/streams-processor-lucene/pom.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>streams-processor-lucene</artifactId>
-
- <parent>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-contrib</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <properties>
- <!-- This is the Version Number for the Apache Streams Project -->
- <streams.version>0.1-SNAPSHOT</streams.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-config</artifactId>
- <version>${streams.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-core</artifactId>
- <version>${streams.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-pojo</artifactId>
- <version>${streams.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
- </dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path-assert</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-testing</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- </dependencies>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jsonschema2pojo/**/*.java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-source-jaxb2</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jaxb2</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/lucene/LuceneTaggerConfiguration.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.lucene</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-contrib/streams-processor-lucene/src/main/java/org/apache/streams/lucene/LuceneSimpleTaggingProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-lucene/src/main/java/org/apache/streams/lucene/LuceneSimpleTaggingProcessor.java b/streams-contrib/streams-processor-lucene/src/main/java/org/apache/streams/lucene/LuceneSimpleTaggingProcessor.java
deleted file mode 100644
index 2595afd..0000000
--- a/streams-contrib/streams-processor-lucene/src/main/java/org/apache/streams/lucene/LuceneSimpleTaggingProcessor.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.lucene;
-
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.google.inject.Injector;
-import com.jayway.jsonpath.InvalidPathException;
-import com.jayway.jsonpath.JsonPath;
-import com.w2olabs.core.graph.CommunityRepository;
-import com.w2olabs.core.graph.CommunityRepositoryResolver;
-import com.w2olabs.core.graph.entities.Entity;
-import com.w2olabs.streams.pojo.W2OActivity;
-import com.w2olabs.util.guice.GuiceInjector;
-import com.w2olabs.util.tagging.SimpleVerbatim;
-import com.w2olabs.util.tagging.engines.international.LanguageTag;
-import com.w2olabs.util.tagging.engines.international.TaggingEngineLanguage;
-import org.apache.avro.data.Json;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.core.StreamsProcessor;
-import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.pojo.json.Activity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.*;
-import java.util.concurrent.LinkedBlockingQueue;
-
-/**
- * References:
- * Some helpful references to help
- * Purpose URL
- * ------------- ----------------------------------------------------------------
- * [Status Codes] http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
- * [Test Cases] http://greenbytes.de/tech/tc/httpredirects/
- * [t.co behavior] https://dev.twitter.com/docs/tco-redirection-behavior
- */
-
-public class LuceneSimpleTaggingProcessor implements StreamsProcessor
-{
- private final static String STREAMS_ID = "LuceneSimpleTaggingProcessor";
-
- private final static Logger LOGGER = LoggerFactory.getLogger(LuceneSimpleTaggingProcessor.class);
-
- private ObjectMapper mapper;
-
- private Queue<StreamsDatum> inQueue;
- private Queue<StreamsDatum> outQueue;
-
- private String community;
- private JsonPath[] textPaths;
- private String[] jsonPathsToText;
- private List<LanguageTag> tags;
- private String metaDataKey;
-
- private static TaggingEngineLanguage<LanguageTag, SimpleVerbatim> taggingEngine;
-
- /**
- * Constructor for a tagging processor that will operate on the document of StreamsDatum at the paths noted by
- * the json paths paramter
- * @param community
- * @param jsonPathsToText
- */
- public LuceneSimpleTaggingProcessor(String community, String[] jsonPathsToText) {
- this(community, jsonPathsToText, null, null);
- }
-
- /**
- * Constructor for a tagging processor that will operate on some meta data field of the StreamsDatum indicated by the
- * meta data key. The data in the meta data field is still expected to be json or able to be converted to json or
- * a list of such data.
- * @param community
- * @param jsonPathsToText
- * @param metaDataKey
- */
- public LuceneSimpleTaggingProcessor(String community, String[] jsonPathsToText, String metaDataKey) {
- this(community, jsonPathsToText, metaDataKey, null);
- }
-
-
- /**
- * For testing purposes. LanguageTag are not serializable and need to be set through the community resolver in production.
- * @param community
- * @param jsonPathsToText
- * @param tags
- */
- public LuceneSimpleTaggingProcessor(String community, String[] jsonPathsToText, String metaDataKey, List<LanguageTag> tags) {
- this.community = community;
- this.jsonPathsToText = jsonPathsToText;
- this.tags = tags;
- this.metaDataKey = metaDataKey;
- verifyJsonPathstoText(this.jsonPathsToText);
- }
-
-// public LuceneSimpleTaggingProcessor(Queue<StreamsDatum> inQueue) {
-// this.inQueue = inQueue;
-// this.outQueue = new LinkedBlockingQueue<StreamsDatum>();
-// }
-
-// public void stop() {
-//
-// }
-
- public String getCommunity() {
- return community;
- }
-
- public void setCommunity(String community) {
- this.community = community;
- }
-
- @Override
- public List<StreamsDatum> process(StreamsDatum entry) {
-
-
- LOGGER.debug("{} processing {}", STREAMS_ID, entry.getDocument().getClass());
-
- List<StreamsDatum> result = Lists.newArrayList();
-
- List<String> jsons = Lists.newLinkedList();
- ObjectNode node;
- // first check for valid json
- if(this.metaDataKey == null)
- jsons.add(getJson(entry.getDocument()));
- else
- getMetaDataJsons(entry, jsons);
-
- for(String json : jsons) {
- try {
- node = (ObjectNode) mapper.readTree(json);
- } catch (IOException e) {
- e.printStackTrace();
- return result;
- }
-
- List<SimpleVerbatim> verbatimList = convertEntryToWorkUnit(json);
- Map<SimpleVerbatim, List<LanguageTag>> objectTags = taggingEngine.findMatches(verbatimList);
- Set<String> tagSet = Sets.newHashSet();
- for( List<LanguageTag> fieldtags : objectTags.values() ) {
- for( LanguageTag tag : fieldtags ) {
- tagSet.add(tag.getTag());
- }
- }
-
- ArrayNode tagArray = JsonNodeFactory.instance.arrayNode();
- Set<String> tags = Sets.newHashSet();
- for( String tag : tagSet ) {
- if(tags.add(tag)){
- tagArray.add(tag);
- }
- }
-
-
-
- // need utility methods for get / create specific node
- ObjectNode extensions = (ObjectNode) node.get("extensions");
- if(extensions == null) {
- extensions = JsonNodeFactory.instance.objectNode();
- node.put("extensions", extensions);
- }
- ObjectNode w2o = (ObjectNode) extensions.get("w2o");
- if(w2o == null) {
- w2o = JsonNodeFactory.instance.objectNode();
- extensions.put("w2o", w2o);
- }
- w2o.put("tags", tagArray);
- w2o.put("contentTags", tagArray);
- if(entry.getDocument() instanceof W2OActivity) {
- entry.setDocument(mapper.convertValue(node, W2OActivity.class));
- }
- else if(entry.getDocument() instanceof Activity) {
- entry.setDocument(mapper.convertValue(node, Activity.class));
- }
- else if(entry.getDocument() instanceof String) {
- try {
- entry.setDocument(mapper.writeValueAsString(node));
- } catch (JsonProcessingException jpe) {
- LOGGER.error("Exception while converting ObjectNode to string. Outputing as ObjectNode. {}", jpe);
- entry.setDocument(node);
- }
- }
- else {
- entry.setDocument(node);
- }
- result.add(entry);
- }
- return result;
- }
-
- private void getMetaDataJsons(StreamsDatum datum, List<String> jsons) {
- if(datum.getMetadata() == null)
- return;
- Object obj = datum.getMetadata().get(this.metaDataKey);
- if(obj == null) {
- LOGGER.debug("Object at key={} was NULL.", this.metaDataKey);
- return;
- }
- if(obj instanceof List) {
- List list = (List) obj;
- String json;
- for(Object o : list) {
- json = getJson(o);
- if(json != null) {
- jsons.add(json);
- }
- }
- }
- else {
- String json = getJson(obj);
- if(json != null) {
- jsons.add(json);
- }
- }
- }
-
- private String getJson(Object object) {
- String json = null;
- if( object instanceof String ) {
- json = (String) object;
- } else if(object instanceof Activity){
- try {
- json = mapper.writeValueAsString(object);
- } catch (JsonProcessingException jpe) {
- json = null;
- LOGGER.error("Failed to convert Activity to String : {}", jpe);
- }
- } else {
- ObjectNode node = (ObjectNode) object;
- json = node.asText();
- }
- return json;
- }
-
- @Override
- public void prepare(Object o) {
- mapper = StreamsJacksonMapper.getInstance();
- if(this.tags == null) {
- resolver = injector.getInstance(CommunityRepositoryResolver.class);
- repo = resolver.get(community);
- List<Entity> entities = repo.getTaggableEntities();
- taggingEngine = new TaggingEngineLanguage<LanguageTag, SimpleVerbatim>(createLanguageTagsFromRexsterTags(entities));
- }
- else {
- taggingEngine = new TaggingEngineLanguage<LanguageTag, SimpleVerbatim>(this.tags);
- }
- compileTextJsonPaths();
- }
-
- @Override
- public void cleanUp() {
-
- }
-
- private static List<LanguageTag> createLanguageTagsFromRexsterTags(List<Entity> graphTags) {
- List<LanguageTag> result = new ArrayList<LanguageTag>(graphTags.size());
- LOGGER.info("Attempting to convert {} Graph tags into Language tags.", graphTags.size());
- String tagLang;
- for(Entity tag : graphTags) {
-// net.sf.json.JSONObject json = null;
- try {
-// json = (net.sf.json.JSONObject) tag;
- tagLang = tag.getAdditionalProperties().get("language") == null ? "en" : tag.getAdditionalProperties().get("language").toString();
- } catch (Exception e) {
- tagLang = "en";
- }
- LOGGER.debug("Tag : {}\n{}\n{}", new String[] {tag.getIdentifier(),tag.getQuery(),tagLang});
- if(TaggingEngineLanguage.SUPPORTED.contains(tagLang)) {
- try {
- result.add(new LanguageTag(tag.getIdentifier(),tag.getQuery(), tagLang));
- } catch (Exception e) {
- e.printStackTrace();
- //result.add(new LanguageTag(tag.getIdentifier(), tag.getQuery(), tagLang));
- }
- }
- else {
- LOGGER.warn("Attempted to load a tag for Language, {}, but that language is not currently supported. SimpleTag is being ignored!");
- }
- }
- LOGGER.info("Loaded {} Language Tags. {} tags were not supported.", result.size(), graphTags.size() - result.size());
- return result;
- }
-
- // Does basic verification that paths are not null and in JsonPath syntax.
- private String[] verifyJsonPathstoText(String[] jsonPathsToText) {
- RuntimeException e = null;
- for(String path : jsonPathsToText) {
- if(StringUtils.isEmpty(path) || !path.matches("[$][.][a-zA-z0-9.]+")) {
- LOGGER.error("Invalid JsonPath path : {}", path);
- e = new RuntimeException("Invalid JsonPath paths!");
- }
- }
- if(e != null)
- throw e;
- return jsonPathsToText;
- }
-
- // Compiles jsonPathToText to JsonPath
- private void compileTextJsonPaths() {
- this.textPaths = new JsonPath[this.jsonPathsToText.length];
- for(int i=0; i < this.jsonPathsToText.length; ++i) {
- this.textPaths[i] = JsonPath.compile(this.jsonPathsToText[i]);
- }
- }
-
- private List<SimpleVerbatim> convertEntryToWorkUnit(String json) {
- List<SimpleVerbatim> textFields = new ArrayList<SimpleVerbatim>();
- for(JsonPath path : this.textPaths) {
- try {
- Object pathObject = path.read(json);
- if( pathObject instanceof String )
- textFields.add(new SimpleVerbatim((String) pathObject) );
- else if( pathObject instanceof List ) {
- List<String> pathObjectList = (List<String>) pathObject;
- for( String pathItem : pathObjectList ) {
- textFields.add(new SimpleVerbatim(pathItem) );
- }
- }
- } catch( InvalidPathException x ) {
- LOGGER.debug("{}: {}", x.getMessage(), path.getPath());
- } catch( ClassCastException x ) {
- LOGGER.warn(x.getMessage());
- }
- }
-
- if(textFields.size() == 0)
- return null;
-
- return textFields;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-contrib/streams-processor-lucene/src/main/jsonschema/org/apache/streams/lucene/LuceneTaggerConfiguration.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-lucene/src/main/jsonschema/org/apache/streams/lucene/LuceneTaggerConfiguration.json b/streams-contrib/streams-processor-lucene/src/main/jsonschema/org/apache/streams/lucene/LuceneTaggerConfiguration.json
deleted file mode 100644
index 048503e..0000000
--- a/streams-contrib/streams-processor-lucene/src/main/jsonschema/org/apache/streams/lucene/LuceneTaggerConfiguration.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "javaType" : "org.apache.streams.lucene.LuceneTaggerConfiguration",
- "javaInterfaces": ["java.io.Serializable"],
- "properties": {
- "tags": {
- "type": "array",
- "items": {
- "tag": {
- "type": "string",
- "description": "Tag Identifier"
- },
- "query": {
- "type": "string",
- "description": "Lucene Query"
- },
- "language": {
- "type": "string",
- "description": "Language"
- }
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-contrib/streams-processor-lucene/src/test/java/org/apache/streams/lucene/TestLucenSimpleTaggingProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-lucene/src/test/java/org/apache/streams/lucene/TestLucenSimpleTaggingProcessor.java b/streams-contrib/streams-processor-lucene/src/test/java/org/apache/streams/lucene/TestLucenSimpleTaggingProcessor.java
deleted file mode 100644
index 62355c5..0000000
--- a/streams-contrib/streams-processor-lucene/src/test/java/org/apache/streams/lucene/TestLucenSimpleTaggingProcessor.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.lucene;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import com.jayway.jsonpath.JsonPath;
-import com.w2olabs.streams.pojo.W2OActivity;
-import com.w2olabs.util.tagging.engines.international.LanguageTag;
-import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.pojo.json.Activity;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import java.util.List;
-import java.util.Scanner;
-
-/**
- * Created by rebanks on 3/18/14.
- */
-public class TestLucenSimpleTaggingProcessor {
-
- private static final String ACTIVITY_JSON = "{\"id\":\"id:twitter:post:410898682381615105\",\"actor\":{\"id\":\"91407775\",\"displayName\":\"winchester_ky\",\"attachments\":[],\"upstreamDuplicates\":[],\"downstreamDuplicates\":[]},\"verb\":\"post\",\"object\":{\"id\":\"id:twitter:410898682381615105\",\"objectType\":\"tweet\",\"attachments\":[],\"upstreamDuplicates\":[],\"downstreamDuplicates\":[]},\"published\":1386800854000,\"provider\":{\"id\":\"id:providers:twitter\",\"attachments\":[],\"upstreamDuplicates\":[],\"downstreamDuplicates\":[]},\"title\":\"\",\"content\":\"Men's Basketball baseball soccer Single-Game Tickets Available - A limited number of tickets remain for Kentucky's upcoming men's ... http://t.co/SH5YZGpdRx\",\"links\":[\"http://ow.ly/2C2XL1\"],\"extensions\":{\"twitter\":{\"created_at\":\"Wed Dec 11 22:27:34 +0000 2013\",\"id\":410898682381615105,\"id_str\":\"410898682381615105\",\"text\":\"Men's Basketball Single-Game Tickets Available - A limited number of t
ickets remain for Kentucky's upcoming men's ... http://t.co/SH5YZGpdRx\",\"source\":\"<a href=\\\"http://www.hootsuite.com\\\" rel=\\\"nofollow\\\">HootSuite</a>\",\"truncated\":false,\"in_reply_to_status_id\":null,\"in_reply_to_status_id_str\":null,\"in_reply_to_user_id\":null,\"in_reply_to_user_id_str\":null,\"in_reply_to_screen_name\":null,\"user\":{\"id\":91407775,\"id_str\":\"91407775\",\"name\":\"Winchester, KY\",\"screen_name\":\"winchester_ky\",\"location\":\"\",\"url\":null,\"description\":null,\"protected\":false,\"followers_count\":136,\"friends_count\":0,\"listed_count\":1,\"created_at\":\"Fri Nov 20 19:29:02 +0000 2009\",\"favourites_count\":0,\"utc_offset\":null,\"time_zone\":null,\"geo_enabled\":false,\"verified\":false,\"statuses_count\":1793,\"lang\":\"en\",\"contributors_enabled\":false,\"is_translator\":false,\"profile_background_color\":\"C0DEED\",\"profile_background_image_url\":\"http://abs.twimg.com/images/themes/theme1/bg.png\",\"profile_background_image_url_
https\":\"https://abs.twimg.com/images/themes/theme1/bg.png\",\"profile_background_tile\":false,\"profile_image_url\":\"http://pbs.twimg.com/profile_images/613854495/winchester_sociallogo_normal.jpg\",\"profile_image_url_https\":\"https://pbs.twimg.com/profile_images/613854495/winchester_sociallogo_normal.jpg\",\"profile_link_color\":\"0084B4\",\"profile_sidebar_border_color\":\"C0DEED\",\"profile_sidebar_fill_color\":\"DDEEF6\",\"profile_text_color\":\"333333\",\"profile_use_background_image\":true,\"default_profile\":true,\"default_profile_image\":false,\"following\":null,\"follow_request_sent\":null,\"notifications\":null},\"geo\":null,\"coordinates\":null,\"place\":null,\"contributors\":null,\"retweet_count\":0,\"favorite_count\":0,\"entities\":{\"hashtags\":[],\"symbols\":[],\"urls\":[{\"url\":\"http://t.co/SH5YZGpdRx\",\"expanded_url\":\"http://ow.ly/2C2XL1\",\"display_url\":\"ow.ly/2C2XL1\",\"indices\":[118,140]}],\"user_mentions\":[]},\"favorited\":false,\"retweeted\":false,
\"possibly_sensitive\":false,\"filter_level\":\"medium\",\"lang\":\"en\"},\"location\":{\"id\":\"id:twitter:410898682381615105\",\"coordinates\":null}}}\n";
- private static final String W2O_ACTIVITY_JSON = "{\"extensions\":{\"w2o\":{\"provider\":\"twitter\",\"analyzer\":\"romance_analyzer\",\"tags\":[\"brand-cascade\",\"language-en\",\"country-ca\"],\"contentTags\":[],\"linkTags\":[],\"lang\":{\"primaryLanguage\":\"en\"}},\"twitter\":{\"retweetCount\":0,\"entities\":{\"symbols\":[],\"urls\":[{\"expanded_url\":\"http://bit.ly/hUmoRz\",\"indices\":[77,99],\"display_url\":\"bit.ly/hUmoRz\",\"url\":\"http://t.co/Ytn45Pbttk\"}],\"hashtags\":[{\"text\":\"SmurfsVillage\",\"indices\":[100,114]}],\"user_mentions\":[{\"id\":188075479,\"name\":\"Beeline Interactive\",\"indices\":[115,128],\"screen_name\":\"BeelineGames\",\"id_str\":\"188075479\"}]}},\"gnip\":{\"matching_rules\":[{\"tag\":\"cascade_CA_CA_en\"}],\"klout_score\":10,\"urls\":[{\"expanded_url\":\"https://itunes.apple.com/us/app/smurfs-village/id399648212?mt=8\",\"url\":\"http://t.co/Ytn45Pbttk\"}],\"klout_profile\":{\"topics\":[],\"klout_user_id\":\"257268143479895040\",\"link\":\"h
ttp://klout.com/user/id/257268143479895040\"},\"language\":{\"value\":\"fr\"}}},\"id\":\"tag:search.twitter.com,2005:372802927385403392\",\"actor\":{\"id\":\"id:twitter.com:583891967\",\"image\":{\"url\":\"https://si0.twimg.com/sticky/default_profile_images/default_profile_1_normal.png\"},\"displayName\":\"Sabine Chappuis\",\"objectType\":\"person\",\"attachments\":[],\"upstreamDuplicates\":[],\"downstreamDuplicates\":[],\"twitterTimeZone\":\"Brussels\",\"friendsCount\":6,\"favoritesCount\":0,\"link\":\"http://www.twitter.com/spoffff\",\"postedTime\":\"2012-05-18T15:14:35.000Z\",\"links\":[{\"rel\":\"me\",\"href\":null}],\"listedCount\":0,\"languages\":[\"fr\"],\"verified\":false,\"utcOffset\":\"7200\",\"followersCount\":0,\"preferredUsername\":\"spoffff\",\"statusesCount\":87},\"verb\":\"post\",\"object\":{\"id\":\"object:search.twitter.com,2005:372802927385403392\",\"summary\":\"Le Grand Schtroumpf confirme que la cascade magique n'est \\\"Plus tr?\ufffds loin.\\\" http://t.co/Ytn45P
bttk #SmurfsVillage @BeelineGames\",\"objectType\":\"note\",\"attachments\":[],\"upstreamDuplicates\":[],\"downstreamDuplicates\":[],\"link\":\"http://twitter.com/spoffff/statuses/372802927385403392\",\"postedTime\":\"2013-08-28T19:28:38.000Z\"},\"published\":1377718118000,\"generator\":{\"id\":\"{link}\",\"displayName\":\"Smurfs' Village on iOS\",\"attachments\":[],\"upstreamDuplicates\":[],\"downstreamDuplicates\":[],\"link\":\"https://itunes.apple.com/us/app/smurfs-village/id399648212?mt=8&uo=4\"},\"provider\":{\"id\":\"{link}\",\"displayName\":\"Twitter\",\"objectType\":\"service\",\"attachments\":[],\"upstreamDuplicates\":[],\"downstreamDuplicates\":[],\"link\":\"http://www.twitter.com\"},\"content\":\"Le Grand Schtroumpf confirme soccer que la cascade magique n'est \\\"Plus tr?\ufffds loin.\\\" http://t.co/Ytn45Pbttk #SmurfsVillage @BeelineGames\",\"links\":[],\"guid\":\"A8fccSz7rpKfDJY078VLyw==_201308\",\"link\":\"http://twitter.com/spoffff/statuses/372802927385403392\",\"posted
Time\":\"2013-08-28T19:28:38.000Z\",\"objectType\":\"activity\",\"twitter_filter_level\":\"medium\"}\n";
- private static final String LINK_EXPANDER_JSON = "{\"body\":\"Analise baseball Coady W2O Lead, EMEA Twitter Linkedin\\nRyan Flinn Director, Earned Media Twitter Linkedin\\nAdam Cohen W2O Lead, Boston Twitter Linkedin\\nSarah Savage Managing Director, Healthcare Twitter Linkedin\\nCarolyn Wang Practice Lead, Healthcare Twitter Linkedin\\nKathy Keanini Group Director, Strategy Twitter Linkedin\\nRob Cronin Practice Lead, Healthcare Twitter Linkedin\\nAnalise Coady W2O Lead, EMEA Twitter Linkedin\\nRyan Flinn Director, Earned Media Twitter Linkedin\\nAdam Cohen W2O Lead, Boston Twitter Linkedin\\nSarah Savage Managing Director, Healthcare Twitter Linkedin\\nCarolyn Wang Practice Lead, Healthcare Twitter Linkedin\\nKathy Keanini Group Director, Strategy Twitter Linkedin\\nRob Cronin Practice Lead, Healthcare Twitter Linkedin\\nOur Thinkers\\nFull-on enterprise consulting, supercharged by the best analytics in the business.\\nProducts & Services\\nMedia\\nPaid. Earned. Shared. Owned.
You name it, we either mastered it or just invented it.\\nthe w2o group\\n� W2O Group 2014\\n\",\"finalUrl\":\"http://www.wcgworld.com/\",\"locale\":null,\"twitterSite\":null,\"urlParts\":[\"www.wcgworld.com\"],\"twitterCreator\":null,\"finalStatusCode\":\"200\",\"author\":null,\"originalUrl\":\"http://www.wcgworld.com/\",\"title\":\"WCG World\",\"description\":\"Find out what makes The WCG Approach second to none\",\"redirects\":[],\"domain\":\"www.wcgworld.com\",\"wasRedirected\":false,\"facebookApp\":null,\"metaData\":{\"content-type\":\"text/html; charset=UTF-8\",\"viewport\":\"width=device-width, initial-scale=1\",\"title\":\"WCG World\",\"og:title\":\"WCG World\",\"og:description\":\"Find out what makes The WCG Approach second to none\",\"content-encoding\":\"UTF-8\",\"x-ua-compatible\":\"IE=edge\",\"og:site_name\":\"WCG World\",\"dc:title\":\"WCG World\",\"og:image\":\"http://www.wcgworld.com/assets/img/home_banner.png\",\"og:url\":\"http://www.wcgworld.com/\"},\"normalized
Url\":\"www.wcgworld.com/\",\"keywords\":[\"keywords\",\"news_keywords\"],\"status\":\"SUCCESS\",\"isTracked\":false,\"medium\":null,\"facebookPage\":null,\"failure\":false,\"lastModifiedDate\":null,\"tookInMillis\":110,\"publishedDate\":null,\"siteStatus\":\"ERROR\",\"imageURL\":\"http://www.wcgworld.com/assets/img/home_banner.png\",\"plainText\":null}\n";
-
- private static List<LanguageTag> tags;
- private static ObjectMapper mapper;
-
-
- @BeforeClass
- public static void setUpTags() {
- tags = Lists.newLinkedList();
- Scanner scanner = new Scanner(TestLucenSimpleTaggingProcessor.class.getResourceAsStream("/TestTags.tsv"));
- while(scanner.hasNextLine()) {
- String[] line = scanner.nextLine().split("\t");
- tags.add(new LanguageTag(line[0], line[1], "en"));
- }
- mapper = new ObjectMapper();
- }
-
- @Test
- public void testSerializability() {
- LuceneSimpleTaggingProcessor processor = new LuceneSimpleTaggingProcessor("testCommunity", new String[]{"test","path"});
- LuceneSimpleTaggingProcessor clone = SerializationUtils.clone(processor);
- }
-
- @Test
- public void testActivityJsonString() {
- LuceneSimpleTaggingProcessor processor = new LuceneSimpleTaggingProcessor("test", new String[] {"$.content"}, null,tags);
- processor.prepare(null);
- List<StreamsDatum> datums = processor.process(new StreamsDatum(ACTIVITY_JSON));
- assertNotNull(datums);
- assertEquals(1, datums.size());
- StreamsDatum datum = datums.get(0);
- assertNotNull(datum);
- assertNotNull(datum.getDocument());
- assertTrue(datum.getDocument() instanceof String);
- String json = (String)datum.getDocument();
- List<String> tags = JsonPath.read(json, "$.extensions.w2o.tags");
- assertEquals(2, tags.size());
- assertTrue(tags.contains("baseball"));
- assertTrue(tags.contains("soccer"));
- tags = JsonPath.read(json, "$.extensions.w2o.contentTags");
- assertEquals(2, tags.size());
- assertTrue(tags.contains("baseball"));
- assertTrue(tags.contains("soccer"));
- }
-
- @Test
- public void testW2OActivityJsonString() {
- LuceneSimpleTaggingProcessor processor = new LuceneSimpleTaggingProcessor("test", new String[] {"$.content"}, null,tags);
- processor.prepare(null);
- List<StreamsDatum> datums = processor.process(new StreamsDatum(W2O_ACTIVITY_JSON));
- assertNotNull(datums);
- assertEquals(1, datums.size());
- StreamsDatum datum = datums.get(0);
- assertNotNull(datum);
- assertNotNull(datum.getDocument());
- assertTrue(datum.getDocument() instanceof String);
- String json = (String)datum.getDocument();
- List<String> tags = JsonPath.read(json, "$.extensions.w2o.tags");
- assertEquals(1, tags.size());
- assertTrue(tags.contains("soccer"));
- tags = JsonPath.read(json, "$.extensions.w2o.contentTags");
- assertEquals(1, tags.size());
- assertTrue(tags.contains("soccer"));
- }
-
- @Test
- public void testLinkExpanderJsonString() {
- LuceneSimpleTaggingProcessor processor = new LuceneSimpleTaggingProcessor("test", new String[] {"$.body"}, null, tags);
- processor.prepare(null);
- List<StreamsDatum> datums = processor.process(new StreamsDatum(LINK_EXPANDER_JSON));
- assertNotNull(datums);
- assertEquals(1, datums.size());
- StreamsDatum datum = datums.get(0);
- assertNotNull(datum);
- assertNotNull(datum.getDocument());
- assertTrue(datum.getDocument() instanceof String);
- String json = (String)datum.getDocument();
- List<String> tags = JsonPath.read(json, "$.extensions.w2o.tags");
- assertEquals(1, tags.size());
- assertTrue(tags.contains("baseball"));
- tags = JsonPath.read(json, "$.extensions.w2o.contentTags");
- assertEquals(1, tags.size());
- assertTrue(tags.contains("baseball"));
- }
-
- @Test
- public void testActivityObject() throws Exception {
- LuceneSimpleTaggingProcessor processor = new LuceneSimpleTaggingProcessor("test", new String[] {"$.content"}, null,tags);
- processor.prepare(null);
- List<StreamsDatum> datums = processor.process(new StreamsDatum(mapper.readValue(ACTIVITY_JSON, Activity.class)));
- assertNotNull(datums);
- assertEquals(1, datums.size());
- StreamsDatum datum = datums.get(0);
- assertNotNull(datum);
- assertNotNull(datum.getDocument());
- assertTrue(datum.getDocument() instanceof Activity);
- String json = mapper.writeValueAsString(datum.getDocument());
- List<String> tags = JsonPath.read(json, "$.extensions.w2o.tags");
- assertEquals(2, tags.size());
- assertTrue(tags.contains("baseball"));
- assertTrue(tags.contains("soccer"));
- tags = JsonPath.read(json, "$.extensions.w2o.contentTags");
- assertEquals(2, tags.size());
- assertTrue(tags.contains("baseball"));
- assertTrue(tags.contains("soccer"));
- }
-
- @Test
- public void testW2OActivityObject() throws Exception{
- LuceneSimpleTaggingProcessor processor = new LuceneSimpleTaggingProcessor("test", new String[] {"$.content"}, null,tags);
- processor.prepare(null);
- List<StreamsDatum> datums = processor.process(new StreamsDatum(mapper.readValue(W2O_ACTIVITY_JSON, W2OActivity.class)));
- assertNotNull(datums);
- assertEquals(1, datums.size());
- StreamsDatum datum = datums.get(0);
- assertNotNull(datum);
- assertNotNull(datum.getDocument());
- assertTrue(datum.getDocument() instanceof W2OActivity);
- String json = (String) mapper.writeValueAsString(datum.getDocument());
- List<String> tags = JsonPath.read(json, "$.extensions.w2o.tags");
- assertEquals(1, tags.size());
- assertTrue(tags.contains("soccer"));
- tags = JsonPath.read(json, "$.extensions.w2o.contentTags");
- assertEquals(1, tags.size());
- assertTrue(tags.contains("soccer"));
- }
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-contrib/streams-processor-lucene/src/test/resources/TestTags.tsv
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-lucene/src/test/resources/TestTags.tsv b/streams-contrib/streams-processor-lucene/src/test/resources/TestTags.tsv
deleted file mode 100644
index c6ed3a7..0000000
--- a/streams-contrib/streams-processor-lucene/src/test/resources/TestTags.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-baseball baseball OR homerun OR "home run"
-soccer soccer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-contrib/streams-processor-tika/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-tika/pom.xml b/streams-contrib/streams-processor-tika/pom.xml
deleted file mode 100644
index 9969e29..0000000
--- a/streams-contrib/streams-processor-tika/pom.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>streams-processor-tika</artifactId>
-
- <parent>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-contrib</artifactId>
- <version>0.1-SNAPSHOT</version>
- </parent>
-
- <properties>
- <tika.version>1.5</tika.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-pojo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-processor-urls</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>${tika.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- <version>${tika.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-testing</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- </dependencies>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jsonschema2pojo/**/*.java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-source-jaxb2</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jaxb2</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/tika/LinkDetails.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.tika</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/CategoryParser.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/CategoryParser.java b/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/CategoryParser.java
deleted file mode 100644
index 18ff747..0000000
--- a/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/CategoryParser.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.tika;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.List;
-
-public class CategoryParser implements Serializable
-{
- /**
- * This method takes a URL and from that text alone determines what categories that URL belongs in.
- * @param url - String URL to categorize
- * @return categories - A List<String&rt; of categories the URL seemingly belongs in
- */
- public static List<String> getCategoriesFromUrl(String url) {
-
- // Clean the URL to remove useless bits and encoding artifacts
- String normalizedUrl = normalizeURL(url);
-
- // Break the url apart and get the good stuff
- String[] keywords = tokenizeURL(normalizedUrl);
-
- return null;
- }
-
- /**
- * Removes the protocol, if it exists, from the front and
- * removes any random encoding characters
- * Extend this to do other url cleaning/pre-processing
- * @param url - The String URL to normalize
- * @return normalizedUrl - The String URL that has no junk or surprises
- */
- private static String normalizeURL(String url)
- {
- // Decode URL to remove any %20 type stuff
- String normalizedUrl = url;
- try {
- // I've used a URLDecoder that's part of Java here,
- // but this functionality exists in most modern languages
- // and is universally called url decoding
- normalizedUrl = URLDecoder.decode(url, "UTF-8");
- }
- catch(UnsupportedEncodingException uee)
- {
- System.err.println("Unable to Decode URL. Decoding skipped.");
- uee.printStackTrace();
- }
-
- // Remove the protocol, http:// ftp:// or similar from the front
- if (normalizedUrl.contains("://"))
- normalizedUrl = normalizedUrl.split(":\\/\\/")[1];
-
- // Room here to do more pre-processing
-
- return normalizedUrl;
- }
-
- /**
- * Takes apart the url into the pieces that make at least some sense
- * This doesn't guarantee that each token is a potentially valid keyword, however
- * because that would require actually iterating over them again, which might be
- * seen as a waste.
- * @param url - Url to be tokenized
- * @return tokens - A String array of all the tokens
- */
- private static String[] tokenizeURL(String url)
- {
- // I assume that we're going to use the whole URL to find tokens in
- // If you want to just look in the GET parameters, or you want to ignore the domain
- // or you want to use the domain as a token itself, that would have to be
- // processed above the next line, and only the remaining parts split
- String[] tokens = url.split("\\b|_");
-
- // One could alternatively use a more complex regex to remove more invalid matches
- // but this is subject to your (?:in)?ability to actually write the regex you want
-
- // These next two get rid of tokens that are too short, also.
-
- // Destroys anything that's not alphanumeric and things that are
- // alphanumeric but only 1 character long
- //String[] tokens = url.split("(?:[\\W_]+\\w)*[\\W_]+");
-
- // Destroys anything that's not alphanumeric and things that are
- // alphanumeric but only 1 or 2 characters long
- //String[] tokens = url.split("(?:[\\W_]+\\w{1,2})*[\\W_]+");
-
- return tokens;
- }
-
- // How this would be used
- public static void main(String[] args)
- {
- List<String> soQuestionUrlClassifications = getCategoriesFromUrl("http://stackoverflow.com/questions/10046178/pattern-matching-for-url-classification");
- List<String> googleQueryURLClassifications = getCategoriesFromUrl("https://www.google.com/search?sugexp=chrome,mod=18&sourceid=chrome&ie=UTF-8&q=spring+is+a+new+service+instance+created#hl=en&sugexp=ciatsh&gs_nf=1&gs_mss=spring%20is%20a%20new%20bean%20instance%20created&tok=lnAt2g0iy8CWkY65Te75sg&pq=spring%20is%20a%20new%20bean%20instance%20created&cp=6&gs_id=1l&xhr=t&q=urlencode&pf=p&safe=off&sclient=psy-ab&oq=url+en&gs_l=&pbx=1&bav=on.2,or.r_gc.r_pw.r_cp.r_qf.,cf.osb&fp=2176d1af1be1f17d&biw=1680&bih=965");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/TikaProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/TikaProcessor.java b/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/TikaProcessor.java
deleted file mode 100644
index 6d66165..0000000
--- a/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/TikaProcessor.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.tika;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
-import com.google.common.collect.Lists;
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.core.StreamsProcessor;
-import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.pojo.json.Activity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-/**
- * References:
- * Some helpful references to help
- * Purpose URL
- * ------------- ----------------------------------------------------------------
- * [Status Codes] http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
- * [Test Cases] http://greenbytes.de/tech/tc/httpredirects/
- * [t.co behavior] https://dev.twitter.com/docs/tco-redirection-behavior
- */
-
-public class TikaProcessor implements StreamsProcessor
-{
- private final static String STREAMS_ID = "LinkCrawlerProcessor";
-
- private final static Logger LOGGER = LoggerFactory.getLogger(TikaProcessor.class);
-
- private ObjectMapper mapper;
-
- @Override
- public List<StreamsDatum> process(StreamsDatum entry) {
-
- List<StreamsDatum> result = Lists.newArrayList();
-
- LOGGER.debug("{} processing {}", STREAMS_ID, entry.getDocument().getClass());
-
- Activity activity;
-
- // get list of shared urls
- if( entry.getDocument() instanceof Activity) {
-
- activity = (Activity) entry.getDocument();
-
- }
- else if(entry.getDocument() instanceof String) {
-
- try {
- activity = mapper.readValue((String) entry.getDocument(), Activity.class);
- } catch (Exception e) {
- e.printStackTrace();
- LOGGER.warn(e.getMessage());
- return(Lists.newArrayList(entry));
- }
-
- }
- else throw new NotImplementedException();
-
- List<String> outputLinks = activity.getLinks();
- // for each
- for( String link : outputLinks ) {
-
- LOGGER.debug( "pulling {}", link);
-
- try {
- StreamsDatum outputDatum = expandLink(link, entry);
- if( outputDatum != null )
- result.add(outputDatum);
- } catch (Exception e) {
- //drop unexpandable links
- LOGGER.debug("Failed to expand link : {}", link);
- LOGGER.debug("Excpetion expanding link : {}", e);
- }
-
- }
-
- return result;
- }
-
- private StreamsDatum expandLink(String link, StreamsDatum input) {
-
- LinkCrawler expander = new LinkCrawler((String)link);
- expander.run();
- StreamsDatum datum = null;
- if(input.getId() == null)
- try {
- datum = new StreamsDatum(this.mapper.writeValueAsString(expander.getArticle()), expander.getFinalURL());
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- return null;
- }
- else
- try {
- datum = new StreamsDatum(this.mapper.writeValueAsString(expander.getArticle()), input.getId());
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- return null;
- }
- datum.setSequenceid(input.getSequenceid());
- datum.setMetadata(input.getMetadata());
- datum.setTimestamp(input.getTimestamp());
- return datum;
-
- }
-
- @Override
- public void prepare(Object o) {
- this.mapper = StreamsJacksonMapper.getInstance();
- this.mapper.registerModule(new JsonOrgModule());
- }
-
- @Override
- public void cleanUp() {
-
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-contrib/streams-processor-tika/src/main/jsonschema/org/apache/streams/tika/BoilerPipeArticle.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-tika/src/main/jsonschema/org/apache/streams/tika/BoilerPipeArticle.json b/streams-contrib/streams-processor-tika/src/main/jsonschema/org/apache/streams/tika/BoilerPipeArticle.json
deleted file mode 100644
index 58f817e..0000000
--- a/streams-contrib/streams-processor-tika/src/main/jsonschema/org/apache/streams/tika/BoilerPipeArticle.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "properties": {
- "siteStatus" : {
- "type" : "string",
- "enum" : ["SUCCESS", "ERROR"]
- },
- "title": {
- "type": "string"
- },
- "description": {
- "type": "string"
- },
- "body": {
- "type": "string"
- },
- "plainText": {
- "type": "string"
- },
- "medium": {
- "type": "string"
- },
- "author": {
- "type": "string"
- },
- "locale": {
- "type": "string"
- },
- "publishedDate": {
- "type": "string",
- "format" : "date-time"
- },
- "lastModifiedDate": {
- "type": "string",
- "format" : "date-time"
- },
- "imageURL": {
- "type": "string"
- },
- "languageDetected": {
- "type": "object",
- "properties": {
- "languageCode": {
- "type": "string"
- },
- "isLanguageReasonablyCertain": {
- "type": "boolean"
- }
- }
- },
- "keywords": {
- "type": "array",
- "uniqueItems": true,
- "items": {
- "type": "string"
- }
- },
- "twitterCreator": {
- "type": "string"
- },
- "twitterSite": {
- "type": "string"
- },
- "facebookPage": {
- "type": "string"
- },
- "facebookApp": {
- "type": "string"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-contrib/streams-processor-tika/src/test/java/org/apache/streams/tika/TestCategoryParser.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-tika/src/test/java/org/apache/streams/tika/TestCategoryParser.java b/streams-contrib/streams-processor-tika/src/test/java/org/apache/streams/tika/TestCategoryParser.java
deleted file mode 100644
index f89006a..0000000
--- a/streams-contrib/streams-processor-tika/src/test/java/org/apache/streams/tika/TestCategoryParser.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.*/
-
-package org.apache.streams.tika;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.junit.Test;
-
-public class TestCategoryParser {
-
- @Test
- public void testSerializability() {
- CategoryParser parser = new CategoryParser();
- CategoryParser clone = SerializationUtils.clone(parser);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-contrib/streams-processor-tika/src/test/java/org/apache/streams/tika/TestTikaProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-tika/src/test/java/org/apache/streams/tika/TestTikaProcessor.java b/streams-contrib/streams-processor-tika/src/test/java/org/apache/streams/tika/TestTikaProcessor.java
deleted file mode 100644
index 35f2d49..0000000
--- a/streams-contrib/streams-processor-tika/src/test/java/org/apache/streams/tika/TestTikaProcessor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.*/
-
-package org.apache.streams.tika;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.junit.Test;
-
-public class TestTikaProcessor {
- @Test
- public void testSerializability() {
- TikaProcessor processor = new TikaProcessor();
- TikaProcessor clone = SerializationUtils.clone(processor);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-consumer/osgi.bnd
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-consumer/osgi.bnd b/streams-osgi-components/activity-consumer/osgi.bnd
deleted file mode 100644
index 53f60f9..0000000
--- a/streams-osgi-components/activity-consumer/osgi.bnd
+++ /dev/null
@@ -1,9 +0,0 @@
-#--------------------------------------------------------------------------------
-# Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
-#--------------------------------------------------------------------------------
-
-#-----------------------------------------------------------------
-# Use this file to add customized Bnd instructions for the bundle
-#-----------------------------------------------------------------
-
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-consumer/pom.xml
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-consumer/pom.xml b/streams-osgi-components/activity-consumer/pom.xml
deleted file mode 100644
index 72d4e71..0000000
--- a/streams-osgi-components/activity-consumer/pom.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.streams.osgi.components</groupId>
- <artifactId>streams-osgi-components</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
- </parent>
-
- <artifactId>activity-consumer</artifactId>
- <name>${bundle.symbolicName} [${bundle.namespace}]</name>
-
- <packaging>bundle</packaging>
-
- <properties>
- <bundle.symbolicName>activity-consumer-bundle</bundle.symbolicName>
- <bundle.namespace>org.apache.streams.osgi.components.activityconsumer</bundle.namespace>
- <commons.log>1.1</commons.log><!--
- <jackson.version>1.9.11</jackson.version>-->
- <jackson.old.version>1.9.11</jackson.old.version>
- </properties>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <!--
- | example additional resource entries, useful when building Eclipse RCP applications
- -->
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin.xml</include>
- <include>plugin.properties</include>
- <include>icons/**</include>
- </includes>
- </resource>
- </resources>
- <plugins>
-
- <plugin>
- <groupId>org.ops4j</groupId>
- <artifactId>maven-pax-plugin</artifactId>
- <!--
- | enable improved OSGi compilation support for the bundle life-cycle.
- | to switch back to the standard bundle life-cycle, move this setting
- | down to the maven-bundle-plugin section
- -->
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <!--
- | the following instructions build a simple set of public/private classes into an OSGi bundle
- -->
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>${bundle.namespace};version="${project.version}",org.apache.streams.osgi.components.activityconsumer.impl</Export-Package>
- <Private-Package>${bundle.namespace}.impl.*</Private-Package>
- <Import-Package>org.apache.streams.osgi.components.activityconsumer,org.apache.streams.osgi.components.activityconsumer.impl,org.apache.commons.logging,org.codehaus.jackson.*;version="${jackson.version}",javax.xml.datatype, javax.xml.namespace, javax.xml.parsers, org.joda.time, org.joda.time.format, org.w3c.dom, org.w3c.dom.bootstrap, org.w3c.dom.ls, org.xml.sax, org.apache.rave.model, org.apache.rave.portal.model.impl, org.apache.streams.cassandra.model
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mrbean</artifactId>
- <version>${jackson.old.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.old.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>${commons.log}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-core</artifactId>
- <version>${rave.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-core-api</artifactId>
- <version>${rave.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-persist-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-testing</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumer.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumer.java b/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumer.java
deleted file mode 100644
index 2fd6bd3..0000000
--- a/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activityconsumer;
-
-
-import org.codehaus.jackson.annotate.JsonTypeInfo;
-
-import java.net.URI;
-
-
-@JsonTypeInfo(use= JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="@class")
-public interface ActivityConsumer {
- public String receive(String activity);
- public void init();
- public URI getSrc();
- public void setSrc(String src);
- public void setInRoute(String route);
- public String getInRoute();
- public String getAuthToken();
- public void setAuthToken(String token);
- public boolean isAuthenticated();
- public void setAuthenticated(boolean authenticated);
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumerWarehouse.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumerWarehouse.java b/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumerWarehouse.java
deleted file mode 100644
index 9153d26..0000000
--- a/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumerWarehouse.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activityconsumer;
-
-/**
- * Public API representing an example OSGi service
- */
-public interface ActivityConsumerWarehouse {
-
- public void register(ActivityConsumer activityConsumer);
- public ActivityConsumer findConsumerBySrc(String src);
- public int getConsumersCount();
-
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/ActivityConsumerWarehouseImpl.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/ActivityConsumerWarehouseImpl.java b/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/ActivityConsumerWarehouseImpl.java
deleted file mode 100644
index 5e40ba5..0000000
--- a/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/ActivityConsumerWarehouseImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activityconsumer.impl;
-
-import java.util.Date;
-import java.util.HashMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.streams.osgi.components.activityconsumer.ActivityConsumerWarehouse;
-import org.apache.streams.osgi.components.activityconsumer.ActivityConsumer;
-
-public class ActivityConsumerWarehouseImpl implements ActivityConsumerWarehouse {
- private static final transient Log LOG = LogFactory.getLog(ActivityConsumerWarehouseImpl.class);
-
- private HashMap<String,ActivityConsumer> consumers;
-
- public ActivityConsumerWarehouseImpl(){
- consumers = new HashMap<String, ActivityConsumer>();
- }
-
- public void register(ActivityConsumer activityConsumer) {
-
- //key in warehouse is the activity publisher URI source
- consumers.put(activityConsumer.getSrc().toASCIIString(), activityConsumer);
- activityConsumer.init();
-
-
- }
-
- public ActivityConsumer findConsumerBySrc(String src){
- return consumers.get(src);
- }
-
-
- public int getConsumersCount(){
- return consumers.size();
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce7aa24d/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/PushActivityConsumer.java
----------------------------------------------------------------------
diff --git a/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/PushActivityConsumer.java b/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/PushActivityConsumer.java
deleted file mode 100644
index 1d4a7c1..0000000
--- a/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/PushActivityConsumer.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.osgi.components.activityconsumer.impl;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.streams.cassandra.model.CassandraActivityStreamsEntry;
-import org.apache.streams.osgi.components.activityconsumer.ActivityConsumer;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.ArrayList;
-
-public class PushActivityConsumer implements ActivityConsumer {
-
- private static final transient Log LOG = LogFactory.getLog(PushActivityConsumer.class);
-
- private URI src;
-
-
- private String authToken;
-
- private boolean authenticated;
-
- private String inRoute;
-
- public PushActivityConsumer(){
- }
-
-
- public URI getSrc() {
- return src;
- }
-
- public void setSrc(String src) {
- try{
- this.src = new URI(src);
-
- } catch (URISyntaxException e) {
- this.src=null;
- }
- }
-
- public String getAuthToken() {
- return authToken;
- }
-
- public void setAuthToken(String authToken) {
- this.authToken = authToken;
- }
-
- public boolean isAuthenticated() {
- return authenticated;
- }
-
- public void setAuthenticated(boolean authenticated) {
- this.authenticated = authenticated;
- }
-
- public String receive (String activity){
- //receive activities...do anything that is necessary
- LOG.info("a message I published: " + activity);
- return activity;
- //pass off to activity splitter
-
- }
-
- public List<String> split(String activities) {
- LOG.info("I am going to split this message: " + activities);
-
- List<String> activitiesList = new ArrayList<String>();
- activitiesList.add(activities);
- return activitiesList;
- }
-
- public void init(){
- //any initialization...
- }
-
- public String getInRoute() {
- return inRoute;
- }
-
- public void setInRoute(String inRoute) {
- this.inRoute = inRoute;
- }
-}