Author: dblevins
Date: Wed Sep 12 15:16:28 2007
New Revision: 575102
URL: http://svn.apache.org/viewvc?rev=575102&view=rev
Log:
Renamed 'ServiceProvider provider-type="" service-types=""' to 'ServiceProvider
service="" types=""' respectively.
Renamed ServiceInfo.serviceType to ServiceInfo.service
Added ServiceInfo.types
Added:
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/assembler/classic/Assembler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.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/main/resources/schema/service-jar.xsd
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/resources/META-INF/org.acme/service-jar.xml
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=575102&r1=575101&r2=575102&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Wed Sep 12 15:16:28 2007
@@ -637,7 +637,7 @@
try {
containerSystem.getJNDIContext().bind("java:openejb/remote_jndi_contexts/" +
contextInfo.id, cntx);
} catch (NamingException e) {
- throw new OpenEJBException("Cannot bind " +
contextInfo.serviceType + " with id " + contextInfo.id, e);
+ throw new OpenEJBException("Cannot bind " + contextInfo.service +
" with id " + contextInfo.id, e);
}
// Update the config tree
@@ -659,19 +659,19 @@
Object service = serviceRecipe.create();
- Class interfce = serviceInterfaces.get(serviceInfo.serviceType);
- checkImplementation(interfce, service.getClass(),
serviceInfo.serviceType, serviceInfo.id);
+ Class interfce = serviceInterfaces.get(serviceInfo.service);
+ checkImplementation(interfce, service.getClass(), serviceInfo.service,
serviceInfo.id);
try {
- this.containerSystem.getJNDIContext().bind("java:openejb/" +
serviceInfo.serviceType + "/" + serviceInfo.id, service);
+ this.containerSystem.getJNDIContext().bind("java:openejb/" +
serviceInfo.service + "/" + serviceInfo.id, service);
} catch (NamingException e) {
- throw new OpenEJBException("Cannot bind " +
serviceInfo.serviceType + " with id " + serviceInfo.id, e);
+ throw new OpenEJBException("Cannot bind " + serviceInfo.service +
" with id " + serviceInfo.id, e);
}
setSystemInstanceComponent(interfce, service);
props.put(interfce.getName(), service);
- props.put(serviceInfo.serviceType, service);
+ props.put(serviceInfo.service, service);
props.put(serviceInfo.id, service);
containerSystem.addContainer(serviceInfo.id, (Container) service);
@@ -699,16 +699,16 @@
Object service = serviceRecipe.create();
- Class interfce = serviceInterfaces.get(serviceInfo.serviceType);
- checkImplementation(interfce, service.getClass(),
serviceInfo.serviceType, serviceInfo.id);
+ Class interfce = serviceInterfaces.get(serviceInfo.service);
+ checkImplementation(interfce, service.getClass(), serviceInfo.service,
serviceInfo.id);
ProxyManager.registerFactory(serviceInfo.id, (ProxyFactory) service);
ProxyManager.setDefaultFactory(serviceInfo.id);
try {
- this.containerSystem.getJNDIContext().bind("java:openejb/" +
serviceInfo.serviceType + "/" + serviceInfo.id, service);
+ this.containerSystem.getJNDIContext().bind("java:openejb/" +
serviceInfo.service + "/" + serviceInfo.id, service);
} catch (NamingException e) {
- throw new OpenEJBException("Cannot bind " +
serviceInfo.serviceType + " with id " + serviceInfo.id, e);
+ throw new OpenEJBException("Cannot bind " + serviceInfo.service +
" with id " + serviceInfo.id, e);
}
setSystemInstanceComponent(interfce, service);
@@ -716,7 +716,7 @@
getContext().put(interfce.getName(), service);
props.put(interfce.getName(), service);
- props.put(serviceInfo.serviceType, service);
+ props.put(serviceInfo.service, service);
props.put(serviceInfo.id, service);
// Update the config tree
@@ -840,13 +840,13 @@
Object service = serviceRecipe.create();
- Class interfce = serviceInterfaces.get(serviceInfo.serviceType);
- checkImplementation(interfce, service.getClass(),
serviceInfo.serviceType, serviceInfo.id);
+ Class interfce = serviceInterfaces.get(serviceInfo.service);
+ checkImplementation(interfce, service.getClass(), serviceInfo.service,
serviceInfo.id);
try {
- this.containerSystem.getJNDIContext().bind("java:openejb/" +
serviceInfo.serviceType + "/" + serviceInfo.id, service);
+ this.containerSystem.getJNDIContext().bind("java:openejb/" +
serviceInfo.service + "/" + serviceInfo.id, service);
} catch (NamingException e) {
- throw new OpenEJBException("Cannot bind " +
serviceInfo.serviceType + " with id " + serviceInfo.id, e);
+ throw new OpenEJBException("Cannot bind " + serviceInfo.service +
" with id " + serviceInfo.id, e);
}
setSystemInstanceComponent(interfce, service);
@@ -854,7 +854,7 @@
getContext().put(interfce.getName(), service);
props.put(interfce.getName(), service);
- props.put(serviceInfo.serviceType, service);
+ props.put(serviceInfo.service, service);
props.put(serviceInfo.id, service);
// Update the config tree
@@ -868,13 +868,13 @@
Object service = serviceRecipe.create();
- Class interfce = serviceInterfaces.get(serviceInfo.serviceType);
- checkImplementation(interfce, service.getClass(),
serviceInfo.serviceType, serviceInfo.id);
+ Class interfce = serviceInterfaces.get(serviceInfo.service);
+ checkImplementation(interfce, service.getClass(), serviceInfo.service,
serviceInfo.id);
try {
- this.containerSystem.getJNDIContext().bind("java:openejb/" +
serviceInfo.serviceType, service);
+ this.containerSystem.getJNDIContext().bind("java:openejb/" +
serviceInfo.service, service);
} catch (NamingException e) {
- throw new OpenEJBException("Cannot bind " +
serviceInfo.serviceType + " with id " + serviceInfo.id, e);
+ throw new OpenEJBException("Cannot bind " + serviceInfo.service +
" with id " + serviceInfo.id, e);
}
setSystemInstanceComponent(interfce, service);
@@ -882,7 +882,7 @@
getContext().put(interfce.getName(), service);
props.put(interfce.getName(), service);
- props.put(serviceInfo.serviceType, service);
+ props.put(serviceInfo.service, service);
props.put(serviceInfo.id, service);
this.securityService = (SecurityService) service;
@@ -898,13 +898,13 @@
Object service = serviceRecipe.create();
- Class interfce = serviceInterfaces.get(serviceInfo.serviceType);
- checkImplementation(interfce, service.getClass(),
serviceInfo.serviceType, serviceInfo.id);
+ Class interfce = serviceInterfaces.get(serviceInfo.service);
+ checkImplementation(interfce, service.getClass(), serviceInfo.service,
serviceInfo.id);
try {
- this.containerSystem.getJNDIContext().bind("java:openejb/" +
serviceInfo.serviceType, service);
+ this.containerSystem.getJNDIContext().bind("java:openejb/" +
serviceInfo.service, service);
} catch (NamingException e) {
- throw new OpenEJBException("Cannot bind " +
serviceInfo.serviceType + " with id " + serviceInfo.id, e);
+ throw new OpenEJBException("Cannot bind " + serviceInfo.service +
" with id " + serviceInfo.id, e);
}
setSystemInstanceComponent(interfce, service);
@@ -912,7 +912,7 @@
getContext().put(interfce.getName(), service);
props.put(interfce.getName(), service);
- props.put(serviceInfo.serviceType, service);
+ props.put(serviceInfo.service, service);
props.put(serviceInfo.id, service);
this.transactionManager = (TransactionManager) service;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java?rev=575102&r1=575101&r2=575102&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java
Wed Sep 12 15:16:28 2007
@@ -22,7 +22,8 @@
public class ServiceInfo extends InfoObject {
- public String serviceType;
+ public String service;
+ public List<String> types;
public String description;
public String id;
public String displayName;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java?rev=575102&r1=575101&r2=575102&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
Wed Sep 12 15:16:28 2007
@@ -219,7 +219,7 @@
println("");
- comment(info.serviceType + "(id=" + info.id + ")");
+ comment(info.service + "(id=" + info.id + ")");
comment("className: " + info.className);
// TODO: the codebase value usually isn't filled in, we should do
that.
// comment("codebase: " + info.codebase);
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=575102&r1=575101&r2=575102&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Wed Sep 12 15:16:28 2007
@@ -493,14 +493,14 @@
if (service.getId() == null) service.setId(provider.getId());
- logger.info("Configuring Service(id=" + service.getId() + ", type=" +
provider.getProviderType() + ", provider-id=" + provider.getId() + ")");
+ logger.info("Configuring Service(id=" + service.getId() + ", type=" +
provider.getService() + ", provider-id=" + provider.getId() + ")");
Properties props = new Properties();
props.putAll(provider.getProperties());
props.putAll(service.getProperties());
props.putAll(getSystemProperties(service.getId()));
- if (providerType != null &&
!provider.getProviderType().equals(providerType)) {
+ if (providerType != null &&
!provider.getService().equals(providerType)) {
throw new OpenEJBException(messages.format("conf.4902",
service.getId(), providerType));
}
@@ -512,7 +512,7 @@
throw new OpenEJBException("Cannot instantiate class " +
infoType.getName(), e);
}
- info.serviceType = provider.getProviderType();
+ info.service = provider.getService();
info.description = provider.getDescription();
info.displayName = provider.getDisplayName();
info.className = provider.getClassName();
@@ -630,14 +630,14 @@
OpenEjbConfiguration runningConfig = getRunningConfig();
for (ResourceInfo resourceInfo : runningConfig.facilities.resources) {
- if (isResourceType(resourceInfo.serviceType, type)) {
+ if (isResourceType(resourceInfo.service, type)) {
resourceIds.add(resourceInfo.id);
}
}
if (sys != null) {
for (ResourceInfo resourceInfo : sys.facilities.resources) {
- if (isResourceType(resourceInfo.serviceType, type)) {
+ if (isResourceType(resourceInfo.service, type)) {
resourceIds.add(resourceInfo.id);
}
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java?rev=575102&r1=575101&r2=575102&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
Wed Sep 12 15:16:28 2007
@@ -101,7 +101,7 @@
List<ServiceProvider> services = getServices(defaultProviderURL);
for (ServiceProvider service : services) {
- if (service.getServiceTypes().contains(type)) {
+ if (service.getTypes().contains(type)) {
return service;
}
}
@@ -115,9 +115,9 @@
List<ServiceProvider> services = getServices(defaultProviderURL);
for (ServiceProvider service : services) {
- if (!service.getProviderType().equals(providerType)) continue;
+ if (!service.getService().equals(providerType)) continue;
- if (service.getServiceTypes().contains(serviceType)) {
+ if (service.getTypes().contains(serviceType)) {
return service;
}
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java?rev=575102&r1=575101&r2=575102&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ServiceProvider.java
Wed Sep 12 15:16:28 2007
@@ -70,12 +70,12 @@
protected String factoryName;
@XmlAttribute(required = true)
protected String id;
- @XmlAttribute(name = "provider-type", required = true)
- protected String providerType;
- @XmlAttribute(name = "service-types", required = false)
+ @XmlAttribute(name = "service", required = true)
+ protected String service;
+ @XmlAttribute(name = "types", required = false)
@XmlJavaTypeAdapter(ListAdapter.class)
// for some reason when this field is type List JaxB gives us a
List<List<String>>
- protected Object serviceTypes;
+ protected Object types;
/**
* Gets the value of the properties property.
@@ -228,8 +228,8 @@
* @return possible object is
* [EMAIL PROTECTED] String }
*/
- public String getProviderType() {
- return providerType;
+ public String getService() {
+ return service;
}
/**
@@ -238,15 +238,15 @@
* @param value allowed object is
* [EMAIL PROTECTED] String }
*/
- public void setProviderType(String value) {
- this.providerType = value;
+ public void setService(String value) {
+ this.service = value;
}
@SuppressWarnings({"unchecked"})
- public List<String> getServiceTypes() {
- if (serviceTypes == null){
- serviceTypes = new ArrayList<String>();
+ public List<String> getTypes() {
+ if (types == null){
+ types = new ArrayList<String>();
}
- return (List<String>) serviceTypes;
+ return (List<String>) types;
}
}
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=575102&r1=575101&r2=575102&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
Wed Sep 12 15:16:28 2007
@@ -49,8 +49,8 @@
# ==========================================================
-->
<ServiceProvider id="Default CMP Container"
- provider-type="Container"
- service-types="CMP_ENTITY"
+ service="Container"
+ types="CMP_ENTITY"
constructor="id, transactionManager, securityService,
CmpEngineFactory, Engine, ConnectorName"
class-name="org.apache.openejb.core.cmp.CmpContainer">
@@ -69,8 +69,8 @@
-->
<ServiceProvider
id="Default BMP Container"
- provider-type="Container"
- service-types="BMP_ENTITY"
+ service="Container"
+ types="BMP_ENTITY"
constructor="id, transactionManager, securityService, PoolSize"
class-name="org.apache.openejb.core.entity.EntityContainer">
@@ -90,8 +90,8 @@
-->
<ServiceProvider
id="Default Stateless Container"
- provider-type="Container"
- service-types="STATELESS"
+ service="Container"
+ types="STATELESS"
constructor="id, transactionManager, securityService, TimeOut,
PoolSize, StrictPooling"
class-name="org.apache.openejb.core.stateless.StatelessContainer">
@@ -132,8 +132,8 @@
-->
<ServiceProvider
id="Default Stateful Container"
- provider-type="Container"
- service-types="STATEFUL"
+ service="Container"
+ types="STATEFUL"
constructor="id, transactionManager, securityService, Passivator,
TimeOut, PoolSize, BulkPassivate"
class-name="org.apache.openejb.core.stateful.StatefulContainer">
@@ -176,8 +176,8 @@
-->
<ServiceProvider
id="Default MDB Container"
- provider-type="Container"
- service-types="MESSAGE"
+ service="Container"
+ types="MESSAGE"
constructor="id, transactionManager, securityService,
ResourceAdapter, MessageListenerInterface, ActivationSpecClass, InstanceLimit"
class-name="org.apache.openejb.core.mdb.MdbContainer">
@@ -207,8 +207,8 @@
-->
<ServiceProvider
id="Default JDK 1.3 ProxyFactory"
- provider-type="ProxyFactory"
- service-types="ProxyFactory"
+ service="ProxyFactory"
+ types="ProxyFactory"
class-name="org.apache.openejb.util.proxy.Jdk13ProxyFactory"/>
<!--
@@ -218,14 +218,14 @@
-->
<ServiceProvider
id="PseudoSecurityService"
- provider-type="SecurityService"
- service-types="SecurityService"
+ service="SecurityService"
+ types="SecurityService"
class-name="org.apache.openejb.ri.sp.PseudoSecurityService"/>
<ServiceProvider
id="Default Security Service"
- provider-type="SecurityService"
- service-types="SecurityService"
+ service="SecurityService"
+ types="SecurityService"
class-name="org.apache.openejb.core.security.SecurityServiceImpl"/>
<!--
@@ -235,8 +235,8 @@
-->
<ServiceProvider
id="Default Transaction Manager"
- provider-type="TransactionManager"
- service-types="TransactionManager"
+ service="TransactionManager"
+ types="TransactionManager"
class-name="org.apache.geronimo.transaction.manager.GeronimoTransactionManager"/>
<!--
@@ -246,8 +246,8 @@
-->
<ServiceProvider
id="Default JDBC Database"
- provider-type="Resource"
- service-types="javax.sql.DataSource, DataSource"
+ service="Resource"
+ types="javax.sql.DataSource, DataSource"
class-name="org.apache.openejb.resource.jdbc.BasicManagedDataSource">
# Driver class name
@@ -426,8 +426,8 @@
<ServiceProvider
id="Default Unmanaged JDBC Database"
- provider-type="Resource"
- service-types="javax.sql.DataSource, DataSource"
+ service="Resource"
+ types="javax.sql.DataSource, DataSource"
class-name="org.apache.openejb.resource.jdbc.BasicDataSource">
# Driver class name
@@ -615,7 +615,7 @@
-->
<ServiceProvider
id="Default JMS Resource Adapter"
- provider-type="Resource"
+ service="Resource"
class-name="org.apache.activemq.ra.ActiveMQResourceAdapter">
# Broker configuration
@@ -631,8 +631,8 @@
<ServiceProvider
id="Default JMS Connection Factory"
- provider-type="Resource"
- service-types="javax.jms.ConnectionFactory,
javax.jms.QueueConnectionFactory, javax.jms.TopicConnectionFactory,
QueueConnectionFactory, TopicConnectionFactory"
+ service="Resource"
+ types="javax.jms.ConnectionFactory,
javax.jms.QueueConnectionFactory, javax.jms.TopicConnectionFactory,
QueueConnectionFactory, TopicConnectionFactory"
class-name="org.apache.activemq.ra.ActiveMQManagedConnectionFactory">
ResourceAdapter Default JMS Resource Adapter
@@ -640,8 +640,8 @@
<ServiceProvider
id="Default Queue"
- provider-type="Resource"
- service-types="javax.jms.Queue, Queue"
+ service="Resource"
+ types="javax.jms.Queue, Queue"
constructor="destination"
class-name="org.apache.activemq.command.ActiveMQQueue">
@@ -649,8 +649,8 @@
<ServiceProvider
id="Default Topic"
- provider-type="Resource"
- service-types="javax.jms.Topic, Topic"
+ service="Resource"
+ types="javax.jms.Topic, Topic"
constructor="destination"
class-name="org.apache.activemq.command.ActiveMQTopic">
@@ -663,8 +663,8 @@
-->
<ServiceProvider
id="Default Local TX ConnectionManager"
- provider-type="ConnectionManager"
- service-types="ConnectionManager"
+ service="ConnectionManager"
+ types="ConnectionManager"
constructor="transactionManager"
class-name="org.apache.openejb.resource.SharedLocalConnectionManager"/>
@@ -675,8 +675,8 @@
-->
<ServiceProvider
id="Default ORB"
- provider-type="Resource"
- service-types="org.omg.CORBA.ORB, ORB"
+ service="Resource"
+ types="org.omg.CORBA.ORB, ORB"
factory-name="create"
class-name="org.apache.openejb.core.OrbFactory">
@@ -689,8 +689,8 @@
-->
<ServiceProvider
id="Default Mail Session"
- provider-type="Resource"
- service-types="javax.mail.Session"
+ service="Resource"
+ types="javax.mail.Session"
factory-name="create"
class-name="org.apache.openejb.core.MailSessionFactory">
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/service-jar.xsd
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/service-jar.xsd?rev=575102&r1=575101&r2=575102&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/service-jar.xsd
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/service-jar.xsd
Wed Sep 12 15:16:28 2007
@@ -38,7 +38,8 @@
<xsd:simpleContent>
<xsd:extension base="xsd:string">
<xsd:attribute name="id" type="xsd:string" use="required"/>
- <xsd:attribute name="provider-type" type="ProviderTypes"
use="required"/>
+ <xsd:attribute name="service" type="ServiceTypes" use="required"/>
+ <xsd:attribute name="types" type="xsd:string" use="optional"/>
<xsd:attribute name="display-name" type="xsd:string" use="optional"/>
<xsd:attribute name="description" type="xsd:string" use="optional"/>
<xsd:attribute name="class-name" type="ClassName"/>
@@ -64,8 +65,8 @@
</xsd:restriction>
</xsd:simpleType>
- <!-- ProviderTypes -->
- <xsd:simpleType name="ProviderTypes">
+ <!-- ServiceTypes -->
+ <xsd:simpleType name="ServiceTypes">
<xsd:restriction base="xsd:string">
<xsd:pattern
value="Container|Proxy|Security|Transaction|Resource|Connector|ConnectionManager|JNDI"/>
</xsd:restriction>
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java?rev=575102&r1=575101&r2=575102&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java
Wed Sep 12 15:16:28 2007
@@ -60,7 +60,7 @@
assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
SecurityServiceInfo serviceInfo = new SecurityServiceInfo();
- serviceInfo.serviceType = "SecurityService";
+ serviceInfo.service = "SecurityService";
serviceInfo.className = SecurityServiceImpl.class.getName();
serviceInfo.id = "New Security Service";
serviceInfo.properties = new Properties();
Added:
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=575102&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/AutoConfigTest.java
(added)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/AutoConfigTest.java
Wed Sep 12 15:16:28 2007
@@ -0,0 +1,82 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core.stateless;
+
+import junit.framework.TestCase;
+
+import javax.naming.InitialContext;
+import javax.ejb.SessionContext;
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Arrays;
+import java.util.Stack;
+
+import org.apache.openejb.core.ivm.naming.InitContextFactory;
+import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
+import org.apache.openejb.assembler.classic.TransactionServiceInfo;
+import org.apache.openejb.assembler.classic.SecurityServiceInfo;
+import org.apache.openejb.assembler.classic.ConnectionManagerInfo;
+import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.jee.EjbJar;
+
+/**
+ * @version $Revision: 570984 $ $Date: 2007-08-29 16:42:12 -0700 (Wed, 29 Aug
2007) $
+ */
+public class AutoConfigTest extends TestCase {
+
+
+ public void test() throws Exception {
+
+ }
+ public void _test() throws Exception {
+
+ System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
InitContextFactory.class.getName());
+
+ ConfigurationFactory config = new ConfigurationFactory();
+ Assembler assembler = new Assembler();
+
+
assembler.createProxyFactory(config.configureService(ProxyFactoryInfo.class));
+
assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
+
assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
+
+
assembler.createConnectionManager(config.configureService(ConnectionManagerInfo.class));
+
+ EjbJar ejbJar = new EjbJar();
+ ejbJar.addEnterpriseBean(new StatelessBean(WidgetBean.class));
+
+ assembler.createApplication(config.configureApplication(ejbJar));
+
+ fail();
+ }
+
+ public static interface Widget {
+ }
+
+ public static class WidgetBean implements Widget {
+
+ @Resource javax.jms.Queue redQueue;
+ @Resource javax.jms.Queue blueQueue;
+ @Resource javax.jms.Queue greenQueue;
+
+ @Resource javax.sql.DataSource yellowDataSource;
+ @Resource javax.sql.DataSource orangeDataSource;
+ @Resource javax.sql.DataSource purpleDataSource;
+ }
+}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/resources/META-INF/org.acme/service-jar.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/resources/META-INF/org.acme/service-jar.xml?rev=575102&r1=575101&r2=575102&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/resources/META-INF/org.acme/service-jar.xml
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/resources/META-INF/org.acme/service-jar.xml
Wed Sep 12 15:16:28 2007
@@ -18,11 +18,11 @@
-->
<ServiceJar>
- <ServiceProvider id="CheddarContainer" provider-type="Container"
class-name="org.acme.SuperContainer">
+ <ServiceProvider id="CheddarContainer" service="Container"
class-name="org.acme.SuperContainer">
myProperty = Yummy Cheese
</ServiceProvider>
- <ServiceProvider id="Default Stateless Container" provider-type="Container"
class-name="org.acme.SuperContainer">
+ <ServiceProvider id="Default Stateless Container" service="Container"
class-name="org.acme.SuperContainer">
myProperty = Overridden Declaration
</ServiceProvider>
Modified:
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?rev=575102&r1=575101&r2=575102&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
(original)
+++
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
Wed Sep 12 15:16:28 2007
@@ -155,7 +155,7 @@
if (conf != null && conf.facilities != null){
ServiceInfo info = new ServiceInfo();
info.className = ((Class)
serviceProperties.get(ServerService.class)).getName();
- info.serviceType = "ServerService";
+ info.service = "ServerService";
info.id = serviceName;
info.properties = serviceProperties;
conf.facilities.services.add(info);
