Author: djencks
Date: Thu Jun 17 23:14:34 2010
New Revision: 955781
URL: http://svn.apache.org/viewvc?rev=955781&view=rev
Log:
OPENEJB-1298 half of some more case-change renames
Added:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapter.java
(contents, props changed)
- copied, changed from r955776,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapterX.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java
(contents, props changed)
- copied, changed from r955776,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter10.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBaseX.java
(contents, props changed)
- copied, changed from r955776,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapterBase.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java
(contents, props changed)
- copied, changed from r955776,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter.java
Removed:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapterX.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter10.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapterBase.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=955781&r1=955780&r2=955781&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:14:34 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.ResourceAdapter;
+import org.apache.openejb.jee.ResourceadapterX;
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");
- ResourceAdapter adapter = connector.setResourceAdapter(new
ResourceAdapter(EmailResourceAdapter.class));
+ ResourceadapterX adapter = connector.setResourceAdapter(new
ResourceadapterX(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=955781&r1=955780&r2=955781&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:14:34 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.ResourceAdapter;
+import org.apache.openejb.jee.ResourceadapterX;
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");
- ResourceAdapter adapter = connector.setResourceAdapter(new
ResourceAdapter(QuartzResourceAdapter.class));
+ ResourceadapterX adapter = connector.setResourceAdapter(new
ResourceadapterX(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=955781&r1=955780&r2=955781&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:14:34 2010
@@ -33,6 +33,8 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.MessageDrivenBeanInfo;
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.loader.SystemInstance;
import org.apache.openejb.config.sys.Resource;
import org.apache.openejb.config.sys.ServiceProvider;
@@ -53,9 +55,7 @@ import org.apache.openejb.jee.jpa.Entity
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.ApplicationClient;
import org.apache.openejb.jee.Connector;
-import org.apache.openejb.jee.ResourceAdapter;
import org.apache.openejb.jee.ConfigProperty;
-import org.apache.openejb.jee.OutboundResourceadapterX;
import org.apache.openejb.jee.ConnectionDefinition;
import org.apache.openejb.jee.MessageListener;
import org.apache.openejb.jee.AdminObject;
@@ -315,7 +315,7 @@ class AppInfoBuilder {
}
}
- ResourceAdapter resourceAdapter = connector.getResourceAdapter();
+ ResourceadapterX resourceAdapter = connector.getResourceAdapter();
if (resourceAdapter.getResourceAdapterClass() != null) {
String id = getId(connectorModule);
String className = resourceAdapter.getResourceAdapterClass();
@@ -337,7 +337,7 @@ class AppInfoBuilder {
connectorInfo.resourceAdapter =
configFactory.configureService(resource, ResourceInfo.class);
}
- OutboundResourceadapterX outbound =
resourceAdapter.getOutboundResourceAdapter();
+ OutboundResourceadapter outbound =
resourceAdapter.getOutboundResourceAdapter();
if (outbound != null) {
String transactionSupport = "none";
switch (outbound.getTransactionSupport()) {
@@ -424,7 +424,7 @@ class AppInfoBuilder {
}
}
- private String getId(AdminObject adminObject, ResourceAdapter
resourceAdapter, ConnectorModule connectorModule) {
+ private String getId(AdminObject adminObject, ResourceadapterX
resourceAdapter, ConnectorModule connectorModule) {
String id;
if (adminObject.getId() != null) {
id = adminObject.getId();
@@ -448,7 +448,7 @@ class AppInfoBuilder {
return id;
}
- private String getId(ConnectionDefinition connection,
OutboundResourceadapterX outbound, ConnectorModule connectorModule) {
+ private String getId(ConnectionDefinition connection,
OutboundResourceadapter outbound, ConnectorModule connectorModule) {
String id;
if (connection.getId() != null) {
id = connection.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=955781&r1=955780&r2=955781&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:14:34 2010
@@ -25,7 +25,7 @@ import static java.util.Arrays.asList;
import static org.apache.openejb.config.ServiceUtils.hasServiceProvider;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.jee.InboundResourceadapter;
-import org.apache.openejb.jee.OutboundResourceadapterX;
+import org.apache.openejb.jee.OutboundResourceadapter;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.config.sys.Resource;
import org.apache.openejb.assembler.classic.ContainerInfo;
@@ -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.ResourceAdapter;
+import org.apache.openejb.jee.ResourceadapterX;
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();
- ResourceAdapter resourceAdapter =
connector.getResourceAdapter();
+ ResourceadapterX resourceAdapter =
connector.getResourceAdapter();
if (resourceAdapter.getResourceAdapterClass() != null) {
String resourceAdapterId;
if (resourceAdapter.getId() != null) {
@@ -1605,7 +1605,7 @@ public class AutoConfig implements Dynam
resourceAdapterIds.add(resourceAdapterId);
}
- OutboundResourceadapterX outbound =
resourceAdapter.getOutboundResourceAdapter();
+ OutboundResourceadapter outbound =
resourceAdapter.getOutboundResourceAdapter();
if (outbound != null) {
for (ConnectionDefinition connection :
outbound.getConnectionDefinition()) {
String type =
connection.getConnectionFactoryInterface();
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=955781&r1=955780&r2=955781&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:14:34 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.ResourceAdapter;
+import org.apache.openejb.jee.ResourceadapterX;
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");
- ResourceAdapter adapter = connector.setResourceAdapter(new
ResourceAdapter(EmailResourceAdapter.class));
+ ResourceadapterX adapter = connector.setResourceAdapter(new
ResourceadapterX(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=955781&r1=955780&r2=955781&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:14:34 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.ResourceAdapter;
+import org.apache.openejb.jee.ResourceadapterX;
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");
- ResourceAdapter adapter = connector.setResourceAdapter(new
ResourceAdapter(QuartzResourceAdapter.class));
+ ResourceadapterX adapter = connector.setResourceAdapter(new
ResourceadapterX(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=955781&r1=955780&r2=955781&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:14:34 2010
@@ -82,16 +82,16 @@ public class Connector extends Connector
}
@XmlElement(name = "resourceadapter", required = true)
- public ResourceAdapter getResourceAdapter() {
+ public ResourceadapterX getResourceAdapter() {
if (resourceAdapter == null) {
- resourceAdapter = new ResourceAdapter();
+ resourceAdapter = new ResourceadapterX();
}
- return (ResourceAdapter) resourceAdapter;
+ return (ResourceadapterX) resourceAdapter;
}
- public ResourceAdapter setResourceAdapter(ResourceAdapter
resourceAdapter16) {
+ public ResourceadapterX setResourceAdapter(ResourceadapterX
resourceAdapter16) {
this.resourceAdapter = resourceAdapter16;
- return (ResourceAdapter) this.resourceAdapter;
+ return (ResourceadapterX) 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=955781&r1=955780&r2=955781&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:14:34 2010
@@ -49,16 +49,16 @@ public class Connector10 extends Connect
}
@XmlElement(name = "resourceadapter", required = true)
- public ResourceAdapter10 getResourceAdapter() {
+ public Resourceadapter10X getResourceAdapter() {
if (resourceAdapter == null){
- resourceAdapter = new ResourceAdapter10();
+ resourceAdapter = new Resourceadapter10X();
}
- return (ResourceAdapter10) resourceAdapter;
+ return (Resourceadapter10X) resourceAdapter;
}
- public ResourceAdapter10 setResourceAdapter(ResourceAdapter10 value) {
+ public Resourceadapter10X setResourceAdapter(Resourceadapter10X value) {
this.resourceAdapter = value;
- return (ResourceAdapter10) resourceAdapter;
+ return (Resourceadapter10X) 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=955781&r1=955780&r2=955781&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:14:34 2010
@@ -52,7 +52,7 @@ public class ConnectorBase {
protected String resourceAdapterVersion = "";
protected License license;
@XmlTransient
- protected ResourceAdapterBase resourceAdapter;
+ protected ResourceadapterBaseX resourceAdapter;
@XmlElement(name = "required-work-context")
protected List<String> requiredWorkContext;
@XmlAttribute
@@ -155,11 +155,11 @@ public class ConnectorBase {
this.license = value;
}
- public ResourceAdapterBase getResourceAdapter() {
+ public ResourceadapterBaseX getResourceAdapter() {
return resourceAdapter;
}
- public void setResourceAdapter(ResourceAdapterBase resourceAdapter) {
+ public void setResourceAdapter(ResourceadapterBaseX resourceAdapter) {
this.resourceAdapter = resourceAdapter;
}
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapter.java
(from r955776,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapterX.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapter.java?p2=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapter.java&p1=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapterX.java&r1=955776&r2=955781&rev=955781&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapterX.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapter.java
Thu Jun 17 23:14:34 2010
@@ -59,7 +59,7 @@ import java.util.List;
"authenticationMechanism",
"reauthenticationSupport"
})
-public class OutboundResourceadapterX {
+public class OutboundResourceadapter {
@XmlElement(name = "connection-definition")
protected List<ConnectionDefinition> connectionDefinition;
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapter.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java
(from r955776,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter10.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java?p2=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java&p1=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter10.java&r1=955776&r2=955781&rev=955781&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter10.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java
Thu Jun 17 23:14:34 2010
@@ -36,12 +36,12 @@ import java.util.List;
// "reauthenticationSupport",
// "securityPermission"
//})
-public class ResourceAdapter10 extends ResourceAdapterBase {
+public class Resourceadapter10X extends ResourceadapterBaseX {
private ConnectionDefinition connectionDefinition = new
ConnectionDefinition();
- public ResourceAdapter10() {
- setOutboundResourceAdapter(new OutboundResourceadapterX());
+ public Resourceadapter10X() {
+ setOutboundResourceAdapter(new OutboundResourceadapter());
getOutboundResourceAdapter().getConnectionDefinition().add(connectionDefinition);
}
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBaseX.java
(from r955776,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapterBase.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBaseX.java?p2=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBaseX.java&p1=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapterBase.java&r1=955776&r2=955781&rev=955781&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapterBase.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBaseX.java
Thu Jun 17 23:14:34 2010
@@ -27,14 +27,14 @@ import java.util.List;
*/
@XmlAccessorType(XmlAccessType.FIELD)
//@XmlSeeAlso(ResourceAdapter.class)
-public class ResourceAdapterBase {
+public class ResourceadapterBaseX {
@XmlElement(name = "resourceadapter-class")
protected String resourceAdapterClass;
@XmlTransient
protected List<ConfigProperty> configProperty;
@XmlElement(name = "outbound-resourceadapter")
- protected OutboundResourceadapterX outboundResourceAdapter;
+ protected OutboundResourceadapter outboundResourceAdapter;
@XmlElement(name = "inbound-resourceadapter")
protected InboundResourceadapter inboundResourceAdapter;
@XmlElement(name = "adminobject")
@@ -46,14 +46,14 @@ public class ResourceAdapterBase {
@XmlID
protected String id;
- public ResourceAdapterBase() {
+ public ResourceadapterBaseX() {
}
- public ResourceAdapterBase(String resourceAdapterClass) {
+ public ResourceadapterBaseX(String resourceAdapterClass) {
this.resourceAdapterClass = resourceAdapterClass;
}
- public ResourceAdapterBase(Class resourceAdapterClass) {
+ public ResourceadapterBaseX(Class resourceAdapterClass) {
this(resourceAdapterClass.getName());
}
@@ -72,11 +72,11 @@ public class ResourceAdapterBase {
return this.configProperty;
}
- public OutboundResourceadapterX getOutboundResourceAdapter() {
+ public OutboundResourceadapter getOutboundResourceAdapter() {
return outboundResourceAdapter;
}
- public OutboundResourceadapterX
setOutboundResourceAdapter(OutboundResourceadapterX value) {
+ public OutboundResourceadapter
setOutboundResourceAdapter(OutboundResourceadapter value) {
this.outboundResourceAdapter = value;
return outboundResourceAdapter;
}
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBaseX.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java
(from r955776,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java?p2=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java&p1=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter.java&r1=955776&r2=955781&rev=955781&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java
Thu Jun 17 23:14:34 2010
@@ -55,16 +55,16 @@ import java.util.List;
// "adminObject",
// "securityPermission"
//})
-public class ResourceAdapter extends ResourceAdapterBase {
+public class ResourceadapterX extends ResourceadapterBaseX {
- public ResourceAdapter() {
+ public ResourceadapterX() {
}
- public ResourceAdapter(Class resourceAdapterClass) {
+ public ResourceadapterX(Class resourceAdapterClass) {
super(resourceAdapterClass);
}
- public ResourceAdapter(String resourceAdapterClass) {
+ public ResourceadapterX(String resourceAdapterClass) {
super(resourceAdapterClass);
}
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterX.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=955781&r1=955780&r2=955781&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:14:34 2010
@@ -201,8 +201,6 @@ public class SessionBean implements Remo
protected NamedMethod beforeCompletionMethod;
@XmlElement(name = "after-completion-method")
protected NamedMethod afterCompletionMethod;
-// @XmlElement(name = "concurrency-type")
-// protected ConcurrencyType concurrencyType;
@XmlElement(name = "around-invoke", required = true)
protected List<AroundInvoke> aroundInvoke;
@XmlElement(name = "around-timeout")
