Author: keith Date: Wed Feb 11 23:42:09 2009 New Revision: 30696 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=30696
Log: fixing MASHUP-1089 Modified: branches/mashup/java/1.5/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java branches/mashup/java/1.5/java/modules/www/mashup.jsp branches/mashup/java/1.5/java/modules/www/taskbar.jsp Modified: branches/mashup/java/1.5/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java?rev=30696&r1=30695&r2=30696&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java (original) +++ branches/mashup/java/1.5/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java Wed Feb 11 23:42:09 2009 @@ -552,7 +552,7 @@ ServerManager serverManager = ServerManager.getInstance(); ConfigurationContext configContext = serverManager.configContext; - AxisService axisService = configContext.getAxisConfiguration().getService(serviceName); + AxisService axisService = configContext.getAxisConfiguration().getServiceForActivation(serviceName); if (axisService.isExposedTransport(transportName)) { return Boolean.valueOf(success); @@ -604,7 +604,7 @@ ServerManager serverManager = ServerManager.getInstance(); ConfigurationContext configContext = serverManager.configContext; - AxisService axisService = configContext.getAxisConfiguration().getService(serviceName); + AxisService axisService = configContext.getAxisConfiguration().getServiceForActivation(serviceName); ServiceDO serviceDO = pm.getService(axisService.getName(), ServiceIdentifierDO.EMPTY_SERVICE_VERSION); if (serviceDO.getIsUTAuthEnabled()) { Modified: branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java?rev=30696&r1=30695&r2=30696&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java (original) +++ branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java Wed Feb 11 23:42:09 2009 @@ -1055,11 +1055,9 @@ throws AxisFault { ServerManager serverManager = ServerManager.getInstance(); ConfigurationContext configContext = serverManager.configContext; - // If all transports in te Axis configuration is enabled for this service, just returning true. - return configContext.getAxisConfiguration().getService(serviceName) - .isEnableAllTransports() || configContext.getAxisConfiguration() - .getService(serviceName).isExposedTransport(transportName); + AxisService service = configContext.getAxisConfiguration().getServiceForActivation(serviceName); + return service.isEnableAllTransports() || service.isExposedTransport(transportName); } public static boolean isMashupActive(String serviceName) throws AxisFault { Modified: branches/mashup/java/1.5/java/modules/www/mashup.jsp URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/www/mashup.jsp?rev=30696&r1=30695&r2=30696&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/www/mashup.jsp (original) +++ branches/mashup/java/1.5/java/modules/www/mashup.jsp Wed Feb 11 23:42:09 2009 @@ -552,8 +552,7 @@ </tr> <% //Service transports handling will only be available to the service author and admins - Boolean manageTransports = ((author.equals(currentUser)) || (RegistryUtils.isAdminRole(userRegistry))) && - MashupUtils.isMashupActive(mashupServiceName); + Boolean manageTransports = (author.equals(currentUser)) || (RegistryUtils.isAdminRole(userRegistry)); %> <tr> <td class="mashup_label"> @@ -593,8 +592,10 @@ } transportCount++; } - if (manageTransports) { %> - <li><a href="service_security_manager.jsp?bounceback=<%=URLEncoder.encode(thisPage, "UTF-8")%>&author=<%=mashupOwner%>&mashup=<%=mashup%>">Configure Security Scenarios</a></li> + if (manageTransports && MashupUtils.isMashupActive(mashupServiceName)) { %> + <li id="configure_security"><a href="service_security_manager.jsp?bounceback=<%=URLEncoder.encode(thisPage, "UTF-8")%>&author=<%=mashupOwner%>&mashup=<%=mashup%>">Configure Security Scenarios</a></li> + <% } else { %> + <li id="configure_security">Security can be configured once the service is started</li> <% } %> </ul> </div> Modified: branches/mashup/java/1.5/java/modules/www/taskbar.jsp URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/www/taskbar.jsp?rev=30696&r1=30695&r2=30696&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/www/taskbar.jsp (original) +++ branches/mashup/java/1.5/java/modules/www/taskbar.jsp Wed Feb 11 23:42:09 2009 @@ -142,6 +142,7 @@ //Enabling service sharing document.getElementById("share-mashup").innerHTML = ' <a href="#" onclick="WSO2.MashupUtils.showMashupSharingDialog(\'<%=paramMashupServiceName%>\', \'<%=currentUser%>\');">Share this Mashup</a>'; + document.getElementById("configure_security").innerHTML = '<a href="service_security_manager.jsp?bounceback=<%=URLEncoder.encode(thisPage, "UTF-8")%>&author=<%=author%>&mashup=<%=paramMashup%>">Configure Security Scenarios</a>'; } else { document.getElementById("service-status").innerHTML = @@ -149,6 +150,7 @@ //Disabling service sharing document.getElementById("share-mashup").innerHTML = "Mashup sharing is not available"; + document.getElementById("configure_security").innerHTML = 'Security can be configured once the service is started'; } } _______________________________________________ Mashup-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
