Author: djencks
Date: Sat Feb 19 12:21:36 2005
New Revision: 154448
URL: http://svn.apache.org/viewcvs?view=rev&rev=154448
Log:
Clean up NameFactory interface and use. Fix cmp problem introduced with last
commit
Modified:
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
Modified:
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java?view=diff&r1=154447&r2=154448
==============================================================================
---
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java
(original)
+++
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java
Sat Feb 19 12:21:36 2005
@@ -105,7 +105,7 @@
J2eeContext j2eeContext = new J2eeContextImpl("test.domain",
"geronimo.server", "testapp", NameFactory.RESOURCE_ADAPTER_MODULE,
"testmodule", TARGET_NAME, NameFactory.JMS_RESOURCE);
kernel = new Kernel(j2eeContext.getJ2eeDomainName(), new
BasicGBeanRegistry());
kernel.boot();
- selfName = NameFactory.getResourceComponentName(null, null, null,
null, null, null, j2eeContext);
+ selfName = NameFactory.getComponentName(null, null, null,
NameFactory.JCA_RESOURCE, null, null, null, j2eeContext);
GBeanData aow = new GBeanData(selfName,
AdminObjectWrapper.getGBeanInfo());
aow.setAttribute("adminObjectInterface",
MockAdminObject.class.getName());
Modified:
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java?view=diff&r1=154447&r2=154448
==============================================================================
---
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
(original)
+++
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
Sat Feb 19 12:21:36 2005
@@ -156,7 +156,7 @@
kernel.loadGBean(cmfName, cmf);
J2eeContext j2eeContext = new J2eeContextImpl("test.domain",
"geronimo", "testapplication", "noModuleType", "testmodule", TARGET_NAME,
NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
- managedConnectionFactoryName =
NameFactory.getResourceComponentName(null, null, null, null, null, null,
j2eeContext);
+ managedConnectionFactoryName = NameFactory.getComponentName(null,
null, null, NameFactory.JCA_RESOURCE, null, null, null, j2eeContext);
GBeanMBean mcfw = new
GBeanMBean(ManagedConnectionFactoryWrapper.getGBeanInfo());
mcfw.setAttribute("managedConnectionFactoryClass",
MockManagedConnectionFactory.class.getName());
Modified:
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?view=diff&r1=154447&r2=154448
==============================================================================
---
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
(original)
+++
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
Sat Feb 19 12:21:36 2005
@@ -146,14 +146,6 @@
return getEjbComponentName(j2eeDomainName, j2eeServerName,
j2eeApplicationName, j2eeModuleName, j2eeName, j2eeType,
context).getCanonicalName();
}
- public static ObjectName getResourceComponentName(String j2eeDomainName,
String j2eeServerName, String j2eeApplicationName, String j2eeModuleName,
String j2eeName, String j2eeType, J2eeContext context) throws
MalformedObjectNameException {
- return getComponentName(j2eeDomainName, j2eeServerName,
j2eeApplicationName, RESOURCE_ADAPTER_MODULE, j2eeModuleName, j2eeName,
j2eeType, context);
- }
-
- public static String getResourceComponentNameString(String j2eeDomainName,
String j2eeServerName, String j2eeApplicationName, String j2eeModuleName,
String j2eeName, String j2eeType, J2eeContext context) throws
MalformedObjectNameException {
- return getResourceComponentName(j2eeDomainName, j2eeServerName,
j2eeApplicationName, j2eeModuleName, j2eeName, j2eeType,
context).getCanonicalName();
- }
-
/**
* Creates a query for components that are in no application with given
name.
*
@@ -209,10 +201,6 @@
props.put(URL_PATTERN, ObjectName.quote(urlPattern));
}
return
ObjectName.getInstance(context.getJ2eeDomainName(j2eeDomainName), props);
- }
-
- public static String getWebComponentNameString(String j2eeDomainName,
String j2eeServerName, String j2eeApplicationName, String j2eeModuleName,
String j2eeName, String j2eeType, J2eeContext context) throws
MalformedObjectNameException {
- return getResourceComponentName(j2eeDomainName, j2eeServerName,
j2eeApplicationName, j2eeModuleName, j2eeName, j2eeType,
context).getCanonicalName();
}
//for non-j2ee-deployable resources such as the transaction manager
Modified:
geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?view=diff&r1=154447&r2=154448
==============================================================================
---
geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
(original)
+++
geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
Sat Feb 19 12:21:36 2005
@@ -99,7 +99,7 @@
staticContentServletGBeanData.setAttribute("initParams",
staticContentServletInitParams);
staticContentServletGBeanData.setAttribute("loadOnStartup", new
Integer(0));
staticContentServletGBeanData.setAttribute("servletMappings",
Collections.singleton(new String("/")));
- ObjectName staticContentServletObjectName =
NameFactory.getResourceComponentName(null, null, null, null, (String)
staticContentServletGBeanData.getAttribute("servletName"), NameFactory.SERVLET,
moduleContext);
+ ObjectName staticContentServletObjectName =
NameFactory.getComponentName(null, null, null, NameFactory.WEB_MODULE, null,
(String) staticContentServletGBeanData.getAttribute("servletName"),
NameFactory.SERVLET, moduleContext);
staticContentServletGBeanData.setName(staticContentServletObjectName);
staticContentServletGBeanData.setReferencePattern("JettyServletRegistration",
webModuleName);
