[prev in list] [next in list] [prev in thread] [next in thread]
List: openejb-cvs
Subject: [openejb-scm] [2635] branches/v2_1/openejb2/modules/core/src/java/org/openejb: Changed openejb build
From: dain () codehaus ! org
Date: 2006-05-01 0:56:51
Message-ID: 20060501010327.26898.qmail () codehaus ! org
[Download RAW message or body]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica,sans-serif; \
font-size: 10pt; } #msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: \
6px; } #msg ul, pre { overflow: auto; }
#patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<title>[2635] branches/v2_1/openejb2/modules/core/src/java/org/openejb: Changed \
openejb builder to set the ejbs reference on the ejb module so jsr77 can see the ejbs \
in the module</title> </head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2635</dd>
<dt>Author</dt> <dd>dain</dd>
<dt>Date</dt> <dd>2006-04-30 21:03:26 -0400 (Sun, 30 Apr 2006)</dd>
</dl>
<h3>Log Message</h3>
<pre>Changed openejb builder to set the ejbs reference on the ejb module so jsr77 can \
see the ejbs in the module MEJB can be j2eeType StatelessSessionBean unless it name \
has the required EJBModule and EJBApplication properties.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesv2_1openejb2modulescoresrcjavaorgopenejbEJBModuleImpljava">branches/v2_1/openejb2/modules/core/src/java/org/openejb/EJBModuleImpl.java</a></li>
<li><a href="#branchesv2_1openejb2modulescoresrcjavaorgopenejbmejbMEJBjava">branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java</a></li>
<li><a href="#branchesv2_1openejb2modulesopenejbbuildersrcjavaorgopenejbdeploymentOpe \
nEJBModuleBuilderjava">branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesv2_1openejb2modulescoresrcjavaorgopenejbEJBModuleImpljava"></a>
<div class="modfile"><h4>Modified: \
branches/v2_1/openejb2/modules/core/src/java/org/openejb/EJBModuleImpl.java (2634 => \
2635)</h4> <pre class="diff">
<span class="info">--- \
branches/v2_1/openejb2/modules/core/src/java/org/openejb/EJBModuleImpl.java 2006-04-30 \
03:53:16 UTC (rev 2634)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/EJBModuleImpl.java 2006-05-01 \
01:03:26 UTC (rev 2635) </span><span class="lines">@@ -133,7 +133,9 @@
</span><span class="cx"> return server.getJavaVMs();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public String[] getEJBs() {
</del><ins>+ public String[] getEjbs() {
+ if (ejbs == null) return new String[0];
+
</ins><span class="cx"> ArrayList copy;
</span><span class="cx"> synchronized (ejbs) {
</span><span class="cx"> copy = new ArrayList(ejbs);
</span><span class="lines">@@ -212,12 +214,6 @@
</span><span class="cx"> \
infoBuilder.addReference("TransactionContextManager", \
TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER); \
</span><span class="cx"> infoBuilder.addAttribute("TMDelegate", \
TransactionManagerDelegate.class, true); </span><span class="cx">
</span><del>- infoBuilder.addAttribute("objectName", String.class, \
false);
- infoBuilder.addAttribute("server", String.class, false);
- infoBuilder.addAttribute("application", String.class, false);
- infoBuilder.addAttribute("javaVMs", String[].class, false);
- infoBuilder.addAttribute("ejbs", String[].class, false);
-
</del><span class="cx"> infoBuilder.addReference("EJBCollection", \
EJB.class); </span><span class="cx">
</span><span class="cx"> infoBuilder.addInterface(EJBModule.class);
</span></pre></div>
<a id="branchesv2_1openejb2modulescoresrcjavaorgopenejbmejbMEJBjava"></a>
<div class="modfile"><h4>Modified: \
branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java (2634 => \
2635)</h4> <pre class="diff">
<span class="info">--- \
branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java 2006-04-30 \
03:53:16 UTC (rev 2634)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java 2006-05-01 \
01:03:26 UTC (rev 2635) </span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> public static final GBeanInfo GBEAN_INFO;
</span><span class="cx">
</span><span class="cx"> static {
</span><del>- GBeanInfoBuilder infoBuilder = \
GBeanInfoBuilder.createStatic(MEJB.class, \
org.apache.geronimo.j2ee.mejb.MEJB.GBEAN_INFO, NameFactory.STATELESS_SESSION_BEAN); \
</del><ins>+ GBeanInfoBuilder infoBuilder = \
GBeanInfoBuilder.createStatic(MEJB.class, \
org.apache.geronimo.j2ee.mejb.MEJB.GBEAN_INFO, "MEJB"); </ins><span \
class="cx"> infoBuilder.addReference("MBeanServerReference", \
MBeanServerReference.class); </span><span class="cx">
</span><span class="cx"> infoBuilder.setConstructor(new \
String[]{"abstractName", "MBeanServerReference"}); \
</span></pre></div> <a \
id="branchesv2_1openejb2modulesopenejbbuildersrcjavaorgopenejbdeploymentOpenEJBModuleBuilderjava"></a>
<div class="modfile"><h4>Modified: \
branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java \
(2634 => 2635)</h4> <pre class="diff">
<span class="info">--- \
branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-04-30 \
03:53:16 UTC (rev 2634)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-05-01 \
01:03:26 UTC (rev 2635) </span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> import org.apache.geronimo.gbean.GBeanInfo;
</span><span class="cx"> import org.apache.geronimo.gbean.GBeanInfoBuilder;
</span><span class="cx"> import org.apache.geronimo.gbean.SingleElementCollection;
</span><ins>+import org.apache.geronimo.gbean.ReferencePatterns;
</ins><span class="cx"> import org.apache.geronimo.j2ee.deployment.EARContext;
</span><span class="cx"> import org.apache.geronimo.j2ee.deployment.EJBModule;
</span><span class="cx"> import org.apache.geronimo.j2ee.deployment.Module;
</span><span class="lines">@@ -94,6 +95,7 @@
</span><span class="cx"> import org.apache.xmlbeans.XmlException;
</span><span class="cx"> import org.apache.xmlbeans.XmlObject;
</span><span class="cx"> import org.openejb.EJBModuleImpl;
</span><ins>+import org.openejb.EJBContainer;
</ins><span class="cx"> import \
org.openejb.deployment.corba.NoDistributedTxTransactionImportPolicyBuilder; \
</span><span class="cx"> import \
org.openejb.deployment.corba.TransactionImportPolicyBuilder; </span><span class="cx"> \
import org.openejb.deployment.pkgen.TranQLPKGenBuilder; </span><span class="lines">@@ \
-415,6 +417,12 @@ </span><span class="cx">
</span><span class="cx"> \
ejbModuleGBeanData.setReferencePattern("TransactionContextManager", \
earContext.getTransactionContextManagerObjectName()); </span><span class="cx"> \
ejbModuleGBeanData.setAttribute("TMDelegate", tmDelegate); </span><ins>+
+ ejbModuleGBeanData.setReferencePatterns("EJBCollection",
+ new ReferencePatterns(new AbstractNameQuery(null,
+ Collections.singletonMap(NameFactory.EJB_MODULE, \
moduleBaseName.getNameProperty(NameFactory.J2EE_NAME)), + \
EJBContainer.class.getName()))); +
</ins><span class="cx"> earContext.addGBean(ejbModuleGBeanData);
</span><span class="cx"> } catch (Exception e) {
</span><span class="cx"> throw new DeploymentException("Unable to \
initialize EJBModule GBean " + ejbModuleGBeanData.getAbstractName(), e); \
</span></pre> </div>
</div>
</body>
</html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic