You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by ds...@apache.org on 2013/10/08 21:34:23 UTC
svn commit: r1530403 [2/2] - in /incubator/streams/branches/webservice: ./
runner/ streams-cassandra/ streams-components/
streams-components/src/main/java/org/apache/streams/components/activityconsumer/
streams-components/src/main/java/org/apache/strea...
Added: incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/propertiesLoader.xml
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/propertiesLoader.xml?rev=1530403&view=auto
==============================================================================
--- incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/propertiesLoader.xml (added)
+++ incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/propertiesLoader.xml Tue Oct 8 19:34:21 2013
@@ -0,0 +1,31 @@
+<!--
+ ~ 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.
+ -->
+
+<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:property-placeholder location="WEB-INF/streams.properties" ignore-unresolvable="true"/>
+
+</beans>
\ No newline at end of file
Modified: incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/spring-web-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/spring-web-servlet.xml?rev=1530403&r1=1530402&r2=1530403&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/spring-web-servlet.xml (original)
+++ incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/spring-web-servlet.xml Tue Oct 8 19:34:21 2013
@@ -17,14 +17,4 @@
<value>.jsp</value>
</property>
</bean>
-
-
- <bean id="activityPublisherRegistration" class="org.apache.streams.osgi.components.impl.ActivityPublisherRegistrationImpl" />
- <bean id="activityConsumerWarehouse" class="org.apache.streams.osgi.components.activityconsumer.impl.ActivityConsumerWarehouseImpl" />
-
- <bean id="activityStreamsSubscriberRegistration" class="org.apache.streams.osgi.components.impl.ActivityStreamsSubscriberRegistrationImpl" />
- <bean id="activityStreamsSubscriberWarehouse" class="org.apache.streams.osgi.components.activitysubscriber.impl.ActivityStreamsSubscriberWarehouseImpl" />
-
-
-
</beans>
\ No newline at end of file
Added: incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/streams.properties
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/streams.properties?rev=1530403&view=auto
==============================================================================
--- incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/streams.properties (added)
+++ incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/streams.properties Tue Oct 8 19:34:21 2013
@@ -0,0 +1,9 @@
+baseUrlPath=http://localhost:8080/streams-web/app/
+
+######cassandra######
+
+cassandra.keyspaceName=keyspacetest
+cassandra.activitystreamsColumnFamilyName=activitystreams
+cassandra.subscriptionColumnFamilyName=subscriptions
+cassandra.publisherColumnFamilyName=publishers
+cassandra.cassandraPort=127.0.0.1
\ No newline at end of file
Modified: incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/web.xml?rev=1530403&r1=1530402&r2=1530403&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/web.xml Tue Oct 8 19:34:21 2013
@@ -11,7 +11,6 @@
<param-name>contextConfigLocation</param-name>
<param-value>
/WEB-INF/propertiesLoader.xml
- /WEB-INF/webservice-servlet.xml
/WEB-INF/spring-web-servlet.xml
</param-value>
</context-param>
Added: incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/webservice-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/webservice-servlet.xml?rev=1530403&view=auto
==============================================================================
--- incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/webservice-servlet.xml (added)
+++ incubator/streams/branches/webservice/streams-web/src/main/webapp/WEB-INF/webservice-servlet.xml Tue Oct 8 19:34:21 2013
@@ -0,0 +1,14 @@
+<?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:context="http://www.springframework.org/schema/context"
+ xmlns:mvc="http://www.springframework.org/schema/mvc"
+ 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/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+
+ <context:component-scan base-package="org.apache.streams.mvc.controller"/>
+ <mvc:annotation-driven />
+
+</beans>
\ No newline at end of file