[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq] Branch 'nagios' - modules/enterprise
From:       alki2109 () fedoraproject ! org (Alexander Kiefer)
Date:       2010-06-30 11:07:12
Message-ID: 20100630110712.5F64C120267 () lists ! fedorahosted ! org
[Download RAW message or body]

 modules/enterprise/gui/portal-war/src/main/webapp/admin/test/ResourceTypeCreator.jsp \
|   23 --------  modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java \
|   26 +++++++++-  modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerLocal.java \
|    3 -  3 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit f98a3de0cdc1b7d7286f6f2c7beb77e9c205d0a3
Author: alexander.kiefer79 at googlemail.com <di34475 at .dh-com.continental.steel>
Date:   Wed Jun 30 13:04:04 2010 +0200

    Logic of creating new ResourceType put to method in Bean instead of .jsp file

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 f71979c..ed98f0e 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
 @@ -40,8 +40,6 @@
 	</form>
 	
 	<%
-		final Log log = LogFactory.getLog(this.getClass());
-	
 		/** Creation of parameters for the new ResourceType */
 		String resourceTypeName = request.getParameter("resourceTypeName");
 		
@@ -50,26 +48,7 @@
 			//After name of new resourceType has been given
 			out.println("Input:" + resourceTypeName);
 			
-			try 
-			{
-				Plugin plugin;
-				plugin = LookupUtil.getResourceMetadataManager().getPlugin("NagiosMonitor");
-				out.println("Name of returned plugin: " + plugin.getName());
-				
-				//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());
-				
-				//ResourceType newResourceType = new ResourceType(resourceTypeName, \
                plugin.getName(), ResourceCategory.SERVICE, parentResourceType);
-				//out.println("Name of new ResourceType: " + newResourceType.getName());
-				//LookupUtil.getResourceMetadataManager().addNewResourceType(newResourceType);
-			} 
-			catch (NoResultException nre)
-			{
-				//NoResultException is thrown if no plugin with spcific name exists
-				log.error(nre);
-			}
+			LookupUtil.getResourceMetadataManager().addNewResourceType(resourceTypeName);
 		}
 		else
 		{
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java \
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
 index b40194b..3d6862d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
                
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
 @@ -88,6 +88,7 @@ import org.rhq.enterprise.server.resource.ResourceManagerLocal;
 import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
 import org.rhq.enterprise.server.resource.group.ResourceGroupDeleteException;
 import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal;
+import org.rhq.enterprise.server.util.LookupUtil;
 
 /**
  * This class manages the metadata for resources. Plugins are registered against \
this bean so that their metadata can be @@ -1508,9 +1509,30 @@ public class \
ResourceMetadataManagerBean implements ResourceMetadataManagerLocal  }
 
     /** Method to add a runtime-created resourceType to an existing plugin */
-    public void addNewResourceType(ResourceType newResourceType) {
+    public void addNewResourceType(String newResourceTypeName) {
+        Plugin plugin = null;
+
+        try {
+            plugin = \
LookupUtil.getResourceMetadataManager().getPlugin("NagiosMonitor"); +        } catch \
(NoResultException nre) { +            //NoResultException is thrown if no plugin \
with spcific name exists +            log.error(nre);
+        }
+
+        log.info("Name of returned plugin: " + plugin.getName());
+
+        //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"); +
+        log.info("Name of parent ResourceType: " + parentResourceType.getName());
+
+        ResourceType newResourceType = new ResourceType(newResourceTypeName, \
plugin.getName(), +            ResourceCategory.SERVICE, parentResourceType);
+
+        log.info("Name of new ResourceType: " + newResourceType.getName());
 
         updateType(newResourceType);
     }
-
 }
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerLocal.java \
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerLocal.java
 index a1390dd..7d7d8f0 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerLocal.java
                
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerLocal.java
 @@ -28,7 +28,6 @@ import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
 import org.rhq.core.domain.auth.Subject;
 import org.rhq.core.domain.plugin.Plugin;
 import org.rhq.core.domain.resource.ResourceCategory;
-import org.rhq.core.domain.resource.ResourceType;
 
 /**
  * Provides functionality surrounding agent plugins and their resource metadata.
@@ -91,6 +90,6 @@ public interface ResourceMetadataManagerLocal {
     void removeObsoleteTypesInNewTransaction(String pluginName);
 
     /** Method to add a runtime-created resourceType to an existing plugin */
-    void addNewResourceType(ResourceType newResourceType);
+    void addNewResourceType(String newResourceTypeName);
 
 }
\ No newline at end of file


[prev in list] [next in list] [prev in thread] [next in thread]