You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/09/05 11:32:59 UTC
[1/2] git commit: Using jclouds 1.6.2-incubating version
Updated Branches:
refs/heads/master 4231fea76 -> b3c204082
Using jclouds 1.6.2-incubating version
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/516491cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/516491cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/516491cf
Branch: refs/heads/master
Commit: 516491cf8caee5dcb6de03312d88127e77d1e94e
Parents: 48b34e1
Author: Isuru Perera <is...@apache.org>
Authored: Thu Sep 5 15:01:54 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Thu Sep 5 15:01:54 2013 +0530
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/516491cf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d62b975..330215e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,6 +251,6 @@
<carbon.platform.package.import.version.range>[4.1.0, 4.2.0)</carbon.platform.package.import.version.range>
<carbon.platform.package.export.version>4.1.0</carbon.platform.package.export.version>
<axis2.osgi.version>1.6.1.wso2v9</axis2.osgi.version>
- <jclouds.version>1.6.1-incubating</jclouds.version>
+ <jclouds.version>1.6.2-incubating</jclouds.version>
</properties>
</project>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b3c20408
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b3c20408
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b3c20408
Branch: refs/heads/master
Commit: b3c20408247bc19518d3f1dd3b67d26e9c9d2236
Parents: 516491c 4231fea
Author: Isuru Perera <is...@apache.org>
Authored: Thu Sep 5 15:02:23 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Thu Sep 5 15:02:23 2013 +0530
----------------------------------------------------------------------
README.md | 88 ++
.../src/main/resources/AccountMgtService.wsdl | 18 +
.../main/resources/EmailValidationService.wsdl | 18 +
.../account/mgt/ui/i18n/JSResources.properties | 17 +
.../account/mgt/ui/i18n/Resources.properties | 17 +
.../web/account-mgt/css/account_mgt.css | 19 +
.../web/account-mgt/css/update_profile.css | 19 +
.../resources/web/account-mgt/js/account_mgt.js | 19 +
.../src/conf/cartridge-config.properties | 21 +
.../src/conf/tenant-resource-policy.xml | 21 +
.../adc/mgt/dao/RepositoryCredentials.java | 21 +
.../stratos/adc/mgt/dto/CartridgeDetail.java | 21 +
.../adc/mgt/dto/CartridgeInformation.java | 21 +
.../adc/mgt/service/RepositoryInfoBean.java | 21 +
.../mgt/utils/ApplicationManagementUtil.java | 21 +
.../adc/mgt/utils/RepositoryCreator.java | 21 +
.../src/main/resources/policies.xsd | 18 +
.../src/scripts/append_zone_file.sh | 20 +
.../stratos/adc/mgt/test/PolicyHolderTest.java | 21 +
.../src/test/resources/log4j.properties | 23 +-
.../src/test/resources/policies-1.xml | 24 +-
.../mgt/SubDomainAwareGroupManagementAgent.java | 23 +-
.../topology/mgt/util/TopologyConstants.java | 21 +
.../adc/topology/mgt/util/TopologyMgtUtil.java | 21 +
.../src/main/resources/META-INF/services.xml | 22 +
.../cartridge/mgt/ui/CartridgeConstans.java | 21 +
.../stratos/cartridge/mgt/ui/Payload.java | 21 +
.../mgt/ui/RepoNotificationClient.java | 21 +
.../mgt/ui/RepoNotificationServlet.java | 23 +-
.../stratos/cartridge/mgt/ui/Repository.java | 21 +
.../cartridge/mgt/ui/i18n/Resources.properties | 17 +
.../src/main/resources/Resources.properties | 23 +-
.../src/main/resources/log4j.properties | 23 +-
.../controller/consumers/TopologyBuilder.java | 21 +
.../internal/CloudControllerDSComponent.java | 23 +-
.../controller/registry/RegistryManager.java | 21 +
.../registry/RegistryManager.java.back | 96 --
.../src/main/resources/META-INF/services.xml | 22 +
.../src/main/resources/cartridge.xsd | 18 +
.../src/main/resources/cartridges.xsd | 18 +
.../src/main/resources/service.xsd | 20 +-
.../src/main/resources/services.xsd | 20 +-
.../src/test/resources/cartridges-1.xml | 24 +-
.../src/test/resources/cartridges-2.xml | 23 +-
.../src/test/resources/cartridges-3.xml | 24 +-
.../src/test/resources/cartridges-4.xml | 24 +-
.../src/test/resources/cartridges-5.xml | 24 +-
.../src/test/resources/cartridges-6.xml | 24 +-
.../src/test/resources/cartridges-7.xml | 24 +-
.../src/test/resources/cartridges-8.xml | 44 +-
.../src/test/resources/cartridges-9.xml | 24 +-
.../email/sender/api/EmailDataHolder.java | 21 +
.../src/main/resources/META-INF/services.xml | 22 +
.../src/test/resources/loadbalancer.conf | 20 +
.../src/test/resources/loadbalancer1.conf | 21 +
.../src/test/resources/loadbalancer2.conf | 20 +
.../src/test/resources/testng.xml | 21 +
.../logging/view/ui/i18n/Resources.properties | 111 +-
.../resources/RedirectorServletService.wsdl | 21 +-
.../ui/clients/PackageInfoServiceClient.java | 18 +
.../register/ui/i18n/JSResources.properties | 17 +
.../register/ui/i18n/Resources.properties | 17 +
.../web/tenant-register/css/tenant-register.css | 19 +
.../web/tenant-register/js/register_config.js | 19 +
.../web/tenant-register/js/select_domain.js | 19 +
.../sso/redirector/ui/i18n/Resources.properties | 85 +-
.../web/stratos-auth/css/stratos-loginpage.css | 209 +--
.../resources/database/wso2_slive_status.sql | 148 --
.../monitor/ui/i18n/JSResources.properties | 16 +
.../status/monitor/ui/i18n/Resources.properties | 17 +
.../resources/web/status-monitor/css/status.css | 18 +
.../TenantActivityUIServiceComponent.java | 18 +
.../activity/ui/i18n/JSResources.properties | 17 +
.../activity/ui/i18n/Resources.properties | 17 +
.../web/tenant-activity/css/tenant-usage.css | 19 +
.../tenant/mgt/core/util/TenantCoreUtil.java | 21 +
.../ui/clients/PackageInfoServiceClient.java | 21 +
.../tenant/mgt/ui/i18n/JSResources.properties | 17 +
.../tenant/mgt/ui/i18n/Resources.properties | 17 +
.../resources/web/tenant-mgt/css/tenant.css | 23 +-
.../web/tenant-mgt/js/tenant_config.js | 19 +
.../web/tenant-mgt/js/theme_resource_util.js | 18 +
.../mgt/internal/util/TenantMgtRampartUtil.java | 21 +
.../services/GAppTenantRegistrationService.java | 21 +
.../InMemoryPasswordcallbackHandler.java | 21 +
.../theme/mgt/ui/i18n/JSResources.properties | 23 +-
.../theme/mgt/ui/i18n/Resources.properties | 21 +
.../web/tenant-theme/css/loginpage.css | 241 ++--
.../resources/web/tenant-theme/css/tenant.css | 169 ++-
.../web/tenant-theme/css/tenent-theme.css | 85 +-
.../web/tenant-theme/css/theme-mgt.css | 21 +
.../web/tenant-theme/js/theme_resource_util.js | 21 +
.../MultitenancyThrottlingService.wsdl | 21 +-
.../resources/carbon-home/dbscripts/db2.sql | 19 +
.../resources/carbon-home/dbscripts/derby.sql | 19 +
.../test/resources/carbon-home/dbscripts/h2.sql | 19 +
.../resources/carbon-home/dbscripts/mssql.sql | 19 +
.../resources/carbon-home/dbscripts/mysql.sql | 19 +
.../resources/carbon-home/dbscripts/oracle.sql | 19 +
.../carbon-home/dbscripts/oracle_rac.sql | 19 +
.../carbon-home/dbscripts/postgresql.sql | 19 +
.../repository/conf/cipher-text.properties | 37 +-
.../repository/conf/secret-conf.properties | 95 +-
.../repository/conf/throttling-rules1.drl | 19 +
.../repository/conf/throttling-rules2.drl | 21 +-
.../repository/conf/throttling-rules3.drl | 20 +-
.../carbon-home/repository/conf/wrapper.conf | 21 +
.../resources/ThrottlingRuleEditorService.wsdl | 21 +-
.../throttling/ui/i18n/JSResources.properties | 21 +
.../throttling/ui/i18n/Resources.properties | 23 +-
.../usage/ui/i18n/JSResources.properties | 23 +-
.../stratos/usage/ui/i18n/Resources.properties | 23 +-
.../web/tenant-usage/css/tenant-usage.css | 23 +-
.../tenant-usage/js/all-tenant-usage-report.js | 21 +
.../web/tenant-usage/js/tenant-usage.js | 21 +
.../web/tenant-usage/js/usage-report.js | 23 +-
.../reports/all_tenant_usage_report.jrxml | 20 +
.../main/resources/reports/usage_report.jrxml | 20 +
.../resources/ValidateDomainAdminService.wsdl | 21 +-
.../main/resources/ValidateDomainService.wsdl | 21 +-
.../domain/ui/i18n/JSResources.properties | 23 +-
.../domain/ui/i18n/Resources.properties | 21 +
.../web/validate-domain/css/validate_domain.css | 23 +-
.../web/validate-domain/js/validate_domain.js | 23 +-
.../validate_with_dns_ajaxprocessor.jsp | 20 +-
.../validate_with_text_ajaxprocessor.jsp | 20 +-
.../src/main/resources/build.properties | 23 +-
.../resources/conf/cartridge-config.properties | 21 +
.../src/main/resources/conf/etc/policies.xsd | 18 +
.../src/main/resources/conf/policies.xml | 24 +-
.../src/main/resources/p2.inf | 17 +
.../src/main/resources/build.properties | 21 +
.../src/main/resources/conf/agent.properties | 21 +
.../src/main/resources/p2.inf | 17 +
.../src/main/resources/build.properties | 23 +-
.../src/main/resources/conf/etc/cartridge.xsd | 20 +-
.../src/main/resources/conf/etc/cartridges.xsd | 20 +-
.../src/main/resources/conf/etc/service.xsd | 20 +-
.../src/main/resources/conf/etc/services.xsd | 20 +-
.../src/main/resources/p2.inf | 17 +
.../resources/build.properties | 21 +
.../resources/conf/cloud-services-desc.xml | 22 +
.../resources/conf/eula.xml | 22 +
.../resources/p2.inf | 17 +
.../src/main/resources/build.properties | 21 +
.../main/resources/conf/cloud-services-desc.xml | 22 +
.../src/main/resources/conf/eula.xml | 22 +
.../src/main/resources/p2.inf | 17 +
.../resources/build.properties | 21 +
.../resources/conf/cloud-services-desc.xml | 22 +
.../resources/p2.inf | 17 +
.../src/main/resources/build.properties | 21 +
.../main/resources/conf/cloud-services-desc.xml | 22 +
.../src/main/resources/p2.inf | 17 +
pom.xml | 160 ++-
products/cloud-controller/LICENSE | 614 ++++++++
products/cloud-controller/LICENSE.txt | 614 --------
.../modules/distribution/lib/home/index.html | 21 +
.../modules/distribution/lib/home/style.css | 23 +-
.../distribution/src/main/assembly/bin.xml | 11 +-
.../distribution/src/main/conf/event-broker.xml | 22 +
.../distribution/src/main/conf/jaas.conf | 20 +
.../src/main/conf/rule-component.conf | 20 +-
.../distribution/src/main/license/LICENSE | 929 ++++++++++++
.../modules/distribution/src/main/notice/NOTICE | 114 ++
.../src/main/resources/web/styles/css/main.css | 21 +
.../src/main/resources/web/styles/css/main.css | 21 +
products/elb/LICENSE.txt | 386 -----
.../distribution/src/main/assembly/bin.xml | 10 +-
.../src/main/conf/rule-component.conf | 20 +-
.../distribution/src/main/license/LICENSE | 1320 ++++++++++++++++++
.../modules/distribution/src/main/notice/NOTICE | 589 ++++++++
.../distribution/src/main/assembly/bin.xml | 12 +-
.../distribution/src/main/license/LICENSE | 793 +++++++++++
.../modules/distribution/src/main/notice/NOTICE | 392 ++++++
products/stratos-controller/conf/jaas.conf | 20 +
.../stratos-controller/conf/loadbalancer.conf | 20 +
.../conf/multitenancy-billing-rules.drl | 19 +
.../stratos-controller/conf/rule-component.conf | 21 +-
.../conf/throttling-rules.drl | 19 +
products/stratos-controller/conf/zoo.cfg | 20 +
.../stratos-controller/dbscripts/billing-h2.sql | 19 +
.../dbscripts/billing-mysql.sql | 19 +
.../dbscripts/metering_h2.sql | 19 +
.../dbscripts/metering_mysql.sql | 19 +
.../stratos-controller/dbscripts/migration.sql | 19 +
products/stratos-controller/dbscripts/s2_h2.sql | 19 +
.../dbscripts/stratos_mysql.sql | 19 +
.../stratos-controller/dbscripts/wso2_rss.sql | 18 +
.../dashboard/ui/i18n/JSResources.properties | 23 +-
.../dashboard/ui/i18n/Resources.properties | 21 +
.../web/tenant-dashboard/css/dashboard.css | 21 +
.../web/tenant-dashboard/js/configurations.js | 21 +
.../web/tenant-dashboard/js/dashboard.js | 21 +
.../modules/distribution/lib/home/faq.html | 21 +
.../modules/distribution/lib/home/index.html | 259 ++--
.../distribution/lib/home/js/orbit-1.2.3.css | 23 +-
.../modules/distribution/lib/home/style.css | 341 ++---
.../modules/distribution/src/assembly/bin.xml | 23 +-
.../distribution/src/bin/add_entry_zone_file.sh | 20 +
.../src/bin/git-folder-structure.sh | 20 +
.../distribution/src/bin/manage-git-repo.sh | 20 +
.../src/bin/remove_entry_zone_file.sh | 20 +
.../distribution/src/bin/set-mysql-password.sh | 20 +
.../distribution/src/bin/update-instance.sh | 20 +
.../distribution/src/main/license/LICENSE | 1152 +++++++++++++++
.../modules/distribution/src/main/notice/NOTICE | 702 ++++++++++
.../WebContent/WEB-INF/web.xml | 21 +
.../WebContent/dashboards/as.html | 21 +
.../WebContent/dashboards/bam.html | 21 +
.../WebContent/dashboards/bps.html | 21 +
.../WebContent/dashboards/brs.html | 21 +
.../WebContent/dashboards/cep.html | 21 +
.../WebContent/dashboards/csg.html | 21 +
.../dashboards/css/features-dashboard.css | 23 +-
.../WebContent/dashboards/dss.html | 21 +
.../WebContent/dashboards/esb.html | 21 +
.../WebContent/dashboards/greg.html | 21 +
.../WebContent/dashboards/gs.html | 21 +
.../WebContent/dashboards/is.html | 21 +
.../WebContent/dashboards/manager.html | 21 +
.../WebContent/dashboards/mb.html | 21 +
.../WebContent/dashboards/ms.html | 21 +
.../css/features-dashboard-new.css | 331 +++--
.../WebContent/tenant-dashboard/css/ie7.css | 37 +-
.../WebContent/tenant-dashboard/index.html | 21 +
.../features-dashboard/features-dashboard.xml | 21 +
.../modules/integration/pom.xml | 2 +-
.../integration/src/test/resources/testng.xml | 22 +
.../web/tenant-login/css/loginpage.css | 557 ++++----
.../resources/web/tenant-login/css/tenant.css | 145 +-
.../main/resources/web/tenant-login/js/login.js | 21 +
.../modules/p2-profile-gen/pom.xml | 8 +-
.../src/main/resources/web/styles/css/main.css | 21 +
.../resources/allthemes/Dark/admin/main.css | 21 +
.../resources/allthemes/Default/admin/main.css | 479 ++++---
.../resources/allthemes/Light/admin/main.css | 21 +
tools/cartridge_create/create_kvm_image.sh | 23 +-
.../init_scripts/default/default | 21 +
.../init_scripts/default/default.ctrg | 21 +
.../init_scripts/default/get-launch-params.rb | 20 +
.../init_scripts/mysql/get-launch-params.rb | 20 +
tools/cartridge_create/init_scripts/mysql/mysql | 21 +
.../init_scripts/mysql/mysql.ctrg | 21 +
.../mysql/openstack/get-launch-params.rb | 20 +
.../init_scripts/mysql/openstack/healthcheck.sh | 20 +
tools/cartridge_create/init_scripts/php/default | 17 +
.../init_scripts/php/default-ssl | 17 +
.../init_scripts/php/get-launch-params.rb | 20 +
.../php/openstack/get-launch-params.rb | 20 +
.../init_scripts/php/openstack/healthcheck.sh | 20 +
tools/cartridge_create/init_scripts/php/php | 21 +
.../cartridge_create/init_scripts/php/php.ctrg | 21 +
tools/cartridge_create/init_scripts/php/x.sh | 20 +
tools/cartridge_create/init_scripts/php/y.sh | 20 +
.../init_scripts/tomcat/get-launch-params.rb | 26 +-
.../tomcat/openstack/get-launch-params.rb | 20 +
.../tomcat/openstack/healthcheck.sh | 20 +
.../init_scripts/tomcat/payload/launch-params | 17 +
tools/ec2-demo-setup/config.sh | 5 +
.../ec2-demo-setup/tempconfigs/agent.properties | 21 +
.../tempconfigs/cartridge-config.properties | 21 +
.../tempconfigs/features-dashboard.xml | 21 +
.../tempconfigs/gitblit.properties | 21 +
tools/ec2-demo-setup/tempconfigs/hosts | 20 +
tools/ec2-demo-setup/tempconfigs/mysql.xml | 22 +
tools/ec2-demo-setup/tempconfigs/php.xml | 22 +
.../tempconfigs/stratosreponotifier.groovy | 21 +
tools/ec2-demo-setup/tempconfigs/tomcat.xml | 22 +
tools/stratos-installer/README.txt | 12 +-
.../cartridges/ec2/ec2_mysql.xml | 36 +
.../cartridges/ec2/ec2_php.xml | 35 +
.../cartridges/ec2/ec2_tomcat.xml | 35 +
tools/stratos-installer/cartridges/mysql.xml | 46 -
.../cartridges/openstack/openstack_mysql.xml | 36 +
.../cartridges/openstack/openstack_php.xml | 35 +
.../cartridges/openstack/openstack_tomcat.xml | 36 +
tools/stratos-installer/cartridges/php.xml | 45 -
tools/stratos-installer/cartridges/tomcat.xml | 45 -
tools/stratos-installer/clean.sh | 2 +-
tools/stratos-installer/conf/setup.conf | 39 +-
.../agent/repository/conf/agent.properties | 21 +
.../conf/datasources/master-datasources.xml | 22 +
.../bam/repository/conf/etc/cassandra.yaml | 20 +
.../cc/repository/conf/cloud-controller.xml | 22 +-
.../cc/repository/deployment/server/mysql.xml | 46 -
.../cc/repository/deployment/server/php.xml | 45 -
.../cc/repository/deployment/server/tomcat.xml | 45 -
.../conf/datasources/master-datasources.xml | 22 +
.../conf/datasources/master-datasources.xml | 22 +
.../repository/conf/cartridge-config.properties | 21 +
.../conf/datasources/master-datasources.xml | 22 +
tools/stratos-installer/ec2-cartridge-setup.sh | 39 -
tools/stratos-installer/ec2-cartridge.sh | 132 ++
tools/stratos-installer/ec2.sh | 82 ++
.../openstack-cartridge-setup.sh | 147 --
tools/stratos-installer/openstack-cartridge.sh | 131 ++
tools/stratos-installer/openstack.sh | 72 +
.../resources/add_entry_zone_file.sh | 20 +
.../resources/billing-mysql.sql | 19 +
.../resources/gitolite-suexec-wrapper.sh | 20 +
.../resources/metering_mysql.sql | 19 +
tools/stratos-installer/resources/notify.php | 21 +
tools/stratos-installer/resources/registry.sql | 19 +
.../resources/remove_entry_zone_file.sh | 20 +
.../resources/stratos_foundation.sql | 19 +
tools/stratos-installer/resources/userstore.sql | 19 +
.../scripts/add_entry_zone_file.sh | 20 +
.../scripts/copy-private-key.sh | 20 +
tools/stratos-installer/scripts/create-app.sh | 20 +
.../scripts/git-folder-structure.sh | 20 +
tools/stratos-installer/scripts/keygen.sh | 20 +
.../scripts/manage-git-repo.sh | 20 +
.../scripts/remove_entry_zone_file.sh | 20 +
.../scripts/set-mysql-password.sh | 20 +
.../scripts/update-instance.sh | 20 +
tools/stratos-installer/setup.sh | 379 ++---
tools/stratos-installer/start-servers.sh | 20 +-
318 files changed, 14705 insertions(+), 3493 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b3c20408/pom.xml
----------------------------------------------------------------------