You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/07/31 13:16:53 UTC
[12/51] [partial] applying patch related to JIRA STRATOS-12
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/conf/synapse-configs/default/synapse.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/conf/synapse-configs/default/synapse.xml b/products/stratos_controller/conf/synapse-configs/default/synapse.xml
deleted file mode 100755
index d8ad52d..0000000
--- a/products/stratos_controller/conf/synapse-configs/default/synapse.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF 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.
- -->
-
-<!-- The default synapse configuration shipped with the WSO2 Elastic Load Balancer
- -->
-
-<definitions xmlns="http://ws.apache.org/ns/synapse">
-</definitions>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/conf/synapse.properties
----------------------------------------------------------------------
diff --git a/products/stratos_controller/conf/synapse.properties b/products/stratos_controller/conf/synapse.properties
deleted file mode 100755
index c3cbdb4..0000000
--- a/products/stratos_controller/conf/synapse.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF 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.
-#
-
-#synapse.threads.core = 20
-#synapse.threads.max = 100
-#synapse.threads.keepalive = 5
-#synapse.threads.qlen = 10
-#synapse.threads.group = synapse-thread-group
-#synapse.threads.idprefix = SynapseWorker
-
-synapse.sal.endpoints.sesssion.timeout.default=600000
-
-#In memory statistics cleaning state
-statistics.clean.enable=false
-
-# Dependency tracking Synapse observer
-# Comment out to disable dependency management
-synapse.observers=org.wso2.carbon.mediation.dependency.mgt.DependencyTracker
-
-# User defined wsdlLocator/Schema Resolver Implementations.
-# synapse.wsdl.resolver=org.wso2.carbon.mediation.initializer.RegistryWSDLLocator
-# synapse.schema.resolver=org.wso2.carbon.mediation.initializer.RegistryXmlSchemaURIResolver
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/conf/tenant-reg-agent.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/conf/tenant-reg-agent.xml b/products/stratos_controller/conf/tenant-reg-agent.xml
deleted file mode 100755
index c39e189..0000000
--- a/products/stratos_controller/conf/tenant-reg-agent.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF 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.
- -->
-<tenantRegListenerServers>
- <!--<server>
- <serverUrl>https://10.100.1.206:9443/services/</serverUrl>
- <userName>admin</userName>
- <password>admin</password>
- </server>-->
-</tenantRegListenerServers>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/conf/throttling-rules.drl
----------------------------------------------------------------------
diff --git a/products/stratos_controller/conf/throttling-rules.drl b/products/stratos_controller/conf/throttling-rules.drl
deleted file mode 100755
index 2225fa6..0000000
--- a/products/stratos_controller/conf/throttling-rules.drl
+++ /dev/null
@@ -1,251 +0,0 @@
-import org.wso2.carbon.throttling.manager.dataobjects.*;
-import org.wso2.carbon.billing.mgt.dataobjects.*;
-import org.wso2.carbon.stratos.common.constants.*;
-
-// free users restrictions
-
-rule unsetRestrictFreeUsers
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_ADD_USER_ACTION, false, null);
-
-end
-
-
-rule restrictFreeDataVolume
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) > (20 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, true,
- "You have exceeded the maximum allowed disk storage of 20Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictFreeDataVolume
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) <= (20 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, false, null);
-end
-
-
-rule restrictFreeBandwidth
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
- eval(($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_INCOMING_BANDWIDTH) +
- $dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_OUTGOING_BANDWIDTH)) > (50 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_SERVICE_IN_BANDWIDTH_ACTION, true,
- "You have exceeded the maximum allowed bandwidth of 50Mb. Please upgrade the subscription.");
- validation.setTenantBlocked(StratosConstants.THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION, true,
- "You have exceeded the maximum allowed bandwidth of 50Mb. Please upgrade the subscription.");
- validation.setTenantBlocked(StratosConstants.THROTTLING_OUT_DATA_ACTION, true,
- "You have exceeded the maximum allowed bandwidth of 50Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictFreeBandwidth
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
- eval(($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_INCOMING_BANDWIDTH) +
- $dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_OUTGOING_BANDWIDTH)) < (50 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_SERVICE_IN_BANDWIDTH_ACTION,false,null);
- validation.setTenantBlocked(StratosConstants.THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION,false,null);
- validation.setTenantBlocked(StratosConstants.THROTTLING_OUT_DATA_ACTION,false,null);
-end
-
-
-//---------------------------------------------------------------------------------
-// small users restrictions
-
-
-
-rule restrictSmallDataVolume
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) > (50 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, true,
- "You have exceeded the maximum allowed disk storage of 50Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictSmallDataVolume
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) <= (50 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, false, null);
-end
-
-
-rule restrictSmallBandwidth
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
- eval(($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_INCOMING_BANDWIDTH) +
- $dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_OUTGOING_BANDWIDTH)) > (150 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_SERVICE_IN_BANDWIDTH_ACTION, true,
- "You have exceeded the maximum allowed bandwidth of 150Mb. Please upgrade the subscription.");
- validation.setTenantBlocked(StratosConstants.THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION, true,
- "You have exceeded the maximum allowed bandwidth of 150Mb. Please upgrade the subscription.");
- validation.setTenantBlocked(StratosConstants.THROTTLING_OUT_DATA_ACTION, true,
- "You have exceeded the maximum allowed bandwidth of 150Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictSmallBandwidth
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
- eval(($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_INCOMING_BANDWIDTH) +
- $dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_OUTGOING_BANDWIDTH)) < (150 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_SERVICE_IN_BANDWIDTH_ACTION,false,null);
- validation.setTenantBlocked(StratosConstants.THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION,false,null);
- validation.setTenantBlocked(StratosConstants.THROTTLING_OUT_DATA_ACTION,false,null);
-end
-
-
-rule unsetRestrictSmallUsers
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
-then
-
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_ADD_USER_ACTION, false, null);
-
-end
-
-
-
-
-//-------------------------------------------------------------------------------
-// medium users restrictions
-
-
-
-rule restrictMediumDataVolume
-when
- $package: MultitenancyPackage(name == "Professional")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) > (500 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, true,
- "You have exceeded the maximum allowed disk storage of 500Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictMediumDataVolume
-when
- $package: MultitenancyPackage(name == "Professional")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) <= (500 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, false, null);
-end
-
-
-rule unsetRestrictMediumUsers
-when
- $package: MultitenancyPackage(name == "Professional")
- $dataContext : ThrottlingDataContext()
-then
-
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_ADD_USER_ACTION, false, null);
-
-end
-
-
-
-//-----------------------------------------------------------------------------------------------
-// large users restrictions
-
-
-rule restrictLargeDataVolume
-when
- $package: MultitenancyPackage(name == "Enterprise")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) > (1500 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, true,
- "You have exceeded the maximum allowed disk storage of 1500Mb.");
-end
-
-
-rule unsetRestrictLargeDataVolume
-when
- $package: MultitenancyPackage(name == "Enterprise")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) <= (1500 * 1024 * 1024) &&
- $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, false, null);
-end
-
-
-rule unsetRestrictLargeUsers
-when
- $package: MultitenancyPackage(name == "Enterprise")
- $dataContext : ThrottlingDataContext()
-then
-
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_ADD_USER_ACTION, false, null);
-
-end
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/conf/user-mgt.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/conf/user-mgt.xml b/products/stratos_controller/conf/user-mgt.xml
deleted file mode 100644
index c6cdb74..0000000
--- a/products/stratos_controller/conf/user-mgt.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF 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.
- -->
-
-<UserManager>
- <Realm>
- <Configuration>
- <AdminRole>admin</AdminRole>
- <AdminUser>
- <UserName>admin</UserName>
- <Password>admin</Password>
- </AdminUser>
- <EveryOneRoleName>everyone</EveryOneRoleName> <!-- By default users in this role sees the registry root -->
- <Property name="dataSource">jdbc/WSO2CarbonDB</Property>
- <Property name="MultiTenantRealmConfigBuilder">org.wso2.carbon.user.core.config.multitenancy.SimpleRealmConfigBuilder</Property>
- </Configuration>
- <!-- Following is the default user store manager. This user store manager is based on embedded-apacheds LDAP. It reads/writes users and roles into the default apacheds LDAP user store. Descriptions about each of the following properties can be found in user management documentation of the respective product. In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
- Note: Do not comment within UserStoreManager tags. Cause, specific tag names are used as tokens when building configurations for products. -->
- <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
- <Property name="ConnectionURL">ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
- <Property name="ConnectionName">uid=admin,ou=system</Property>
- <Property name="ConnectionPassword">admin</Property>
- <Property name="passwordHashMethod">SHA</Property>
- <Property name="UserNameListFilter">(objectClass=person)</Property>
- <Property name="UserEntryObjectClass">wso2Person</Property>
- <Property name="UserSearchBase">ou=Users,dc=wso2,dc=org</Property>
- <Property name="UserNameSearchFilter">(&(objectClass=person)(uid=?))</Property>
- <Property name="UserNameAttribute">uid</Property>
- <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
- <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="UsernameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
- <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
- <Property name="ReadLDAPGroups">true</Property>
- <Property name="WriteLDAPGroups">true</Property>
- <Property name="EmptyRolesAllowed">true</Property>
- <Property name="GroupSearchBase">ou=Groups,dc=wso2,dc=org</Property>
- <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
- <Property name="GroupEntryObjectClass">groupOfNames</Property>
- <Property name="GroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
- <Property name="GroupNameAttribute">cn</Property>
- <Property name="MembershipAttribute">member</Property>
- <Property name="UserRolesCacheEnabled">true</Property>
- <Property name="UserDNPattern">uid={0},ou=Users,dc=wso2,dc=org</Property>
- </UserStoreManager-->
-
- <!-- Following is the configuration for internal JDBC user store. This user store manager is based on JDBC. In case if application needs to manage passwords externally set property <Property name="PasswordsExternallyManaged">true</Property>. In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>. Furthermore properties, IsEmailUserName and DomainCalculation are readonly properties.
- Note: Do not comment within UserStoreManager tags. Cause, specific tag names are used as tokens when building configurations for products. -->
- <UserStoreManager class="org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager">
- <Property name="ReadOnly">false</Property>
- <Property name="MaxUserNameListLength">100</Property>
- <Property name="IsEmailUserName">false</Property>
- <Property name="DomainCalculation">default</Property>
- <Property name="PasswordDigest">SHA-256</Property>
- <Property name="StoreSaltedPassword">true</Property>
- <Property name="UserNameUniqueAcrossTenants">false</Property>
- <Property name="PasswordJavaRegEx">^[\S]{5,30}$</Property>
- <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
- <Property name="UsernameJavaRegEx">^[^~!#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
- <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
- <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="UserRolesCacheEnabled">true</Property>
- </UserStoreManager>
-
- <!-- If product is using an external LDAP as the user store in READ ONLY mode, use following user manager.
- In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
- -->
- <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadOnlyLDAPUserStoreManager">
- <Property name="ReadOnly">true</Property>
- <Property name="MaxUserNameListLength">100</Property>
- <Property name="ConnectionURL">ldap://localhost:10389</Property>
- <Property name="ConnectionName">uid=admin,ou=system</Property>
- <Property name="ConnectionPassword">admin</Property>
- <Property name="UserSearchBase">ou=system</Property>
- <Property name="UserNameListFilter">(objectClass=person)</Property>
- <Property name="UserNameAttribute">uid</Property>
- <Property name="ReadLDAPGroups">false</Property>
- <Property name="GroupSearchBase">ou=system</Property>
- <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
- <Property name="GroupNameAttribute">cn</Property>
- <Property name="MembershipAttribute">member</Property>
- <Property name="UserRolesCacheEnabled">true</Property>
- <Property name="ReplaceEscapeCharactersAtUserLogin">true</Property>
- </UserStoreManager-->
-
- <!-- Active directory configuration is as follows.
- In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
- There are few special properties for "Active Directory".
- They are :
- 1.Referral - (comment out this property if this feature is not reuired) This enables LDAP referral support.
- 2.BackLinksEnabled - (Do not comment, set to true or false) In some cases LDAP works with BackLinksEnabled. In which role is stored
- at user level. Depending on this value we need to change the Search Base within code.
- 3.isADLDSRole - (Do not comment) Set to true if connecting to an AD LDS instance else set to false.
- -->
- <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ActiveDirectoryUserStoreManager">
- <Property name="defaultRealmName">WSO2.ORG</Property>
- <Property name="kdcEnabled">false</Property>
- <Property name="ConnectionURL">ldaps://10.100.1.100:636</Property>
- <Property name="ConnectionName">CN=admin,CN=Users,DC=WSO2,DC=Com</Property>
- <Property name="ConnectionPassword">A1b2c3d4</Property>
- <Property name="passwordHashMethod">SHA</Property>
- <Property name="UserSearchBase">CN=Users,DC=WSO2,DC=Com</Property>
- <Property name="UserEntryObjectClass">user</Property>
- <Property name="UserNameAttribute">cn</Property>
- <Property name="isADLDSRole">false</Property>
- <Property name="userAccountControl">512</Property>
- <Property name="UserNameListFilter">(objectClass=user)</Property>
- <Property name="UserNameSearchFilter">(&(objectClass=user)(cn=?))</Property>
- <Property name="UsernameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>]{3,30}$</Property>
- <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
- <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>]{3,30}$</Property>
- <Property name="ReadLDAPGroups">true</Property>
- <Property name="WriteLDAPGroups">true</Property>
- <Property name="EmptyRolesAllowed">true</Property>
- <Property name="GroupSearchBase">CN=Users,DC=WSO2,DC=Com</Property>
- <Property name="GroupEntryObjectClass">group</Property>
- <Property name="GroupNameAttribute">cn</Property>
- <Property name="MembershipAttribute">member</Property>
- <Property name="GroupNameListFilter">(objectcategory=group)</Property>
- <Property name="GroupNameSearchFilter">(&(objectClass=group)(cn=?))</Property>
- <Property name="UserRolesCacheEnabled">true</Property>
- <Property name="Referral">follow</Property>
- <Property name="BackLinksEnabled">true</Property>
- </UserStoreManager-->
-
- <!-- If product is using an external LDAP as the user store in read/write mode, use following user manager
- In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
- -->
- <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
- <Property name="ConnectionURL">ldap://localhost:10389</Property>
- <Property name="ConnectionName">uid=admin,ou=system</Property>
- <Property name="ConnectionPassword">secret</Property>
- <Property name="passwordHashMethod">SHA</Property>
- <Property name="UserNameListFilter">(objectClass=person)</Property>
- <Property name="UserEntryObjectClass">inetOrgPerson</Property>
- <Property name="UserSearchBase">ou=system</Property>
- <Property name="UserNameSearchFilter">(&(objectClass=person)(uid=?))</Property>
- <Property name="UserNameAttribute">uid</Property>
- <Property name="UsernameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>]{3,30}$</Property>
- <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>]{3,30}$</Property>
- <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
- <Property name="ReadLDAPGroups">true</Property>
- <Property name="WriteLDAPGroups">true</Property>
- <Property name="EmptyRolesAllowed">false</Property>
- <Property name="GroupSearchBase">ou=system</Property>
- <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
- <Property name="GroupEntryObjectClass">groupOfNames</Property>
- <Property name="GroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
- <Property name="GroupNameAttribute">cn</Property>
- <Property name="MembershipAttribute">member</Property>
- <Property name="UserRolesCacheEnabled">true</Property>
- <Property name="ReplaceEscapeCharactersAtUserLogin">true</Property>
- </UserStoreManager-->
-
- <!-- Following user manager is used by Identity Server (IS) as its default user manager.
- IS will do token replacement when building the product. Therefore do not change the syntax.
- If "kdcEnabled" parameter is true, IS will allow service principle management. Thus "ServicePasswordJavaRegEx", "ServiceNameJavaRegEx"
- properties control the service name format and service password formats.
- In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
- -->
- <!--ISUserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
- <Property name="defaultRealmName">WSO2.ORG</Property>
- <Property name="kdcEnabled">false</Property>
- <Property name="ConnectionURL">ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
- <Property name="ConnectionName">uid=admin,ou=system</Property>
- <Property name="ConnectionPassword">admin</Property>
- <Property name="passwordHashMethod">SHA</Property>
- <Property name="UserNameListFilter">(objectClass=person)</Property>
- <Property name="UserEntryObjectClass">scimPerson</Property>
- <Property name="UserSearchBase">ou=Users,dc=wso2,dc=org</Property>
- <Property name="UserNameSearchFilter">(&(objectClass=person)(uid=?))</Property>
- <Property name="UserNameAttribute">uid</Property>
- <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
- <Property name="ServicePasswordJavaRegEx">^[\\S]{5,30}$</Property>
- <Property name="ServiceNameJavaRegEx">^[\\S]{2,30}/[\\S]{2,30}$</Property>
- <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="UsernameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
- <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
- <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$</Property>
- <Property name="ReadLDAPGroups">true</Property>
- <Property name="WriteLDAPGroups">true</Property>
- <Property name="EmptyRolesAllowed">true</Property>
- <Property name="GroupSearchBase">ou=Groups,dc=wso2,dc=org</Property>
- <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
- <Property name="GroupEntryObjectClass">groupOfNames</Property>
- <Property name="GroupNameSearchFilter">(&(objectClass=groupOfNames)(cn=?))</Property>
- <Property name="GroupNameAttribute">cn</Property>
- <Property name="MembershipAttribute">member</Property>
- <Property name="UserRolesCacheEnabled">true</Property>
- <Property name="UserDNPattern">uid={0},ou=Users,dc=wso2,dc=org</Property>
- <Property name="SCIMEnabled">true</Property>
- </ISUserStoreManager-->
-
- <AuthorizationManager
- class="org.wso2.carbon.user.core.authorization.JDBCAuthorizationManager">
- <Property name="AdminRoleManagementPermissions">/permission</Property>
- <Property name="AuthorizationCacheEnabled">true</Property>
- </AuthorizationManager>
- </Realm>
-</UserManager>
-
-<!--*******Description of some of the configuration properties used in user-mgt.xml*********************************
-UserRolesCacheEnabled - This is to indicate whether to cache role list of a user. By default it is set to true.
- You may need to disable it if user-roles are changed by external means and need to reflect
- those changes in the carbon product immediately.
-
-ReplaceEscapeCharactersAtUserLogin - This is to configure whether escape characters in user name needs to be replaced at user login.
- Currently the identified escape characters that needs to be replaced are '\' & '\\'
-
-UserDNPattern - This property will be used when authenticating users. During authentication we do a bind. But if the user is login with
- email address or some other property we need to first lookup LDAP and retreive DN for the user. This involves an additional step.
- If UserDNPattern is specified the DN will be contructed using the pattern specified in this property. Performance of this is much better than looking
- up DN and binding user.
-
-passwordHashMethod - This says how the password should be stored. Allowed values are as follows,
- SHA - Uses SHA digest method
- MD5 - Uses MD 5 digest method
- PLAIN_TEXT - Plain text passwords
- In addition to above this supports all digest methods supported by http://docs.oracle.com/javase/6/docs/api/java/security/MessageDigest.html.
-
--->
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/conf/zoo.cfg
----------------------------------------------------------------------
diff --git a/products/stratos_controller/conf/zoo.cfg b/products/stratos_controller/conf/zoo.cfg
deleted file mode 100644
index ca3cc26..0000000
--- a/products/stratos_controller/conf/zoo.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-tickTime=2000
-dataDir=repository/data/zookeeper
-clientPort=2181
-start_zk_server=false
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/modules/cloud-service-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/cloud-service-mgt/pom.xml b/products/stratos_controller/modules/cloud-service-mgt/pom.xml
deleted file mode 100644
index 895a37b..0000000
--- a/products/stratos_controller/modules/cloud-service-mgt/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF 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.apache.stratos</groupId>
- <artifactId>stratos-controller-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.manager.services.mgt</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Stratos - Cloud Manager Cloud Services Management</name>
-
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <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>
- <Private-Package>
- org.apache.stratos.manager.services.mgt.*,
- </Private-Package>
- <Import-Package>
- org.wso2.carbon.registry.core.*;version=1.0.1,
- !javax.xml.namespace,
- javax.xml.namespace; version=0.0.0,
- javax.servlet; version=2.4.0,
- javax.servlet.http; version=2.4.0,
- org.apache.axiom.*; version="${axiom.osgi.version.range}",
- *;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- <!--<dependency>-->
- <!--<groupId>org.wso2.carbon</groupId>-->
- <!--<artifactId>org.wso2.carbon.registry.extensions</artifactId>-->
- <!--<version>${registry-component.version}</version>-->
- <!--</dependency>-->
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.resource</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.tenant.mgt</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/beans/CloudService.java
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/beans/CloudService.java b/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/beans/CloudService.java
deleted file mode 100644
index 7648280..0000000
--- a/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/beans/CloudService.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.apache.stratos.manager.services.mgt.beans;
-
-public class CloudService {
- private String name;
- private String label;
- private String link;
- private String icon;
- private String description;
- private boolean active;
- private String productPageURL;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getLabel() {
- return label;
- }
-
- public void setLabel(String label) {
- this.label = label;
- }
-
- public String getLink() {
- return link;
- }
-
- public void setLink(String link) {
- this.link = link;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public boolean isActive() {
- return active;
- }
-
- public void setActive(boolean active) {
- this.active = active;
- }
-
- public String getProductPageURL() {
- return productPageURL;
- }
-
- public void setProductPageURL(String productPageURL) {
- this.productPageURL = productPageURL;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/internal/CloudServiceMgtServiceComponent.java
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/internal/CloudServiceMgtServiceComponent.java b/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/internal/CloudServiceMgtServiceComponent.java
deleted file mode 100644
index 542e601..0000000
--- a/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/internal/CloudServiceMgtServiceComponent.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.apache.stratos.manager.services.mgt.internal;
-
-import org.apache.stratos.manager.services.mgt.util.Util;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.user.core.service.RealmService;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.osgi.service.component.ComponentContext;
-
-/**
- * @scr.component name="org.wso2.stratos.manager.services.mgt"
- * immediate="true"
- * @scr.reference name="registry.service"
- * interface="org.wso2.carbon.registry.core.service.RegistryService" cardinality="1..1"
- * policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService"
- * @scr.reference name="user.realmservice.default"
- * interface="org.wso2.carbon.user.core.service.RealmService"
- * cardinality="1..1" policy="dynamic" bind="setRealmService"
- * unbind="unsetRealmService"
- */
-public class CloudServiceMgtServiceComponent {
- private static Log log = LogFactory.getLog(CloudServiceMgtServiceComponent.class);
-
- protected void activate(ComponentContext context) {
- try {
- Util.loadCloudServicesConfiguration();
- Util.loadServiceIcons();
- log.debug("******* Cloud Manager Service Manager bundle is activated ******* ");
- } catch (Throwable e) {
- String msg = "******* Cloud Manager Service Manager bundle activation failed. ******* ";
- log.error(msg, e);
- }
- }
-
- protected void deactivate(ComponentContext context) {
- log.debug("******* Cloud Manager Service Manager bundle is deactivated ******* ");
- }
- protected void setRegistryService(RegistryService registryService) {
- Util.setRegistryService(registryService);
- }
-
- protected void unsetRegistryService(RegistryService registryService) {
- Util.setRegistryService(null);
- }
-
- protected void setRealmService(RealmService realmService) {
- Util.setRealmService(realmService);
- }
-
- protected void unsetRealmService(RealmService realmService) {
- Util.setRealmService(null);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/services/CloudManagerService.java
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/services/CloudManagerService.java b/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/services/CloudManagerService.java
deleted file mode 100644
index f12a4bb..0000000
--- a/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/services/CloudManagerService.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.apache.stratos.manager.services.mgt.services;
-
-import org.wso2.carbon.core.AbstractAdmin;
-import org.wso2.carbon.registry.core.session.UserRegistry;
-import org.apache.stratos.common.config.CloudServiceConfig;
-import org.apache.stratos.common.config.CloudServicesDescConfig;
-import org.apache.stratos.common.constants.StratosConstants;
-import org.apache.stratos.manager.services.mgt.beans.CloudService;
-import org.apache.stratos.manager.services.mgt.util.Util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class CloudManagerService extends AbstractAdmin {
-
- public CloudService[] retrieveCloudServiceInfo() throws Exception {
- UserRegistry registry = (UserRegistry)getConfigUserRegistry();
- int tenantId = registry.getTenantId();
-
- CloudServicesDescConfig cloudServicesDesc = Util.getCloudServicesDescConfig();
- Map<String, CloudServiceConfig> cloudServiceConfigs =
- cloudServicesDesc.getCloudServiceConfigs();
- List<CloudService> cloudServices = new ArrayList<CloudService>();
- if (cloudServiceConfigs != null) {
- Set<String> configKeys = cloudServiceConfigs.keySet();
- for (String configKey : configKeys) {
- CloudServiceConfig cloudServiceConfig = cloudServiceConfigs.get(configKey);
- String label = cloudServiceConfig.getLabel();
- if (label == null) {
- // we are only returning display-able services
- continue;
- }
- CloudService cloudService = new CloudService();
- String name = cloudServiceConfig.getName();
- cloudService.setName(name);
- cloudService.setLabel(label);
- cloudService.setLink(cloudServiceConfig.getLink());
- cloudService.setIcon(cloudServiceConfig.getIcon());
- cloudService.setDescription(cloudServiceConfig.getDescription());
- cloudService.setProductPageURL(cloudServiceConfig.getProductPageURL());
- boolean active = Util.isCloudServiceActive(name, tenantId);
- cloudService.setActive(tenantId == 0 || active);
-
- cloudServices.add(cloudService);
- }
- }
- return cloudServices.toArray(new CloudService[cloudServices.size()]);
- }
-
- public void saveCloudServicesActivity(String[] activeServiceNames) throws Exception {
- UserRegistry registry = (UserRegistry)getConfigUserRegistry();
- int tenantId = registry.getTenantId();
-
- CloudServicesDescConfig cloudServicesDesc = Util.getCloudServicesDescConfig();
- Map<String, CloudServiceConfig> cloudServiceConfigMap =
- cloudServicesDesc.getCloudServiceConfigs();
-
- List<String> activeServiceNamesList = Arrays.asList(activeServiceNames);
- if (cloudServiceConfigMap != null) {
- for (String cloudServiceName : cloudServiceConfigMap.keySet()) {
- if (activeServiceNamesList.contains(cloudServiceName)) {
- // this should be made active
- if (!Util.isCloudServiceActive(cloudServiceName, tenantId)) {
- Util.setCloudServiceActive(true, cloudServiceName, tenantId);
- }
- } else {
- // this should be made inactive
- if (Util.isCloudServiceActive(cloudServiceName, tenantId)) {
- Util.setCloudServiceActive(false, cloudServiceName, tenantId);
- }
-
- }
- }
- }
- Util.setCloudServiceActive(true, StratosConstants.CLOUD_IDENTITY_SERVICE, tenantId);
- Util.setCloudServiceActive(true, StratosConstants.CLOUD_GOVERNANCE_SERVICE, tenantId);
- }
-
- public void activate(String cloudServiceName) throws Exception {
- UserRegistry registry = (UserRegistry) getConfigUserRegistry();
- int tenantId = registry.getTenantId();
- if (!Util.isCloudServiceActive(cloudServiceName, tenantId)) {
- Util.setCloudServiceActive(true, cloudServiceName, tenantId);
- }
- }
-
- public void deactivate(String cloudServiceName) throws Exception {
- if (StratosConstants.CLOUD_IDENTITY_SERVICE.equals(cloudServiceName) ||
- StratosConstants.CLOUD_GOVERNANCE_SERVICE.equals(cloudServiceName)) {
- // cloud identity and governance services cannot be deactivated..
- return;
- }
- UserRegistry registry = (UserRegistry) getConfigUserRegistry();
- int tenantId = registry.getTenantId();
- if (Util.isCloudServiceActive(cloudServiceName, tenantId)) {
- Util.setCloudServiceActive(false, cloudServiceName, tenantId);
- }
- }
-}
-
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Constants.java
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Constants.java b/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Constants.java
deleted file mode 100644
index 3b615b2..0000000
--- a/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Constants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.apache.stratos.manager.services.mgt.util;
-
-public class Constants {
- public static final String CLOUD_SERVICE_INFO_STORE_PATH =
- "/repository/components/org.wso2.stratos/cloud-manager/cloud-services";
- public static final String CLOUD_SERVICE_ICONS_STORE_PATH =
- "/repository/components/org.wso2.stratos/cloud-manager/" +
- "cloud-services-icons";
-
- public static final String CLOUD_SERVICE_IS_ACTIVE_PROP_KEY = "active";
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Util.java
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Util.java b/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Util.java
deleted file mode 100644
index 904537f..0000000
--- a/products/stratos_controller/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Util.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.apache.stratos.manager.services.mgt.util;
-
-import org.wso2.carbon.registry.core.Collection;
-import org.wso2.carbon.registry.core.RegistryConstants;
-import org.wso2.carbon.registry.core.Resource;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.registry.core.session.UserRegistry;
-import org.apache.stratos.common.config.CloudServiceConfig;
-import org.apache.stratos.common.config.CloudServicesDescConfig;
-import org.apache.stratos.common.config.PermissionConfig;
-import org.apache.stratos.common.constants.StratosConstants;
-import org.apache.stratos.common.util.CommonUtil;
-import org.wso2.carbon.user.api.RealmConfiguration;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.user.core.tenant.TenantManager;
-import org.wso2.carbon.user.mgt.UserMgtConstants;
-import org.wso2.carbon.utils.CarbonUtils;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.activation.MimetypesFileTypeMap;
-
-public class Util {
-
- private static final Log log = LogFactory.getLog(Util.class);
-
- private static final String CONFIG_FILENAME = "cloud-services-desc.xml";
-
- private static RegistryService registryService;
- private static RealmService realmService;
- private static CloudServicesDescConfig cloudServicesDescConfig = null;
-
- public static synchronized void setRegistryService(RegistryService service) {
- if ((registryService == null) || (service == null)) {
- registryService = service;
- }
- }
-
- public static RegistryService getRegistryService() {
- return registryService;
- }
-
- public static synchronized void setRealmService(RealmService service) {
- if ((realmService == null) || (service == null)) {
- realmService = service;
- }
- }
-
- public static RealmService getRealmService() {
- return realmService;
- }
-
- public static TenantManager getTenantManager() {
- return realmService.getTenantManager();
- }
-
- public static RealmConfiguration getBootstrapRealmConfiguration() {
- return realmService.getBootstrapRealmConfiguration();
- }
-
- public static UserRegistry getTenantZeroSystemGovernanceRegistry() throws RegistryException {
- return registryService.getGovernanceSystemRegistry();
- }
-
- public static UserRegistry getSystemGovernanceRegistry(int tenantId) throws RegistryException {
- return registryService.getGovernanceSystemRegistry(tenantId);
- }
-
- public static UserRegistry getSystemConfigRegistry(int tenantId) throws RegistryException {
- return registryService.getConfigSystemRegistry(tenantId);
- }
-
- public static void loadCloudServicesConfiguration() throws Exception {
- // now load the cloud services configuration
- String configFileName =
- CarbonUtils.getCarbonConfigDirPath() + File.separator + StratosConstants.MULTITENANCY_CONFIG_FOLDER +
- File.separator+ CONFIG_FILENAME;
- OMElement configElement;
- try {
- configElement = CommonUtil.buildOMElement(new FileInputStream(configFileName));
- } catch (Exception e) {
- String msg = "Error in building the cloud service configuration. config filename: " +
- configFileName + ".";
- log.error(msg, e);
- throw new Exception(msg, e);
- }
- cloudServicesDescConfig = new CloudServicesDescConfig(configElement);
- }
-
- public static CloudServicesDescConfig getCloudServicesDescConfig() {
- return cloudServicesDescConfig;
- }
-
- public static CloudServiceConfig getCloudServiceConfig(String cloudServiceName) {
- Map<String, CloudServiceConfig> cloudServiceConfigs =
- cloudServicesDescConfig.getCloudServiceConfigs();
- return cloudServiceConfigs.get(cloudServiceName);
- }
-
- public static void setCloudServiceActive(boolean active, String cloudServiceName,
- int tenantId)throws Exception {
- CloudServiceConfig cloudServiceConfig = getCloudServiceConfig(cloudServiceName);
- if (cloudServiceConfig.getLabel() == null) {
- // for the non-labeled services, we are not setting/unsetting the service active
- return;
- }
-
- UserRegistry tenantZeroSystemGovernanceRegistry;
- UserRegistry systemConfigRegistry;
- try {
- tenantZeroSystemGovernanceRegistry = Util.getTenantZeroSystemGovernanceRegistry();
- systemConfigRegistry = Util.getSystemConfigRegistry(tenantId);
- } catch (RegistryException e) {
- String msg = "Error in getting the tenant 0 system config registry";
- log.error(msg, e);
- throw new Exception(msg, e);
- }
-
- String cloudServiceInfoPath =
- Constants.CLOUD_SERVICE_INFO_STORE_PATH + RegistryConstants.PATH_SEPARATOR +
- tenantId + RegistryConstants.PATH_SEPARATOR + cloudServiceName;
- Resource cloudServiceInfoResource;
- if (tenantZeroSystemGovernanceRegistry.resourceExists(cloudServiceInfoPath)) {
- cloudServiceInfoResource = tenantZeroSystemGovernanceRegistry.get(cloudServiceInfoPath);
- } else {
- cloudServiceInfoResource = tenantZeroSystemGovernanceRegistry.newCollection();
- }
- cloudServiceInfoResource.setProperty(Constants.CLOUD_SERVICE_IS_ACTIVE_PROP_KEY,
- active ? "true" : "false");
- tenantZeroSystemGovernanceRegistry.put(cloudServiceInfoPath, cloudServiceInfoResource);
-
- // then we will copy the permissions
- List<PermissionConfig> permissionConfigs = cloudServiceConfig.getPermissionConfigs();
- for (PermissionConfig permissionConfig : permissionConfigs) {
- String path = permissionConfig.getPath();
- String name = permissionConfig.getName();
- if (active) {
- if (!systemConfigRegistry.resourceExists(path)) {
- Collection collection = systemConfigRegistry.newCollection();
- collection.setProperty(UserMgtConstants.DISPLAY_NAME, name);
- systemConfigRegistry.put(path, collection);
- }
- } else {
- if (systemConfigRegistry.resourceExists(path)) {
- systemConfigRegistry.delete(path);
- }
- }
- }
- }
-
- public static boolean isCloudServiceActive(String cloudServiceName,
- int tenantId)throws Exception {
- UserRegistry systemGovernanceRegistry;
- try {
- systemGovernanceRegistry = Util.getTenantZeroSystemGovernanceRegistry();
- } catch (RegistryException e) {
- String msg = "Error in getting the tenant 0 system config registry";
- log.error(msg, e);
- throw new Exception(msg, e);
- }
-
- String cloudServiceInfoPath =
- Constants.CLOUD_SERVICE_INFO_STORE_PATH + RegistryConstants.PATH_SEPARATOR +
- tenantId + RegistryConstants.PATH_SEPARATOR + cloudServiceName;
-
- if (systemGovernanceRegistry.resourceExists(cloudServiceInfoPath)) {
- Resource cloudServiceInfoResource = systemGovernanceRegistry.get(cloudServiceInfoPath);
- String isActiveStr = cloudServiceInfoResource.getProperty(
- Constants.CLOUD_SERVICE_IS_ACTIVE_PROP_KEY);
- return "true".equals(isActiveStr);
- }
-
- return false;
- }
-
- /**
- * Currently this is not used, as the icons are loaded from the webapps
- *
- * @throws Exception
- */
- public static void loadServiceIcons() throws Exception {
- String serviceIconDirLocation =
- CarbonUtils.getCarbonHome() + "/resources/cloud-service-icons";
- File serviceIconDirDir = new File(serviceIconDirLocation);
- UserRegistry registry = getTenantZeroSystemGovernanceRegistry();
- try {
- // adding the common media types
- Map<String, String> extensionToMediaTypeMap = new HashMap<String, String>();
- extensionToMediaTypeMap.put("gif", "img/gif");
- extensionToMediaTypeMap.put("jpg", "img/gif");
- extensionToMediaTypeMap.put("png", "img/png");
-
- File[] filesAndDirs = serviceIconDirDir.listFiles();
- if (filesAndDirs == null) {
- return;
- }
- List<File> filesDirs = Arrays.asList(filesAndDirs);
-
- for (File file : filesDirs) {
- String filename = file.getName();
- String fileRegistryPath = Constants.CLOUD_SERVICE_ICONS_STORE_PATH +
- RegistryConstants.PATH_SEPARATOR + filename;
-
- // Add the file to registry
- Resource newResource = registry.newResource();
- String mediaType = null;
- if (filename.contains(".")) {
- String fileExt = filename.substring(filename.lastIndexOf(".") + 1);
- mediaType = extensionToMediaTypeMap.get(fileExt.toLowerCase());
- }
- if (mediaType == null) {
- mediaType = new MimetypesFileTypeMap().getContentType(file);
- }
- newResource.setMediaType(mediaType);
- newResource.setContentStream(new FileInputStream(file));
- registry.put(fileRegistryPath, newResource);
- }
- } catch (Exception e) {
- String msg = "Error loading icons to the system registry for registry path: " +
- Constants.CLOUD_SERVICE_ICONS_STORE_PATH;
- log.error(msg, e);
- throw new Exception(msg, e);
- }
-
- try {
- CommonUtil.setAnonAuthorization(RegistryConstants.GOVERNANCE_REGISTRY_BASE_PATH +
- Constants.CLOUD_SERVICE_ICONS_STORE_PATH, registry.getUserRealm());
- } catch (RegistryException e) {
- String msg = "Setting the annon access enabled for the services icons paths.";
- log.error(msg, e);
- throw new Exception(msg, e);
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/modules/cloud-service-mgt/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/cloud-service-mgt/src/main/resources/META-INF/component.xml b/products/stratos_controller/modules/cloud-service-mgt/src/main/resources/META-INF/component.xml
deleted file mode 100644
index 29bdc6b..0000000
--- a/products/stratos_controller/modules/cloud-service-mgt/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF 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.
- -->
-
-<component xmlns="http://products.wso2.org/carbon">
- <ManagementPermissions>
- <ManagementPermission>
- <DisplayName>Configure</DisplayName>
- <ResourceId>/permission/admin/configure</ResourceId>
- </ManagementPermission>
- <ManagementPermission>
- <DisplayName>Cloud-Services</DisplayName>
- <ResourceId>/permission/admin/configure/cloud-services</ResourceId>
- </ManagementPermission>
- </ManagementPermissions>
-</component>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/modules/cloud-service-mgt/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/cloud-service-mgt/src/main/resources/META-INF/services.xml b/products/stratos_controller/modules/cloud-service-mgt/src/main/resources/META-INF/services.xml
deleted file mode 100644
index efc772e..0000000
--- a/products/stratos_controller/modules/cloud-service-mgt/src/main/resources/META-INF/services.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF 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.
- -->
-<serviceGroup>
- <service name="CloudManagerService" scope="transportsession">
- <transports>
- <transport>https</transport>
- </transports>
- <parameter name="ServiceClass" locked="false">
- org.apache.stratos.manager.services.mgt.services.CloudManagerService
- </parameter>
- <operation name="retrieveCloudServiceInfo">
- <parameter name="AuthorizationAction" locked="true">/permission/admin/login</parameter>
- </operation>
- <operation name="saveCloudServicesActivity">
- <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/cloud-services</parameter>
- </operation>
- <operation name="activate">
- <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/cloud-services</parameter>
- </operation>
- <operation name="deactivate">
- <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/cloud-services</parameter>
- </operation>
- </service>
- <parameter name="adminService" locked="true">true</parameter>
- <parameter name="hiddenService" locked="true">true</parameter>
-</serviceGroup>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/modules/dashboard/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/dashboard/pom.xml b/products/stratos_controller/modules/dashboard/pom.xml
deleted file mode 100644
index 6e2a5da..0000000
--- a/products/stratos_controller/modules/dashboard/pom.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF 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.apache.stratos</groupId>
- <artifactId>stratos-controller-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.manager.dashboard.ui</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Stratos - Cloud Manager Dashboard User Interface</name>
-
- <build>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <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>
- <Export-Package>
- org.apache.stratos.manager.dashboard.ui.*,
- </Export-Package>
- <Import-Package>
- org.wso2.carbon.ui.servlets.*,
- javax.servlet; version=2.4.0,
- javax.servlet.http; version=2.4.0,
- org.apache.lucene.*,
- *;resolution:=optional
- </Import-Package>
- <Carbon-Component>UIBundle</Carbon-Component>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
-
- <dependencies>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.common.ui</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom.wso2</groupId>
- <artifactId>axiom</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ui</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.profiles.ui</artifactId>
- <version>${registry-component.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.resource.ui</artifactId>
- <version>${governance-component.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.account.mgt.ui</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.manager.dashboard.stub</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <properties>
- <eclipse.version>3.2.0</eclipse.version>
- <!-- Component versions == Carbon version, if not, please change the properties below. -->
- <registry-component.version>4.1.0</registry-component.version>
- <governance-component.version>4.1.0</governance-component.version>
- </properties>
-
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java b/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
deleted file mode 100644
index 5359afa..0000000
--- a/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.apache.stratos.manager.dashboard.ui.clients;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.CarbonConstants;
-import org.wso2.carbon.context.CarbonContext;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.ui.CarbonUIUtil;
-import org.wso2.carbon.utils.ServerConstants;
-import org.apache.stratos.manager.dashboard.stub.CloudManagerServiceStub;
-import org.apache.stratos.manager.dashboard.stub.xsd.CloudService;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpSession;
-
-public class CloudManagerServiceClient {
- private static final Log log = LogFactory.getLog(CloudManagerServiceClient.class);
-
- private CloudManagerServiceStub stub;
- private String epr;
- public static final String CLOUD_SERVICE = "cloudService";
-
- public CloudManagerServiceClient(
- String cookie, String backendServerURL, ConfigurationContext configContext)
- throws RegistryException {
-
- epr = backendServerURL + "CloudManagerService";
-
- try {
- stub = new CloudManagerServiceStub(configContext, epr);
-
- ServiceClient client = stub._getServiceClient();
- Options option = client.getOptions();
- option.setManageSession(true);
- option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
- } catch (AxisFault axisFault) {
- String msg = "Failed to initiate AddServices service client. " + axisFault.getMessage();
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
- public CloudManagerServiceClient(ServletRequest request, ServletConfig config, HttpSession session)
- throws RegistryException {
-
- String cookie = (String)session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext = (ConfigurationContext) config.
- getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
- epr = backendServerURL + "CloudManagerService";
-
- try {
- stub = new CloudManagerServiceStub(configContext, epr);
-
- ServiceClient client = stub._getServiceClient();
- Options option = client.getOptions();
- option.setManageSession(true);
- option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
- } catch (AxisFault axisFault) {
- String msg = "Failed to initiate Add Services service client. " + axisFault.getMessage();
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
- public CloudService[] retrieveCloudServiceInfo() throws Exception {
- try {
- if (CarbonContext.getCurrentContext().getCache(null).containsKey(CLOUD_SERVICE)) {
- return (CloudService[]) CarbonContext.getCurrentContext()
- .getCache(null).get(CLOUD_SERVICE);
- }
- } catch (Exception ignored) {
- // TODO: this exception needs not be handled, but the situation which leads to this
- // exception needs to be.
- }
- CloudService[] cloudServices = stub.retrieveCloudServiceInfo();
- CarbonContext.getCurrentContext().getCache(null).put(CLOUD_SERVICE, cloudServices);
- return cloudServices;
- }
-
-
- public void saveCloudServicesActivity(String[] activeServiceNames) throws Exception {
- CloudService[] cloudServices =
- (CloudService[]) CarbonContext.getCurrentContext().getCache(null).get(CLOUD_SERVICE);
-
- for (CloudService cloudService : cloudServices) {
- for (String activeService : activeServiceNames) {
- if (cloudService.getName().equals(activeService)) {
- cloudService.setActive(true);
- break;
- } else {
- cloudService.setActive(false);
- }
- }
- }
-
- stub.saveCloudServicesActivity(activeServiceNames);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/utils/Util.java
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/utils/Util.java b/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/utils/Util.java
deleted file mode 100644
index 9d3e1a1..0000000
--- a/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/utils/Util.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF 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.apache.stratos.manager.dashboard.ui.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Util {
- public static List<String> getNewlyActivatedServices(List<String> oldActivateServices,
- List<String> newActivateServices) {
- List<String> newlyActivatedServices = new ArrayList<String>();
- for (String service: newActivateServices) {
- if (!oldActivateServices.contains(service)) {
- newlyActivatedServices.add(service);
- }
- }
- return newlyActivatedServices;
- }
- public static List<String> getNewlyDeactivatedServices(List<String> oldActivateServices,
- List<String> newActivateServices) {
- List<String> newlyDeactivatedServices = new ArrayList<String>();
- for (String service: oldActivateServices) {
- if (!newActivateServices.contains(service)) {
- newlyDeactivatedServices.add(service);
- }
- }
- return newlyDeactivatedServices;
- }
-
-
-}
-