Author: objectiser Date: 2011-01-27 04:54:00 -0500 (Thu, 27 Jan 2011) New Revision: 1281 Modified: trunk/distribution/src/main/release/db/jboss/as5.properties trunk/distribution/src/main/release/db/jboss/as6.properties trunk/distribution/src/main/release/db/jboss/jboss-beans.xml trunk/distribution/src/main/release/install/build.xml trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml Log: Update install script and config files to deal with AS5/6 implementation differences. Modified: trunk/distribution/src/main/release/db/jboss/as5.properties =================================================================== --- trunk/distribution/src/main/release/db/jboss/as5.properties 2011-01-26 18:26:35 UTC (rev 1280) +++ trunk/distribution/src/main/release/db/jboss/as5.properties 2011-01-27 09:54:00 UTC (rev 1281) @@ -1,2 +1,4 @@ dsp.service.deployer=org.jboss.soa.dsp.deployer.jbossas5.JBossServiceDeployer dsp.server.config.factory=org.jboss.soa.dsp.server.jbossas5.JBossServerConfigFactory +kernel.locator=org.jboss.soa.dsp.server.jbossas5.KernelLocator +dsp.server.config.impl=org.jboss.soa.dsp.server.jbossas5.JBossServerConfigImpl Modified: trunk/distribution/src/main/release/db/jboss/as6.properties =================================================================== --- trunk/distribution/src/main/release/db/jboss/as6.properties 2011-01-26 18:26:35 UTC (rev 1280) +++ trunk/distribution/src/main/release/db/jboss/as6.properties 2011-01-27 09:54:00 UTC (rev 1281) @@ -1,2 +1,4 @@ dsp.service.deployer=org.jboss.soa.dsp.deployer.jbossas6.JBossServiceDeployer dsp.server.config.factory=org.jboss.soa.dsp.server.jbossas6.JBossServerConfigFactory +kernel.locator=org.jboss.soa.dsp.server.jbossas6.KernelLocator +dsp.server.config.impl=org.jboss.soa.dsp.server.jbossas6.JBossServerConfigImpl Modified: trunk/distribution/src/main/release/db/jboss/jboss-beans.xml =================================================================== --- trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2011-01-26 18:26:35 UTC (rev 1280) +++ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2011-01-27 09:54:00 UTC (rev 1281) @@ -24,7 +24,7 @@ Locate the single instance of the kernel --> <bean name="org.jboss.soa.dsp:service=KernelLocator" - class="org.jboss.soa.dsp.server.jbossas5.KernelLocator"> + class=&quot;@kernel.locator(a)&quot;&gt; <property name="kernel"> <inject bean="jboss.kernel:service=Kernel" /> </property> @@ -34,7 +34,7 @@ ServerConfig --> <bean name="org.jboss.soa.dsp:service=ServerConfig" - class="org.jboss.soa.dsp.server.jbossas5.JBossServerConfigImpl"> + class=&quot;@dsp.server.config.impl(a)&quot;&gt; <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> <property name="webServiceHost">${jboss.bind.address}</property> </bean> Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2011-01-26 18:26:35 UTC (rev 1280) +++ trunk/distribution/src/main/release/install/build.xml 2011-01-27 09:54:00 UTC (rev 1281) @@ -87,6 +87,7 @@ overwrite="true"> <filterset> <filter token="database" value="${database}"/> + <filterset filtersfile="../db/jboss/as${as.version}.properties" /> </filterset> </copy> @@ -237,6 +238,7 @@ overwrite="true"> <filterset> <filter token="database" value="${database}"/> + <filterset filtersfile="../db/jboss/as${as.version}.properties" /> </filterset> </copy> <copy todir="${deploy.dir}/${bpel-runtime}/lib" overwrite="true"> Modified: trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml =================================================================== --- trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2011-01-26 18:26:35 UTC (rev 1280) +++ trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2011-01-27 09:54:00 UTC (rev 1281) @@ -25,7 +25,7 @@ Locate the single instance of the kernel --> <bean name="org.jboss.soa.dsp:service=KernelLocator" - class="org.jboss.soa.dsp.server.jbossas5.KernelLocator"> + class=&quot;@kernel.locator(a)&quot;&gt; <property name="kernel"> <inject bean="jboss.kernel:service=Kernel" /> </property> @@ -35,7 +35,7 @@ ServerConfig --> <bean name="org.jboss.soa.dsp:service=ServerConfig" - class="org.jboss.soa.dsp.server.jbossas5.JBossServerConfigImpl"> + class=&quot;@dsp.server.config.impl(a)&quot;&gt; <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> <property name="webServiceHost">${jboss.bind.address}</property> <property name="clusterNodeName"><inject bean="HAPartition" property="nodeName" /></property>