Author: djencks
Date: Thu Jun 17 23:44:11 2010
New Revision: 955791
URL: http://svn.apache.org/viewvc?rev=955791&view=rev
Log:
OPENEJB-1298 2nd half of some case changes, also fix some errors in list-valued
attributes in SessionBean
Added:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter.java
(contents, props changed)
- copied, changed from r955781,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10.java
(contents, props changed)
- copied, changed from r955781,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBase.java
(contents, props changed)
- copied, changed from r955781,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBaseX.java
Removed:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBaseX.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java
Modified:
openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java
openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConnectorBase.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
Modified:
openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java?rev=955791&r1=955790&r2=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java
Thu Jun 17 23:44:11 2010
@@ -31,7 +31,7 @@ import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.InboundResourceadapter;
import org.apache.openejb.jee.MessageDrivenBean;
import org.apache.openejb.jee.Connector;
-import org.apache.openejb.jee.ResourceadapterX;
+import org.apache.openejb.jee.Resourceadapter;
import org.apache.openejb.jee.MessageAdapter;
import org.apache.openejb.jee.MessageListener;
import org.apache.openejb.util.Join;
@@ -81,7 +81,7 @@ public class CustomMdbContainerTest exte
AppModule app = new AppModule(this.getClass().getClassLoader(),
"testapp");
Connector connector = new Connector("email-ra");
- ResourceadapterX adapter = connector.setResourceAdapter(new
ResourceadapterX(EmailResourceAdapter.class));
+ Resourceadapter adapter = connector.setResourceAdapter(new
Resourceadapter(EmailResourceAdapter.class));
InboundResourceadapter inbound = adapter.setInboundResourceAdapter(new
InboundResourceadapter());
MessageAdapter messageAdapter = inbound.setMessageAdapter(new
MessageAdapter());
MessageListener listener = messageAdapter.addMessageListener(new
MessageListener(EmailConsumer.class, EmailAccountInfo.class));
Modified:
openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java?rev=955791&r1=955790&r2=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
Thu Jun 17 23:44:11 2010
@@ -30,7 +30,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.MessageDrivenBean;
import org.apache.openejb.jee.Connector;
-import org.apache.openejb.jee.ResourceadapterX;
+import org.apache.openejb.jee.Resourceadapter;
import org.apache.openejb.jee.InboundResourceadapter;
import org.apache.openejb.jee.MessageAdapter;
import org.apache.openejb.jee.MessageListener;
@@ -72,7 +72,7 @@ public class QuartzMdbContainerTest exte
AppModule app = new AppModule(this.getClass().getClassLoader(),
"testapp");
Connector connector = new Connector("quartz");
- ResourceadapterX adapter = connector.setResourceAdapter(new
ResourceadapterX(QuartzResourceAdapter.class));
+ Resourceadapter adapter = connector.setResourceAdapter(new
Resourceadapter(QuartzResourceAdapter.class));
InboundResourceadapter inbound = adapter.setInboundResourceAdapter(new
InboundResourceadapter());
MessageAdapter messageAdapter = inbound.setMessageAdapter(new
MessageAdapter());
MessageListener listener = messageAdapter.addMessageListener(new
MessageListener(Job.class, JobSpec.class));
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=955791&r1=955790&r2=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
Thu Jun 17 23:44:11 2010
@@ -34,7 +34,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.jee.InboundResourceadapter;
import org.apache.openejb.jee.OutboundResourceadapter;
-import org.apache.openejb.jee.ResourceadapterX;
+import org.apache.openejb.jee.Resourceadapter;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.config.sys.Resource;
import org.apache.openejb.config.sys.ServiceProvider;
@@ -315,7 +315,7 @@ class AppInfoBuilder {
}
}
- ResourceadapterX resourceAdapter = connector.getResourceAdapter();
+ Resourceadapter resourceAdapter = connector.getResourceAdapter();
if (resourceAdapter.getResourceAdapterClass() != null) {
String id = getId(connectorModule);
String className = resourceAdapter.getResourceAdapterClass();
@@ -424,7 +424,7 @@ class AppInfoBuilder {
}
}
- private String getId(AdminObject adminObject, ResourceadapterX
resourceAdapter, ConnectorModule connectorModule) {
+ private String getId(AdminObject adminObject, Resourceadapter
resourceAdapter, ConnectorModule connectorModule) {
String id;
if (adminObject.getId() != null) {
id = adminObject.getId();
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=955791&r1=955790&r2=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
Thu Jun 17 23:44:11 2010
@@ -44,7 +44,7 @@ import org.apache.openejb.jee.JndiRefere
import org.apache.openejb.jee.ResourceRef;
import org.apache.openejb.jee.JndiConsumer;
import org.apache.openejb.jee.Connector;
-import org.apache.openejb.jee.ResourceadapterX;
+import org.apache.openejb.jee.Resourceadapter;
import org.apache.openejb.jee.ConnectionDefinition;
import org.apache.openejb.jee.MessageListener;
import org.apache.openejb.jee.AdminObject;
@@ -1594,7 +1594,7 @@ public class AutoConfig implements Dynam
for (ConnectorModule connectorModule :
appModule.getResourceModules()) {
Connector connector = connectorModule.getConnector();
- ResourceadapterX resourceAdapter =
connector.getResourceAdapter();
+ Resourceadapter resourceAdapter =
connector.getResourceAdapter();
if (resourceAdapter.getResourceAdapterClass() != null) {
String resourceAdapterId;
if (resourceAdapter.getId() != null) {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java?rev=955791&r1=955790&r2=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java
Thu Jun 17 23:44:11 2010
@@ -31,7 +31,7 @@ import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.InboundResourceadapter;
import org.apache.openejb.jee.MessageDrivenBean;
import org.apache.openejb.jee.Connector;
-import org.apache.openejb.jee.ResourceadapterX;
+import org.apache.openejb.jee.Resourceadapter;
import org.apache.openejb.jee.MessageAdapter;
import org.apache.openejb.jee.MessageListener;
import org.apache.openejb.util.Join;
@@ -81,7 +81,7 @@ public class CustomMdbContainerTest exte
AppModule app = new AppModule(this.getClass().getClassLoader(),
"testapp");
Connector connector = new Connector("email-ra");
- ResourceadapterX adapter = connector.setResourceAdapter(new
ResourceadapterX(EmailResourceAdapter.class));
+ Resourceadapter adapter = connector.setResourceAdapter(new
Resourceadapter(EmailResourceAdapter.class));
InboundResourceadapter inbound = adapter.setInboundResourceAdapter(new
InboundResourceadapter());
MessageAdapter messageAdapter = inbound.setMessageAdapter(new
MessageAdapter());
MessageListener listener = messageAdapter.addMessageListener(new
MessageListener(EmailConsumer.class, EmailAccountInfo.class));
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java?rev=955791&r1=955790&r2=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
Thu Jun 17 23:44:11 2010
@@ -31,7 +31,7 @@ import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.InboundResourceadapter;
import org.apache.openejb.jee.MessageDrivenBean;
import org.apache.openejb.jee.Connector;
-import org.apache.openejb.jee.ResourceadapterX;
+import org.apache.openejb.jee.Resourceadapter;
import org.apache.openejb.jee.MessageAdapter;
import org.apache.openejb.jee.MessageListener;
import org.apache.openejb.resource.quartz.QuartzResourceAdapter;
@@ -72,7 +72,7 @@ public class QuartzMdbContainerTest exte
AppModule app = new AppModule(this.getClass().getClassLoader(),
"testapp");
Connector connector = new Connector("quartz");
- ResourceadapterX adapter = connector.setResourceAdapter(new
ResourceadapterX(QuartzResourceAdapter.class));
+ Resourceadapter adapter = connector.setResourceAdapter(new
Resourceadapter(QuartzResourceAdapter.class));
InboundResourceadapter inbound = adapter.setInboundResourceAdapter(new
InboundResourceadapter());
MessageAdapter messageAdapter = inbound.setMessageAdapter(new
MessageAdapter());
MessageListener listener = messageAdapter.addMessageListener(new
MessageListener(Job.class, JobSpec.class));
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java?rev=955791&r1=955790&r2=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
Thu Jun 17 23:44:11 2010
@@ -82,16 +82,16 @@ public class Connector extends Connector
}
@XmlElement(name = "resourceadapter", required = true)
- public ResourceadapterX getResourceAdapter() {
+ public Resourceadapter getResourceAdapter() {
if (resourceAdapter == null) {
- resourceAdapter = new ResourceadapterX();
+ resourceAdapter = new Resourceadapter();
}
- return (ResourceadapterX) resourceAdapter;
+ return (Resourceadapter) resourceAdapter;
}
- public ResourceadapterX setResourceAdapter(ResourceadapterX
resourceAdapter16) {
+ public Resourceadapter setResourceAdapter(Resourceadapter
resourceAdapter16) {
this.resourceAdapter = resourceAdapter16;
- return (ResourceadapterX) this.resourceAdapter;
+ return (Resourceadapter) this.resourceAdapter;
}
@XmlAttribute(required = true)
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java?rev=955791&r1=955790&r2=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java
Thu Jun 17 23:44:11 2010
@@ -49,16 +49,16 @@ public class Connector10 extends Connect
}
@XmlElement(name = "resourceadapter", required = true)
- public Resourceadapter10X getResourceAdapter() {
+ public Resourceadapter10 getResourceAdapter() {
if (resourceAdapter == null){
- resourceAdapter = new Resourceadapter10X();
+ resourceAdapter = new Resourceadapter10();
}
- return (Resourceadapter10X) resourceAdapter;
+ return (Resourceadapter10) resourceAdapter;
}
- public Resourceadapter10X setResourceAdapter(Resourceadapter10X value) {
+ public Resourceadapter10 setResourceAdapter(Resourceadapter10 value) {
this.resourceAdapter = value;
- return (Resourceadapter10X) resourceAdapter;
+ return (Resourceadapter10) resourceAdapter;
}
@XmlElement(name="spec-version")
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConnectorBase.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConnectorBase.java?rev=955791&r1=955790&r2=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConnectorBase.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConnectorBase.java
Thu Jun 17 23:44:11 2010
@@ -52,7 +52,7 @@ public class ConnectorBase {
protected String resourceAdapterVersion = "";
protected License license;
@XmlTransient
- protected ResourceadapterBaseX resourceAdapter;
+ protected ResourceadapterBase resourceAdapter;
@XmlElement(name = "required-work-context")
protected List<String> requiredWorkContext;
@XmlAttribute
@@ -155,11 +155,11 @@ public class ConnectorBase {
this.license = value;
}
- public ResourceadapterBaseX getResourceAdapter() {
+ public ResourceadapterBase getResourceAdapter() {
return resourceAdapter;
}
- public void setResourceAdapter(ResourceadapterBaseX resourceAdapter) {
+ public void setResourceAdapter(ResourceadapterBase resourceAdapter) {
this.resourceAdapter = resourceAdapter;
}
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter.java
(from r955781,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter.java?p2=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter.java&p1=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java&r1=955781&r2=955791&rev=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter.java
Thu Jun 17 23:44:11 2010
@@ -55,16 +55,16 @@ import java.util.List;
// "adminObject",
// "securityPermission"
//})
-public class ResourceadapterX extends ResourceadapterBaseX {
+public class Resourceadapter extends ResourceadapterBase {
- public ResourceadapterX() {
+ public Resourceadapter() {
}
- public ResourceadapterX(Class resourceAdapterClass) {
+ public Resourceadapter(Class resourceAdapterClass) {
super(resourceAdapterClass);
}
- public ResourceadapterX(String resourceAdapterClass) {
+ public Resourceadapter(String resourceAdapterClass) {
super(resourceAdapterClass);
}
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10.java
(from r955781,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10.java?p2=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10.java&p1=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java&r1=955781&r2=955791&rev=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10.java
Thu Jun 17 23:44:11 2010
@@ -36,11 +36,11 @@ import java.util.List;
// "reauthenticationSupport",
// "securityPermission"
//})
-public class Resourceadapter10X extends ResourceadapterBaseX {
+public class Resourceadapter10 extends ResourceadapterBase {
private ConnectionDefinition connectionDefinition = new
ConnectionDefinition();
- public Resourceadapter10X() {
+ public Resourceadapter10() {
setOutboundResourceAdapter(new OutboundResourceadapter());
getOutboundResourceAdapter().getConnectionDefinition().add(connectionDefinition);
}
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBase.java
(from r955781,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBaseX.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBase.java?p2=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBase.java&p1=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBaseX.java&r1=955781&r2=955791&rev=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBaseX.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBase.java
Thu Jun 17 23:44:11 2010
@@ -27,7 +27,7 @@ import java.util.List;
*/
@XmlAccessorType(XmlAccessType.FIELD)
//@XmlSeeAlso(ResourceAdapter.class)
-public class ResourceadapterBaseX {
+public class ResourceadapterBase {
@XmlElement(name = "resourceadapter-class")
protected String resourceAdapterClass;
@@ -46,14 +46,14 @@ public class ResourceadapterBaseX {
@XmlID
protected String id;
- public ResourceadapterBaseX() {
+ public ResourceadapterBase() {
}
- public ResourceadapterBaseX(String resourceAdapterClass) {
+ public ResourceadapterBase(String resourceAdapterClass) {
this.resourceAdapterClass = resourceAdapterClass;
}
- public ResourceadapterBaseX(Class resourceAdapterClass) {
+ public ResourceadapterBase(Class resourceAdapterClass) {
this(resourceAdapterClass.getName());
}
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBase.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java?rev=955791&r1=955790&r2=955791&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
Thu Jun 17 23:44:11 2010
@@ -772,19 +772,17 @@ public class SessionBean implements Remo
}
public List<AroundTimeout> getAroundTimeout() {
- return aroundTimeout;
- }
-
- public void setAroundTimeout(List<AroundTimeout> aroundTimeout) {
- this.aroundTimeout = aroundTimeout;
+ if (aroundTimeout == null) {
+ aroundTimeout = new ArrayList<AroundTimeout>();
+ }
+ return this.aroundTimeout;
}
public List<AsyncMethod> getAsyncMethod() {
- return asyncMethod;
- }
-
- public void setAsyncMethod(List<AsyncMethod> asyncMethod) {
- this.asyncMethod = asyncMethod;
+ if (asyncMethod == null) {
+ asyncMethod = new ArrayList<AsyncMethod>();
+ }
+ return this.asyncMethod;
}
public ConcurrencyManagementType getConcurrencyManagementType() {
@@ -796,11 +794,10 @@ public class SessionBean implements Remo
}
public List<ConcurrentMethod> getConcurrentMethod() {
- return concurrentMethod;
- }
-
- public void setConcurrentMethod(List<ConcurrentMethod> concurrentMethod) {
- this.concurrentMethod = concurrentMethod;
+ if (concurrentMethod == null) {
+ concurrentMethod = new ArrayList<ConcurrentMethod>();
+ }
+ return this.concurrentMethod;
}
public void addAfterBegin(String method) {
@@ -855,11 +852,10 @@ public class SessionBean implements Remo
public List<Timer> getTimer() {
- return timer;
- }
-
- public void setTimer(List<Timer> timer) {
- this.timer = timer;
+ if (timer == null) {
+ timer = new ArrayList<Timer>();
+ }
+ return this.timer;
}
public Timeout getAccessTimeout() {
