Skip to content

Commit

Permalink
Moving userstore-config and user-manager components to carbon-identity
Browse files Browse the repository at this point in the history
  • Loading branch information
thanujalk committed Jun 16, 2015
1 parent 32adb0b commit 0f4f601
Show file tree
Hide file tree
Showing 207 changed files with 28,582 additions and 52 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<dependencies>
<dependency>
<groupId>org.wso2.carbon.commons</groupId>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.user.mgt.stub</artifactId>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<artifactId>org.wso2.carbon.identity.application.mgt.stub</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.commons</groupId>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.user.mgt.stub</artifactId>
</dependency>
</dependencies>
Expand Down Expand Up @@ -76,8 +76,8 @@
org.wso2.carbon.ui.util; version="${carbon.kernel.package.import.version.range}",
org.wso2.carbon.utils; version="${carbon.kernel.package.import.version.range}",

org.wso2.carbon.user.mgt.stub; version="${carbon.commons.imp.pkg.version}",
org.wso2.carbon.user.mgt.stub.types.carbon; version="${carbon.commons.imp.pkg.version}",
org.wso2.carbon.user.mgt.stub; version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.user.mgt.stub.types.carbon; version="${carbon.identity.package.import.version.range}",

org.wso2.carbon.identity.application.mgt.stub; version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.identity.application.common.model.xsd; version="${carbon.identity.package.import.version.range}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<artifactId>org.wso2.carbon.identity.core</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.commons</groupId>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.user.mgt</artifactId>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<artifactId>org.wso2.carbon.ui</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.commons</groupId>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.user.mgt.stub</artifactId>
</dependency>
<dependency>
Expand Down Expand Up @@ -74,7 +74,7 @@
org.apache.commons.lang; version="${commons-lang.wso2.osgi.version.range}",

org.wso2.carbon.ui;version="${carbon.kernel.package.import.version.range}",
org.wso2.carbon.user.mgt.stub.*;version="${carbon.commons.imp.pkg.version}",
org.wso2.carbon.user.mgt.stub.*;version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.identity.application.common;
version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.identity.application.common.model.idp.xsd;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<artifactId>org.wso2.carbon.core.services</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.commons</groupId>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.user.mgt</artifactId>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<artifactId>org.wso2.carbon.user.core</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.commons</groupId>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.user.mgt.common</artifactId>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<artifactId>org.wso2.carbon.user.core</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.commons</groupId>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.user.mgt.common</artifactId>
</dependency>
<dependency>
Expand Down Expand Up @@ -82,7 +82,7 @@
org.wso2.carbon.context; version="${carbon.kernel.package.import.version.range}",
org.wso2.carbon.core; version="${carbon.kernel.package.import.version.range}",
org.wso2.carbon.user.core.*; version="${carbon.kernel.package.import.version.range}",
org.wso2.carbon.user.mgt.common; version="${carbon.commons.imp.pkg.version}",
org.wso2.carbon.user.mgt.common; version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.registry.core.service; version="${carbon.kernel.registry.imp.pkg.version}",
org.wso2.carbon.user.api; version="${carbon.user.api.imp.pkg.version.range}",
</Import-Package>
Expand Down
6 changes: 3 additions & 3 deletions components/security/org.wso2.carbon.security.mgt.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
<artifactId>org.wso2.carbon.security.mgt.stub</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.commons</groupId>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.user.mgt.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.commons</groupId>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.user.mgt.ui</artifactId>
</dependency>
</dependencies>
Expand Down Expand Up @@ -81,7 +81,7 @@
org.wso2.carbon.registry.core.*; version="${carbon.kernel.registry.imp.pkg.version}",
org.wso2.carbon.security.mgt.stub.*;
version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.user.mgt.stub.types.carbon; version="${carbon.commons.imp.pkg.version}",
org.wso2.carbon.user.mgt.stub.types.carbon; version="${carbon.identity.package.import.version.range}",
</Import-Package>
<Export-Package>
org.wso2.carbon.security.ui.*; version="${carbon.identity.package.export.version}"
Expand Down
70 changes: 70 additions & 0 deletions components/user-manager/org.wso2.carbon.user.mgt.common/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>user-manager</artifactId>
<version>4.5.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.user.mgt.common</artifactId>
<packaging>bundle</packaging>
<name>WSO2 Carbon - User Management Common</name>
<description>org.wso2.carbon.user.mgt.common</description>
<url>http://wso2.org</url>

<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>

<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Import-Package>
javax.activation; version="${javax.activation.import.pkg.version}",
org.apache.axis2; version="${axis2.osgi.version.range}"
</Import-Package>
<Export-Package>
org.wso2.carbon.user.mgt.common.*
</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.user.mgt.common;

public class ClaimValue {

private String claimURI;
private String value;
public String getClaimURI() {
return claimURI;
}
public String getValue() {
return value;
}
public void setClaimURI(String claimURI) {
this.claimURI = claimURI;
}
public void setValue(String value) {
this.value = value;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
/*
* Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.user.mgt.common;

/**
* Problem this class solves : Reduce the number of WS calls and amount of data
* transfered between FE and BE.
* <p/>
* This is a classic sample of DTOs. An instance of this class can represent
* either an user item or role item. This is used to represent items in lists of
* users and roles sent to the Carbon FE. It contains information to indicate
* whether the representing item is editable or selected within the given
* context.
* <p/>
* Here are the use cases. Usecase 1 : When listing roles we should not show the
* editable link if it is a external role.
* <p/>
* Before FlaggedName 1) Send the complete role list (hybrid + external) to FE
* 2) Send the role list that are external to FE
* <p/>
* When listing roles in FE go through both lists, and do not show edit links
* for external roles. This logic in JSPs could not be reused. Idea was to cut
* down the number of calls. It was a feedback given in a review.
* <p/>
* After FlaggedNames 1) Send the list of FlaggedNames
* <p/>
* Usecase 2 : When user clicks on edit users of a Role
* <p/>
* Before FlaggedName 1) Send the list of users that are already in the role so
* that I can show the ticks in the GUI 2) Send the complete requested user list
* to FE (selected by *) so I can show them unchecked
* <p/>
* After FlaggedName 1)Cut down the nubmer of calls going back and forth
*/
public class FlaggedName {

private String itemName;
private String itemDisplayName;
private boolean isSelected;
private boolean isEditable;
private String roleType;
private String domainName;
private boolean readOnly;
private String dn;
private boolean isShared;

public String getItemName() {
return itemName;
}

public boolean isSelected() {
return isSelected;
}

public void setItemName(String itemName) {
this.itemName = itemName;
}

public void setSelected(boolean isSelected) {
this.isSelected = isSelected;
}

public boolean isEditable() {
return isEditable;
}

public void setEditable(boolean isEditable) {
this.isEditable = isEditable;
}

public String getRoleType() {
return roleType;
}

public void setRoleType(String roleType) {
this.roleType = roleType;
}

public String getDomainName() {
return domainName;
}

public void setDomainName(String domainName) {
this.domainName = domainName;
}

public String getItemDisplayName() {
return itemDisplayName;
}

public void setItemDisplayName(String itemDisplayName) {
this.itemDisplayName = itemDisplayName;
}

public boolean isReadOnly() {
return readOnly;
}

public void setReadOnly(boolean readOnly) {
this.readOnly = readOnly;
}

public String getDn() {
return dn;
}

public void setDn(String dn) {
this.dn = dn;
}

public boolean isShared() {
return isShared;
}

public void setShared(boolean shared) {
isShared = shared;
}
}
Loading

0 comments on commit 0f4f601

Please sign in to comment.