Removed compiled groovy classes from hq.jar (causing classloading iss…

…ues with ui plugins)
dulong · Oct 8, 2009 · e550da4 · e550da4
1 parent 4f6e1fe
commit e550da4
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 19 deletions.
diff --git a/build.xml b/build.xml
@@ -507,6 +507,8 @@
   	      <exclude name="org/hyperic/hq/plugin/**"/>
   	      <!-- Exclude unit tests -->
   	      <exclude name="org/hyperic/**/*_test*"/>
+		  <!-- Exclude groovy classes -->
+		  <exclude name="org/hyperic/hq/hqu/rendit/**"/>
   	    </jar>
 
   	    <!-- We only want server and shared classes for the UI -->

diff --git a/build_util/hqu-build.xml b/build_util/hqu-build.xml
@@ -17,7 +17,6 @@
 					<fileset dir="${rendit_sys.dir}">
 						<include name="**/*.groovy" />
 						<include name="**/*.properties" />
-						<exclude name="**/*.java" />
 					</fileset>
 				</copy>
 				<mkdir dir="@{wardir}/hqu" />
@@ -26,6 +25,9 @@
 						<exclude name="scaffold/**" />
 						<exclude name="extra/**" />
 						<exclude name="old/**" />
+						<exclude name="**/.classpath"/>
+						<exclude name="**/.project"/>
+						<exclude name="**/bin/**"/>
 					</fileset>
 				</copy>
 			</sequential>

diff --git a/src/org/hyperic/hq/bizapp/server/action/email/EmailAction.java b/src/org/hyperic/hq/bizapp/server/action/email/EmailAction.java
@@ -44,7 +44,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.hyperic.dao.DAOFactory;
 import org.hyperic.hq.appdef.shared.AppdefEntityID;
 import org.hyperic.hq.application.HQApp;
 import org.hyperic.hq.application.Scheduler;
@@ -71,7 +70,7 @@
 import org.hyperic.hq.events.InvalidActionDataException;
 import org.hyperic.hq.events.Notify;
 import org.hyperic.hq.events.server.session.AlertRegulator;
-import org.hyperic.hq.hqu.rendit.RenditServer;
+import org.hyperic.hq.hqu.RenditServer;
 import org.hyperic.hq.measurement.MeasurementNotFoundException;
 import org.hyperic.util.ConfigPropertyException;
 import org.hyperic.util.StringUtil;

diff --git a/src/org/hyperic/hq/bizapp/server/action/integrate/OpenNMSAction.java b/src/org/hyperic/hq/bizapp/server/action/integrate/OpenNMSAction.java
@@ -48,7 +48,7 @@
 import org.hyperic.hq.events.AlertDefinitionInterface;
 import org.hyperic.hq.events.AlertInterface;
 import org.hyperic.hq.events.InvalidActionDataException;
-import org.hyperic.hq.hqu.rendit.RenditServer;
+import org.hyperic.hq.hqu.RenditServer;
 import org.hyperic.util.config.ConfigResponse;
 import org.hyperic.util.config.ConfigSchema;
 import org.hyperic.util.config.InvalidOptionException;

diff --git a/...rg/hyperic/hq/hqu/rendit/IDispatcher.java → src/org/hyperic/hq/hqu/IDispatcher.java b/...rg/hyperic/hq/hqu/rendit/IDispatcher.java → src/org/hyperic/hq/hqu/IDispatcher.java
@@ -22,14 +22,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA.
  */
-package org.hyperic.hq.hqu.rendit;
+package org.hyperic.hq.hqu;
 
 import java.io.File;
 import java.util.Properties;
 
 import org.hyperic.hq.authz.server.session.AuthzSubject;
 import org.hyperic.hq.authz.server.session.Resource;
-import org.hyperic.hq.hqu.AttachmentDescriptor;
 import org.hyperic.hq.hqu.server.session.Attachment;
 import org.hyperic.hq.hqu.server.session.UIPlugin;
 

diff --git a/...org/hyperic/hq/hqu/rendit/IHQUPlugin.java → src/org/hyperic/hq/hqu/IHQUPlugin.java b/...org/hyperic/hq/hqu/rendit/IHQUPlugin.java → src/org/hyperic/hq/hqu/IHQUPlugin.java
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA.
  */
-package org.hyperic.hq.hqu.rendit;
+package org.hyperic.hq.hqu;
 
 import java.io.File;
 import java.util.Properties;

diff --git a/...endit/InvokeMethodInvocationBindings.java → ...q/hqu/InvokeMethodInvocationBindings.java b/...endit/InvokeMethodInvocationBindings.java → ...q/hqu/InvokeMethodInvocationBindings.java
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA.
  */
-package org.hyperic.hq.hqu.rendit;
+package org.hyperic.hq.hqu;
 
 import java.util.List;
 

diff --git a/...ic/hq/hqu/rendit/PluginLoadException.java → ...g/hyperic/hq/hqu/PluginLoadException.java b/...ic/hq/hqu/rendit/PluginLoadException.java → ...g/hyperic/hq/hqu/PluginLoadException.java
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA.
  */
-package org.hyperic.hq.hqu.rendit;
+package org.hyperic.hq.hqu;
 
 public class PluginLoadException 
     extends RuntimeException

diff --git a/.../hyperic/hq/hqu/rendit/PluginWrapper.java → src/org/hyperic/hq/hqu/PluginWrapper.java b/.../hyperic/hq/hqu/rendit/PluginWrapper.java → src/org/hyperic/hq/hqu/PluginWrapper.java
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA.
  */
-package org.hyperic.hq.hqu.rendit;
+package org.hyperic.hq.hqu;
 
 import groovy.lang.GroovyClassLoader;
 
@@ -41,6 +41,7 @@
 import org.hyperic.hq.authz.server.session.Resource;
 import org.hyperic.hq.common.SystemException;
 import org.hyperic.hq.hqu.AttachmentDescriptor;
+import org.hyperic.hq.hqu.IDispatcher;
 import org.hyperic.hq.hqu.server.session.Attachment;
 import org.hyperic.hq.hqu.server.session.UIPlugin;
 import org.hyperic.util.Runnee;

diff --git a/...g/hyperic/hq/hqu/rendit/RenditServer.java → src/org/hyperic/hq/hqu/RenditServer.java b/...g/hyperic/hq/hqu/rendit/RenditServer.java → src/org/hyperic/hq/hqu/RenditServer.java
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA.
  */
-package org.hyperic.hq.hqu.rendit;
+package org.hyperic.hq.hqu;
 
 import java.io.File;
 import java.io.Writer;

diff --git a/...hqu/rendit/RequestInvocationBindings.java → ...ric/hq/hqu/RequestInvocationBindings.java b/...hqu/rendit/RequestInvocationBindings.java → ...ric/hq/hqu/RequestInvocationBindings.java
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA.
  */
-package org.hyperic.hq.hqu.rendit;
+package org.hyperic.hq.hqu;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;

diff --git a/src/org/hyperic/hq/hqu/rendit/BaseController.groovy b/src/org/hyperic/hq/hqu/rendit/BaseController.groovy
@@ -17,8 +17,11 @@ import org.hyperic.hq.hqu.rendit.helpers.MetricHelper
 import org.hyperic.hq.hqu.rendit.helpers.UserHelper
 import org.hyperic.hq.hqu.rendit.helpers.AutodiscoveryHelper
 import org.hyperic.hq.hqu.rendit.helpers.RoleHelper
+
+import org.hyperic.hq.hqu.RequestInvocationBindings;
 import org.hyperic.hq.hqu.rendit.render.RenderFrame
 
+
 import org.apache.commons.fileupload.servlet.ServletFileUpload
 import org.apache.commons.fileupload.FileItemIterator
 import org.apache.commons.fileupload.FileItemStream

diff --git a/src/org/hyperic/hq/hqu/rendit/DefaultControllerDispatcher.groovy b/src/org/hyperic/hq/hqu/rendit/DefaultControllerDispatcher.groovy
@@ -3,6 +3,7 @@ package org.hyperic.hq.hqu.rendit
 import org.hyperic.hq.hqu.rendit.i18n.BundleMapFacade
 import org.apache.commons.logging.Log
 import org.apache.commons.logging.LogFactory
+import org.hyperic.hq.hqu.RequestInvocationBindings
 
 /**
  * Called by the dispatcher to execute controller methods.  

diff --git a/src/org/hyperic/hq/hqu/rendit/HQUPlugin.groovy b/src/org/hyperic/hq/hqu/rendit/HQUPlugin.groovy
@@ -13,6 +13,7 @@ import org.hyperic.hq.hqu.rendit.helpers.ResourceHelper
 import org.hyperic.hq.hqu.server.session.Attachment
 import org.hyperic.hq.hqu.server.session.UIPlugin
 import org.hyperic.hq.hqu.AttachmentDescriptor
+import org.hyperic.hq.hqu.IHQUPlugin;
 import org.hyperic.hq.hqu.SimpleAttachmentDescriptor
 import org.hyperic.hq.hqu.ViewDescriptor
 import org.hyperic.hq.hqu.server.session.UIPluginManagerEJBImpl as PluginMan 

diff --git a/src/org/hyperic/hq/hqu/rendit/dispatcher.groovy b/src/org/hyperic/hq/hqu/rendit/dispatcher.groovy
@@ -1,11 +1,11 @@
 package org.hyperic.hq.hqu.rendit
 
-import org.codehaus.groovy.runtime.InvokerHelper
-import groovy.lang.Script
 
 import org.hyperic.hq.authz.server.session.AuthzSubject
 import org.hyperic.hq.authz.server.session.Resource
 import org.hyperic.hq.hqu.AttachmentDescriptor
+import org.hyperic.hq.hqu.IDispatcher;
+import org.hyperic.hq.hqu.IHQUPlugin;
 import org.hyperic.hq.hqu.server.session.Attachment
 import org.hyperic.hq.hqu.server.session.UIPlugin
 import org.hyperic.hq.hqu.rendit.metaclass.AuthzSubjectCategory
@@ -21,6 +21,8 @@ import org.hyperic.hq.hqu.rendit.metaclass.ResourceGroupCategory
 import org.hyperic.hq.hqu.rendit.metaclass.RoleCategory
 import org.hyperic.hq.hqu.rendit.metaclass.StringCategory
 import org.hyperic.hq.hqu.rendit.metaclass.AgentCategory
+import org.hyperic.hq.hqu.InvokeMethodInvocationBindings
+import org.hyperic.hq.hqu.RequestInvocationBindings
 
 import org.apache.commons.logging.Log
 import org.apache.commons.logging.LogFactory

diff --git a/src/org/hyperic/hq/hqu/rendit/helpers/AgentHelper.groovy b/src/org/hyperic/hq/hqu/rendit/helpers/AgentHelper.groovy
@@ -4,10 +4,13 @@ import org.hyperic.hq.appdef.server.session.AgentManagerEJBImpl as AgentMan
 import org.hyperic.hq.authz.server.session.AuthzSubject
 import org.hyperic.hq.appdef.shared.AgentNotFoundException
 
+
 class AgentHelper extends BaseHelper {
 
     private aMan = AgentMan.one
 
+
+
     AgentHelper(AuthzSubject user) {
         super(user)
     }

diff --git a/src/org/hyperic/hq/hqu/server/session/UIPluginManagerEJBImpl.java b/src/org/hyperic/hq/hqu/server/session/UIPluginManagerEJBImpl.java
@@ -48,7 +48,7 @@
 import org.hyperic.hq.context.Bootstrap;
 import org.hyperic.hq.hqu.AttachmentDescriptor;
 import org.hyperic.hq.hqu.ViewDescriptor;
-import org.hyperic.hq.hqu.rendit.RenditServer;
+import org.hyperic.hq.hqu.RenditServer;
 import org.hyperic.hq.hqu.shared.UIPluginManagerLocal;
 import org.hyperic.hq.hqu.shared.UIPluginManagerUtil;
 import org.hyperic.hq.hqu.server.session.AttachType;

diff --git a/src/org/hyperic/hq/product/server/mbean/ProductPluginDeployer.java b/src/org/hyperic/hq/product/server/mbean/ProductPluginDeployer.java
@@ -63,7 +63,7 @@
 import org.hyperic.hq.bizapp.server.session.SystemAudit;
 import org.hyperic.hq.common.SystemException;
 import org.hyperic.hq.context.Bootstrap;
-import org.hyperic.hq.hqu.rendit.RenditServer;
+import org.hyperic.hq.hqu.RenditServer;
 import org.hyperic.hq.product.PluginException;
 import org.hyperic.hq.product.PluginInfo;
 import org.hyperic.hq.product.ProductPlugin;

diff --git a/src/org/hyperic/hq/ui/server/session/UIStartupListener.java b/src/org/hyperic/hq/ui/server/session/UIStartupListener.java
@@ -34,7 +34,7 @@
 import org.hyperic.hq.appdef.server.session.ResourceDeletedZevent;
 import org.hyperic.hq.application.HQApp;
 import org.hyperic.hq.application.StartupListener;
-import org.hyperic.hq.hqu.rendit.RenditServer;
+import org.hyperic.hq.hqu.RenditServer;
 import org.hyperic.hq.product.server.session.PluginsDeployedCallback;
 import org.hyperic.hq.zevents.ZeventManager;
 import org.hyperic.util.file.DirWatcher;

diff --git a/src/org/hyperic/hq/ui/servlet/RenditServlet.java b/src/org/hyperic/hq/ui/servlet/RenditServlet.java
@@ -39,8 +39,8 @@
 import org.hyperic.hq.auth.shared.SessionException;
 import org.hyperic.hq.authz.server.session.AuthzSubject;
 import org.hyperic.hq.bizapp.server.session.AuthzBossEJBImpl;
-import org.hyperic.hq.hqu.rendit.RenditServer;
-import org.hyperic.hq.hqu.rendit.RequestInvocationBindings;
+import org.hyperic.hq.hqu.RenditServer;
+import org.hyperic.hq.hqu.RequestInvocationBindings;
 import org.hyperic.hq.ui.util.RequestUtils;
 import org.hyperic.util.StringUtil;