You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/10 22:21:22 UTC
svn commit: r494991 - in /incubator/openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/
container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/
container/openejb-core/src/main/...
Author: dblevins
Date: Wed Jan 10 13:21:20 2007
New Revision: 494991
URL: http://svn.apache.org/viewvc?view=rev&rev=494991
Log:
normalizing the service names in jndi
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEngine.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/AbstractCMRTest.java
incubator/openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEngine.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEngine.java?view=diff&rev=494991&r1=494990&r2=494991
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEngine.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEngine.java Wed Jan 10 13:21:20 2007
@@ -115,7 +115,7 @@
jdoManagerBuilder.addMapping(url);
}
- String jdbcName = "java:openejb/connector/" + connectorName;
+ String jdbcName = "java:openejb/Connector/" + connectorName;
DataSource connectionFactory = (DataSource) new InitialContext().lookup(jdbcName);
if (connectionFactory == null) {
throw new OpenEJBException(jdbcName + " does not exist");
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java?view=diff&rev=494991&r1=494990&r2=494991
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java Wed Jan 10 13:21:20 2007
@@ -78,7 +78,7 @@
*
* <jdo-conf>
* <database name="Global_TX_Database" engine="instantdb">
- * <jndi name="java:openejb/connector/Default JDBC Database" />
+ * <jndi name="java:openejb/Connector/Default JDBC Database" />
* <mapping href="default.cmp_mapping.xml" />
* </database>
* <transaction-demarcation mode="global">
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?view=diff&rev=494991&r1=494990&r2=494991
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Wed Jan 10 13:21:20 2007
@@ -377,7 +377,7 @@
ConnectorReference reference = new ConnectorReference(connectionManager, managedConnectionFactory);
- containerSystem.getJNDIContext().bind("java:openejb/connector/" + conInfo.connectorId, reference);
+ containerSystem.getJNDIContext().bind("java:openejb/" + serviceInfo.serviceType + "/" + conInfo.connectorId, reference);
}
private ConnectionManager createConnectionManager(ConnectionManagerInfo serviceInfo) throws OpenEJBException, java.lang.reflect.InvocationTargetException, IllegalAccessException, NoSuchMethodException, NamingException {
@@ -392,7 +392,7 @@
Class interfce = serviceInterfaces.get(serviceInfo.serviceType);
checkImplementation(interfce, service.getClass(), serviceInfo.serviceType, serviceInfo.id);
- this.containerSystem.getJNDIContext().bind("java:openejb/" + serviceInfo.serviceType+"/"+serviceInfo.id, service);
+ this.containerSystem.getJNDIContext().bind("java:openejb/" + serviceInfo.serviceType + "/" + serviceInfo.id, service);
SystemInstance.get().setComponent(interfce, service);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?view=diff&rev=494991&r1=494990&r2=494991
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Wed Jan 10 13:21:20 2007
@@ -225,14 +225,14 @@
Reference reference = null;
if (referenceInfo.resourceID != null) {
- String jndiName = "java:openejb/connector/" + referenceInfo.resourceID;
+ String jndiName = "java:openejb/Connector/" + referenceInfo.resourceID;
reference = new IntraVmJndiReference(jndiName);
} else if (referenceInfo.location != null) {
String openEjbSubContextName1 = "java:openejb/remote_jndi_contexts/" + referenceInfo.location.jndiContextId;
String jndiName2 = referenceInfo.location.remoteRefName;
reference = new JndiReference(openEjbSubContextName1, jndiName2);
} else {
- String jndiName = "java:openejb/connector/" + referenceInfo.referenceName;
+ String jndiName = "java:openejb/Connector/" + referenceInfo.referenceName;
reference = new IntraVmJndiReference(jndiName);
}
bindings.put(normalize(referenceInfo.referenceName), wrapReference(reference));
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java?view=diff&rev=494991&r1=494990&r2=494991
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java Wed Jan 10 13:21:20 2007
@@ -152,7 +152,7 @@
for (ResourceReferenceInfo referenceInfo : encInfo.resourceRefs) {
Reference reference = null;
if (referenceInfo.getResourceId() != null) {
- String jndiName = "java:openejb/connector/" + referenceInfo.getResourceId();
+ String jndiName = "java:openejb/Connector/" + referenceInfo.getResourceId();
reference = new IntraVmJndiReference(jndiName);
} else {
String openEjbSubContextName1 = "java:openejb/remote_jndi_contexts/" + referenceInfo.getRemoteContextId();
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml?view=diff&rev=494991&r1=494990&r2=494991
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml Wed Jan 10 13:21:20 2007
@@ -56,7 +56,7 @@
<o:jndiBinding id="jndiBinding" context="#jndiContext">
<property name="bindings">
<map>
- <entry key="java:openejb/connector/Default JDBC Database">
+ <entry key="java:openejb/Connector/Default JDBC Database">
<o:connectorRef manager="#defaultConnectionManager" factory="#defaultJdbcDatabase"/>
</entry>
<entry key="java:openejb/TransactionManager" value-ref="transactionManager"/>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml?view=diff&rev=494991&r1=494990&r2=494991
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml Wed Jan 10 13:21:20 2007
@@ -53,7 +53,7 @@
<o:jndiBinding id="jndiBinding" context="#jndiContext">
<property name="bindings">
<map>
- <entry key="java:openejb/connector/Default JDBC Database">
+ <entry key="java:openejb/Connector/Default JDBC Database">
<o:connectorRef manager="#defaultConnectionManager" factory="#defaultJdbcDatabase"/>
</entry>
<entry key="java:openejb/TransactionManager" value-ref="transactionManager"/>
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml?view=diff&rev=494991&r1=494990&r2=494991
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml Wed Jan 10 13:21:20 2007
@@ -19,8 +19,8 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
<persistence-unit transaction-type="JTA" name="cmp">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <jta-data-source>java:openejb/connector/Default JDBC Database</jta-data-source>
- <non-jta-data-source>java:openejb/connector/Default JDBC Database</non-jta-data-source>
+ <jta-data-source>java:openejb/Connector/Default JDBC Database</jta-data-source>
+ <non-jta-data-source>java:openejb/Connector/Default JDBC Database</non-jta-data-source>
<mapping-file>META-INF/jpa.mapping.xml</mapping-file>
<class>org.apache.openejb.test.entity.cmp.BasicCmpBean</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
@@ -30,8 +30,8 @@
</persistence-unit>
<persistence-unit name="openjpa-test-unit">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <jta-data-source>java:openejb/connector/Default JDBC Database</jta-data-source>
- <non-jta-data-source>java:openejb/connector/Default JDBC Database</non-jta-data-source>
+ <jta-data-source>java:openejb/Connector/Default JDBC Database</jta-data-source>
+ <non-jta-data-source>java:openejb/Connector/Default JDBC Database</non-jta-data-source>
<class>org.apache.openejb.test.entity.Customer</class>
</persistence-unit>
</persistence>
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/AbstractCMRTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/AbstractCMRTest.java?view=diff&rev=494991&r1=494990&r2=494991
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/AbstractCMRTest.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/AbstractCMRTest.java Wed Jan 10 13:21:20 2007
@@ -75,7 +75,7 @@
InitialContext jndiContext = new InitialContext( );
transactionManager = (TransactionManager) jndiContext.lookup("java:openejb/TransactionManager");
- ds = (DataSource) jndiContext.lookup("java:openejb/connector/Default JDBC Database");
+ ds = (DataSource) jndiContext.lookup("java:openejb/Connector/Default JDBC Database");
}
protected static void dumpTable(DataSource ds, String table) throws SQLException {
Modified: incubator/openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java?view=diff&rev=494991&r1=494990&r2=494991
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java Wed Jan 10 13:21:20 2007
@@ -88,7 +88,7 @@
boolean disabled = Boolean.parseBoolean(properties.getProperty("disabled"));
if (!disabled) {
- NamingEnumeration<Binding> bindings = new InitialContext().listBindings("java:openejb/connector/");
+ NamingEnumeration<Binding> bindings = new InitialContext().listBindings("java:openejb/Connector/");
int dbIndex = 0;
for (Binding binding : Collections.list(bindings)) {
Object value = binding.getObject();