Author: dblevins
Date: Thu Dec 27 21:43:33 2007
New Revision: 607174
URL: http://svn.apache.org/viewvc?rev=607174&view=rev
Log:
Rearanged constructor args, added a second constructor
Modified:
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/sys/AbstractService.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigureServiceTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/AutoConfigTest.java
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=607174&r1=607173&r2=607174&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 Dec 27 21:43:33 2007
@@ -988,7 +988,7 @@
throw new OpenEJBException("No provider available for
resource-env-ref '" + resourceId + "' of type '" + type + "' for '" + beanName
+ "'.");
}
- Resource resource = new Resource(resourceId, providerId, null);
+ Resource resource = new Resource(resourceId, null, providerId);
resource.getProperties().setProperty("destination", resourceId);
ResourceInfo resourceInfo = configFactory.configureService(resource,
ResourceInfo.class);
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java?rev=607174&r1=607173&r2=607174&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/AbstractService.java
Thu Dec 27 21:43:33 2007
@@ -63,8 +63,13 @@
protected AbstractService(String id) {
this(id, null, null);
}
-
- protected AbstractService(String id, String provider, String type) {
+
+ protected AbstractService(String id, String type) {
+ this.id = id;
+ this.type = type;
+ }
+
+ protected AbstractService(String id, String type, String provider) {
this.id = id;
this.provider = provider;
this.type = type;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.java?rev=607174&r1=607173&r2=607174&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ConnectionManager.java
Thu Dec 27 21:43:33 2007
@@ -21,7 +21,6 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import java.util.Properties;
/**
* <p>Java class for anonymous complex type.
@@ -49,8 +48,8 @@
super(id);
}
- public ConnectionManager(String id, String provider, String type) {
- super(id, provider, type);
+ public ConnectionManager(String id, String type, String provider) {
+ super(id, type, provider);
}
public ConnectionManager() {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.java?rev=607174&r1=607173&r2=607174&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Connector.java
Thu Dec 27 21:43:33 2007
@@ -21,7 +21,6 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import java.util.Properties;
/**
@@ -49,8 +48,8 @@
super(id);
}
- public Connector(String id, String provider, String type) {
- super(id, provider, type);
+ public Connector(String id, String type, String provider) {
+ super(id, type, provider);
}
public Connector() {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.java?rev=607174&r1=607173&r2=607174&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Container.java
Thu Dec 27 21:43:33 2007
@@ -22,7 +22,6 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import java.util.Properties;
/**
@@ -52,8 +51,8 @@
super(id);
}
- public Container(String id, String provider, String type) {
- super(id, provider, type);
+ public Container(String id, String type, String provider) {
+ super(id, type, provider);
}
public Container() {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.java?rev=607174&r1=607173&r2=607174&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JndiProvider.java
Thu Dec 27 21:43:33 2007
@@ -21,7 +21,6 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import java.util.Properties;
/**
@@ -49,8 +48,8 @@
super(id);
}
- public JndiProvider(String id, String provider, String type) {
- super(id, provider, type);
+ public JndiProvider(String id, String type, String provider) {
+ super(id, type, provider);
}
public JndiProvider() {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java?rev=607174&r1=607173&r2=607174&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ProxyFactory.java
Thu Dec 27 21:43:33 2007
@@ -21,7 +21,6 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import java.util.Properties;
/**
@@ -49,8 +48,8 @@
super(id);
}
- public ProxyFactory(String id, String provider, String type) {
- super(id, provider, type);
+ public ProxyFactory(String id, String type, String provider) {
+ super(id, type, provider);
}
public ProxyFactory() {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java?rev=607174&r1=607173&r2=607174&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java
Thu Dec 27 21:43:33 2007
@@ -22,7 +22,6 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import java.util.Properties;
/**
@@ -54,8 +53,12 @@
super(id);
}
- public Resource(String id, String provider, String type) {
- super(id, provider, type);
+ public Resource(String id, String type) {
+ super(id, type);
+ }
+
+ public Resource(String id, String type, String provider) {
+ super(id, type, provider);
}
public Resource() {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java?rev=607174&r1=607173&r2=607174&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SecurityService.java
Thu Dec 27 21:43:33 2007
@@ -21,7 +21,6 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import java.util.Properties;
/**
@@ -50,8 +49,8 @@
super(id);
}
- public SecurityService(String id, String provider, String type) {
- super(id, provider, type);
+ public SecurityService(String id, String type, String provider) {
+ super(id, type, provider);
}
public SecurityService() {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java?rev=607174&r1=607173&r2=607174&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/TransactionManager.java
Thu Dec 27 21:43:33 2007
@@ -21,7 +21,6 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import java.util.Properties;
/**
@@ -49,8 +48,8 @@
super(id);
}
- public TransactionManager(String id, String provider, String type) {
- super(id, provider, type);
+ public TransactionManager(String id, String type, String provider) {
+ super(id, type, provider);
}
public TransactionManager() {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?rev=607174&r1=607173&r2=607174&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
Thu Dec 27 21:43:33 2007
@@ -678,7 +678,7 @@
types="javax.jms.Queue, Queue"
constructor="destination"
class-name="org.apache.activemq.command.ActiveMQQueue">
-
+ destination destination
</ServiceProvider>
<ServiceProvider
@@ -687,7 +687,7 @@
types="javax.jms.Topic, Topic"
constructor="destination"
class-name="org.apache.activemq.command.ActiveMQTopic">
-
+ destination destination
</ServiceProvider>
<!--
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigureServiceTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigureServiceTest.java?rev=607174&r1=607173&r2=607174&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigureServiceTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigureServiceTest.java
Thu Dec 27 21:43:33 2007
@@ -19,14 +19,10 @@
import junit.framework.TestCase;
import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
import org.apache.openejb.assembler.classic.ContainerInfo;
-import org.apache.openejb.assembler.classic.ResourceInfo;
-import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.config.sys.Container;
import org.apache.openejb.config.sys.Resource;
-import org.apache.openejb.loader.SystemInstance;
import java.net.URI;
-import java.net.URLEncoder;
/**
* @version $Rev$ $Date$
@@ -61,7 +57,7 @@
// We should be able to create one of these with a different name
- Container container = new Container("MyContainer",
"org.acme#CheddarContainer", "STATELESS");
+ Container container = new Container("MyContainer", "STATELESS",
"org.acme#CheddarContainer");
StatelessSessionContainerInfo myStatelessContainer =
factory.configureService(container, StatelessSessionContainerInfo.class);
assertNotNull(myStatelessContainer);
@@ -76,7 +72,7 @@
public void testConfigureServiceOverriddenProperty() throws Exception {
ConfigurationFactory factory = new ConfigurationFactory();
- Container container = new Container("MyContainer",
"org.acme#CheddarContainer", "STATELESS");
+ Container container = new Container("MyContainer", "STATELESS",
"org.acme#CheddarContainer");
container.getProperties().setProperty("myProperty", "Cheese is good");
StatelessSessionContainerInfo myStatelessContainer =
factory.configureService(container, StatelessSessionContainerInfo.class);
@@ -93,7 +89,7 @@
public void testConfigureServiceAddedProperty() throws Exception {
ConfigurationFactory factory = new ConfigurationFactory();
- Container container = new Container("MyContainer",
"org.acme#CheddarContainer", "STATELESS");
+ Container container = new Container("MyContainer", "STATELESS",
"org.acme#CheddarContainer");
container.getProperties().setProperty("anotherProperty", "Cheese is
good");
StatelessSessionContainerInfo myStatelessContainer =
factory.configureService(container, StatelessSessionContainerInfo.class);
@@ -111,7 +107,7 @@
public void testConfigureByType() throws Exception {
ConfigurationFactory factory = new ConfigurationFactory();
- Container container = new Container("MyContainer", null, "STATELESS");
+ Container container = new Container("MyContainer", "STATELESS", null);
container.getProperties().setProperty("anotherProperty", "Cheese is
good");
ContainerInfo myStatelessContainer =
factory.configureService(container, ContainerInfo.class);
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/AutoConfigTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/AutoConfigTest.java?rev=607174&r1=607173&r2=607174&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/AutoConfigTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/AutoConfigTest.java
Thu Dec 27 21:43:33 2007
@@ -51,9 +51,9 @@
assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
- assembler.createResource(config.configureService(new
org.apache.openejb.config.sys.Resource("defaultDataSource", null,
"DataSource"), ResourceInfo.class));
- assembler.createResource(config.configureService(new
org.apache.openejb.config.sys.Resource("yellowDataSource", null, "DataSource"),
ResourceInfo.class));
- assembler.createResource(config.configureService(new
org.apache.openejb.config.sys.Resource("PurpleDataSource", null, "DataSource"),
ResourceInfo.class));
+ assembler.createResource(config.configureService(new
org.apache.openejb.config.sys.Resource("defaultDataSource", "DataSource",
null), ResourceInfo.class));
+ assembler.createResource(config.configureService(new
org.apache.openejb.config.sys.Resource("yellowDataSource", "DataSource", null),
ResourceInfo.class));
+ assembler.createResource(config.configureService(new
org.apache.openejb.config.sys.Resource("PurpleDataSource", "DataSource", null),
ResourceInfo.class));
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(WidgetBean.class));
