Author: djencks
Date: Tue Jul 7 00:31:49 2009
New Revision: 791660
URL: http://svn.apache.org/viewvc?rev=791660&view=rev
Log:
OPENEJB-1014 java prefix removal cleanup in files with no other changes
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactory.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/JdbcConfigTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
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/LazyEjbReference.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java?rev=791660&r1=791659&r2=791660&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java
Tue Jul 7 00:31:49 2009
@@ -86,7 +86,7 @@
case REMOTE: type = InterfaceType.BUSINESS_REMOTE; break;
}
- String jndiName = "java:openejb/Deployment/" +
JndiBuilder.format(deploymentId, info.getInterface(), type);
+ String jndiName = "openejb/Deployment/" +
JndiBuilder.format(deploymentId, info.getInterface(), type);
if (useCrossClassLoaderRef && isRemote(deploymentInfo)) {
reference = new CrossClassLoaderJndiReference(jndiName);
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java?rev=791660&r1=791659&r2=791660&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
Tue Jul 7 00:31:49 2009
@@ -29,7 +29,7 @@
import org.apache.openejb.spi.SecurityService;
/**
- * @Depricated Use org.apache.openejb.client.LocalInitialContextFactory
+ * @deprecated Use org.apache.openejb.client.LocalInitialContextFactory
*/
public class InitContextFactory implements
javax.naming.spi.InitialContextFactory {
@@ -59,7 +59,7 @@
ContainerSystem containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
Context context = containerSystem.getJNDIContext();
- context = (Context) context.lookup("java:openejb/local");
+ context = (Context) context.lookup("openejb/local");
return context;
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java?rev=791660&r1=791659&r2=791660&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
Tue Jul 7 00:31:49 2009
@@ -21,7 +21,6 @@
import javax.naming.Context;
import javax.naming.Name;
import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
import javax.naming.spi.ObjectFactory;
import org.apache.openejb.core.CoreDeploymentInfo;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactory.java?rev=791660&r1=791659&r2=791660&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactory.java
Tue Jul 7 00:31:49 2009
@@ -25,7 +25,6 @@
import org.apache.openejb.spi.ContainerSystem;
import javax.naming.Context;
-import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
import java.net.URI;
@@ -60,7 +59,7 @@
try {
ContainerSystem containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
Context context = containerSystem.getJNDIContext();
- Object obj = context.lookup("java:openejb/Resource/" +
resouceId);
+ Object obj = context.lookup("openejb/Resource/" +
resouceId);
if (!(obj instanceof DataSource)) {
throw new IllegalArgumentException("Resource with id "
+ resouceId +
" is not a DataSource, but is " +
obj.getClass().getName());
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java?rev=791660&r1=791659&r2=791660&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java
Tue Jul 7 00:31:49 2009
@@ -47,10 +47,6 @@
private Assembler assembler;
private ConfigurationFactory config;
- public void asList(Object... objects){
- Arrays.asList(objects);
- }
-
protected void setUp() throws Exception {
config = new ConfigurationFactory();
assembler = new Assembler();
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/JdbcConfigTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/JdbcConfigTest.java?rev=791660&r1=791659&r2=791660&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/JdbcConfigTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/JdbcConfigTest.java
Tue Jul 7 00:31:49 2009
@@ -51,10 +51,10 @@
ContainerSystem containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
- DataSource managedDS = (DataSource)
containerSystem.getJNDIContext().lookup("java:openejb/Resource/Default JDBC
Database");
+ DataSource managedDS = (DataSource)
containerSystem.getJNDIContext().lookup("openejb/Resource/Default JDBC
Database");
assertNotNull("managedDS is null", managedDS);
- DataSource unmanagedDS = (DataSource)
containerSystem.getJNDIContext().lookup("java:openejb/Resource/Default
Unmanaged JDBC Database");
+ DataSource unmanagedDS = (DataSource)
containerSystem.getJNDIContext().lookup("openejb/Resource/Default Unmanaged
JDBC Database");
assertNotNull("unmanagedDS is null", unmanagedDS);
// test without a transaction
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java?rev=791660&r1=791659&r2=791660&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
Tue Jul 7 00:31:49 2009
@@ -39,6 +39,7 @@
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
import org.apache.openejb.util.URISupport;
import org.apache.openejb.core.CoreContainerSystem;
+import org.apache.openejb.core.ivm.naming.IvmJndiFactory;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.xbean.naming.context.ImmutableContext;
@@ -116,11 +117,11 @@
Properties properties = new Properties();
DataSource dataSource = new jdbcDataSource();
-
MockInitialContextFactory.install(Collections.singletonMap("java:openejb/Resource/TestDs",
dataSource));
- assertSame(dataSource, new
InitialContext().lookup("java:openejb/Resource/TestDs"));
+
MockInitialContextFactory.install(Collections.singletonMap("openejb/Resource/TestDs",
dataSource));
+ assertSame(dataSource, new
InitialContext().lookup("openejb/Resource/TestDs"));
- CoreContainerSystem containerSystem = new CoreContainerSystem();
- containerSystem.getJNDIContext().bind("java:openejb/Resource/TestDs",
dataSource);
+ CoreContainerSystem containerSystem = new CoreContainerSystem(new
IvmJndiFactory());
+ containerSystem.getJNDIFactory().bind("openejb/Resource/TestDs",
dataSource);
SystemInstance.get().setComponent(ContainerSystem.class,
containerSystem);
properties.put("DataSource", "TestDs");
Modified:
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java?rev=791660&r1=791659&r2=791660&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
(original)
+++
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
Tue Jul 7 00:31:49 2009
@@ -98,7 +98,7 @@
if (!disabled && containerSystem != null) {
NamingEnumeration<Binding> bindings = null;
try {
- bindings =
containerSystem.getJNDIContext().listBindings("java:openejb/Resource/");
+ bindings =
containerSystem.getJNDIContext().listBindings("openejb/Resource/");
Set<String> dbnames = new TreeSet<String>();
for (Binding binding : Collections.list(bindings)) {
Object value = binding.getObject();
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=791660&r1=791659&r2=791660&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
Tue Jul 7 00:31:49 2009
@@ -336,7 +336,7 @@
ContainerSystem containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
NamingEnumeration<Binding> namingEnumeration = null;
try {
- namingEnumeration =
containerSystem.getJNDIContext().listBindings("java:openejb/resourceAdapter");
+ namingEnumeration =
containerSystem.getJNDIContext().listBindings("openejb/resourceAdapter");
} catch (NamingException ignored) {
// no resource adapters were created
}
