Author: keith Date: Thu Jul 17 21:46:49 2008 New Revision: 19443 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19443
Log: Fixing Mashup-974 Modified: trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupSecurityScenarioConfigAdmin.java trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java Modified: trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupSecurityScenarioConfigAdmin.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupSecurityScenarioConfigAdmin.java?rev=19443&r1=19442&r2=19443&view=diff ============================================================================== --- trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupSecurityScenarioConfigAdmin.java (original) +++ trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupSecurityScenarioConfigAdmin.java Thu Jul 17 21:46:49 2008 @@ -19,6 +19,7 @@ import org.wso2.wsas.admin.service.util.SecurityAssignment; import org.wso2.wsas.persistence.dataobject.SecurityScenarioDO; import org.wso2.wsas.persistence.dataobject.ServiceIdentifierDO; +import org.wso2.wsas.persistence.PersistenceManager; import org.wso2.mashup.MashupConstants; import org.apache.axis2.AxisFault; @@ -58,6 +59,14 @@ private String getAuthorName(String serviceName) { int index = serviceName.indexOf(MashupConstants.SEPARATOR_CHAR); - return serviceName.substring(0,index); + String username = serviceName.substring(0, index); + if (MashupConstants.SYSTEM_USER.equals(username)) { + PersistenceManager pm = new PersistenceManager(); + String adminUsername = pm.getConfigurationProperty(MashupConstants.PRIMARY_USER_ID); + if (adminUsername != null) { + username = adminUsername; + } + } + return username; } } Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java?rev=19443&r1=19442&r2=19443&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java Thu Jul 17 21:46:49 2008 @@ -1401,6 +1401,13 @@ String username = (String) currentMessageContext.getAxisService().getParameterValue( MashupConstants.MASHUP_AUTHOR_NAME); + if (MashupConstants.SYSTEM_USER.equals(username)) { + PersistenceManager pm = new PersistenceManager(); + String adminUsername = pm.getConfigurationProperty(MashupConstants.PRIMARY_USER_ID); + if (adminUsername != null) { + username = adminUsername; + } + } return new CustomProtocolSocketFactory(username); } _______________________________________________ Mashup-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
