nishan
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge pull conflicts

Browse Source
revert-70aa11f8
hasuniea 9 years ago
parent 878d114cf8 67e1bfb012
commit ac0d06d465
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File

1
components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/config/AuthenticatorConfig.java
Unescape View File

@ -55,6 +55,7 @@ public class AuthenticatorConfig {
public void setParams(List<Parameter> params) { public void setParams(List<Parameter> params) {
this.params = params; this.params = params;
} }
@XmlRootElement(name = "Parameter") @XmlRootElement(name = "Parameter")
public static class Parameter { public static class Parameter {
private String name; private String name;

3
components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/internal/WebappAuthenticatorFrameworkServiceComponent.java
Unescape View File

@ -78,7 +78,8 @@ public class WebappAuthenticatorFrameworkServiceComponent {
WebappAuthenticatorConfig.init(); WebappAuthenticatorConfig.init();
WebappAuthenticatorRepository repository = new WebappAuthenticatorRepository(); WebappAuthenticatorRepository repository = new WebappAuthenticatorRepository();
for (AuthenticatorConfig config : WebappAuthenticatorConfig.getInstance().getAuthenticators()) { for (AuthenticatorConfig config : WebappAuthenticatorConfig.getInstance().getAuthenticators()) {
WebappAuthenticator authenticator = (WebappAuthenticator)Class.forName(config.getClassName()).newInstance(); WebappAuthenticator authenticator =
(WebappAuthenticator) Class.forName(config.getClassName()).newInstance();
if ((config.getParams() != null) && (!config.getParams().isEmpty())) { if ((config.getParams() != null) && (!config.getParams().isEmpty())) {
Properties properties = new Properties(); Properties properties = new Properties();

12
features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml
Unescape View File

@ -4,12 +4,12 @@
<Name>OAuth</Name> <Name>OAuth</Name>
<ClassName>org.wso2.carbon.webapp.authenticator.framework.authenticator.OAuthAuthenticator</ClassName> <ClassName>org.wso2.carbon.webapp.authenticator.framework.authenticator.OAuthAuthenticator</ClassName>
<Parameters> <Parameters>
<Parameter name="IsRemote">true</Parameter> <Parameter Name="IsRemote">true</Parameter>
<Parameter name="TokenValidationEndpointUrl">https://localhost:9443</Parameter> <Parameter Name="TokenValidationEndpointUrl">https://localhost:9443</Parameter>
<Parameter name="Username">admin</Parameter> <Parameter Name="Username">admin</Parameter>
<Parameter name="Password">admin</Parameter> <Parameter Name="Password">admin</Parameter>
<Parameter name="MaxTotalConnections">100</Parameter> <Parameter Name="MaxTotalConnections">100</Parameter>
<Parameter name="MaxConnectionsPerHost">100</Parameter> <Parameter Name="MaxConnectionsPerHost">100</Parameter>
</Parameters> </Parameters>
</Authenticator> </Authenticator>
<Authenticator> <Authenticator>

Write Preview
Loading…
Cancel
Save