You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/10/16 02:22:07 UTC
svn commit: r1023155 - in /openejb/trunk/openejb3: ./
container/openejb-core/src/test/java/org/apache/openejb/config/
examples/alternate-descriptors/src/main/resources/META-INF/
server/openejb-multicast/src/main/resources/META-INF/org.apache.openejb.se...
Author: dblevins
Date: Sat Oct 16 00:22:07 2010
New Revision: 1023155
URL: http://svn.apache.org/viewvc?rev=1023155&view=rev
Log:
svn merge -r 1021964:1021965 https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x
http://svn.apache.org/viewvc?view=revision&revision=1021965
------------------------------------------------------------------------
r1021965 | dblevins | 2010-10-12 17:46:07 -0700 (Tue, 12 Oct 2010) | 2 lines
Added available properties to the config file so defaults are known
------------------------------------------------------------------------
Modified:
openejb/trunk/openejb3/ (props changed)
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed)
openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed)
openejb/trunk/openejb3/server/openejb-multicast/src/main/resources/META-INF/org.apache.openejb.server.ServerService/multicast
openejb/trunk/openejb3/server/openejb-multicast/src/main/resources/META-INF/org.apache.openejb.server.ServerService/multipoint
Propchange: openejb/trunk/openejb3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:22:07 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1:779593
-/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961
+/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965
/openejb/branches/openejb-jcdi:984659-985270
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:22:07 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
-/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961
+/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965
/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:984659-985270
Propchange: openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:22:07 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
-/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961
+/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965
/openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270
Modified: openejb/trunk/openejb3/server/openejb-multicast/src/main/resources/META-INF/org.apache.openejb.server.ServerService/multicast
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-multicast/src/main/resources/META-INF/org.apache.openejb.server.ServerService/multicast?rev=1023155&r1=1023154&r2=1023155&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-multicast/src/main/resources/META-INF/org.apache.openejb.server.ServerService/multicast (original)
+++ openejb/trunk/openejb3/server/openejb-multicast/src/main/resources/META-INF/org.apache.openejb.server.ServerService/multicast Sat Oct 16 00:22:07 2010
@@ -2,3 +2,8 @@ server = org.apache.openejb.server.
bind = 239.255.2.3
port = 6142
disabled = true
+
+group = default
+heart_rate = 500
+loopback_mode = false
+max_missed_heartbeats = 10
Modified: openejb/trunk/openejb3/server/openejb-multicast/src/main/resources/META-INF/org.apache.openejb.server.ServerService/multipoint
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-multicast/src/main/resources/META-INF/org.apache.openejb.server.ServerService/multipoint?rev=1023155&r1=1023154&r2=1023155&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-multicast/src/main/resources/META-INF/org.apache.openejb.server.ServerService/multipoint (original)
+++ openejb/trunk/openejb3/server/openejb-multicast/src/main/resources/META-INF/org.apache.openejb.server.ServerService/multipoint Sat Oct 16 00:22:07 2010
@@ -1,5 +1,10 @@
server = org.apache.openejb.server.discovery.MultipointDiscoveryAgent
bind = 127.0.0.1
port = 4212
-initialServers =
disabled = true
+
+initialServers =
+group = default
+heart_rate = 500
+loopback_mode = false
+max_missed_heartbeats = 10