[Hyperic-hq-discuss] hq r13902 - in trunk: . installer/data src/org/hyperic/hq/appdef/server/session

[<jh...@hy...>]

Author: jhickey
Date: 2009-10-23 17:35:23 -0700 (Fri, 23 Oct 2009)
New Revision: 13902
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13902

Modified:
   trunk/.classpath
   trunk/installer/data/db-upgrade.xml
   trunk/src/org/hyperic/hq/appdef/server/session/ServerManagerEJBImpl.java
Log:
HQ-1896 Changed AMS Health UI plugin to HQ Health UI plugin on upgrade.  Fixed HHQ-3265 error preventing the "HQ Agent" server type from being created during plugin deploy (due to ObjectDeletedException when removing old "AMS Agent" server instance)

Modified: trunk/.classpath
===================================================================
--- trunk/.classpath	2009-10-23 23:05:53 UTC (rev 13901)
+++ trunk/.classpath	2009-10-24 00:35:23 UTC (rev 13902)
@@ -127,7 +127,6 @@
 	<classpathentry kind="lib" path="thirdparty/lib/mx4j/mx4j-rjmx.jar"/>
 	<classpathentry kind="lib" path="thirdparty/lib/mx4j/mx4j-tools.jar"/>
 	<classpathentry kind="lib" path="thirdparty/lib/mx4j/mx4j.jar"/>
-	<classpathentry kind="lib" path="thirdparty/lib/mysql_jdbc/mysql-connector-java-5.1.10-bin.jar"/>
 	<classpathentry kind="lib" path="thirdparty/lib/oracle_jdbc/ojdbc14.jar"/>
 	<classpathentry kind="lib" path="thirdparty/lib/oracle_jdbc/oracle12.jar"/>
 	<classpathentry kind="lib" path="thirdparty/lib/postgresql/postgresql-7.4.3.jar"/>
@@ -223,6 +222,5 @@
 	<classpathentry kind="lib" path="thirdparty/lib/com.springsource.com.sun.xml.bind-2.1.7.jar"/>
 	<classpathentry kind="lib" path="thirdparty/lib/com.springsource.javax.xml.bind-2.1.7.jar"/>
 	<classpathentry kind="lib" path="thirdparty/lib/com.springsource.javax.xml.stream-1.0.1.jar"/>
-	<classpathentry kind="lib" path="thirdparty/lib/mysql_jdbc/mysql-connector-java-5.1.10-bin.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

Modified: trunk/installer/data/db-upgrade.xml
===================================================================
--- trunk/installer/data/db-upgrade.xml	2009-10-23 23:05:53 UTC (rev 13901)
+++ trunk/installer/data/db-upgrade.xml	2009-10-24 00:35:23 UTC (rev 13902)
@@ -10857,6 +10857,16 @@
                         columnType="VARCHAR2"
                         nullable="NOT NULL" />
   </schemaSpec>
+	
+   <schemaSpec version="3.192">         
+	    <schema-directSQL>  
+	      <statement desc="Updating HQ Health Plugin">
+	        UPDATE EAM_UI_VIEW
+	        SET DESCRIPTION='HQ Health'
+	        WHERE DESCRIPTION='AMS Health'
+	      </statement>   
+	    </schema-directSQL>  
+   </schemaSpec>
 
 </dbupgrade>
 </target>

Modified: trunk/src/org/hyperic/hq/appdef/server/session/ServerManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/appdef/server/session/ServerManagerEJBImpl.java	2009-10-23 23:05:53 UTC (rev 13901)
+++ trunk/src/org/hyperic/hq/appdef/server/session/ServerManagerEJBImpl.java	2009-10-24 00:35:23 UTC (rev 13902)
@@ -520,6 +520,10 @@
                 platform.getServersBag().remove(server);
             }
             
+            //Remove Server from ServerType.  If not done, results in an ObjectDeletedException 
+            //when updating plugin types during plugin deployment
+            server.getServerType().getServers().remove(server);
+            
             // Keep config response ID so it can be deleted later.
             final ConfigResponseDB config = server.getConfigResponse();