[embjopr-commits] EMBJOPR SVN: r306 - in trunk/core/src/main: java/org/jboss/on/embedded/ui and 1 other directories.

[embjopr-commits at lists.jboss.org]

Author: ips
Date: 2009-04-17 15:00:55 -0400 (Fri, 17 Apr 2009)
New Revision: 306

Modified:
   trunk/core/src/main/java/org/jboss/on/embedded/BootstrapAction.java
   trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java
   trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml
Log:
fix message key on xhtml page; turn down some more logging


Modified: trunk/core/src/main/java/org/jboss/on/embedded/BootstrapAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/BootstrapAction.java	2009-04-17 17:59:46 UTC (rev 305)
+++ trunk/core/src/main/java/org/jboss/on/embedded/BootstrapAction.java	2009-04-17 19:00:55 UTC (rev 306)
@@ -95,13 +95,13 @@
             try
             {
                 String version = getVersion();
-                LOG.info("Bootstrapping Administration Console" + ((version != null) ? (" v" + version) : "") + "...");
+                LOG.info("Initializing Administration Console" + ((version != null) ? (" v" + version) : "") + "...");
                 long startTime = System.currentTimeMillis();
                 reconfigureJdkLogging();
                 initPluginContainer();
                 ResourceManagerFactory.resourceManager().discoverResources();
                 long elapsedTime = System.currentTimeMillis() - startTime;
-                LOG.info("Done bootstrapping Administration Console (" + elapsedTime + " ms elapsed).");
+                LOG.debug("Done initializing Administration Console (" + elapsedTime + " ms elapsed).");
                 this.initialized = true;
             }
             catch (Exception e)
@@ -120,6 +120,7 @@
         if (this.initialized) {
             try
             {
+                LOG.info("Shutting down Administration Console...");
                 PluginContainer.getInstance().shutdown();
             }
             catch (RuntimeException e)
@@ -175,7 +176,7 @@
 
     private static void reconfigureJdkLogging() {
         try {
-            LOG.debug("Reconfiguring JDK logging...");
+            LOG.trace("Reconfiguring JDK logging...");
             setJdkLoggerLevel(FACES_API_LOGGER_NAME, Level.WARNING);
             setJdkLoggerLevel(FACES_RI_LOGGER_NAME, Level.WARNING);
             setJdkLoggerLevel(FACELETS_LOGGER_NAME, Level.WARNING);
@@ -223,16 +224,14 @@
     }
 
     private static void configureMockScenarioLoader() {
-        LOG.debug("Configuring Mock Scenario Loader...");
+        LOG.trace("Configuring Mock Scenario Loader...");
         System.setProperty("on.mock.jboss.scenario", "scenario2.xml");
     }
 
     private static void logLoadedPlugins(PluginContainer pluginContainer) {
         Collection<PluginEnvironment> pluginEnvironments = pluginContainer.getPluginManager().getPlugins();
         for (PluginEnvironment pluginEnvironment : pluginEnvironments)
-        {
-            LOG.info("Loaded RHQ plugin [" + pluginEnvironment.getPluginName() + "].");
-        }
+            LOG.debug("Loaded RHQ plugin [" + pluginEnvironment.getPluginName() + "].");        
     }
 
     private static void setJdkLoggerLevel(String name, Level level) {

Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java	2009-04-17 17:59:46 UTC (rev 305)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java	2009-04-17 19:00:55 UTC (rev 306)
@@ -48,7 +48,7 @@
 @Name("navigationContent")
 public class NavigationContent
 {
-    private static final Log log = LogFactory.getLog(NavigationContent.class);
+    private final Log log = LogFactory.getLog(this.getClass());
 
     // used by resourceNavigation.xhtml to render the nav
   	@In(value = "rootNode", create=true) 
@@ -57,7 +57,7 @@
         
     @Factory(value = "rootNode") 
     public JONTreeNode createJONTreeNode() {
-    	log.debug("createJONTreeNode factory method being called.");
+    	log.trace("createJONTreeNode factory method being called.");
     	DummyTreeNode dummy = new DummyTreeNode();
     	PlatformResourceTreeNode platform = new PlatformResourceTreeNode(ResourceManagerFactory.resourceManager().getPlatform());
         dummy.addChild(platform);
@@ -68,7 +68,8 @@
     @Observer(ResourceManager.RESOURCE_CREATED_EVENT)
     public void updateNavWithNewResource(ResourceType typeOfNewResource, Resource parentResource)
     {
-        log.info("Resource of type [" + typeOfNewResource + "] added beneath Resource [" + parentResource + "].");
+        log.trace("Resource of type [" + typeOfNewResource + "] added beneath Resource [" + parentResource
+                + "] - updating nav tree...");
         JONTreeNode parentNode = findNode(getResourcePath(parentResource));
         JONTreeNode node = findNodeByResourceTypeAndParent(typeOfNewResource, parentNode);
         node.reInitializeChildrenMap();
@@ -77,7 +78,7 @@
     @Observer(ResourceManager.RESOURCE_DELETED_EVENT)
     public void updateNavWithDeletedResource(Resource deletedResource)
     {
-        log.info("Resource [" + deletedResource + "] deleted.");
+        log.trace("Resource [" + deletedResource + "] deleted - updating nav tree...");
         JONTreeNode node = findNode(getResourcePath(deletedResource));        
         if (node == null)
         {
@@ -104,7 +105,7 @@
         return rootNode.findNode(path);
     }
     
-    // TODO consider have this return TreeNodeWithResourceType
+    // TODO consider having this return TreeNodeWithResourceType
     private ResourceTypeTreeNode findNodeByResourceTypeAndParent(ResourceType resourceType, JONTreeNode parentResourceNode)
     {
         return ((BaseTreeNode) parentResourceNode).findNodeByType(resourceType);
@@ -123,6 +124,5 @@
         // TODO this could call a static method on ResourceTreeNode to keep this
         // implementation better encapsulated
         return String.valueOf(resourceId);
-    }
- 
+    } 
 }

Modified: trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml	2009-04-17 17:59:46 UTC (rev 305)
+++ trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml	2009-04-17 19:00:55 UTC (rev 306)
@@ -28,7 +28,7 @@
     <ui:composition template="/layout.xhtml">
 
         <!-- page title -->
-        <ui:define name="pagetitle">#{messages['resource.add.pageTitle']}</ui:define>
+        <ui:define name="pagetitle">#{messages['resource.add.pageTitlePrefix']} #{resourceType.name}</ui:define>
 
         <!-- body -->
         <ui:define name="body">