Return-Path: 
 <scm-return-31666-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 3959 invoked from network); 11 Sep 2008 18:49:49 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 11 Sep 2008 18:49:49 -0000
Received: (qmail 31402 invoked by uid 500); 11 Sep 2008 18:49:46 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 31392 invoked by uid 500); 11 Sep 2008 18:49:46 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 31383 invoked by uid 99); 11 Sep 2008 18:49:46 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Sep 2008 11:49:46 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Sep 2008 18:48:56 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0467E238898F; Thu, 11 Sep 2008 11:49:28 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r694414 - in /geronimo/server/trunk: ./
 plugins/client/client/src/main/history/ plugins/openejb/geronimo-openejb/
 plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/
 plugins/openejb/openejb/src/main/history/ plugins/...
Date: Thu, 11 Sep 2008 18:49:24 -0000
To: scm@geronimo.apache.org
From: dblevins@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080911184928.0467E238898F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dblevins
Date: Thu Sep 11 11:49:20 2008
New Revision: 694414

URL: http://svn.apache.org/viewvc?rev=694414&view=rev
Log:
Adding dependency on the openejb-multicast module.  Temporarily mixed the multicast functionlity into the EjbDaemonGBean.  Should get splitout later.

Modified:
    geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=694414&r1=694413&r2=694414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Thu Sep 11 11:49:20 2008
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-multicast</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-interceptor</artifactId>
         <type>jar</type>
@@ -37,11 +42,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.openejb</groupId>
         <artifactId>asm-finder</artifactId>
         <type>jar</type>
@@ -72,6 +72,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.openjpa</groupId>
+        <artifactId>openjpa</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=694414&r1=694413&r2=694414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Thu Sep 11 11:49:20 2008
@@ -89,6 +89,11 @@
         
         <dependency>
             <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-multicast</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-client</artifactId>
         </dependency>
         

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java?rev=694414&r1=694413&r2=694414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java Thu Sep 11 11:49:20 2008
@@ -35,6 +35,10 @@
     private int threads;
     private ServiceManager serviceManager;
 
+    private String multicastHost;
+    private int multicastPort;
+    private boolean enableMulticast;
+
     public EjbDaemonGBean() {
         System.setProperty("openejb.nobanner","true");
         serviceManager = new ServiceManager();
@@ -68,6 +72,30 @@
         this.threads = threads;
     }
 
+    public boolean isEnableMulticast() {
+        return enableMulticast;
+    }
+
+    public void setEnableMulticast(boolean enableMulticast) {
+        this.enableMulticast = enableMulticast;
+    }
+
+    public String getMulticastHost() {
+        return multicastHost;
+    }
+
+    public void setMulticastHost(String multicastHost) {
+        this.multicastHost = multicastHost;
+    }
+
+    public int getMulticastPort() {
+        return multicastPort;
+    }
+
+    public void setMulticastPort(int multicastPort) {
+        this.multicastPort = multicastPort;
+    }
+
     public InetSocketAddress getListenAddress() {
         return new InetSocketAddress(host, port);
     }
@@ -76,6 +104,9 @@
         Properties properties = SystemInstance.get().getProperties();
         properties.setProperty("ejbd.bind", host);
         properties.setProperty("ejbd.port", Integer.toString(port));
+        properties.setProperty("multicast.bind", multicastHost);
+        properties.setProperty("multicast.port", Integer.toString(multicastPort));
+        properties.setProperty("multicast.disabled", Boolean.toString(!enableMulticast));
         if (threads > 0) {
             properties.setProperty("ejbd.threads", Integer.toString(threads));
         }
@@ -98,6 +129,9 @@
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic("OpenEJB Daemon", EjbDaemonGBean.class);
         infoBuilder.addAttribute("host", String.class, true);
         infoBuilder.addAttribute("port", int.class, true);
+        infoBuilder.addAttribute("multicastHost", String.class, true);
+        infoBuilder.addAttribute("multicastPort", int.class, true);
+        infoBuilder.addAttribute("enableMulticast", boolean.class, true);
         infoBuilder.addAttribute("threads", int.class, true);
 
         GBEAN_INFO = infoBuilder.getBeanInfo();

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?rev=694414&r1=694413&r2=694414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Thu Sep 11 11:49:20 2008
@@ -66,6 +66,8 @@
 import org.apache.openejb.config.EjbModule;
 import org.apache.openejb.core.ServerFederation;
 import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.resource.XAResourceWrapper;
+import org.apache.openejb.resource.GeronimoTransactionManagerFactory.GeronimoXAResourceWrapper;
 import org.apache.openejb.spi.ApplicationServer;
 import org.apache.openejb.spi.ContainerSystem;
 import org.apache.openejb.spi.SecurityService;
@@ -123,6 +125,7 @@
         transactionServiceInfo.id = "Default Transaction Manager";
         transactionServiceInfo.service = "TransactionManager";
         assembler.createTransactionManager(transactionServiceInfo);
+	    SystemInstance.get().setComponent(XAResourceWrapper.class, new GeronimoXAResourceWrapper());
 
         // install security service
         SecurityService securityService = new GeronimoSecurityService();

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=694414&r1=694413&r2=694414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Thu Sep 11 11:49:20 2008
@@ -7,24 +7,24 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-spec-corba</artifactId>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-multicast</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>activemq-broker</artifactId>
+        <artifactId>transaction</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-server</artifactId>
+        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+        <artifactId>xbean-finder</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-core</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>system-database</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.openejb</groupId>
@@ -33,72 +33,77 @@
     </dependency>
     <dependency>
         <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-ejbd</artifactId>
+        <artifactId>openejb-javaagent</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-server</artifactId>
+        <artifactId>asm-finder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-client</artifactId>
+        <artifactId>openejb-jee</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-javaagent</artifactId>
+        <groupId>org.codehaus.swizzle</groupId>
+        <artifactId>swizzle-stream</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-jee</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-openejb</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>asm-finder</artifactId>
+        <groupId>org.apache.yoko</groupId>
+        <artifactId>yoko-spec-corba</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>webservices-common</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.swizzle</groupId>
-        <artifactId>swizzle-stream</artifactId>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-client</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>transaction</artifactId>
+        <artifactId>activemq-broker</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-openejb</artifactId>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-server</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>system-database</artifactId>
+        <artifactId>j2ee-server</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>server-security-config</artifactId>
-        <type>car</type>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-ejbd</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <type>car</type>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-core</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>webservices-common</artifactId>
+        <artifactId>openjpa</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>server-security-config</artifactId>
         <type>car</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml?rev=694414&r1=694413&r2=694414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml Thu Sep 11 11:49:20 2008
@@ -68,6 +68,9 @@
         <attribute name="port">${PlanOpenEJBPort}</attribute>
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="threads">20</attribute>
+        <attribute name="multicastPort">${PlanOpenEJBMulticastPort}</attribute>
+        <attribute name="multicastHost">${PlanOpenEJBMulticastHostname}</attribute>
+        <attribute name="enableMulticast">true</attribute>
         <dependency>
             <name>OpenEjbSystem</name>
         </dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=694414&r1=694413&r2=694414&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Sep 11 11:49:20 2008
@@ -109,6 +109,8 @@
         <PlanHTTPSPort>8443</PlanHTTPSPort>
         <PlanAJPPort>8019</PlanAJPPort>
         <PlanOpenEJBPort>4201</PlanOpenEJBPort>
+        <PlanOpenEJBMulticastPort>6142</PlanOpenEJBMulticastPort>
+        <PlanOpenEJBMulticastHostname>239.255.3.2</PlanOpenEJBMulticastHostname>
         <PlanNamingPort>1099</PlanNamingPort>
         <PlanActiveMQPort>61616</PlanActiveMQPort>
         <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
@@ -1116,6 +1118,22 @@
 
             <dependency>
                 <groupId>org.apache.openejb</groupId>
+                <artifactId>openejb-multicast</artifactId>
+                <version>${openejbVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.openejb</groupId>
+                        <artifactId>javaee-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.openejb</groupId>
                 <artifactId>openejb-ejbd</artifactId>
                 <version>${openejbVersion}</version>
                 <exclusions>