Author: djencks
Date: Sat Jun 26 00:20:19 2010
New Revision: 958155
URL: http://svn.apache.org/viewvc?rev=958155&view=rev
Log:
finish improving connector related jaxb classes and undoing an earlier
ill-advised rename
Added:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
(contents, props changed)
- copied, changed from r958150,
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/OutboundResourceAdapter.java
(contents, props changed)
- copied, changed from r958150,
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
(contents, props changed)
- copied, changed from r958150,
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/ResourceAdapter10.java
(contents, props changed)
- copied, changed from r958150,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java
Removed:
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/OutboundResourceadapterX.java
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
Modified:
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/main/java/org/apache/openejb/config/ConnectorModule.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.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/Connector16.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter16.java
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=958155&r1=958154&r2=958155&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
Sat Jun 26 00:20:19 2010
@@ -38,13 +38,13 @@ import org.apache.openejb.jee.AdminObjec
import org.apache.openejb.jee.ApplicationClient;
import org.apache.openejb.jee.ConfigProperty;
import org.apache.openejb.jee.ConnectionDefinition;
-import org.apache.openejb.jee.ConnectorBase;
+import org.apache.openejb.jee.Connector;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.InboundResourceadapter;
import org.apache.openejb.jee.MessageListener;
-import org.apache.openejb.jee.OutboundResourceadapterX;
+import org.apache.openejb.jee.OutboundResourceAdapter;
import org.apache.openejb.jee.PortComponent;
-import org.apache.openejb.jee.ResourceadapterBase;
+import org.apache.openejb.jee.ResourceAdapter;
import org.apache.openejb.jee.ServiceImplBean;
import org.apache.openejb.jee.Servlet;
import org.apache.openejb.jee.WebApp;
@@ -297,7 +297,7 @@ class AppInfoBuilder {
// the id generation code in AutoConfig$AppResources
//
- ConnectorBase connector = connectorModule.getConnector();
+ Connector connector = connectorModule.getConnector();
ConnectorInfo connectorInfo = new ConnectorInfo();
connectorInfo.description = connector.getDescription();
@@ -316,7 +316,7 @@ class AppInfoBuilder {
}
}
- ResourceadapterBase resourceAdapter =
connector.getResourceAdapter();
+ ResourceAdapter resourceAdapter = connector.getResourceAdapter();
if (resourceAdapter.getResourceAdapterClass() != null) {
String id = getId(connectorModule);
String className = resourceAdapter.getResourceAdapterClass();
@@ -338,7 +338,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()) {
@@ -425,7 +425,7 @@ class AppInfoBuilder {
}
}
- private String getId(AdminObject adminObject, ResourceadapterBase
resourceAdapter, ConnectorModule connectorModule) {
+ private String getId(AdminObject adminObject, ResourceAdapter
resourceAdapter, ConnectorModule connectorModule) {
String id;
if (adminObject.getId() != null) {
id = adminObject.getId();
@@ -449,7 +449,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=958155&r1=958154&r2=958155&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
Sat Jun 26 00:20:19 2010
@@ -26,7 +26,7 @@ import org.apache.openejb.jee.Activation
import org.apache.openejb.jee.AdminObject;
import org.apache.openejb.jee.AssemblyDescriptor;
import org.apache.openejb.jee.ConnectionDefinition;
-import org.apache.openejb.jee.ConnectorBase;
+import org.apache.openejb.jee.Connector;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.jee.InboundResourceadapter;
import org.apache.openejb.jee.JndiConsumer;
@@ -35,12 +35,12 @@ import org.apache.openejb.jee.MessageDes
import org.apache.openejb.jee.MessageDestinationRef;
import org.apache.openejb.jee.MessageDrivenBean;
import org.apache.openejb.jee.MessageListener;
-import org.apache.openejb.jee.OutboundResourceadapterX;
+import org.apache.openejb.jee.OutboundResourceAdapter;
import org.apache.openejb.jee.PersistenceContextRef;
import org.apache.openejb.jee.PersistenceRef;
import org.apache.openejb.jee.PersistenceType;
+import org.apache.openejb.jee.ResourceAdapter;
import org.apache.openejb.jee.ResourceRef;
-import org.apache.openejb.jee.ResourceadapterBase;
import org.apache.openejb.jee.SessionType;
import org.apache.openejb.jee.jpa.unit.Persistence;
import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
@@ -1591,9 +1591,9 @@ public class AutoConfig implements Dynam
//
for (ConnectorModule connectorModule :
appModule.getResourceModules()) {
- ConnectorBase connector = connectorModule.getConnector();
+ Connector connector = connectorModule.getConnector();
- ResourceadapterBase resourceAdapter =
connector.getResourceAdapter();
+ ResourceAdapter resourceAdapter =
connector.getResourceAdapter();
if (resourceAdapter.getResourceAdapterClass() != null) {
String resourceAdapterId;
if (resourceAdapter.getId() != null) {
@@ -1604,7 +1604,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/main/java/org/apache/openejb/config/ConnectorModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java?rev=958155&r1=958154&r2=958155&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java
Sat Jun 26 00:20:19 2010
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.config;
-import org.apache.openejb.jee.ConnectorBase;
+import org.apache.openejb.jee.Connector;
import java.io.File;
import java.net.URL;
@@ -34,18 +34,18 @@ public class ConnectorModule implements
private final ValidationContext validation;
private final Map<String,Object> altDDs = new HashMap<String,Object>();
- private ConnectorBase connector;
+ private Connector connector;
private ClassLoader classLoader;
private String jarLocation;
private final String moduleId;
private final List<URL> libraries = new ArrayList<URL>();
private final Set<String> watchedResources = new TreeSet<String>();
- public ConnectorModule(ConnectorBase connector) {
+ public ConnectorModule(Connector connector) {
this(connector, Thread.currentThread().getContextClassLoader(), null,
null);
}
- public ConnectorModule(ConnectorBase connector, ClassLoader classLoader,
String jarLocation, String moduleId) {
+ public ConnectorModule(Connector connector, ClassLoader classLoader,
String jarLocation, String moduleId) {
this.connector = connector;
this.classLoader = classLoader;
this.jarLocation = jarLocation;
@@ -81,11 +81,11 @@ public class ConnectorModule implements
return altDDs;
}
- public ConnectorBase getConnector() {
+ public Connector getConnector() {
return connector;
}
- public void setConnector(ConnectorBase connector) {
+ public void setConnector(Connector connector) {
this.connector = connector;
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=958155&r1=958154&r2=958155&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Sat Jun 26 00:20:19 2010
@@ -46,7 +46,7 @@ import org.apache.openejb.OpenEJB;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.api.LocalClient;
import org.apache.openejb.api.RemoteClient;
-import org.apache.openejb.jee.ConnectorBase;
+import org.apache.openejb.jee.Connector;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.jee.Application;
import org.apache.openejb.jee.ApplicationClient;
@@ -919,7 +919,7 @@ public class DeploymentLoader {
// read the ra.xml file
Map<String, URL> descriptors = getDescriptors(baseUrl);
- ConnectorBase connector = null;
+ Connector connector = null;
URL rarXmlUrl = descriptors.get("ra.xml");
if (rarXmlUrl != null){
connector = ReadDescriptors.readConnector(rarXmlUrl);
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=958155&r1=958154&r2=958155&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
Sat Jun 26 00:20:19 2010
@@ -22,7 +22,7 @@ import org.apache.openejb.core.webservic
import org.apache.openejb.jee.ApplicationClient;
import org.apache.openejb.jee.Connector16;
import org.apache.openejb.jee.Connector10;
-import org.apache.openejb.jee.ConnectorBase;
+import org.apache.openejb.jee.Connector;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.FacesConfig;
import org.apache.openejb.jee.HandlerChains;
@@ -285,7 +285,7 @@ public class ReadDescriptors implements
connectorModule.setConnector((Connector16) data);
} else if (data instanceof URL) {
URL url = (URL) data;
- ConnectorBase connector = readConnector(url);
+ Connector connector = readConnector(url);
connectorModule.setConnector(connector);
} else {
DeploymentLoader.logger.debug("No ra.xml found assuming annotated
beans present: " + appModule.getJarLocation() + ", module: " +
connectorModule.getModuleId());
@@ -429,13 +429,13 @@ public class ReadDescriptors implements
return definition;
}
- public static ConnectorBase readConnector(URL url) throws OpenEJBException
{
- ConnectorBase connector;
+ public static Connector readConnector(URL url) throws OpenEJBException {
+ Connector connector;
try {
- connector = (ConnectorBase)
JaxbJavaee.unmarshal(Connector16.class, url.openStream());
+ connector = (Connector) JaxbJavaee.unmarshal(Connector16.class,
url.openStream());
} catch (JAXBException e) {
try {
- connector = (ConnectorBase)
JaxbJavaee.unmarshal(Connector10.class, url.openStream());
+ connector = (Connector)
JaxbJavaee.unmarshal(Connector10.class, url.openStream());
} catch (ParserConfigurationException e1) {
throw new OpenEJBException("Cannot parse the ra.xml file: " +
url.toExternalForm(), e);
} catch (SAXException e1) {
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
(from r958150,
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/Connector.java?p2=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java&p1=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConnectorBase.java&r1=958150&r2=958155&rev=958155&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/Connector.java
Sat Jun 26 00:20:19 2010
@@ -33,7 +33,7 @@ import java.util.Map;
* Base class for Connector (1.6) and Connector10 (1.0) jaxb clases
*/
@XmlAccessorType(XmlAccessType.FIELD)
-public class ConnectorBase {
+public class Connector {
@XmlElement(name = "module-name")
protected String moduleName;
@@ -52,7 +52,7 @@ public class ConnectorBase {
protected String resourceAdapterVersion = "";
protected License license;
@XmlTransient
- protected ResourceadapterBase resourceAdapter;
+ protected ResourceAdapter resourceAdapter;
@XmlElement(name = "required-work-context")
protected List<String> requiredWorkContext;
@XmlAttribute
@@ -64,10 +64,10 @@ public class ConnectorBase {
@XmlAttribute(name = "metadata-complete")
protected Boolean metadataComplete;
- public ConnectorBase() {
+ public Connector() {
}
- public ConnectorBase(String id) {
+ public Connector(String id) {
this.id = id;
}
@@ -155,11 +155,11 @@ public class ConnectorBase {
this.license = value;
}
- public ResourceadapterBase getResourceAdapter() {
+ public ResourceAdapter getResourceAdapter() {
return resourceAdapter;
}
- public void setResourceAdapter(ResourceadapterBase resourceAdapter) {
+ public void setResourceAdapter(ResourceAdapter resourceAdapter) {
this.resourceAdapter = resourceAdapter;
}
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
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=958155&r1=958154&r2=958155&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
Sat Jun 26 00:20:19 2010
@@ -34,7 +34,7 @@ import javax.xml.bind.annotation.*;
// "license",
// "resourceAdapter"
//})
-public class Connector10 extends ConnectorBase {
+public class Connector10 extends Connector {
public Connector10() {
}
@@ -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/Connector16.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector16.java?rev=958155&r1=958154&r2=958155&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector16.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector16.java
Sat Jun 26 00:20:19 2010
@@ -63,7 +63,7 @@ import javax.xml.bind.annotation.*;
// "resourceAdapter",
// "requiredWorkContext"
//})
-public class Connector16 extends ConnectorBase {
+public class Connector16 extends Connector {
public Connector16() {
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java?rev=958155&r1=958154&r2=958155&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
Sat Jun 26 00:20:19 2010
@@ -139,12 +139,12 @@ public class ObjectFactory {
}
/**
- * Create an instance of {...@link JAXBElement }...@code <}...@link
ConnectorBase }...@code >}}
+ * Create an instance of {...@link JAXBElement }...@code <}...@link
Connector }...@code >}}
*
*/
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/j2ee";, name =
"connector")
- public JAXBElement<ConnectorBase> createConnector(ConnectorBase value) {
- return new JAXBElement<ConnectorBase>(_Connector_QNAME,
ConnectorBase.class, null, value);
+ public JAXBElement<Connector> createConnector(Connector value) {
+ return new JAXBElement<Connector>(_Connector_QNAME, Connector.class,
null, value);
}
/**
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java
(from r958150,
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=958150&r2=958155&rev=958155&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
Sat Jun 26 00:20:19 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/ResourceAdapter.java
(from r958150,
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/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/ResourceadapterBase.java&r1=958150&r2=958155&rev=958155&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/ResourceAdapter.java
Sat Jun 26 00:20:19 2010
@@ -27,14 +27,14 @@ import java.util.List;
*/
@XmlAccessorType(XmlAccessType.FIELD)
//@XmlSeeAlso(ResourceAdapter.class)
-public class ResourceadapterBase {
+public class ResourceAdapter {
@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 ResourceAdapter() {
}
- public ResourceadapterBase(String resourceAdapterClass) {
+ public ResourceAdapter(String resourceAdapterClass) {
this.resourceAdapterClass = resourceAdapterClass;
}
- public ResourceadapterBase(Class resourceAdapterClass) {
+ public ResourceAdapter(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/ResourceAdapter.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter10.java
(from r958150,
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=958150&r2=958155&rev=958155&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
Sat Jun 26 00:20:19 2010
@@ -36,12 +36,12 @@ import java.util.List;
// "reauthenticationSupport",
// "securityPermission"
//})
-public class Resourceadapter10X extends ResourceadapterBase {
+public class ResourceAdapter10 extends ResourceAdapter {
private ConnectionDefinition connectionDefinition = new
ConnectionDefinition();
- public Resourceadapter10X() {
- setOutboundResourceAdapter(new OutboundResourceadapterX());
+ 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
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter16.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter16.java?rev=958155&r1=958154&r2=958155&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter16.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter16.java
Sat Jun 26 00:20:19 2010
@@ -55,7 +55,7 @@ import java.util.List;
// "adminObject",
// "securityPermission"
//})
-public class ResourceAdapter16 extends ResourceadapterBase {
+public class ResourceAdapter16 extends ResourceAdapter {
public ResourceAdapter16() {
}
