[Carbon-dev] svn commit r31167 - trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt

[isuru at wso2.com]

Author: isuru
Date: Thu Feb 19 22:31:37 2009
New Revision: 31167
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=31167

Log:
removing caching and throttling from operation level and service grp level module lists

Modified:
   trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/operation_modules.jsp
   trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/service_group_modules.jsp
   trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/service_modules.jsp

Modified: trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/operation_modules.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/operation_modules.jsp?rev=31167&r1=31166&r2=31167&view=diff
==============================================================================
--- trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/operation_modules.jsp	(original)
+++ trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/operation_modules.jsp	Thu Feb 19 22:31:37 2009
@@ -73,7 +73,8 @@
                 <td  style="padding:0;border:0;!important"><fmt:message key="module"/> &nbsp;&nbsp;&nbsp;
                     <select id="moduleSelector">
                         <% for (ModuleMetaData module : modules) {
-                            if (module.getEngagedGlobalLevel() || module.getEngagedServiceGroupLevel() || module.getEngagedServiceLevel() || module.getEngagedOperationLevel()) {
+                            if ("wso2throttle".equals(module.getModulename()) || "wso2caching".equals(module.getModulename()) ||
+                                    module.getEngagedGlobalLevel() || module.getEngagedServiceGroupLevel() || module.getEngagedServiceLevel() || module.getEngagedOperationLevel()) {
                                 continue;
                             }
                         %>

Modified: trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/service_group_modules.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/service_group_modules.jsp?rev=31167&r1=31166&r2=31167&view=diff
==============================================================================
--- trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/service_group_modules.jsp	(original)
+++ trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/service_group_modules.jsp	Thu Feb 19 22:31:37 2009
@@ -72,7 +72,8 @@
                 <td><fmt:message key="module"/> &nbsp;&nbsp;&nbsp;
                     <select id="moduleSelector">
                         <% for (ModuleMetaData module : modules) {
-                            if (module.getEngagedGlobalLevel() || module.getEngagedServiceGroupLevel()) {
+                            if ("wso2throttle".equals(module.getModulename()) || "wso2caching".equals(module.getModulename()) ||
+                                    module.getEngagedGlobalLevel() || module.getEngagedServiceGroupLevel()) {
                                 continue;
                             }
                         %>

Modified: trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/service_modules.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/service_modules.jsp?rev=31167&r1=31166&r2=31167&view=diff
==============================================================================
--- trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/service_modules.jsp	(original)
+++ trunk/carbon-components/module-mgt/org.wso2.carbon.module.mgt.ui/src/main/resources/web/modulemgt/service_modules.jsp	Thu Feb 19 22:31:37 2009
@@ -78,8 +78,8 @@
                     <fmt:message key="module"/> &nbsp;&nbsp;&nbsp;
                     <select id="moduleSelector">
                         <% for (ModuleMetaData module : modules) {
-                            if (module.getEngagedGlobalLevel() || module.getEngagedServiceGroupLevel() || module.getEngagedServiceLevel() ||
-                                    "wso2throttle".equals(module.getModulename()) || "wso2caching".equals(module.getModulename())) {
+                            if ("wso2throttle".equals(module.getModulename()) || "wso2caching".equals(module.getModulename()) ||
+                                    module.getEngagedGlobalLevel() || module.getEngagedServiceGroupLevel() || module.getEngagedServiceLevel()) {
                                 continue;
                             }
                         %>