servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r398686 - in /incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf: jmx.xml jndi.properties jndi.xml servicemix.xml tx.xml
Date Mon, 01 May 2006 20:49:58 GMT
Author: gnodet
Date: Mon May  1 13:49:55 2006
New Revision: 398686

URL: http://svn.apache.org/viewcvs?rev=398686&view=rev
Log:
SM-419: WSDL for WS-Notification component are not available
Split the configuration files, ensure JNDI is initialized only once and add WS-N jms connectionFactory
to JNDI tree

Added:
    incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jmx.xml
    incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/tx.xml
Modified:
    incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.properties
    incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.xml
    incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/servicemix.xml

Added: incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jmx.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jmx.xml?rev=398686&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jmx.xml (added)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jmx.xml Mon May 
1 13:49:55 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!-- START SNIPPET: jndi -->
+<beans>
+
+  <!-- JMX server and connector -->
+  <bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean"/>
+  <bean id="registry" class="mx4j.tools.naming.NamingService" init-method="start">
+    <property name="port" value="1099"/>
+  </bean>
+  <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean"
depends-on="registry">
+    <property name="objectName" value="connector:name=rmi"/>
+    <property name="serviceUrl" value="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi"/>
+    <property name="threaded" value="true"/>
+    <property name="daemon" value="true"/>
+    <property name="environment">
+      <map>
+        <!-- Uncomment the following line to enable authentication for jmx
+        <entry key="jmx.remote.authenticator" value-ref="jmxRemoteAuthenticator" />
+         -->
+      </map>
+    </property>
+  </bean>
+  <bean id="jmxRemoteAuthenticator" class="mx4j.tools.remote.PasswordAuthenticator">
+    <constructor-arg>
+      <bean factory-method="getInputStream" factory-bean="jmxRemotePasswords" />
+    </constructor-arg>
+  </bean>
+  <bean id="jmxRemotePasswords"  factory-method="getResource" factory-bean="resourceLoader">
+    <constructor-arg value="classpath:passwords.txt"/>
+  </bean>
+  <bean id="resourceLoader" class="org.springframework.core.io.DefaultResourceLoader"
/>
+
+</beans>
+<!-- END SNIPPET: jndi -->

Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.properties?rev=398686&r1=398685&r2=398686&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.properties (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.properties Mon
May  1 13:49:55 2006
@@ -1,2 +1,2 @@
-java.naming.factory.initial = org.apache.xbean.spring.jndi.SpringInitialContextFactory
-java.naming.provider.url = jndi.xml
+java.naming.factory.initial=org.apache.xbean.spring.jndi.SpringInitialContextFactory
+java.naming.provider.url=

Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.xml?rev=398686&r1=398685&r2=398686&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.xml Mon May
 1 13:49:55 2006
@@ -2,28 +2,34 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!-- START SNIPPET: jndi -->
 <beans>
-  <bean id="jndi" class="org.apache.xbean.spring.jndi.DefaultContext" singleton="true">
+
+  <bean id="jndi" 
+        class="org.apache.xbean.spring.jndi.SpringInitialContextFactory" 
+        factory-method="makeInitialContext"
+        singleton="true">
     <property name="entries">
       <map>
-        <entry key="jdbc/pxe__pm">
+      
+        <!-- PXE DB datasource -->
+        <entry key="java:comp/env/jdbc/pxe__pm">
           <bean class="org.hsqldb.jdbc.jdbcDataSource">
             <property name="database" value="jdbc:hsqldb:mem:pxe"/>
             <property name="user" value = "sa"/>
             <property name="password" value = ""/>
           </bean>
         </entry>
+        
+        <!-- wsn2005 jms connection factory -->
+        <entry key="java:comp/env/jms/wsnotificationCF">
+          <bean class="org.apache.activemq.ActiveMQConnectionFactory">
+            <property name="brokerURL" value="tcp://localhost:61616" />
+          </bean>
+        </entry>
 
+        <!-- transaction manager -->
         <entry key="javax.transaction.TransactionManager" value-ref="transactionManager"
/>
       </map>
     </property>
-  </bean>
-
-  <bean id="extendedTransactionManager" class="org.jencks.factory.TransactionManagerFactoryBean"/>
-  <bean id="transactionContextManager" class="org.jencks.factory.TransactionContextManagerFactoryBean">
-    <property name="transactionManager" ref="extendedTransactionManager"/>
-  </bean>
-  <bean id="transactionManager" class="org.jencks.factory.GeronimoTransactionManagerFactoryBean">
-    <property name="transactionContextManager" ref="transactionContextManager"/>
   </bean>
 
 </beans>

Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/servicemix.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/servicemix.xml?rev=398686&r1=398685&r2=398686&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/servicemix.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/servicemix.xml Mon
May  1 13:49:55 2006
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns:sm="http://servicemix.apache.org/config/1.0">
 
+  <import resource="classpath:jmx.xml" />
+  <import resource="classpath:tx.xml" />
+  <import resource="classpath:activemq.xml" />
+  <import resource="classpath:jndi.xml" />
+
   <!-- the JBI container -->
   <sm:container id="jbi" 
                 rootDir="./wdir" 
@@ -16,49 +21,5 @@
 		
     </sm:activationSpecs>
   </sm:container>
-
-  <bean id="transactionContextManager" class="org.jencks.factory.TransactionContextManagerFactoryBean"/>
-  <bean id="transactionManager" class="org.jencks.factory.GeronimoTransactionManagerFactoryBean"
/>
-
-  <!-- JMX server and connector -->
-  <bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean"/>
-  <bean id="registry" class="mx4j.tools.naming.NamingService" init-method="start">
-    <property name="port" value="1099"/>
-  </bean>
-  <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean"
depends-on="registry">
-    <property name="objectName" value="connector:name=rmi"/>
-    <property name="serviceUrl" value="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi"/>
-    <property name="threaded" value="true"/>
-    <property name="daemon" value="true"/>
-    <property name="environment">
-      <map>
-        <!-- Uncomment the following line to enable authentication for jmx
-        <entry key="jmx.remote.authenticator" value-ref="jmxRemoteAuthenticator" />
-         -->
-      </map>
-    </property>
-  </bean>
-  <bean id="jmxRemoteAuthenticator" class="mx4j.tools.remote.PasswordAuthenticator">
-    <constructor-arg>
-      <bean factory-method="getInputStream" factory-bean="jmxRemotePasswords" />
-    </constructor-arg>
-  </bean>
-  <bean id="jmxRemotePasswords"  factory-method="getResource" factory-bean="resourceLoader">
-    <constructor-arg value="classpath:passwords.txt"/>
-  </bean>
-  <bean id="resourceLoader" class="org.springframework.core.io.DefaultResourceLoader"
/>
-
-  <!-- message broker -->
-  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean" depends-on="mbeanServer">
-     <property name="config" value="classpath:activemq.xml"/>
-  </bean>
-
-  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
-    <property name="connectionFactory">
-      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-        <property name="brokerURL" value="tcp://localhost:61616"/>
-      </bean>
-    </property>
-  </bean>
 
 </beans>

Added: incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/tx.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/tx.xml?rev=398686&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/tx.xml (added)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/tx.xml Mon May  1
13:49:55 2006
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+  <bean id="extendedTransactionManager" class="org.jencks.factory.TransactionManagerFactoryBean"/>
+  <bean id="transactionContextManager" class="org.jencks.factory.TransactionContextManagerFactoryBean">
+    <property name="transactionManager" ref="extendedTransactionManager"/>
+  </bean>
+  <bean id="transactionManager" class="org.jencks.factory.GeronimoTransactionManagerFactoryBean">
+    <property name="transactionContextManager" ref="transactionContextManager"/>
+  </bean>
+  
+  <!-- We should configure a txlog to handle tx recovery -->
+
+</beans>



Mime
View raw message