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 2014/03/22 00:19:43 UTC
[05/71] [abbrv] fixing STREAMS-26 branch
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streamsCamelContext.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streamsCamelContext.xml b/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streamsCamelContext.xml
deleted file mode 100644
index 4360f39..0000000
--- a/trunk/streams-eip-routes/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/6ea69f29/trunk/streams-eip-routes/src/main/resources/META-INF/streams.properties
----------------------------------------------------------------------
diff --git a/trunk/streams-eip-routes/src/main/resources/META-INF/streams.properties b/trunk/streams-eip-routes/src/main/resources/META-INF/streams.properties
deleted file mode 100644
index b7bbfce..0000000
--- a/trunk/streams-eip-routes/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/6ea69f29/trunk/streams-eip-routes/src/test/java/org/apache/streams/messaging/service/impl/CassandraActivityServiceTest.java
----------------------------------------------------------------------
diff --git a/trunk/streams-eip-routes/src/test/java/org/apache/streams/messaging/service/impl/CassandraActivityServiceTest.java b/trunk/streams-eip-routes/src/test/java/org/apache/streams/messaging/service/impl/CassandraActivityServiceTest.java
deleted file mode 100644
index d22826f..0000000
--- a/trunk/streams-eip-routes/src/test/java/org/apache/streams/messaging/service/impl/CassandraActivityServiceTest.java
+++ /dev/null
@@ -1,87 +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 org.springframework.beans.factory.annotation.Autowired;
-
-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");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-osgi-components/activity-consumer/osgi.bnd
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-consumer/osgi.bnd b/trunk/streams-osgi-components/activity-consumer/osgi.bnd
deleted file mode 100644
index 55bbd6d..0000000
--- a/trunk/streams-osgi-components/activity-consumer/osgi.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-#-----------------------------------------------------------------
-# Use this file to add customized Bnd instructions for the bundle
-#-----------------------------------------------------------------
-
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-osgi-components/activity-consumer/pom.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-consumer/pom.xml b/trunk/streams-osgi-components/activity-consumer/pom.xml
deleted file mode 100644
index aa03c47..0000000
--- a/trunk/streams-osgi-components/activity-consumer/pom.xml
+++ /dev/null
@@ -1,150 +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:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- 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.1-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>
- </dependency>
-
- <dependency>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-core-api</artifactId>
- <version>${rave.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-cassandra</artifactId>
- <version>0.1-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumer.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumer.java b/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumer.java
deleted file mode 100644
index 1f7553b..0000000
--- a/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumer.java
+++ /dev/null
@@ -1,21 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumerWarehouse.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumerWarehouse.java b/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumerWarehouse.java
deleted file mode 100644
index 96ca70a..0000000
--- a/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/ActivityConsumerWarehouse.java
+++ /dev/null
@@ -1,13 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/ActivityConsumerWarehouseImpl.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/ActivityConsumerWarehouseImpl.java b/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/ActivityConsumerWarehouseImpl.java
deleted file mode 100644
index 6a99882..0000000
--- a/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/ActivityConsumerWarehouseImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/PushActivityConsumer.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/PushActivityConsumer.java b/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/PushActivityConsumer.java
deleted file mode 100644
index 38f1c5c..0000000
--- a/trunk/streams-osgi-components/activity-consumer/src/main/java/org/apache/streams/osgi/components/activityconsumer/impl/PushActivityConsumer.java
+++ /dev/null
@@ -1,88 +0,0 @@
-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;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-context.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-context.xml b/trunk/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-context.xml
deleted file mode 100644
index 3507e27..0000000
--- a/trunk/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-context.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/6ea69f29/trunk/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-osgi.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-osgi.xml b/trunk/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-osgi.xml
deleted file mode 100644
index 2c46c12..0000000
--- a/trunk/streams-osgi-components/activity-consumer/src/main/resources/META-INF/spring/activity-consumer-osgi.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/6ea69f29/trunk/streams-osgi-components/activity-consumer/src/main/resources/readme.txt
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-consumer/src/main/resources/readme.txt b/trunk/streams-osgi-components/activity-consumer/src/main/resources/readme.txt
deleted file mode 100644
index 5774586..0000000
--- a/trunk/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/6ea69f29/trunk/streams-osgi-components/activity-registration/osgi.bnd
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-registration/osgi.bnd b/trunk/streams-osgi-components/activity-registration/osgi.bnd
deleted file mode 100644
index 55bbd6d..0000000
--- a/trunk/streams-osgi-components/activity-registration/osgi.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-#-----------------------------------------------------------------
-# Use this file to add customized Bnd instructions for the bundle
-#-----------------------------------------------------------------
-
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-osgi-components/activity-registration/pom.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-registration/pom.xml b/trunk/streams-osgi-components/activity-registration/pom.xml
deleted file mode 100644
index 9ab8a74..0000000
--- a/trunk/streams-osgi-components/activity-registration/pom.xml
+++ /dev/null
@@ -1,125 +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:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- 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.1-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>
- </dependencies>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityPublisherRegistration.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityPublisherRegistration.java b/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityPublisherRegistration.java
deleted file mode 100644
index 1da3fa6..0000000
--- a/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityPublisherRegistration.java
+++ /dev/null
@@ -1,11 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityStreamsSubscriberRegistration.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityStreamsSubscriberRegistration.java b/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityStreamsSubscriberRegistration.java
deleted file mode 100644
index 54de6e1..0000000
--- a/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/ActivityStreamsSubscriberRegistration.java
+++ /dev/null
@@ -1,11 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityPublisherRegistrationImpl.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityPublisherRegistrationImpl.java b/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityPublisherRegistrationImpl.java
deleted file mode 100644
index f0b8649..0000000
--- a/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityPublisherRegistrationImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java b/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java
deleted file mode 100644
index 0992cbe..0000000
--- a/trunk/streams-osgi-components/activity-registration/src/main/java/org/apache/streams/osgi/components/impl/ActivityStreamsSubscriberRegistrationImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context-osgi.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context-osgi.xml b/trunk/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context-osgi.xml
deleted file mode 100644
index f4d0cb7..0000000
--- a/trunk/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context-osgi.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/6ea69f29/trunk/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context.xml b/trunk/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context.xml
deleted file mode 100644
index 287053d..0000000
--- a/trunk/streams-osgi-components/activity-registration/src/main/resources/META-INF/spring/activity-registration-context.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/6ea69f29/trunk/streams-osgi-components/activity-registration/src/main/resources/readme.txt
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-registration/src/main/resources/readme.txt b/trunk/streams-osgi-components/activity-registration/src/main/resources/readme.txt
deleted file mode 100644
index 5774586..0000000
--- a/trunk/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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/osgi.bnd
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/osgi.bnd b/trunk/streams-osgi-components/activity-subscriber/osgi.bnd
deleted file mode 100644
index 55bbd6d..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/osgi.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-#-----------------------------------------------------------------
-# Use this file to add customized Bnd instructions for the bundle
-#-----------------------------------------------------------------
-
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-osgi-components/activity-subscriber/pom.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/pom.xml b/trunk/streams-osgi-components/activity-subscriber/pom.xml
deleted file mode 100644
index 367fee7..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/pom.xml
+++ /dev/null
@@ -1,129 +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:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- 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.1-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>
- </dependencies>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java b/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java
deleted file mode 100644
index a00aeef..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriber.java
+++ /dev/null
@@ -1,20 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriberWarehouse.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriberWarehouse.java b/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriberWarehouse.java
deleted file mode 100644
index 0c6d4e7..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriberWarehouse.java
+++ /dev/null
@@ -1,16 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java b/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java
deleted file mode 100644
index 4017cc3..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscription.java
+++ /dev/null
@@ -1,20 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java b/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java
deleted file mode 100644
index c63a1ef..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionFilter.java
+++ /dev/null
@@ -1,16 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java b/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java
deleted file mode 100644
index 23b270f..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/ActivityStreamsSubscriptionOutput.java
+++ /dev/null
@@ -1,29 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java b/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java
deleted file mode 100644
index e41cfa4..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java
+++ /dev/null
@@ -1,108 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java b/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java
deleted file mode 100644
index 9357196..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionCassandraFilterImpl.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionCassandraFilterImpl.java b/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionCassandraFilterImpl.java
deleted file mode 100644
index 20713a6..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionCassandraFilterImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java b/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java
deleted file mode 100644
index 40389e4..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionLuceneFilterImpl.java
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionLuceneFilterImpl.java b/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionLuceneFilterImpl.java
deleted file mode 100644
index 4dcb88c..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/src/main/java/org/apache/streams/osgi/components/activitysubscriber/impl/ActivityStreamsSubscriptionLuceneFilterImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-context.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-context.xml b/trunk/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-context.xml
deleted file mode 100644
index 7fff1ec..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-context.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-osgi.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-osgi.xml b/trunk/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-osgi.xml
deleted file mode 100644
index c83f8b3..0000000
--- a/trunk/streams-osgi-components/activity-subscriber/src/main/resources/META-INF/spring/activity-subscriber-osgi.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/6ea69f29/trunk/streams-osgi-components/activity-subscriber/src/main/resources/readme.txt
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/activity-subscriber/src/main/resources/readme.txt b/trunk/streams-osgi-components/activity-subscriber/src/main/resources/readme.txt
deleted file mode 100644
index 5774586..0000000
--- a/trunk/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/6ea69f29/trunk/streams-osgi-components/pom.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/pom.xml b/trunk/streams-osgi-components/pom.xml
deleted file mode 100644
index d7f68cd..0000000
--- a/trunk/streams-osgi-components/pom.xml
+++ /dev/null
@@ -1,46 +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:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- 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.1-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>
- <module>streams-components-all</module>
- </modules>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-osgi-components/streams-components-all/pom.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-osgi-components/streams-components-all/pom.xml b/trunk/streams-osgi-components/streams-components-all/pom.xml
deleted file mode 100644
index 7fb055c..0000000
--- a/trunk/streams-osgi-components/streams-components-all/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="MACROMAN"?>
-<!--
- 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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>streams-components-all</artifactId>
-
- <name>Apache Streams Components All</name>
-
- <dependencies>
- <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-subscriber</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</groupId>
- <artifactId>streams-eip-routes</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo-extensions/pom.xml b/trunk/streams-pojo-extensions/pom.xml
deleted file mode 100644
index 85796dd..0000000
--- a/trunk/streams-pojo-extensions/pom.xml
+++ /dev/null
@@ -1,149 +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/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-project</artifactId>
- <version>0.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>streams-pojo-extensions</artifactId>
-
- <properties>
- <streams.version>0.1-SNAPSHOT</streams.version>
- </properties>
- <dependencies>
- <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>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </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>-->
- <!--<artifactId>maven-remote-resources-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<resourceBundles>-->
- <!--<resourceBundle>org.apache.streams:shared-resources:${project.version}</resourceBundle>-->
- <!--</resourceBundles>-->
- <!--</configuration>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>process-remote-resources</id>-->
- <!--<goals>-->
- <!--<goal>process</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--<configuration>-->
- <!--<includes>-->
- <!--<include>**/*.json</include>-->
- <!--</includes>-->
- <!--</configuration>-->
- <!--</plugin>-->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jsonschema2pojo</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>src/main/jsonschema/org/apache/streams/ActivityExtended.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>false</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo-extensions/src/main/jsonschema/org/apache/streams/ActivityExtended.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo-extensions/src/main/jsonschema/org/apache/streams/ActivityExtended.json b/trunk/streams-pojo-extensions/src/main/jsonschema/org/apache/streams/ActivityExtended.json
deleted file mode 100644
index c900c05..0000000
--- a/trunk/streams-pojo-extensions/src/main/jsonschema/org/apache/streams/ActivityExtended.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "type": "object",
- "title" : "activity",
- "$schema": "http://json-schema.org/draft-03/schema",
- "id": "#",
- "javaType" : "org.apache.streams.pojo.json.ActivityExtended",
- "properties": {
- "extensions": {
- "type": "object",
- "dynamic": "true",
- "required": false,
- "description": "Extension fields go here.",
- "javaType" : "org.apache.streams.pojo.json.Extensions"
- }
- },
- "extends": "file://../../../../../../../streams-pojo/src/main/jsonschema/org/apache/streams/pojo/activity.json"
-}
\ No newline at end of file