You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by le...@apache.org on 2013/02/05 22:18:50 UTC
svn commit: r1442748 - in /incubator/streams/trunk:
streams-eip-routes/src/main/resources/META-INF/spring/
streams-web/src/main/webapp/WEB-INF/
streams-web/src/main/webapp/WEB-INF/spring/
Author: letourneau
Date: Tue Feb 5 21:18:49 2013
New Revision: 1442748
URL: http://svn.apache.org/viewvc?rev=1442748&view=rev
Log:
changing context files to separate osgi import and spring beans
Removed:
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/spring/camelContext.xml
Modified:
incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/osgi-component-import.xml
incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/applicationContext.xml
Modified: incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/osgi-component-import.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/osgi-component-import.xml?rev=1442748&r1=1442747&r2=1442748&view=diff
==============================================================================
--- incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/osgi-component-import.xml (original)
+++ incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/osgi-component-import.xml Tue Feb 5 21:18:49 2013
@@ -10,51 +10,11 @@
<osgi:reference id="activityPublisherRegistration" interface="org.apache.streams.osgi.components.ActivityPublisherRegistration" />
<osgi:reference id="activityConsumerWarehouse" interface="org.apache.streams.osgi.components.activityconsumer.ActivityConsumerWarehouse" />
- <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"/>
-
<osgi:reference id="activityStreamsSubscriberRegistration" interface="org.apache.streams.osgi.components.ActivityStreamsSubscriberRegistration" />
<osgi:reference id="activityStreamsSubscriberWarehouse" interface="org.apache.streams.osgi.components.activitysubscriber.ActivityStreamsSubscriberWarehouse" />
- <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"/>
-
- <bean id="activityWarehouseDistributor" class="org.apache.streams.messaging.aggregation.ActivityAggregator">
- <property name="activityStreamsSubscriberWarehouse" ref="activityStreamsSubscriberWarehouse"/>
- </bean>
-
-
-
-
-
-
- <bean id="jmsConnectionFactory"
- class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="tcp://localhost:61616" />
- </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
Modified: incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml?rev=1442748&r1=1442747&r2=1442748&view=diff
==============================================================================
--- incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml (original)
+++ incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml Tue Feb 5 21:18:49 2013
@@ -33,6 +33,45 @@
<bean id="configuration" class="org.apache.streams.messaging.configuration.EipConfigurator" />
+ <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"/>
+
+ <bean id="activityWarehouseDistributor" class="org.apache.streams.messaging.aggregation.ActivityAggregator">
+ <property name="activityStreamsSubscriberWarehouse" ref="activityStreamsSubscriberWarehouse"/>
+ </bean>
+
+
+ <bean id="jmsConnectionFactory"
+ class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="tcp://localhost:61616" />
+ </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>
Modified: incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/applicationContext.xml?rev=1442748&r1=1442747&r2=1442748&view=diff
==============================================================================
--- incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/applicationContext.xml Tue Feb 5 21:18:49 2013
@@ -10,20 +10,12 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd">
- <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent">
- <property name="connectionFactory">
- <bean class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="vm://localhost?create=false&waitForStart=10000"/>
- <!--
+ <bean id="activityPublisherRegistration" class="org.apache.streams.osgi.components.impl.ActivityPublisherRegistrationImpl" />
+ <bean id="activityConsumerWarehouse" class="org.apache.streams.osgi.components.activityconsumer.impl.ActivityConsumerWarehouseImpl" />
- <property name="userName" value="${activemq.username}"/>
- <property name="password" value="${activemq.password}"/>
+ <bean id="activityStreamsSubscriberRegistration" class="org.apache.streams.osgi.components.impl.ActivityStreamsSubscriberRegistrationImpl" />
+ <bean id="activityStreamsSubscriberWarehouse" class="org.apache.streams.osgi.components.activitysubscriber.impl.ActivityStreamsSubscriberWarehouseImpl" />
- -->
- </bean>
- </property>
- </bean>
- <bean id="myTransform" class="org.apache.streams.osgi.components.impl.TransformServiceImpl"/>
</beans>
\ No newline at end of file