Re: [Dev] Please review and commit

2017-01-18 Thread Thanuja Jayasinghe
Thanks.

On Thu, Jan 19, 2017 at 12:22 PM, Chamila De Alwis 
wrote:

> Hi Thanuja,
>
> The above are now committed.
>
>
> Regards,
> Chamila de Alwis
> Committer and PMC Member - Apache Stratos
> Senior Software Engineer | WSO2
> Blog: https://medium.com/@chamilad
>
>
>
> On Wed, Jan 18, 2017 at 10:34 PM, Thanuja Jayasinghe 
> wrote:
>
>> Hi Chamila,
>>
>> Please use following diffs for the 4.2.0 branch.
>>
>> Thanks,
>>
>> On Wed, Jan 18, 2017 at 12:52 PM, Chamila De Alwis 
>> wrote:
>>
>>> Will do.
>>>
>>>
>>> Regards,
>>> Chamila de Alwis
>>> Committer and PMC Member - Apache Stratos
>>> Senior Software Engineer | WSO2
>>> Blog: https://medium.com/@chamilad
>>>
>>>
>>>
>>> On Wed, Jan 18, 2017 at 12:45 PM, Niranjan Karunanandham <
>>> niran...@wso2.com> wrote:
>>>
 Hi ChamilaD,

 Can you look into this?

 Regards,
 Nira

 On Wed, Jan 18, 2017 at 11:47 AM, Thanuja Jayasinghe 
 wrote:

> Hi Team,
>
> The same fix [1] added for carbon-kernel 4.4.x branch and created the
> issue [2] also.
>
> [1] - https://github.com/wso2/carbon-kernel/pull/1273
> [2] - https://github.com/wso2/carbon-kernel/issues/1272
>
> Thanks,
> Thanuja
>
> On Wed, Jan 18, 2017 at 9:54 AM, Thanuja Jayasinghe 
> wrote:
>
>> Hi Team,
>>
>> Please find the attached svn diffs created to resolve issue [1] and
>> [2]. Please review and commit them.
>>
>> [1] - https://wso2.org/jira/browse/IDENTITY-5551
>> [2] - https://wso2.org/jira/browse/IDENTITY-3457
>>
>> Thanks,
>> Thanuja
>>
>> --
>> *Thanuja Lakmal*
>> Senior Software Engineer
>> WSO2 Inc. http://wso2.com/
>> *lean.enterprise.middleware*
>> Mobile: +94715979891 +94758009992
>>
>
>
>
> --
> *Thanuja Lakmal*
> Senior Software Engineer
> WSO2 Inc. http://wso2.com/
> *lean.enterprise.middleware*
> Mobile: +94715979891 +94758009992
>



 --


 *Niranjan Karunanandham*
 Associate Technical Lead - WSO2 Inc.
 WSO2 Inc.: http://www.wso2.com


>>>
>>
>>
>> --
>> *Thanuja Lakmal*
>> Senior Software Engineer
>> WSO2 Inc. http://wso2.com/
>> *lean.enterprise.middleware*
>> Mobile: +94715979891 +94758009992
>>
>
>


-- 
*Thanuja Lakmal*
Senior Software Engineer
WSO2 Inc. http://wso2.com/
*lean.enterprise.middleware*
Mobile: +94715979891 +94758009992
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please review and commit

2017-01-18 Thread Chamila De Alwis
Hi Thanuja,

The above are now committed.


Regards,
Chamila de Alwis
Committer and PMC Member - Apache Stratos
Senior Software Engineer | WSO2
Blog: https://medium.com/@chamilad



On Wed, Jan 18, 2017 at 10:34 PM, Thanuja Jayasinghe 
wrote:

> Hi Chamila,
>
> Please use following diffs for the 4.2.0 branch.
>
> Thanks,
>
> On Wed, Jan 18, 2017 at 12:52 PM, Chamila De Alwis 
> wrote:
>
>> Will do.
>>
>>
>> Regards,
>> Chamila de Alwis
>> Committer and PMC Member - Apache Stratos
>> Senior Software Engineer | WSO2
>> Blog: https://medium.com/@chamilad
>>
>>
>>
>> On Wed, Jan 18, 2017 at 12:45 PM, Niranjan Karunanandham <
>> niran...@wso2.com> wrote:
>>
>>> Hi ChamilaD,
>>>
>>> Can you look into this?
>>>
>>> Regards,
>>> Nira
>>>
>>> On Wed, Jan 18, 2017 at 11:47 AM, Thanuja Jayasinghe 
>>> wrote:
>>>
 Hi Team,

 The same fix [1] added for carbon-kernel 4.4.x branch and created the
 issue [2] also.

 [1] - https://github.com/wso2/carbon-kernel/pull/1273
 [2] - https://github.com/wso2/carbon-kernel/issues/1272

 Thanks,
 Thanuja

 On Wed, Jan 18, 2017 at 9:54 AM, Thanuja Jayasinghe 
 wrote:

> Hi Team,
>
> Please find the attached svn diffs created to resolve issue [1] and
> [2]. Please review and commit them.
>
> [1] - https://wso2.org/jira/browse/IDENTITY-5551
> [2] - https://wso2.org/jira/browse/IDENTITY-3457
>
> Thanks,
> Thanuja
>
> --
> *Thanuja Lakmal*
> Senior Software Engineer
> WSO2 Inc. http://wso2.com/
> *lean.enterprise.middleware*
> Mobile: +94715979891 +94758009992
>



 --
 *Thanuja Lakmal*
 Senior Software Engineer
 WSO2 Inc. http://wso2.com/
 *lean.enterprise.middleware*
 Mobile: +94715979891 +94758009992

>>>
>>>
>>>
>>> --
>>>
>>>
>>> *Niranjan Karunanandham*
>>> Associate Technical Lead - WSO2 Inc.
>>> WSO2 Inc.: http://www.wso2.com
>>>
>>>
>>
>
>
> --
> *Thanuja Lakmal*
> Senior Software Engineer
> WSO2 Inc. http://wso2.com/
> *lean.enterprise.middleware*
> Mobile: +94715979891 +94758009992
>
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please review and commit

2017-01-18 Thread Thanuja Jayasinghe
Hi Chamila,

Please use following diffs for the 4.2.0 branch.

Thanks,

On Wed, Jan 18, 2017 at 12:52 PM, Chamila De Alwis 
wrote:

> Will do.
>
>
> Regards,
> Chamila de Alwis
> Committer and PMC Member - Apache Stratos
> Senior Software Engineer | WSO2
> Blog: https://medium.com/@chamilad
>
>
>
> On Wed, Jan 18, 2017 at 12:45 PM, Niranjan Karunanandham <
> niran...@wso2.com> wrote:
>
>> Hi ChamilaD,
>>
>> Can you look into this?
>>
>> Regards,
>> Nira
>>
>> On Wed, Jan 18, 2017 at 11:47 AM, Thanuja Jayasinghe 
>> wrote:
>>
>>> Hi Team,
>>>
>>> The same fix [1] added for carbon-kernel 4.4.x branch and created the
>>> issue [2] also.
>>>
>>> [1] - https://github.com/wso2/carbon-kernel/pull/1273
>>> [2] - https://github.com/wso2/carbon-kernel/issues/1272
>>>
>>> Thanks,
>>> Thanuja
>>>
>>> On Wed, Jan 18, 2017 at 9:54 AM, Thanuja Jayasinghe 
>>> wrote:
>>>
 Hi Team,

 Please find the attached svn diffs created to resolve issue [1] and
 [2]. Please review and commit them.

 [1] - https://wso2.org/jira/browse/IDENTITY-5551
 [2] - https://wso2.org/jira/browse/IDENTITY-3457

 Thanks,
 Thanuja

 --
 *Thanuja Lakmal*
 Senior Software Engineer
 WSO2 Inc. http://wso2.com/
 *lean.enterprise.middleware*
 Mobile: +94715979891 +94758009992

>>>
>>>
>>>
>>> --
>>> *Thanuja Lakmal*
>>> Senior Software Engineer
>>> WSO2 Inc. http://wso2.com/
>>> *lean.enterprise.middleware*
>>> Mobile: +94715979891 +94758009992
>>>
>>
>>
>>
>> --
>>
>>
>> *Niranjan Karunanandham*
>> Associate Technical Lead - WSO2 Inc.
>> WSO2 Inc.: http://www.wso2.com
>>
>>
>


-- 
*Thanuja Lakmal*
Senior Software Engineer
WSO2 Inc. http://wso2.com/
*lean.enterprise.middleware*
Mobile: +94715979891 +94758009992
Index: 
src/main/java/org/wso2/carbon/core/services/loggeduserinfo/LoggedUserInfoAdmin.java
===
--- 
src/main/java/org/wso2/carbon/core/services/loggeduserinfo/LoggedUserInfoAdmin.java
 (revision 219330)
+++ 
src/main/java/org/wso2/carbon/core/services/loggeduserinfo/LoggedUserInfoAdmin.java
 (working copy)
@@ -20,6 +20,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.CarbonConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.core.AbstractAdmin;
 import org.wso2.carbon.core.common.LoggedUserInfo;
@@ -48,13 +49,13 @@
 String userName = (String) request.getSession().getAttribute(
 ServerConstants.USER_LOGGED_IN);
 
-int index = userName.indexOf("/");
+int index = userName.indexOf(CarbonConstants.DOMAIN_SEPARATOR);
 if (index < 0) {
 String domainName = (String) request.getSession().getAttribute(
 CarbonAuthenticationUtil.LOGGED_IN_DOMAIN);
 
 if (domainName != null) {
-userName = domainName + "/" + userName;
+userName = domainName + CarbonConstants.DOMAIN_SEPARATOR + 
userName;
 }
 }
 LoggedUserInfo loggedUserInfo = new LoggedUserInfo();
Index: src/main/java/org/wso2/carbon/user/core/UserCoreConstants.java
===
--- src/main/java/org/wso2/carbon/user/core/UserCoreConstants.java  
(revision 219332)
+++ src/main/java/org/wso2/carbon/user/core/UserCoreConstants.java  
(working copy)
@@ -17,6 +17,9 @@
 */
 package org.wso2.carbon.user.core;
 
+import org.apache.commons.lang.StringUtils;
+import org.wso2.carbon.base.ServerConfiguration;
+
 public class UserCoreConstants {
 
 public static final String DATA_SOURCE = "um.datasource";
@@ -62,8 +65,17 @@
 
 public static final String IS_USER_IN_ROLE_CACHE_IDENTIFIER = 
"@__isUserHasTheRole__@";
 
-public static final String DOMAIN_SEPARATOR = "/";
+public static final String DOMAIN_SEPARATOR;
 
+static {
+String userDomainSeparator = 
ServerConfiguration.getInstance().getFirstProperty("UserDomainSeparator");
+if (userDomainSeparator != null && 
!userDomainSeparator.trim().isEmpty()) {
+DOMAIN_SEPARATOR = userDomainSeparator.trim();
+} else {
+DOMAIN_SEPARATOR = "/";
+}
+}
+
 public static final String PRINCIPAL_USERNAME_SEPARATOR = "_";
 
 public static final String SHARED_ROLE_TENANT_SEPERATOR = 
"@SharedRoleSeperator@";
Index: 
src/main/java/org/wso2/carbon/user/core/ldap/ReadOnlyLDAPUserStoreManager.java
===
--- 
src/main/java/org/wso2/carbon/user/core/ldap/ReadOnlyLDAPUserStoreManager.java  
(revision 219332)
+++ 
src/main/java/org/wso2/carbon/user/core/ldap/ReadOnlyLDAPUserStoreManager.java  
(working copy)
@@ -41,7 +41,9 @@
 import org.wso2.carbon.user.core.util.UserCoreUtil;
 
 import javax

Re: [Dev] Please review and commit

2017-01-17 Thread Chamila De Alwis
Will do.


Regards,
Chamila de Alwis
Committer and PMC Member - Apache Stratos
Senior Software Engineer | WSO2
Blog: https://medium.com/@chamilad



On Wed, Jan 18, 2017 at 12:45 PM, Niranjan Karunanandham 
wrote:

> Hi ChamilaD,
>
> Can you look into this?
>
> Regards,
> Nira
>
> On Wed, Jan 18, 2017 at 11:47 AM, Thanuja Jayasinghe 
> wrote:
>
>> Hi Team,
>>
>> The same fix [1] added for carbon-kernel 4.4.x branch and created the
>> issue [2] also.
>>
>> [1] - https://github.com/wso2/carbon-kernel/pull/1273
>> [2] - https://github.com/wso2/carbon-kernel/issues/1272
>>
>> Thanks,
>> Thanuja
>>
>> On Wed, Jan 18, 2017 at 9:54 AM, Thanuja Jayasinghe 
>> wrote:
>>
>>> Hi Team,
>>>
>>> Please find the attached svn diffs created to resolve issue [1] and [2].
>>> Please review and commit them.
>>>
>>> [1] - https://wso2.org/jira/browse/IDENTITY-5551
>>> [2] - https://wso2.org/jira/browse/IDENTITY-3457
>>>
>>> Thanks,
>>> Thanuja
>>>
>>> --
>>> *Thanuja Lakmal*
>>> Senior Software Engineer
>>> WSO2 Inc. http://wso2.com/
>>> *lean.enterprise.middleware*
>>> Mobile: +94715979891 +94758009992
>>>
>>
>>
>>
>> --
>> *Thanuja Lakmal*
>> Senior Software Engineer
>> WSO2 Inc. http://wso2.com/
>> *lean.enterprise.middleware*
>> Mobile: +94715979891 +94758009992
>>
>
>
>
> --
>
>
> *Niranjan Karunanandham*
> Associate Technical Lead - WSO2 Inc.
> WSO2 Inc.: http://www.wso2.com
>
>
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please review and commit

2017-01-17 Thread Niranjan Karunanandham
Hi ChamilaD,

Can you look into this?

Regards,
Nira

On Wed, Jan 18, 2017 at 11:47 AM, Thanuja Jayasinghe 
wrote:

> Hi Team,
>
> The same fix [1] added for carbon-kernel 4.4.x branch and created the
> issue [2] also.
>
> [1] - https://github.com/wso2/carbon-kernel/pull/1273
> [2] - https://github.com/wso2/carbon-kernel/issues/1272
>
> Thanks,
> Thanuja
>
> On Wed, Jan 18, 2017 at 9:54 AM, Thanuja Jayasinghe 
> wrote:
>
>> Hi Team,
>>
>> Please find the attached svn diffs created to resolve issue [1] and [2].
>> Please review and commit them.
>>
>> [1] - https://wso2.org/jira/browse/IDENTITY-5551
>> [2] - https://wso2.org/jira/browse/IDENTITY-3457
>>
>> Thanks,
>> Thanuja
>>
>> --
>> *Thanuja Lakmal*
>> Senior Software Engineer
>> WSO2 Inc. http://wso2.com/
>> *lean.enterprise.middleware*
>> Mobile: +94715979891 +94758009992
>>
>
>
>
> --
> *Thanuja Lakmal*
> Senior Software Engineer
> WSO2 Inc. http://wso2.com/
> *lean.enterprise.middleware*
> Mobile: +94715979891 +94758009992
>



-- 


*Niranjan Karunanandham*
Associate Technical Lead - WSO2 Inc.
WSO2 Inc.: http://www.wso2.com
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please review and commit

2017-01-17 Thread Thanuja Jayasinghe
Hi Team,

The same fix [1] added for carbon-kernel 4.4.x branch and created the issue
[2] also.

[1] - https://github.com/wso2/carbon-kernel/pull/1273
[2] - https://github.com/wso2/carbon-kernel/issues/1272

Thanks,
Thanuja

On Wed, Jan 18, 2017 at 9:54 AM, Thanuja Jayasinghe 
wrote:

> Hi Team,
>
> Please find the attached svn diffs created to resolve issue [1] and [2].
> Please review and commit them.
>
> [1] - https://wso2.org/jira/browse/IDENTITY-5551
> [2] - https://wso2.org/jira/browse/IDENTITY-3457
>
> Thanks,
> Thanuja
>
> --
> *Thanuja Lakmal*
> Senior Software Engineer
> WSO2 Inc. http://wso2.com/
> *lean.enterprise.middleware*
> Mobile: +94715979891 +94758009992
>



-- 
*Thanuja Lakmal*
Senior Software Engineer
WSO2 Inc. http://wso2.com/
*lean.enterprise.middleware*
Mobile: +94715979891 +94758009992
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please review and commit

2017-01-17 Thread Thanuja Jayasinghe
Hi Team,

Please find the attached svn diffs created to resolve issue [1] and [2].
Please review and commit them.

[1] - https://wso2.org/jira/browse/IDENTITY-5551
[2] - https://wso2.org/jira/browse/IDENTITY-3457

Thanks,
Thanuja

-- 
*Thanuja Lakmal*
Senior Software Engineer
WSO2 Inc. http://wso2.com/
*lean.enterprise.middleware*
Mobile: +94715979891 +94758009992
Index: 
src/main/java/org/wso2/carbon/core/services/loggeduserinfo/LoggedUserInfoAdmin.java
===
--- 
src/main/java/org/wso2/carbon/core/services/loggeduserinfo/LoggedUserInfoAdmin.java
 (revision 219330)
+++ 
src/main/java/org/wso2/carbon/core/services/loggeduserinfo/LoggedUserInfoAdmin.java
 (working copy)
@@ -20,6 +20,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.CarbonConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.core.AbstractAdmin;
 import org.wso2.carbon.core.common.LoggedUserInfo;
@@ -48,13 +49,13 @@
 String userName = (String) request.getSession().getAttribute(
 ServerConstants.USER_LOGGED_IN);
 
-int index = userName.indexOf("/");
+int index = userName.indexOf(CarbonConstants.DOMAIN_SEPARATOR);
 if (index < 0) {
 String domainName = (String) request.getSession().getAttribute(
 CarbonAuthenticationUtil.LOGGED_IN_DOMAIN);
 
 if (domainName != null) {
-userName = domainName + "/" + userName;
+userName = domainName + CarbonConstants.DOMAIN_SEPARATOR + 
userName;
 }
 }
 LoggedUserInfo loggedUserInfo = new LoggedUserInfo();
Index: src/main/java/org/wso2/carbon/user/core/UserCoreConstants.java
===
--- src/main/java/org/wso2/carbon/user/core/UserCoreConstants.java  
(revision 219323)
+++ src/main/java/org/wso2/carbon/user/core/UserCoreConstants.java  
(working copy)
@@ -17,6 +17,9 @@
 */
 package org.wso2.carbon.user.core;
 
+import org.apache.commons.lang.StringUtils;
+import org.wso2.carbon.base.ServerConfiguration;
+
 public class UserCoreConstants {
 
 public static final String DATA_SOURCE = "um.datasource";
@@ -62,8 +65,17 @@
 
 public static final String IS_USER_IN_ROLE_CACHE_IDENTIFIER = 
"@__isUserHasTheRole__@";
 
-public static final String DOMAIN_SEPARATOR = "/";
+public static final String DOMAIN_SEPARATOR;
 
+static {
+String userDomainSeparator = 
ServerConfiguration.getInstance().getFirstProperty("UserDomainSeparator");
+if (!StringUtils.isEmpty(userDomainSeparator)) {
+DOMAIN_SEPARATOR = userDomainSeparator.trim();
+} else {
+DOMAIN_SEPARATOR = "/";
+}
+}
+
 public static final String PRINCIPAL_USERNAME_SEPARATOR = "_";
 
 public static final String SHARED_ROLE_TENANT_SEPERATOR = 
"@SharedRoleSeperator@";
Index: 
src/main/java/org/wso2/carbon/user/core/ldap/ReadOnlyLDAPUserStoreManager.java
===
--- 
src/main/java/org/wso2/carbon/user/core/ldap/ReadOnlyLDAPUserStoreManager.java  
(revision 219323)
+++ 
src/main/java/org/wso2/carbon/user/core/ldap/ReadOnlyLDAPUserStoreManager.java  
(working copy)
@@ -41,7 +41,9 @@
 import org.wso2.carbon.user.core.util.UserCoreUtil;
 
 import javax.naming.AuthenticationException;
+import javax.naming.CompositeName;
 import javax.naming.InvalidNameException;
+import javax.naming.Name;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.PartialResultException;
@@ -1639,8 +1641,8 @@
 Attributes userAttributes;
 try {
 // '\' and '"' characters need another level of escaping 
before searching
-userAttributes = 
dirContext.getAttributes(user.replace("", "\\")
-.replace("\\\"", "\""), returnedAttributes);
+userAttributes = dirContext.getAttributes(new 
CompositeName().add(user.replace("", "\\")
+.replace("\\\"", "\"")), returnedAttributes);
 
 String displayName = null;
 String userName = null;
@@ -2787,7 +2789,8 @@
 if (debug) {
 log.debug("Using DN: " + group);
 }
-Attributes groupAttributes = dirContext.getAttributes(group, 
returnedAttributes);
+Attributes groupAttributes = dirContext.getAttributes(new 
CompositeName().add(group),
+returnedAttributes);
 if (groupAttributes != null) {
 Attribute groupAttribute = 
groupAttributes.get(groupNameAttribute);

Re: [Dev] Please review and commit

2015-06-15 Thread Johann Nallathamby
Merged.

Thanks.

On Mon, Jun 15, 2015 at 5:58 PM, Godwin Amila Shrimal 
wrote:

> Hi,
>
> https://github.com/wso2/carbon-identity/pull/438
>
> Thanks
> Godwin
>
> --
> *Godwin Amila Shrimal*
> Senior Software Engineer
> WSO2 Inc.; http://wso2.com
> lean.enterprise.middleware
>
> mobile: *+94772264165*
> linkedin: *http://lnkd.in/KUum6D *
> twitter: https://twitter.com/godwinamila
>



-- 
Thanks & Regards,

*Johann Dilantha Nallathamby*
Technical Lead & Product Lead of WSO2 Identity Server
Integration Technologies Team
WSO2, Inc.
lean.enterprise.middleware

Mobile - *+9476950*
Blog - *http://nallaa.wordpress.com *
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please review and commit

2015-06-15 Thread Godwin Amila Shrimal
Hi,

https://github.com/wso2/carbon-identity/pull/438

Thanks
Godwin

-- 
*Godwin Amila Shrimal*
Senior Software Engineer
WSO2 Inc.; http://wso2.com
lean.enterprise.middleware

mobile: *+94772264165*
linkedin: *http://lnkd.in/KUum6D *
twitter: https://twitter.com/godwinamila
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please review and commit the fix for REGISTRY-2561

2015-06-09 Thread Bhathiya Jayasekara
Hi Manoj,

I got this fix reviewed by Carbon and Registry teams ((Kishanthan, Sagara,
Chandana). In the fix review it was decided to add this DataHolder class.

Thanks,
Bhathiya



On Tue, Jun 9, 2015 at 5:05 PM, Manoj Kumara  wrote:

> Hi Bhathiya,
>
> I can see that you have introduced a new DataHolder class with the fix.
> Even though this is the proper pattern to follow since we are not allowing
> introducing such changes with patches how to proceed on this.
>
> Regards,
> Manoj
>
>
> *Manoj Kumara |* Senior Software Engineer
>  Inc. *| **lean. enterprise. middleware.*
> #20, Palm Grove, Colombo 03, Sri Lanka
> *Mobile:* +94 713 448188 *|** Work:* +94 112 145345
>
>
> On Tue, Jun 9, 2015 at 1:41 PM, Bhathiya Jayasekara 
> wrote:
>
>> Hi Kishanthan,
>>
>> Please review and commit the fix[1] to patch 11. Fix diff is attached to
>> the JIRA itself.
>>
>> [1] https://wso2.org/jira/browse/REGISTRY-2561
>>
>> Thanks,
>> --
>> *Bhathiya Jayasekara*
>> *Senior Software Engineer,*
>> *WSO2 inc., http://wso2.com *
>>
>> *Phone: +94715478185 <%2B94715478185>*
>> *LinkedIn: http://www.linkedin.com/in/bhathiyaj
>> *
>> *Twitter: https://twitter.com/bhathiyax *
>> *Blog: http://movingaheadblog.blogspot.com
>> *
>>
>> ___
>> Dev mailing list
>> Dev@wso2.org
>> http://wso2.org/cgi-bin/mailman/listinfo/dev
>>
>>
>


-- 
*Bhathiya Jayasekara*
*Senior Software Engineer,*
*WSO2 inc., http://wso2.com *

*Phone: +94715478185*
*LinkedIn: http://www.linkedin.com/in/bhathiyaj
*
*Twitter: https://twitter.com/bhathiyax *
*Blog: http://movingaheadblog.blogspot.com
*
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please review and commit the fix for REGISTRY-2561

2015-06-09 Thread Manoj Kumara
Hi Bhathiya,

I can see that you have introduced a new DataHolder class with the fix.
Even though this is the proper pattern to follow since we are not allowing
introducing such changes with patches how to proceed on this.

Regards,
Manoj


*Manoj Kumara |* Senior Software Engineer
 Inc. *| **lean. enterprise. middleware.*
#20, Palm Grove, Colombo 03, Sri Lanka
*Mobile:* +94 713 448188 *|** Work:* +94 112 145345


On Tue, Jun 9, 2015 at 1:41 PM, Bhathiya Jayasekara 
wrote:

> Hi Kishanthan,
>
> Please review and commit the fix[1] to patch 11. Fix diff is attached to
> the JIRA itself.
>
> [1] https://wso2.org/jira/browse/REGISTRY-2561
>
> Thanks,
> --
> *Bhathiya Jayasekara*
> *Senior Software Engineer,*
> *WSO2 inc., http://wso2.com *
>
> *Phone: +94715478185 <%2B94715478185>*
> *LinkedIn: http://www.linkedin.com/in/bhathiyaj
> *
> *Twitter: https://twitter.com/bhathiyax *
> *Blog: http://movingaheadblog.blogspot.com
> *
>
> ___
> Dev mailing list
> Dev@wso2.org
> http://wso2.org/cgi-bin/mailman/listinfo/dev
>
>
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please review and commit the fix for REGISTRY-2561

2015-06-09 Thread Bhathiya Jayasekara
Hi Kishanthan,

Please review and commit the fix[1] to patch 11. Fix diff is attached to
the JIRA itself.

[1] https://wso2.org/jira/browse/REGISTRY-2561

Thanks,
-- 
*Bhathiya Jayasekara*
*Senior Software Engineer,*
*WSO2 inc., http://wso2.com *

*Phone: +94715478185*
*LinkedIn: http://www.linkedin.com/in/bhathiyaj
*
*Twitter: https://twitter.com/bhathiyax *
*Blog: http://movingaheadblog.blogspot.com
*
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please review and commit

2015-05-11 Thread Sameera Jayasoma
Committed revision 212440.

On Mon, May 11, 2015 at 7:52 PM, Madhawa Gunasekara 
wrote:

> Hi Devs,
>
> Please find the correct svn diff.
>
> Thanks,
> Madhawa
>
> On Mon, May 11, 2015 at 4:51 PM, Madhawa Gunasekara 
> wrote:
>
>> Hi Devs,
>>
>> Please review and commit, Please find the attached svn diff for the JIRA
>> issue https://wso2.org/jira/browse/CARBON-15239
>>
>>
>> Thanks,
>> Madhawa
>> --
>> *Madhawa Gunasekara*
>> Software Engineer
>> WSO2 Inc.; http://wso2.com
>> lean.enterprise.middleware
>>
>> mobile: +94 719411002 <+94+719411002>
>> blog: *http://madhawa-gunasekara.blogspot.com
>> *
>> linkedin: *http://lk.linkedin.com/in/mgunasekara
>> *
>>
>
>
>
> --
> *Madhawa Gunasekara*
> Software Engineer
> WSO2 Inc.; http://wso2.com
> lean.enterprise.middleware
>
> mobile: +94 719411002 <+94+719411002>
> blog: *http://madhawa-gunasekara.blogspot.com
> *
> linkedin: *http://lk.linkedin.com/in/mgunasekara
> *
>



-- 
Sameera Jayasoma,
Software Architect,

WSO2, Inc. (http://wso2.com)
email: same...@wso2.com
blog: http://blog.sameera.org
twitter: https://twitter.com/sameerajayasoma
flickr: http://www.flickr.com/photos/sameera-jayasoma/collections
Mobile: 0094776364456

Lean . Enterprise . Middleware
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please review and commit

2015-05-11 Thread Madhawa Gunasekara
Hi Devs,

Please find the correct svn diff.

Thanks,
Madhawa

On Mon, May 11, 2015 at 4:51 PM, Madhawa Gunasekara 
wrote:

> Hi Devs,
>
> Please review and commit, Please find the attached svn diff for the JIRA
> issue https://wso2.org/jira/browse/CARBON-15239
>
>
> Thanks,
> Madhawa
> --
> *Madhawa Gunasekara*
> Software Engineer
> WSO2 Inc.; http://wso2.com
> lean.enterprise.middleware
>
> mobile: +94 719411002 <+94+719411002>
> blog: *http://madhawa-gunasekara.blogspot.com
> *
> linkedin: *http://lk.linkedin.com/in/mgunasekara
> *
>



-- 
*Madhawa Gunasekara*
Software Engineer
WSO2 Inc.; http://wso2.com
lean.enterprise.middleware

mobile: +94 719411002 <+94+719411002>
blog: *http://madhawa-gunasekara.blogspot.com
*
linkedin: *http://lk.linkedin.com/in/mgunasekara
*
Index: core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java
===
--- core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java	(revision 212341)
+++ core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java	(working copy)
@@ -202,8 +202,14 @@
 		}
 		props.setDefaultCatalog(config.getDefaultCatalog());
 		props.setDriverClassName(config.getDriverClassName());
-		props.setUsername(config.getUsername());
-	props.setPassword(config.getPassword());
+		String username = config.getUsername();
+		if (null != username && !("").equals(username)) {
+			props.setUsername(username);
+			String password = config.getPassword();
+			if (null != password && !("").equals(password)) {
+props.setPassword(password);
+			}
+		}
 		if (config.getMaxActive() != null) {
 		props.setMaxActive(config.getMaxActive());
 		}
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please review and commit

2015-05-11 Thread Madhawa Gunasekara
Hi Devs,

Please review and commit, Please find the attached svn diff for the JIRA
issue https://wso2.org/jira/browse/CARBON-15239


Thanks,
Madhawa
-- 
*Madhawa Gunasekara*
Software Engineer
WSO2 Inc.; http://wso2.com
lean.enterprise.middleware

mobile: +94 719411002 <+94+719411002>
blog: *http://madhawa-gunasekara.blogspot.com
*
linkedin: *http://lk.linkedin.com/in/mgunasekara
*
Index: kernel/branches/4.2.0/patches/patch0003/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java
===
--- kernel/branches/4.2.0/patches/patch0003/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java	(revision 212341)
+++ kernel/branches/4.2.0/patches/patch0003/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java	(working copy)
@@ -202,8 +202,14 @@
 		}
 		props.setDefaultCatalog(config.getDefaultCatalog());
 		props.setDriverClassName(config.getDriverClassName());
-		props.setUsername(config.getUsername());
-	props.setPassword(config.getPassword());
+		String username = config.getUsername();
+		if (username != null && !username.equals("")) {
+			props.setUsername(username);
+		}
+		String password = config.getPassword();
+		if (password != null && !password.equals("")) {
+			props.setPassword(password);
+		}
 		if (config.getMaxActive() != null) {
 		props.setMaxActive(config.getMaxActive());
 		}
Index: kernel/branches/4.2.0/patches/patch0010/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/pom.xml
===
--- kernel/branches/4.2.0/patches/patch0010/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/pom.xml	(revision 212341)
+++ kernel/branches/4.2.0/patches/patch0010/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/pom.xml	(working copy)
@@ -51,6 +51,17 @@
 org.wso2.carbon.utils
 ${project.version}
 
+
+org.testng
+testng
+6.1.1
+test
+
+
+com.h2database.wso2
+h2-database-engine
+test
+
 
 
 
Index: kernel/branches/4.2.0/patches/patch0010/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java
===
--- kernel/branches/4.2.0/patches/patch0010/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java	(revision 212341)
+++ kernel/branches/4.2.0/patches/patch0010/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java	(working copy)
@@ -202,8 +202,14 @@
 		}
 		props.setDefaultCatalog(config.getDefaultCatalog());
 		props.setDriverClassName(config.getDriverClassName());
-		props.setUsername(config.getUsername());
-	props.setPassword(config.getPassword());
+		String username = config.getUsername();
+		if (null != username && !("").equals(username)) {
+			props.setUsername(username);
+			String password = config.getPassword();
+			if (null != password && !("").equals(password)) {
+props.setPassword(password);
+			}
+		}
 		if (config.getMaxActive() != null) {
 		props.setMaxActive(config.getMaxActive());
 		}
Index: platform/branches/turing/components/data-services/org.wso2.carbon.dataservices.core/4.2.1/src/main/java/org/wso2/carbon/dataservices/core/admin/DataServiceAdmin.java
===
--- platform/branches/turing/components/data-services/org.wso2.carbon.dataservices.core/4.2.1/src/main/java/org/wso2/carbon/dataservices/core/admin/DataServiceAdmin.java	(revision 212341)
+++ platform/branches/turing/components/data-services/org.wso2.carbon.dataservices.core/4.2.1/src/main/java/org/wso2/carbon/dataservices/core/admin/DataServiceAdmin.java	(working copy)
@@ -221,9 +221,16 @@
 			}
 
 			Class.forName(driverClass.trim());
-			connection = DriverManager.getConnection(jdbcURL, username, resolvePwd);
-			String message = "Database connection is successfull with driver class " + driverClass
-	+ " , jdbc url " + jdbcURL + " and user name " + username;
+			String message;
+			if (username != null && !username.equals("")) {
+connection = DriverManager.getConnection(jdbcURL, username, resolvePwd);
+message = "Database connection is successful with driver class " + driverClass +
+  " , jdbc url " + jdbcURL + " and user name " + username;
+			} else {
+connection = DriverManager.getConnection(jdbcURL);
+message = "Database connection is successful with driver class " + driverClass +
+  " , jdbc url " + jdb

Re: [Dev] Please review and commit

2015-04-27 Thread Godwin Amila Shrimal
Kind reminder.

On Sun, Apr 26, 2015 at 11:37 PM, Godwin Amila Shrimal 
wrote:

> Hi,
>
> Please review and commit the diff attached in [1]
>
> [1] https://wso2.org/jira/browse/IDENTITY-3166
>
>
> Thanks
> Godwin
>
>
> --
> *Godwin Amila Shrimal*
> Senior Software Engineer
> WSO2 Inc.; http://wso2.com
> lean.enterprise.middleware
>
> mobile: *+94772264165*
> linkedin: *http://lnkd.in/KUum6D *
> twitter: https://twitter.com/godwinamila
>



-- 
*Godwin Amila Shrimal*
Senior Software Engineer
WSO2 Inc.; http://wso2.com
lean.enterprise.middleware

mobile: *+94772264165*
linkedin: *http://lnkd.in/KUum6D *
twitter: https://twitter.com/godwinamila
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please review and commit

2015-04-26 Thread Godwin Amila Shrimal
Hi,

Please review and commit the diff attached in [1]

[1] https://wso2.org/jira/browse/IDENTITY-3166


Thanks
Godwin


-- 
*Godwin Amila Shrimal*
Senior Software Engineer
WSO2 Inc.; http://wso2.com
lean.enterprise.middleware

mobile: *+94772264165*
linkedin: *http://lnkd.in/KUum6D *
twitter: https://twitter.com/godwinamila
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please review and commit attached test cases

2015-01-15 Thread Nuwan Dias
Adding Sanjeewa

On Fri, Jan 16, 2015 at 10:54 AM, Dinesh J Weerakkody 
wrote:

> Hi,
>
> I have attached herewith test cases and configuration files for
>
>- Custom sequence execution on API invocation
>- Performance test for My subscription page of API Store
>
> Please review and commit to APIM 1.9.0
>
> Thanks
>
> *Dinesh J. Weerakkody*
> Software Engineer
> WSO2 Inc.
> lean | enterprise | middleware
> M : +94 727 361788 | E : dine...@wso2.com | W : www.wso2.com
>



-- 
Nuwan Dias

Associate Tech Lead - WSO2, Inc. http://wso2.com
email : nuw...@wso2.com
Phone : +94 777 775 729
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please Review and Commit

2015-01-06 Thread Nuwan Dias
Done, revision r210870.

On Tue, Jan 6, 2015 at 12:59 PM, Sam Sivayogam  wrote:

> Hi Nuwan
>
> I attached the test classes for the following jira
> https://wso2.org/jira/browse/APIMANAGER-3154
>
> Pls review and commit
>
>
> Thanks
> --
> *Sam Sivayogam*
>
> Software Engineer
> Mobile  : +94 772 906 439
> Office   : +94 112 145 345
> *WSO2, Inc. :** wso2.com *
> lean.enterprise.middleware.
>



-- 
Nuwan Dias

Associate Tech Lead - WSO2, Inc. http://wso2.com
email : nuw...@wso2.com
Phone : +94 777 775 729
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please Review and Commit

2015-01-05 Thread Sam Sivayogam
Hi Nuwan

I attached the test classes for the following jira
https://wso2.org/jira/browse/APIMANAGER-3154

Pls review and commit


Thanks
-- 
*Sam Sivayogam*

Software Engineer
Mobile  : +94 772 906 439
Office   : +94 112 145 345
*WSO2, Inc. :** wso2.com *
lean.enterprise.middleware.
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please review and commit patches

2015-01-04 Thread Malithi Edirisinghe
Hi,

Please review and commit following JIRAs.

https://wso2.org/jira/browse/IDENTITY-2914
https://wso2.org/jira/browse/IDENTITY-2948
https://wso2.org/jira/browse/IDENTITY-2949
https://wso2.org/jira/browse/IDENTITY-2959

Thanks,
Malithi.

-- 

*Malithi Edirisinghe*
Senior Software Engineer
WSO2 Inc.

Mobile : +94 (0) 718176807
malit...@wso2.com
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please review and commit

2014-12-23 Thread Dinusha Senanayaka
On Tue, Dec 23, 2014 at 2:54 PM, Lahiru Cooray  wrote:

> Hi,
>
> Please merge the PR
> https://github.com/wso2/app-manager/pull/108
>
Done. Thanks .

>
> --
> *Lahiru Cooray*
> Software Engineer
> WSO2, Inc.;http://wso2.com/
> lean.enterprise.middleware
>
> Mobile: +94 715 654154
>



-- 
Dinusha Dilrukshi
Senior Software Engineer
WSO2 Inc.: http://wso2.com/
Mobile: +94725255071
Blog: http://dinushasblog.blogspot.com/
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please review and commit

2014-12-23 Thread Lahiru Cooray
Hi,

Please merge the PR
https://github.com/wso2/app-manager/pull/108

-- 
*Lahiru Cooray*
Software Engineer
WSO2, Inc.;http://wso2.com/
lean.enterprise.middleware

Mobile: +94 715 654154
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please review and commit : APPM-265

2014-12-17 Thread Lahiru Cooray
Hi,

Please merge the PR
https://github.com/wso2/app-manager/pull/94
-- 
*Lahiru Cooray*
Software Engineer
WSO2, Inc.;http://wso2.com/
lean.enterprise.middleware

Mobile: +94 715 654154
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please review and commit APIMANAGER-3218

2014-12-16 Thread Kasun Gunasekara
Hi,

Please review and commit [1]

[1] https://wso2.org/jira/browse/APIMANAGER-3218

Thank you.

Kasun Gunasekara
Software Engineering Intern - WSO2
Mobile : +94 77 6986482
Twitter  | Google+
 | LinkedIn

___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please review and commit : APPM-155

2014-12-16 Thread Lahiru Cooray
Hi Ruwan,

Yes, there are many similar hard coded texts in the existing code base and
I think we need to change all the occurrences..

Thanks..

On Tue, Dec 16, 2014 at 10:25 PM, Ruwan Yatawara  wrote:
>
> Hi Lahiru,
>
> Small suggestion. Noticed that a bunch of text such as  Allows 5
> request(s) per minute. are hard coded. Actually these tier value are
> subject to change once the tiers.xml is changed.
>
> Hence it would be best to load these values dynamically, else it would be
> reported as another bug later on.
>
> Thanks and Regards,
>
> Ruwan Yatawara
>
> Senior Software Engineer,
> WSO2 Inc.
>
> email : ruw...@wso2.com
> mobile : +94 77 9110413
> blog : http://thoughts.ruwan-ace.com/
> www: :http://wso2.com
>
>
> On Tue, Dec 16, 2014 at 6:55 PM, Lahiru Cooray  wrote:
>>
>> Hi,
>>
>> Please merge the PR
>> https://github.com/wso2/app-manager/pull/92
>>
>>
>> --
>> *Lahiru Cooray*
>> Software Engineer
>> WSO2, Inc.;http://wso2.com/
>> lean.enterprise.middleware
>>
>> Mobile: +94 715 654154
>>
>

-- 
*Lahiru Cooray*
Software Engineer
WSO2, Inc.;http://wso2.com/
lean.enterprise.middleware

Mobile: +94 715 654154
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


Re: [Dev] Please review and commit : APPM-155

2014-12-16 Thread Ruwan Yatawara
Hi Lahiru,

Small suggestion. Noticed that a bunch of text such as  Allows 5 request(s)
per minute. are hard coded. Actually these tier value are subject to change
once the tiers.xml is changed.

Hence it would be best to load these values dynamically, else it would be
reported as another bug later on.

Thanks and Regards,

Ruwan Yatawara

Senior Software Engineer,
WSO2 Inc.

email : ruw...@wso2.com
mobile : +94 77 9110413
blog : http://thoughts.ruwan-ace.com/
www: :http://wso2.com


On Tue, Dec 16, 2014 at 6:55 PM, Lahiru Cooray  wrote:
>
> Hi,
>
> Please merge the PR
> https://github.com/wso2/app-manager/pull/92
>
>
> --
> *Lahiru Cooray*
> Software Engineer
> WSO2, Inc.;http://wso2.com/
> lean.enterprise.middleware
>
> Mobile: +94 715 654154
>
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please review and commit : APPM-155

2014-12-16 Thread Lahiru Cooray
Hi,

Please merge the PR
https://github.com/wso2/app-manager/pull/92


-- 
*Lahiru Cooray*
Software Engineer
WSO2, Inc.;http://wso2.com/
lean.enterprise.middleware

Mobile: +94 715 654154
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please review and commit APIMANAGER-3203

2014-12-12 Thread Kasun Gunasekara
Hi,

Please review and commit the changes for,

https://wso2.org/jira/browse/APIMANAGER-3203

Thank you.

Kasun Gunasekara
Software Engineering Intern - WSO2
Mobile : +94 77 6986482
Twitter  | Google+
 | LinkedIn

___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] Please review and commit : APPM-224

2014-12-12 Thread Lahiru Cooray
Hi,

Please merge the PR
https://github.com/wso2/app-manager/pull/89

(fix for : https://wso2.org/jira/browse/APPM-224)

-- 
*Lahiru Cooray*
Software Engineer
WSO2, Inc.;http://wso2.com/
lean.enterprise.middleware

Mobile: +94 715 654154
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev


[Dev] [DEV] Please review and commit

2014-12-10 Thread Dinesh J Weerakkody
Hi,

I have attached a diff file herewith which has test cases and some
improvements to TestUtil class.

This diff contain testcases for following jiras
https://wso2.org/jira/browse/APIMANAGER-3017
https://wso2.org/jira/browse/APIMANAGER-3149
https://wso2.org/jira/browse/APIMANAGER-2957

Modifications done to TestUtil class
Used api name as contextpath (removed hard coded path. otherwise we cannot
create multiple APIs) and JSONParser to check the response status when
creating an API

Thanks

*Dinesh J. Weerakkody*
Software Engineer
WSO2 Inc.
lean | enterprise | middleware
M : +94 727 361788 | E : dine...@wso2.com | W : www.wso2.com
Index: 
1.8.0/modules/integration/tests-ui/src/test/java/org/wso2/carbon/am/integration/ui/APIMANAGER2957EpochTimeTestCase.java
===
--- 
1.8.0/modules/integration/tests-ui/src/test/java/org/wso2/carbon/am/integration/ui/APIMANAGER2957EpochTimeTestCase.java
 (revision 0)
+++ 
1.8.0/modules/integration/tests-ui/src/test/java/org/wso2/carbon/am/integration/ui/APIMANAGER2957EpochTimeTestCase.java
 (working copy)
@@ -0,0 +1,118 @@
+/*
+*Copyright (c) 2005-2014, 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.am.integration.ui;
+
+import org.apache.http.protocol.HttpContext;
+import org.openqa.selenium.Alert;
+import org.openqa.selenium.By;
+import org.openqa.selenium.NoAlertPresentException;
+import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.wso2.carbon.am.integration.ui.util.TestUtil;
+import org.wso2.carbon.automation.core.BrowserManager;
+import org.wso2.carbon.automation.core.ProductConstant;
+
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
+import static org.testng.Assert.assertTrue;
+
+public class APIMANAGER2957EpochTimeTestCase extends AMIntegrationUiTestBase {
+private WebDriver driver;
+private boolean acceptNextAlert = true;
+private StringBuffer verificationErrors = new StringBuffer();
+
+private static final String TEST_DATA_API_NAME = "EpochAPI";
+private static final String TEST_DATA_API_VERSION = "1.0.0";
+private static final String TEST_DATA_API_TIER = "Unlimited";
+private static final String TEST_DATA_APP_NAME = "DefaultApplication";
+
+@BeforeClass(alwaysRun = true)
+public void init() throws Exception {
+super.init(0);
+driver = BrowserManager.getWebDriver();
+driver.get(getLoginURL(ProductConstant.AM_SERVER_NAME));
+
+driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
+}
+
+@Test(groups = "wso2.am", description = "This method adds and publishes 
the Test API in carbon.super store")
+public void testCreatePublishAndSubscribeAPI() throws Exception {
+
+// login to publisher and create new API
+String publisherURL = getPublisherURL(ProductConstant.AM_SERVER_NAME);
+HttpContext httpContext = TestUtil.login(userInfo.getUserName(), 
userInfo.getPassword(), publisherURL);
+assertTrue(TestUtil.addAPI(userInfo.getUserName(), TEST_DATA_API_NAME, 
TEST_DATA_API_VERSION, httpContext, publisherURL));
+assertTrue(TestUtil.publishAPI(userInfo.getUserName(), 
TEST_DATA_API_NAME, TEST_DATA_API_VERSION, httpContext, publisherURL));
+
+// login to store and subscribe to API
+String storeURL = getStoreURL(ProductConstant.AM_SERVER_NAME);
+httpContext = TestUtil.login(userInfo.getUserName(), 
userInfo.getPassword(), storeURL);
+assertTrue(TestUtil.addSubscription(userInfo.getUserName(), 
TEST_DATA_API_NAME, TEST_DATA_API_VERSION, TEST_DATA_API_TIER, 
TEST_DATA_APP_NAME, httpContext, storeURL));
+
+System.out.println("API Create and Publish test case is completed ");
+}
+
+@Test(groups = "wso2.am", description = "Check time conversion from epoch 
to human readable version", dependsOnMethods = 
"testCreatePublishAndSubscribeAPI")
+public void testFIDELITYDEV86EpochTimeTestCase() throws Exception {
+// login to publisher
+driver.get(getPublisherURL(ProductConstant.AM_SERVER_NAME

[Dev] Please review and commit

2014-11-26 Thread Lakshman Udayakantha
Hi,

Please review and commit these jiras.

[1] https://wso2.org/jira/browse/APIMANAGER-3119
[2] https://wso2.org/jira/browse/APIMANAGER-2835
[3] https://wso2.org/jira/browse/APIMANAGER-2656


Thanks

-- 
Lakshman Udayakantha
WSO2 Inc. www.wso2.com
lean.enterprise.middleware
Mobile: *0711241005*
___
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev