Author: ozizka(a)redhat.com Date: 2009-07-14 15:33:13 -0400 (Tue, 14 Jul 2009) New Revision: 557 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java Log: Ejb tests updated Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-07-14 18:11:59 UTC (rev 556) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-07-14 19:33:13 UTC (rev 557) @@ -32,8 +32,10 @@ + public enum ResourceTypes { + + } - /** * Information about deployable types - * navigation tree labels, archive extensions, @@ -50,16 +52,22 @@ RAR(AppConstants.NAV_RAR, "RAR", "rar", ".rar", null, "application/rar"), EMB_RAR(AppConstants.NAV_EMB_RAR,"Embedded RAR", "", ".rar", null, "application/rar"), MC_BEAN(AppConstants.NAV_MC, "?", "mc", "", null, "application/java-archive"), - EMB_WAR(AppConstants.NAV_EMB_WAR,"Embbedded WAR", "", ".war", null, "application/war"); + EMB_WAR(AppConstants.NAV_EMB_WAR,"Embbedded WAR", "", ".war", null, "application/war"), + // TODO: Create a superclass for non-app resource types - ResourceTypes. + JBCACHE(AppConstants.NAV_JBCACHE, "JBoss Cache", null, null, null, null), + HBN(AppConstants.NAV_HBN, "Hibernate", null, null, null, null); + + static{ EJB2.jmxMBeanNameFormat = "jboss.j2ee:module=\"%s\",service=EjbModule"; - EJB3.jmxMBeanNameFormat = "jboss.j2ee:ear=%s,jar=%s,service=EJB3"; + EJB3.jmxMBeanNameFormat = "jboss.j2ee:ear=%1s,jar=%1s,service=EJB3"; } private String jmxMBeanNameFormat; private void setJmxMBeanNameFormat( String name ){ this.jmxMBeanNameFormat = name; } public String getJmxMBeanNameFormat(){ return this.jmxMBeanNameFormat; } + public String formatJmxMBeanName( String deployableName ){ return String.format(this.jmxMBeanNameFormat, deployableName); } @@ -131,8 +139,11 @@ public static final String NAV_EMB_WAR = "Embedded WARs"; public static final String NAV_EMB_RAR = "Embedded RARs"; + // Non-app resource types. public static final String NAV_SBMS = "Service Binding Managers"; public static final String NAV_SBM = "ServiceBindingManager"; + public static final String NAV_JBCACHE = "JBoss Cache"; + public static final String NAV_HBN = "Hibernate"; public static final String EAR_MALFORMED_APP_FILENAME = "malformed-application-xml.ear";