merged latest code

wso2 · Mar 19, 2015 · 66f5552 · 66f5552
2 parents dcd7aca + 90e1de3
commit 66f5552
Show file tree

Hide file tree

Showing 343 changed files with 7,351 additions and 70,745 deletions.
diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
@@ -207,5 +207,9 @@ under the License.
  <groupId>org.wso2.carbon</groupId>
  <artifactId>org.wso2.carbon.identity.user.profile.stub</artifactId>
  </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.um.ws.api.stub</artifactId>
+ </dependency>
  </dependencies>
 </project>
diff --git a/...lients/src/main/java/org/wso2/am/admin/clients/aar/services/AARServiceUploaderClient.java b/...lients/src/main/java/org/wso2/am/admin/clients/aar/services/AARServiceUploaderClient.java
diff --git a/.../admin-clients/src/main/java/org/wso2/am/admin/clients/common/ApplicationAdminClient.java b/.../admin-clients/src/main/java/org/wso2/am/admin/clients/common/ApplicationAdminClient.java
diff --git a/...mon/admin-clients/src/main/java/org/wso2/am/admin/clients/common/AuthenticatorClient.java b/...mon/admin-clients/src/main/java/org/wso2/am/admin/clients/common/AuthenticatorClient.java
diff --git a/...admin-clients/src/main/java/org/wso2/am/admin/clients/common/CarbonAppUploaderClient.java b/...admin-clients/src/main/java/org/wso2/am/admin/clients/common/CarbonAppUploaderClient.java