[jboss-cvs] JBossAS SVN: r68065 - in branches/JBPAPP_4_2: varia/src/resources/services/binding and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Dec 8 11:08:40 EST 2007
Author: fnasser at redhat.com
Date: 2007-12-08 11:08:39 -0500 (Sat, 08 Dec 2007)
New Revision: 68065
Modified:
branches/JBPAPP_4_2/build/build.xml
branches/JBPAPP_4_2/varia/src/resources/services/binding/sample-bindings.xml
Log:
Revert change committed in r68056
Modified: branches/JBPAPP_4_2/build/build.xml
===================================================================
--- branches/JBPAPP_4_2/build/build.xml 2007-12-08 15:53:09 UTC (rev 68064)
+++ branches/JBPAPP_4_2/build/build.xml 2007-12-08 16:08:39 UTC (rev 68065)
@@ -662,9 +662,9 @@
-->
<target name="partition-build" depends="init">
<antcall target="partition-production"/>
+ <antcall target="makeProductionConfigChanges"/>
<antcall target="partition-default"/>
<antcall target="partition-minimal"/>
- <antcall target="makeConfigChanges"/>
<antcall target="replace-messaging"/>
<antcall target="jboss-all-client"/>
<!--<antcall target="setup-ejb3-dist"/>-->
@@ -902,6 +902,9 @@
<target name="makeProductionConfigChanges"
depends="partition-default,partition-production">
+ <!-- Fix up the EOL characters for Windows files -->
+ <antcall target="fixEOL"/>
+
<ant antfile="build.xml" target="updateConfigFiles">
<property name="config.type" value="dev" />
<property name="config.dir" value="${install.all}" />
@@ -916,44 +919,10 @@
<property name="config.type" value="prod" />
<property name="config.dir" value="${install.production}" />
</ant>
+
</target>
- <!-- Update config files for 4.2/4.3 -->
- <target name="makeConfigChanges"
- depends="makeProductionConfigChanges">
-
- <!-- Fix up the EOL characters for Windows files -->
- <antcall target="fixEOL"/>
-
- <condition property="verconf.to.keep" value="43CONF" else="42CONF">
- <or>
- <isset arg1="build.soa"/>
- <isset arg1="build.with.jbm"/>
- </or>
- </condition>
-
- <condition property="verconf.to.delete" value="42CONF" else="43CONF">
- <or>
- <isset arg1="build.soa"/>
- <isset arg1="build.with.jbm"/>
- </or>
- </condition>
-
- <replaceregexp file="${install.examples}/binding-manager/sample-bindings.xml"
- flags="gm"
- match="@.*${verconf.to.keep}\s"
- replace=""
- />
-
- <replaceregexp file="${install.examples}/binding-manager/sample-bindings.xml"
- flags="gs"
- match="@${verconf.to.delete}((?!@END.*CONF).)*@END${verconf.to.delete}\s"
- replace=""
- />
-
- </target>
-
<!-- Modify run.sh for production config -->
<target name="updateConfigFiles">
@@ -1122,7 +1091,6 @@
]]></replacevalue>
</replace>
-
</target>
<target name="patch.for.43" if="build.soa">
@@ -1192,7 +1160,6 @@
]]></replacevalue>
</replace>
-
</target>
<!-- Before executing <replace> task on Windows, convert the target files from -->
@@ -1209,7 +1176,6 @@
<fixcrlf srcdir="../server/src/etc/conf/default" includes="jboss-service.xml" eol="crlf"/>
<fixcrlf srcdir="../connector/src/resources/jca-sar" includes="jbossjca-service.xml" eol="crlf"/>
<fixcrlf srcdir="../server/src/main/org/jboss/metadata/serviceref" includes="ServiceRefDelegate.java" eol="crlf"/>
- <fixcrlf srcdir="../varia/src/resources/services/binding" includes="sample-bindings.xml" eol="crlf"/>
</target>
<!-- set proxy settings -->
Modified: branches/JBPAPP_4_2/varia/src/resources/services/binding/sample-bindings.xml
===================================================================
--- branches/JBPAPP_4_2/varia/src/resources/services/binding/sample-bindings.xml 2007-12-08 15:53:09 UTC (rev 68064)
+++ branches/JBPAPP_4_2/varia/src/resources/services/binding/sample-bindings.xml 2007-12-08 16:08:39 UTC (rev 68065)
@@ -404,7 +404,6 @@
delegateClass="org.jboss.services.binding.AttributeMappingDelegate">
<delegate-config>
<attribute name="Configuration"><![CDATA[
- at 43CONF
<config>
<invoker transport="bisocket">
<attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
@@ -428,29 +427,6 @@
<handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
</handlers>
</config>
- at END43CONF
- at 42CONF
- <config>
- <invoker transport="bisocket">
- <attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="dataType" isParam="true">jms</attribute>
- <attribute name="socket.check_connection" isParam="true">false</attribute>
- <attribute name="timeout" isParam="true">0</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">4457</attribute>
- <attribute name="leasePeriod">10000</attribute>
- <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
- <attribute name="serverSocketClass">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
- <attribute name="numberOfRetries" isParam="true">1</attribute>
- <attribute name="numberOfCallRetries" isParam="true">1</attribute>
- <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
- </invoker>
- <handlers>
- <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
- </handlers>
- </config>
- at END42CONF
]]></attribute>
</delegate-config>
<binding port="4457"/>
@@ -836,7 +812,6 @@
delegateClass="org.jboss.services.binding.AttributeMappingDelegate">
<delegate-config>
<attribute name="Configuration"><![CDATA[
- at 43CONF
<config>
<invoker transport="bisocket">
<attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
@@ -860,29 +835,6 @@
<handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
</handlers>
</config>
- at END43CONF
- at 42CONF
- <config>
- <invoker transport="bisocket">
- <attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="dataType" isParam="true">jms</attribute>
- <attribute name="socket.check_connection" isParam="true">false</attribute>
- <attribute name="timeout" isParam="true">0</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">4557</attribute>
- <attribute name="leasePeriod">10000</attribute>
- <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
- <attribute name="serverSocketClass">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
- <attribute name="numberOfRetries" isParam="true">1</attribute>
- <attribute name="numberOfCallRetries" isParam="true">1</attribute>
- <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
- </invoker>
- <handlers>
- <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
- </handlers>
- </config>
- at END42CONF
]]></attribute>
</delegate-config>
<binding port="4557"/>
@@ -1269,7 +1221,6 @@
delegateClass="org.jboss.services.binding.AttributeMappingDelegate">
<delegate-config>
<attribute name="Configuration"><![CDATA[
- at 43CONF
<config>
<invoker transport="bisocket">
<attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
@@ -1293,29 +1244,6 @@
<handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
</handlers>
</config>
- at END43CONF
- at 42CONF
- <config>
- <invoker transport="bisocket">
- <attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="dataType" isParam="true">jms</attribute>
- <attribute name="socket.check_connection" isParam="true">false</attribute>
- <attribute name="timeout" isParam="true">0</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">4657</attribute>
- <attribute name="leasePeriod">10000</attribute>
- <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
- <attribute name="serverSocketClass">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
- <attribute name="numberOfRetries" isParam="true">1</attribute>
- <attribute name="numberOfCallRetries" isParam="true">1</attribute>
- <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
- </invoker>
- <handlers>
- <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
- </handlers>
- </config>
- at END42CONF
]]></attribute>
</delegate-config>
<binding port="4657"/>
@@ -1659,7 +1587,6 @@
delegateClass="org.jboss.services.binding.AttributeMappingDelegate">
<delegate-config>
<attribute name="Configuration"><![CDATA[
- at 43CONF
<config>
<invoker transport="bisocket">
<attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
@@ -1683,29 +1610,6 @@
<handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
</handlers>
</config>
- at END43CONF
- at 42CONF
- <config>
- <invoker transport="bisocket">
- <attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="dataType" isParam="true">jms</attribute>
- <attribute name="socket.check_connection" isParam="true">false</attribute>
- <attribute name="timeout" isParam="true">0</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">4757</attribute>
- <attribute name="leasePeriod">10000</attribute>
- <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
- <attribute name="serverSocketClass">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
- <attribute name="numberOfRetries" isParam="true">1</attribute>
- <attribute name="numberOfCallRetries" isParam="true">1</attribute>
- <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
- </invoker>
- <handlers>
- <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
- </handlers>
- </config>
- at END42CONF
]]></attribute>
</delegate-config>
<binding port="4757"/>
More information about the jboss-cvs-commits
mailing list