modules/enterprise/gui/portal-war/src/main/webapp/admin/test/ResourceTypeCreator.jsp |
42 ++--------
1 file changed, 12 insertions(+), 30 deletions(-)
New commits:
commit 991934d4d344d2d34e34d052e976c3aab1ae13ca
Author: alexander.kiefer79(a)googlemail.com <di34475@.dh-com.continental.steel>
Date: Fri Jun 25 17:12:22 2010 +0200
Changed jsp Page from explicit usage of NamingService to usage of LookupUtil
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/ResourceTypeCreator.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/ResourceTypeCreator.jsp
index 16170ec..f71979c 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/ResourceTypeCreator.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/ResourceTypeCreator.jsp
@@ -14,7 +14,8 @@
<%@page
import="org.rhq.enterprise.server.resource.ResourceTypeManagerLocal"%>
<%@page
import="org.rhq.enterprise.server.resource.ResourceTypeManagerBean"%>
<%@page import="org.apache.commons.logging.*"%>
-<html>
+
+<%@page import="org.rhq.enterprise.server.util.LookupUtil"%><html>
<head>
<meta http-equiv="Content-Type" content="text/html;
charset=ISO-8859-1">
<title>ResourceTypeCreator</title>
@@ -41,48 +42,29 @@
<%
final Log log = LogFactory.getLog(this.getClass());
- Properties properties = new Properties();
- properties.put(Context.INITIAL_CONTEXT_FACTORY,
"org.jnp.interfaces.NamingContextFactory");
- properties.put(Context.URL_PKG_PREFIXES,
"org.jboss.naming:org.jnp.interfaces");
- properties.put(Context.PROVIDER_URL, "jnp://localhost:2099");
-
-
-
-
-
/** Creation of parameters for the new ResourceType */
String resourceTypeName = request.getParameter("resourceTypeName");
if( resourceTypeName != null )
{
//After name of new resourceType has been given
- out.println(resourceTypeName);
+ out.println("Input:" + resourceTypeName);
try
{
- Context context = new InitialContext(properties);
-
- Object ref1 = context.lookup("ResourceMetadataManagerBean/local");
- ResourceMetadataManagerLocal rmml = (ResourceMetadataManagerLocal)
javax.rmi.PortableRemoteObject.narrow(ref1, ResourceMetadataManagerLocal.class);
-
- Object ref2 = context.lookup("ResourceTypeManagerBean/local");
- ResourceTypeManagerLocal rtml = (ResourceTypeManagerLocal)
javax.rmi.PortableRemoteObject.narrow(ref2, ResourceTypeManagerLocal.class);
-
Plugin plugin;
- plugin = rmml.getPlugin("NagiosMonitor");
-
- out.println("DEBUG OUTPUT");
- out.println(plugin.getName());
+ plugin =
LookupUtil.getResourceMetadataManager().getPlugin("NagiosMonitor");
+ out.println("Name of returned plugin: " + plugin.getName());
- //ResourceType parentResourceType =
rtml.getResourceTypeByNameAndPlugin("Nagios@127.0.0.1:6557","NagiosMonitor");
- //ResourceType newResourceType = new ResourceType(resourceTypeName, plugin.getName(),
ResourceCategory.SERVER, parentResourceType);
+ //Method to get the parent resource Type
+ //Got name and plugin from the rhq_resource_type table in the rhq database
+ ResourceType parentResourceType =
LookupUtil.getResourceTypeManager().getResourceTypeByNameAndPlugin("NagiosMonitor","NagiosMonitor");
+ out.println("Name of parent ResourceType: " +
parentResourceType.getName());
- //rmml.addNewResourceType(newResourceType);
+ //ResourceType newResourceType = new ResourceType(resourceTypeName, plugin.getName(),
ResourceCategory.SERVICE, parentResourceType);
+ //out.println("Name of new ResourceType: " + newResourceType.getName());
+ //LookupUtil.getResourceMetadataManager().addNewResourceType(newResourceType);
}
- catch (NamingException e)
- {
- log.error(e);
- }
catch (NoResultException nre)
{
//NoResultException is thrown if no plugin with spcific name exists
Show replies by date