Author: djencks
Date: Fri Jun 25 23:52:08 2010
New Revision: 958150
URL: http://svn.apache.org/viewvc?rev=958150&view=rev
Log:
Enable connector 1.0 support. Start undoing some renames of jaxb classes.
Start improving naming of some ambiguous connector-related jaxb classes.
Added:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector16.java
(contents, props changed)
- copied, changed from r957694,
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/OutboundResourceadapterX.java
(contents, props changed)
- copied, changed from r957694,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapter.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter16.java
(contents, props changed)
- copied, changed from r957694,
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/Resourceadapter10X.java
(contents, props changed)
- copied, changed from r957694,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10.java
Removed:
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/OutboundResourceadapter.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
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/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-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/Connector10.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceadapterBase.java
openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.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=958150&r1=958149&r2=958150&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
Fri Jun 25 23:52:08 2010
@@ -27,11 +27,11 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.jee.Connector16;
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.ResourceAdapter16;
import org.apache.openejb.jee.MessageAdapter;
import org.apache.openejb.jee.MessageListener;
import org.apache.openejb.util.Join;
@@ -80,8 +80,8 @@ 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));
+ Connector16 connector = new Connector16("email-ra");
+ ResourceAdapter16 adapter = connector.setResourceAdapter(new
ResourceAdapter16(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=958150&r1=958149&r2=958150&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
Fri Jun 25 23:52:08 2010
@@ -27,10 +27,10 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.jee.Connector16;
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.ResourceAdapter16;
import org.apache.openejb.jee.InboundResourceadapter;
import org.apache.openejb.jee.MessageAdapter;
import org.apache.openejb.jee.MessageListener;
@@ -71,8 +71,8 @@ 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));
+ Connector16 connector = new Connector16("quartz");
+ ResourceAdapter16 adapter = connector.setResourceAdapter(new
ResourceAdapter16(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=958150&r1=958149&r2=958150&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
Fri Jun 25 23:52:08 2010
@@ -16,67 +16,68 @@
*/
package org.apache.openejb.config;
-import static org.apache.openejb.util.URLs.toFile;
+import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.assembler.classic.ClientInfo;
+import org.apache.openejb.assembler.classic.ConnectorInfo;
import org.apache.openejb.assembler.classic.EjbJarInfo;
import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
-import org.apache.openejb.assembler.classic.PersistenceUnitInfo;
+import org.apache.openejb.assembler.classic.HandlerChainInfo;
import org.apache.openejb.assembler.classic.JndiEncInfo;
-import org.apache.openejb.assembler.classic.ClientInfo;
-import org.apache.openejb.assembler.classic.ConnectorInfo;
-import org.apache.openejb.assembler.classic.ResourceInfo;
import org.apache.openejb.assembler.classic.MdbContainerInfo;
-import org.apache.openejb.assembler.classic.WebAppInfo;
-import org.apache.openejb.assembler.classic.ServletInfo;
-import org.apache.openejb.assembler.classic.PortInfo;
-import org.apache.openejb.assembler.classic.HandlerChainInfo;
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.Resourceadapter;
-import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.assembler.classic.PersistenceUnitInfo;
+import org.apache.openejb.assembler.classic.PortInfo;
+import org.apache.openejb.assembler.classic.ResourceInfo;
+import org.apache.openejb.assembler.classic.ServletInfo;
+import org.apache.openejb.assembler.classic.WebAppInfo;
+import org.apache.openejb.config.sys.Container;
import org.apache.openejb.config.sys.Resource;
import org.apache.openejb.config.sys.ServiceProvider;
-import org.apache.openejb.config.sys.Container;
-import org.apache.openejb.util.Logger;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Messages;
-import org.apache.openejb.util.MakeTxLookup;
-import org.apache.openejb.util.References;
-import org.apache.openejb.util.CircularReferencesException;
-import org.apache.openejb.jee.oejb3.EjbDeployment;
-import org.apache.openejb.jee.oejb3.OpenejbJar;
-import org.apache.openejb.jee.jpa.unit.Persistence;
-import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
-import org.apache.openejb.jee.jpa.unit.Property;
-import org.apache.openejb.jee.jpa.JpaJaxbUtil;
-import org.apache.openejb.jee.jpa.EntityMappings;
-import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.AdminObject;
import org.apache.openejb.jee.ApplicationClient;
-import org.apache.openejb.jee.Connector;
import org.apache.openejb.jee.ConfigProperty;
import org.apache.openejb.jee.ConnectionDefinition;
+import org.apache.openejb.jee.ConnectorBase;
+import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.InboundResourceadapter;
import org.apache.openejb.jee.MessageListener;
-import org.apache.openejb.jee.AdminObject;
-import org.apache.openejb.jee.WebApp;
-import org.apache.openejb.jee.Servlet;
-import org.apache.openejb.jee.Webservices;
-import org.apache.openejb.jee.WebserviceDescription;
+import org.apache.openejb.jee.OutboundResourceadapterX;
import org.apache.openejb.jee.PortComponent;
+import org.apache.openejb.jee.ResourceadapterBase;
import org.apache.openejb.jee.ServiceImplBean;
+import org.apache.openejb.jee.Servlet;
+import org.apache.openejb.jee.WebApp;
+import org.apache.openejb.jee.WebserviceDescription;
+import org.apache.openejb.jee.Webservices;
+import org.apache.openejb.jee.jpa.EntityMappings;
+import org.apache.openejb.jee.jpa.JpaJaxbUtil;
+import org.apache.openejb.jee.jpa.unit.Persistence;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
+import org.apache.openejb.jee.jpa.unit.Property;
+import org.apache.openejb.jee.oejb3.EjbDeployment;
+import org.apache.openejb.jee.oejb3.OpenejbJar;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.CircularReferencesException;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.MakeTxLookup;
+import org.apache.openejb.util.Messages;
+import org.apache.openejb.util.References;
import javax.xml.bind.JAXBException;
-import java.util.Map;
-import java.util.TreeMap;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
-import java.util.ArrayList;
import java.util.Set;
-import java.util.LinkedHashSet;
-import java.net.URL;
-import java.io.File;
-import java.io.IOException;
+import java.util.TreeMap;
+
+import static org.apache.openejb.util.URLs.toFile;
/**
* @version $Rev$ $Date$
@@ -296,7 +297,7 @@ class AppInfoBuilder {
// the id generation code in AutoConfig$AppResources
//
- Connector connector = connectorModule.getConnector();
+ ConnectorBase connector = connectorModule.getConnector();
ConnectorInfo connectorInfo = new ConnectorInfo();
connectorInfo.description = connector.getDescription();
@@ -315,7 +316,7 @@ class AppInfoBuilder {
}
}
- Resourceadapter resourceAdapter = connector.getResourceAdapter();
+ ResourceadapterBase resourceAdapter =
connector.getResourceAdapter();
if (resourceAdapter.getResourceAdapterClass() != null) {
String id = getId(connectorModule);
String className = resourceAdapter.getResourceAdapterClass();
@@ -337,7 +338,7 @@ class AppInfoBuilder {
connectorInfo.resourceAdapter =
configFactory.configureService(resource, ResourceInfo.class);
}
- OutboundResourceadapter outbound =
resourceAdapter.getOutboundResourceAdapter();
+ OutboundResourceadapterX outbound =
resourceAdapter.getOutboundResourceAdapter();
if (outbound != null) {
String transactionSupport = "none";
switch (outbound.getTransactionSupport()) {
@@ -424,7 +425,7 @@ class AppInfoBuilder {
}
}
- private String getId(AdminObject adminObject, Resourceadapter
resourceAdapter, ConnectorModule connectorModule) {
+ private String getId(AdminObject adminObject, ResourceadapterBase
resourceAdapter, ConnectorModule connectorModule) {
String id;
if (adminObject.getId() != null) {
id = adminObject.getId();
@@ -448,7 +449,7 @@ class AppInfoBuilder {
return id;
}
- private String getId(ConnectionDefinition connection,
OutboundResourceadapter outbound, ConnectorModule connectorModule) {
+ private String getId(ConnectionDefinition connection,
OutboundResourceadapterX 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=958150&r1=958149&r2=958150&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
Fri Jun 25 23:52:08 2010
@@ -17,65 +17,64 @@
*/
package org.apache.openejb.config;
-import static org.apache.openejb.config.ServiceUtils.NONE;
-import static org.apache.openejb.config.ServiceUtils.ANY;
-
-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.OutboundResourceadapter;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.config.sys.Resource;
import org.apache.openejb.assembler.classic.ContainerInfo;
import org.apache.openejb.assembler.classic.ResourceInfo;
-import org.apache.openejb.util.LinkResolver;
-import org.apache.openejb.util.UniqueDefaultLinkResolver;
-import org.apache.openejb.jee.MessageDrivenBean;
+import org.apache.openejb.config.sys.Resource;
import org.apache.openejb.jee.ActivationConfig;
+import org.apache.openejb.jee.ActivationConfigProperty;
+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.EnterpriseBean;
+import org.apache.openejb.jee.InboundResourceadapter;
+import org.apache.openejb.jee.JndiConsumer;
+import org.apache.openejb.jee.JndiReference;
import org.apache.openejb.jee.MessageDestination;
-import org.apache.openejb.jee.AssemblyDescriptor;
-import org.apache.openejb.jee.PersistenceType;
-import org.apache.openejb.jee.SessionType;
import org.apache.openejb.jee.MessageDestinationRef;
-import org.apache.openejb.jee.JndiReference;
-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.ConnectionDefinition;
+import org.apache.openejb.jee.MessageDrivenBean;
import org.apache.openejb.jee.MessageListener;
-import org.apache.openejb.jee.AdminObject;
+import org.apache.openejb.jee.OutboundResourceadapterX;
import org.apache.openejb.jee.PersistenceContextRef;
import org.apache.openejb.jee.PersistenceRef;
-import org.apache.openejb.jee.ActivationConfigProperty;
+import org.apache.openejb.jee.PersistenceType;
+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;
import org.apache.openejb.jee.oejb3.EjbDeployment;
import org.apache.openejb.jee.oejb3.OpenejbJar;
import org.apache.openejb.jee.oejb3.ResourceLink;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.LinkResolver;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
-import org.apache.openejb.util.URISupport;
import org.apache.openejb.util.SuperProperties;
-import static org.apache.openejb.util.Join.join;
+import org.apache.openejb.util.URISupport;
+import org.apache.openejb.util.UniqueDefaultLinkResolver;
import javax.jms.Queue;
import javax.jms.Topic;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.util.TreeSet;
-import java.util.HashMap;
import java.util.TreeMap;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Collection;
-import java.util.Iterator;
-import java.net.URI;
+import java.util.TreeSet;
+
+import static java.util.Arrays.asList;
+import static org.apache.openejb.config.ServiceUtils.ANY;
+import static org.apache.openejb.config.ServiceUtils.NONE;
+import static org.apache.openejb.config.ServiceUtils.hasServiceProvider;
+import static org.apache.openejb.util.Join.join;
public class AutoConfig implements DynamicDeployer {
@@ -1592,9 +1591,9 @@ public class AutoConfig implements Dynam
//
for (ConnectorModule connectorModule :
appModule.getResourceModules()) {
- Connector connector = connectorModule.getConnector();
+ ConnectorBase connector = connectorModule.getConnector();
- Resourceadapter resourceAdapter =
connector.getResourceAdapter();
+ ResourceadapterBase resourceAdapter =
connector.getResourceAdapter();
if (resourceAdapter.getResourceAdapterClass() != null) {
String resourceAdapterId;
if (resourceAdapter.getId() != null) {
@@ -1605,7 +1604,7 @@ public class AutoConfig implements Dynam
resourceAdapterIds.add(resourceAdapterId);
}
- OutboundResourceadapter outbound =
resourceAdapter.getOutboundResourceAdapter();
+ OutboundResourceadapterX 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=958150&r1=958149&r2=958150&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
Fri Jun 25 23:52:08 2010
@@ -16,16 +16,16 @@
*/
package org.apache.openejb.config;
-import org.apache.openejb.jee.Connector;
+import org.apache.openejb.jee.ConnectorBase;
import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Map;
import java.util.List;
-import java.util.ArrayList;
+import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import java.net.URL;
/**
* @version $Rev$ $Date$
@@ -34,18 +34,18 @@ public class ConnectorModule implements
private final ValidationContext validation;
private final Map<String,Object> altDDs = new HashMap<String,Object>();
- private Connector connector;
+ private ConnectorBase 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(Connector connector) {
+ public ConnectorModule(ConnectorBase connector) {
this(connector, Thread.currentThread().getContextClassLoader(), null,
null);
}
- public ConnectorModule(Connector connector, ClassLoader classLoader,
String jarLocation, String moduleId) {
+ public ConnectorModule(ConnectorBase 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 Connector getConnector() {
+ public ConnectorBase getConnector() {
return connector;
}
- public void setConnector(Connector connector) {
+ public void setConnector(ConnectorBase 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=958150&r1=958149&r2=958150&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
Fri Jun 25 23:52:08 2010
@@ -46,10 +46,10 @@ 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.loader.SystemInstance;
import org.apache.openejb.jee.Application;
import org.apache.openejb.jee.ApplicationClient;
-import org.apache.openejb.jee.Connector;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.FacesConfig;
import org.apache.openejb.jee.JavaWsdlMapping;
@@ -919,7 +919,7 @@ public class DeploymentLoader {
// read the ra.xml file
Map<String, URL> descriptors = getDescriptors(baseUrl);
- Connector connector = null;
+ ConnectorBase 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=958150&r1=958149&r2=958150&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
Fri Jun 25 23:52:08 2010
@@ -20,7 +20,9 @@ import static org.apache.openejb.util.UR
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.core.webservices.WsdlResolver;
import org.apache.openejb.jee.ApplicationClient;
-import org.apache.openejb.jee.Connector;
+import org.apache.openejb.jee.Connector16;
+import org.apache.openejb.jee.Connector10;
+import org.apache.openejb.jee.ConnectorBase;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.FacesConfig;
import org.apache.openejb.jee.HandlerChains;
@@ -279,15 +281,15 @@ public class ReadDescriptors implements
if (connectorModule.getConnector() != null) return;
Object data = connectorModule.getAltDDs().get("ra.xml");
- if (data instanceof Connector) {
- connectorModule.setConnector((Connector) data);
+ if (data instanceof Connector16) {
+ connectorModule.setConnector((Connector16) data);
} else if (data instanceof URL) {
URL url = (URL) data;
- Connector connector = readConnector(url);
+ ConnectorBase connector = readConnector(url);
connectorModule.setConnector(connector);
} else {
DeploymentLoader.logger.debug("No ra.xml found assuming annotated
beans present: " + appModule.getJarLocation() + ", module: " +
connectorModule.getModuleId());
- connectorModule.setConnector(new Connector());
+ connectorModule.setConnector(new Connector16());
}
}
@@ -427,14 +429,24 @@ public class ReadDescriptors implements
return definition;
}
- public static Connector readConnector(URL url) throws OpenEJBException {
- Connector connector;
+ public static ConnectorBase readConnector(URL url) throws OpenEJBException
{
+ ConnectorBase connector;
try {
- connector = (Connector) JaxbJavaee.unmarshal(Connector.class,
url.openStream());
+ connector = (ConnectorBase)
JaxbJavaee.unmarshal(Connector16.class, url.openStream());
+ } catch (JAXBException e) {
+ try {
+ connector = (ConnectorBase)
JaxbJavaee.unmarshal(Connector10.class, url.openStream());
+ } catch (ParserConfigurationException e1) {
+ throw new OpenEJBException("Cannot parse the ra.xml file: " +
url.toExternalForm(), e);
+ } catch (SAXException e1) {
+ throw new OpenEJBException("Cannot parse the ra.xml file: " +
url.toExternalForm(), e);
+ } catch (JAXBException e1) {
+ throw new OpenEJBException("Cannot unmarshall the ra.xml file:
" + url.toExternalForm(), e);
+ } catch (IOException e1) {
+ throw new OpenEJBException("Cannot read the ra.xml file: " +
url.toExternalForm(), e);
+ }
} catch (SAXException e) {
throw new OpenEJBException("Cannot parse the ra.xml file: " +
url.toExternalForm(), e);
- } catch (JAXBException e) {
- throw new OpenEJBException("Cannot unmarshall the ra.xml file: " +
url.toExternalForm(), e);
} catch (IOException e) {
throw new OpenEJBException("Cannot read the ra.xml file: " +
url.toExternalForm(), e);
} catch (Exception e) {
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=958150&r1=958149&r2=958150&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
Fri Jun 25 23:52:08 2010
@@ -27,11 +27,11 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.jee.Connector16;
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.ResourceAdapter16;
import org.apache.openejb.jee.MessageAdapter;
import org.apache.openejb.jee.MessageListener;
import org.apache.openejb.util.Join;
@@ -80,8 +80,8 @@ 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));
+ Connector16 connector = new Connector16("email-ra");
+ ResourceAdapter16 adapter = connector.setResourceAdapter(new
ResourceAdapter16(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=958150&r1=958149&r2=958150&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
Fri Jun 25 23:52:08 2010
@@ -30,8 +30,8 @@ import org.apache.openejb.assembler.clas
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.Connector16;
+import org.apache.openejb.jee.ResourceAdapter16;
import org.apache.openejb.jee.MessageAdapter;
import org.apache.openejb.jee.MessageListener;
import org.apache.openejb.resource.quartz.QuartzResourceAdapter;
@@ -71,8 +71,8 @@ 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));
+ Connector16 connector = new Connector16("quartz");
+ ResourceAdapter16 adapter = connector.setResourceAdapter(new
ResourceAdapter16(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/Connector10.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java?rev=958150&r1=958149&r2=958150&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
Fri Jun 25 23:52:08 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")
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector16.java
(from r957694,
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/Connector16.java?p2=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector16.java&p1=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java&r1=957694&r2=958150&rev=958150&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/Connector16.java
Fri Jun 25 23:52:08 2010
@@ -63,12 +63,12 @@ import javax.xml.bind.annotation.*;
// "resourceAdapter",
// "requiredWorkContext"
//})
-public class Connector extends ConnectorBase {
+public class Connector16 extends ConnectorBase {
- public Connector() {
+ public Connector16() {
}
- public Connector(String id) {
+ public Connector16(String id) {
super(id);
}
@@ -82,16 +82,16 @@ public class Connector extends Connector
}
@XmlElement(name = "resourceadapter", required = true)
- public Resourceadapter getResourceAdapter() {
+ public ResourceAdapter16 getResourceAdapter() {
if (resourceAdapter == null) {
- resourceAdapter = new Resourceadapter();
+ resourceAdapter = new ResourceAdapter16();
}
- return (Resourceadapter) resourceAdapter;
+ return (ResourceAdapter16) resourceAdapter;
}
- public Resourceadapter setResourceAdapter(Resourceadapter
resourceAdapter16) {
+ public ResourceAdapter16 setResourceAdapter(ResourceAdapter16
resourceAdapter16) {
this.resourceAdapter = resourceAdapter16;
- return (Resourceadapter) this.resourceAdapter;
+ return (ResourceAdapter16) this.resourceAdapter;
}
@XmlAttribute(required = true)
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector16.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector16.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector16.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapterX.java
(from r957694,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapter.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapterX.java?p2=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapterX.java&p1=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapter.java&r1=957694&r2=958150&rev=958150&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapter.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapterX.java
Fri Jun 25 23:52:08 2010
@@ -59,7 +59,7 @@ import java.util.List;
"authenticationMechanism",
"reauthenticationSupport"
})
-public class OutboundResourceadapter {
+public class OutboundResourceadapterX {
@XmlElement(name = "connection-definition")
protected List<ConnectionDefinition> connectionDefinition;
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceadapterX.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter16.java
(from r957694,
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/ResourceAdapter16.java?p2=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter16.java&p1=openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter.java&r1=957694&r2=958150&rev=958150&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/ResourceAdapter16.java
Fri Jun 25 23:52:08 2010
@@ -55,16 +55,16 @@ import java.util.List;
// "adminObject",
// "securityPermission"
//})
-public class Resourceadapter extends ResourceadapterBase {
+public class ResourceAdapter16 extends ResourceadapterBase {
- public Resourceadapter() {
+ public ResourceAdapter16() {
}
- public Resourceadapter(Class resourceAdapterClass) {
+ public ResourceAdapter16(Class resourceAdapterClass) {
super(resourceAdapterClass);
}
- public Resourceadapter(String resourceAdapterClass) {
+ public ResourceAdapter16(String resourceAdapterClass) {
super(resourceAdapterClass);
}
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter16.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter16.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter16.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Resourceadapter10X.java
(from r957694,
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=957694&r2=958150&rev=958150&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
Fri Jun 25 23:52:08 2010
@@ -36,12 +36,12 @@ import java.util.List;
// "reauthenticationSupport",
// "securityPermission"
//})
-public class Resourceadapter10 extends ResourceadapterBase {
+public class Resourceadapter10X extends ResourceadapterBase {
private ConnectionDefinition connectionDefinition = new
ConnectionDefinition();
- public Resourceadapter10() {
- setOutboundResourceAdapter(new OutboundResourceadapter());
+ public Resourceadapter10X() {
+ setOutboundResourceAdapter(new OutboundResourceadapterX());
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
Modified:
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/ResourceadapterBase.java?rev=958150&r1=958149&r2=958150&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/ResourceadapterBase.java
Fri Jun 25 23:52:08 2010
@@ -34,7 +34,7 @@ public class ResourceadapterBase {
@XmlTransient
protected List<ConfigProperty> configProperty;
@XmlElement(name = "outbound-resourceadapter")
- protected OutboundResourceadapter outboundResourceAdapter;
+ protected OutboundResourceadapterX outboundResourceAdapter;
@XmlElement(name = "inbound-resourceadapter")
protected InboundResourceadapter inboundResourceAdapter;
@XmlElement(name = "adminobject")
@@ -72,11 +72,11 @@ public class ResourceadapterBase {
return this.configProperty;
}
- public OutboundResourceadapter getOutboundResourceAdapter() {
+ public OutboundResourceadapterX getOutboundResourceAdapter() {
return outboundResourceAdapter;
}
- public OutboundResourceadapter
setOutboundResourceAdapter(OutboundResourceadapter value) {
+ public OutboundResourceadapterX
setOutboundResourceAdapter(OutboundResourceadapterX value) {
this.outboundResourceAdapter = value;
return outboundResourceAdapter;
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java?rev=958150&r1=958149&r2=958150&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java
Fri Jun 25 23:52:08 2010
@@ -196,11 +196,11 @@ public class JeeTest extends TestCase {
}
public void testRar15() throws Exception {
- marshalAndUnmarshal(Connector.class, "connector-1.5-example.xml");
+ marshalAndUnmarshal(Connector16.class, "connector-1.5-example.xml");
}
public void testRar16() throws Exception {
- marshalAndUnmarshal(Connector.class, "connector-1.6-example.xml");
+ marshalAndUnmarshal(Connector16.class, "connector-1.6-example.xml");
}
/**
