You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/03/21 07:20:57 UTC

[1/2] git commit: removin -a from subscribed-cartridges-info

Repository: incubator-stratos
Updated Branches:
  refs/heads/master 7eabec337 -> a9a7419dc


removin -a from subscribed-cartridges-info


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/49ba869d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/49ba869d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/49ba869d

Branch: refs/heads/master
Commit: 49ba869dc92224fa4643d7bdb8126c68b25862ac
Parents: f0899ef
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Mar 21 02:19:37 2014 -0400
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Mar 21 02:19:37 2014 -0400

----------------------------------------------------------------------
 .../SubscribedCartridgeInfoCommand.java         | 50 +++++---------------
 1 file changed, 12 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/49ba869d/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribedCartridgeInfoCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribedCartridgeInfoCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribedCartridgeInfoCommand.java
index 285c23c..cc002a3 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribedCartridgeInfoCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribedCartridgeInfoCommand.java
@@ -24,6 +24,7 @@ import org.apache.commons.cli.GnuParser;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
 import org.apache.stratos.cli.StratosCommandContext;
@@ -48,13 +49,8 @@ public class SubscribedCartridgeInfoCommand implements Command<StratosCommandCon
 	 * @return Options expected from command-line.
 	 */
 	private Options constructOptions() {
+
 		final Options options = new Options();
-		
-        Option alias = new Option(CliConstants.ALIAS_OPTION, CliConstants.ALIAS_LONG_OPTION,
-                true, "subscription alias");
-        alias.setArgName("alias");
-        options.addOption(alias);
-		
 		return options;
 	}
 	
@@ -80,45 +76,23 @@ public class SubscribedCartridgeInfoCommand implements Command<StratosCommandCon
 	}
 
 	@Override
-	public int execute(StratosCommandContext context, String[] args)
-			throws CommandException {
+	public int execute(StratosCommandContext context, String[] args) throws CommandException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}
 		
 		if (args != null && args.length > 0) {
-			String alias = null;
+			String alias = args[0];
 
-			final CommandLineParser parser = new GnuParser();
-			CommandLine commandLine;
-			try {
-				commandLine = parser.parse(options, args);
-				if (logger.isDebugEnabled()) {
-					logger.debug("Executing {} command...", getName());
-				}
-                if (commandLine.hasOption(CliConstants.ALIAS_OPTION)) {
-                    if (logger.isTraceEnabled()) {
-                        logger.trace("Cartridge alias option is passed");
-                    }
-                    alias = commandLine.getOptionValue(CliConstants.ALIAS_OPTION);
-                }
-
-                if (alias == null) {
-                    System.out.println("alias is required...");
-                    context.getStratosApplication().printUsage(getName());
-                    return CliConstants.BAD_ARGS_CODE;
-                }
+            if(StringUtils.isBlank(alias)){
+                System.out.println("Please specify a non blank alias.");
+                return CliConstants.BAD_ARGS_CODE;
+            }
+            else{
                 RestCommandLineService.getInstance().listSubscribedCartridgeInfo(alias);
-
-				return CliConstants.SUCCESSFUL_CODE;
-			} catch (ParseException e) {
-				if (logger.isErrorEnabled()) {
-					logger.error("Error parsing arguments", e);
-				}
-				System.out.println(e.getMessage());
-				return CliConstants.BAD_ARGS_CODE;
-			}
-		} else {
+                return CliConstants.SUCCESSFUL_CODE;
+            }
+		}else {
 			context.getStratosApplication().printUsage(getName());
 			return CliConstants.BAD_ARGS_CODE;
 		}


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

Posted by ud...@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/a9a7419d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a9a7419d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a9a7419d

Branch: refs/heads/master
Commit: a9a7419dc732ff1bfb48e0fba71ae7fe42ab4dfb
Parents: 49ba869 7eabec3
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Mar 21 02:20:28 2014 -0400
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Mar 21 02:20:28 2014 -0400

----------------------------------------------------------------------
 .../autoscaler/NetworkPartitionContext.java     |    2 +-
 .../stratos/autoscaler/PartitionContext.java    |    4 +-
 .../algorithm/AutoscaleAlgorithm.java           |    2 +-
 .../autoscaler/algorithm/OneAfterAnother.java   |    2 +-
 .../autoscaler/algorithm/RoundRobin.java        |    2 +-
 .../autoscaler/api/AutoScalerServiceImpl.java   |    2 +-
 .../cloud/controller/CloudControllerClient.java |    6 +-
 .../autoscaler/commands/PartitionsCommands.java |    2 +-
 .../deployment/policy/DeploymentPolicy.java     |    2 +-
 .../interfaces/AutoScalerServiceInterface.java  |    2 +-
 .../internal/AutoscalerServerComponent.java     |    2 +-
 .../health/AutoscalerHealthStatReceiver.java    |    2 +-
 .../autoscaler/partition/PartitionGroup.java    |    4 +-
 .../autoscaler/partition/PartitionManager.java  |    2 +-
 .../partition/deployers/PartitionDeployer.java  |    2 +-
 .../partition/deployers/PartitionReader.java    |    4 +-
 .../autoscaler/policy/PolicyManager.java        |    2 +-
 .../deployers/DeploymentPolicyReader.java       |    5 +-
 .../autoscaler/registry/RegistryManager.java    |    2 +-
 .../autoscaler/rule/RuleTasksDelegator.java     |    2 +-
 .../stratos/autoscaler/util/AutoscalerUtil.java |    8 +-
 .../stratos/autoscaler/TestMinimumRule.java     |    2 +-
 .../policy/PartitionDeployerTest.java           |    3 +-
 .../src/test/resources/autoscaler.drl           |    4 +-
 .../resources/test-minimum-autoscaler-rule.drl  |    4 +-
 .../test-terminating-obsoleted-members-rule.drl |    4 +-
 .../apache/stratos/cli/StratosApplication.java  |   12 +-
 .../org.apache.stratos.cloud.controller/pom.xml |    1 +
 .../cloud/controller/iaases/VCloudIaas.java     |  140 ++-
 .../console/cartridge_info.jag                  |    1 -
 .../partials/configure_stratos_wizard.hbs       |   14 +-
 .../theme1/renderers/configure_stratos.js       |  275 ++---
 .../renderers/configure_stratos_wizard.js       |  266 ++--
 .../console/themes/theme1/renderers/login.js    |    8 +
 components/org.apache.stratos.manager/pom.xml   |    1 +
 .../behaviour/CartridgeMgtBehaviour.java        |    6 +-
 .../manager/client/AutoscalerServiceClient.java |   21 +-
 .../client/CloudControllerServiceClient.java    |    7 +-
 .../stratos/manager/deploy/service/Service.java |    4 +-
 .../service/ServiceDeploymentManager.java       |    8 +-
 .../service/multitenant/MultiTenantService.java |    4 +-
 .../multitenant/lb/MultiTenantLBService.java    |    4 +-
 .../apache/stratos/manager/dto/Cartridge.java   |    9 +-
 .../category/ExistingLoadBalancerCategory.java  |    4 +-
 .../manager/lb/category/LBDataContext.java      |    7 +-
 .../lb/category/LoadBalancerCategory.java       |    2 +-
 .../ServiceLevelLoadBalancerCategory.java       |    2 +-
 .../manager/CartridgeSubscriptionManager.java   |    8 +-
 .../manager/service/RepositoryInfoBean.java     |    3 +-
 .../ApplicationCartridgeSubscription.java       |    2 +-
 .../subscription/CartridgeSubscription.java     |    4 +-
 .../subscription/DataCartridgeSubscription.java |    4 +-
 .../FrameworkCartridgeSubscription.java         |    2 +-
 .../subscription/LBCartridgeSubscription.java   |    4 +-
 .../subscription/PersistenceContext.java        |    2 +-
 .../manager/subscription/SubscriptionData.java  |    2 +-
 .../factory/CartridgeSubscriptionFactory.java   |    2 +-
 .../SubscriptionMultiTenantBehaviour.java       |    4 +-
 .../utils/CartridgeSubscriptionUtils.java       |   11 +-
 .../utils/ApplicationManagementUtil.java        |   10 +-
 .../manager/test/CartridgeSubscriptionTest.java |    2 +-
 .../manager/test/LookupDataHolderTest.java      |    2 +-
 .../bean/util/converter/PojoConverter.java      |   20 +-
 .../rest/endpoint/services/ServiceUtils.java    |   32 +-
 .../pom.xml                                     |    3 -
 .../resources/conf/scripts/sh/customization     |    3 +
 .../src/main/resources/p2.inf                   |    1 +
 .../resources/p2.inf                            |   15 +-
 .../src/main/resources/p2.inf                   |   15 +-
 .../distribution/src/main/conf/mincheck.drl     |    4 +-
 .../distribution/src/main/conf/scaling.drl      |    4 +-
 .../DeploymentPolicyDeploymentTestCase.java     |    2 +-
 .../tests/PartitionDeploymentTestCase.java      |    6 +-
 .../distribution/src/main/assembly/bin.xml      |    4 +
 products/pom.xml                                |    1 +
 .../modules/distribution/src/assembly/bin.xml   |   19 +-
 .../distribution/src/main/conf/carbon.xml       |  628 ++++++++++
 products/stratos/conf/README-STRATOS            |   90 ++
 .../stratos/conf/application-authenticators.xml |   23 +
 products/stratos/conf/axis2.xml                 |  526 ++++++++
 products/stratos/conf/bam.xml                   |   45 +
 products/stratos/conf/billing-config.xml        |   68 ++
 products/stratos/conf/cipher-text.properties    |   26 +
 products/stratos/conf/cloud-services-desc.xml   |  195 +++
 .../conf/data-bridge/data-bridge-config.xml     |   71 ++
 .../conf/data-bridge/thrift-agent-config.xml    |   44 +
 products/stratos/conf/datasources.properties    |   58 +
 products/stratos/conf/email-bill-generated.xml  |   39 +
 .../conf/email-billing-notifications.xml        |   50 +
 .../conf/email-new-tenant-activation.xml        |   47 +
 .../conf/email-new-tenant-registration.xml      |   47 +
 products/stratos/conf/email-password-reset.xml  |   43 +
 .../conf/email-payment-received-customer.xml    |   39 +
 .../conf/email-payment-received-wso2.xml        |   39 +
 .../conf/email-registration-complete.xml        |   38 +
 .../conf/email-registration-moderation.xml      |   47 +
 ...l-registration-payment-received-customer.xml |   39 +
 products/stratos/conf/email-registration.xml    |   46 +
 products/stratos/conf/email-update.xml          |   39 +
 products/stratos/conf/embedded-ldap.xml         |  165 +++
 products/stratos/conf/event-broker.xml          |   63 +
 products/stratos/conf/features-dashboard.xml    |   93 ++
 products/stratos/conf/identity.xml              |  108 ++
 products/stratos/conf/jaas.conf                 |   30 +
 products/stratos/conf/jndi.properties           |    3 +
 .../conf/metering-config-non-manager.xml        |  104 ++
 .../stratos/conf/multitenancy-billing-rules.drl |   53 +
 products/stratos/conf/nhttp.properties          |   42 +
 products/stratos/conf/passthru-http.properties  |   34 +
 products/stratos/conf/rule-component.conf       |   22 +
 products/stratos/conf/samples-desc.xml          |   33 +
 products/stratos/conf/sso-idp-config.xml        |   38 +
 products/stratos/conf/status-monitor-config.xml |   53 +
 products/stratos/conf/stratos-datasources.xml   |   69 ++
 .../conf/synapse-configs/default/registry.xml   |   26 +
 .../default/sequences/errorHandler.xml          |   31 +
 .../synapse-configs/default/sequences/fault.xml |   76 ++
 .../synapse-configs/default/sequences/main.xml  |  110 ++
 .../conf/synapse-configs/default/synapse.xml    |   25 +
 products/stratos/conf/synapse.properties        |   38 +
 .../conf/temp-artifacts/carbon/module.xml       |   47 +
 .../carbon/scripts/registry/artifacts.js        |  574 +++++++++
 .../carbon/scripts/registry/registry-osgi.js    |  445 +++++++
 .../carbon/scripts/registry/registry-ws.js      |   56 +
 .../carbon/scripts/registry/registry.js         |   24 +
 .../carbon/scripts/server/config.js             |   32 +
 .../carbon/scripts/server/osgi.js               |   10 +
 .../carbon/scripts/server/server.js             |   90 ++
 .../carbon/scripts/server/tenant.js             |   49 +
 .../carbon/scripts/user/registry-space.js       |   39 +
 .../temp-artifacts/carbon/scripts/user/space.js |   10 +
 .../carbon/scripts/user/user-manager.js         |  158 +++
 .../temp-artifacts/carbon/scripts/user/user.js  |   78 ++
 ...ryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar |  Bin 0 -> 11856 bytes
 .../org.wso2.store.sso.common_1.0.0.jar         |  Bin 0 -> 13957 bytes
 ...so2.stratos.identity.saml2.sso.mgt_2.2.0.jar |  Bin 0 -> 12276 bytes
 .../stratos/conf/temp-artifacts/sso/module.xml  |    6 +
 .../temp-artifacts/sso/scripts/sso.client.js    |  172 +++
 products/stratos/conf/tenant-reg-agent.xml      |   25 +
 products/stratos/conf/throttling-rules.drl      |  270 ++++
 products/stratos/conf/user-mgt.xml              |  241 ++++
 products/stratos/conf/zoo.cfg                   |   24 +
 products/stratos/dbscripts/billing-h2.sql       |  128 ++
 products/stratos/dbscripts/billing-mysql.sql    |  139 +++
 products/stratos/dbscripts/metering_h2.sql      |  133 ++
 products/stratos/dbscripts/metering_mysql.sql   |  168 +++
 products/stratos/dbscripts/migration.sql        |   26 +
 products/stratos/dbscripts/s2_h2.sql            |  115 ++
 products/stratos/dbscripts/stratos_mysql.sql    |  159 +++
 products/stratos/dbscripts/wso2_rss.sql         |   99 ++
 .../stratos/modules/distribution/INSTALL.txt    |   61 +
 .../stratos/modules/distribution/LICENSE.txt    |  488 ++++++++
 .../stratos/modules/distribution/README.txt     |   42 +
 .../modules/distribution/lib/home/faq.html      |  413 +++++++
 .../distribution/lib/home/images/bottom.gif     |  Bin 0 -> 523 bytes
 .../distribution/lib/home/images/bullet-01.gif  |  Bin 0 -> 159 bytes
 .../distribution/lib/home/images/content-bg.gif |  Bin 0 -> 233 bytes
 .../distribution/lib/home/images/favicon.ico    |  Bin 0 -> 17542 bytes
 .../lib/home/images/feature-01-icon.gif         |  Bin 0 -> 2825 bytes
 .../lib/home/images/feature-02-icon.gif         |  Bin 0 -> 3361 bytes
 .../lib/home/images/feature-03-icon.gif         |  Bin 0 -> 3285 bytes
 .../lib/home/images/feature-middle-bg.gif       |  Bin 0 -> 1139 bytes
 .../distribution/lib/home/images/intro-bg.gif   |  Bin 0 -> 3964 bytes
 .../distribution/lib/home/images/intro-text.gif |  Bin 0 -> 4082 bytes
 .../distribution/lib/home/images/left-bg.gif    |  Bin 0 -> 1135 bytes
 .../distribution/lib/home/images/logo.gif       |  Bin 0 -> 11127 bytes
 .../lib/home/images/powered-logo.gif            |  Bin 0 -> 1280 bytes
 .../distribution/lib/home/images/register.gif   |  Bin 0 -> 6946 bytes
 .../distribution/lib/home/images/sign-in.gif    |  Bin 0 -> 3150 bytes
 .../lib/home/images/stratos-products-new.jpg    |  Bin 0 -> 25720 bytes
 .../distribution/lib/home/images/title-bg.gif   |  Bin 0 -> 1182 bytes
 .../distribution/lib/home/images/top.gif        |  Bin 0 -> 16149 bytes
 .../distribution/lib/home/images/webinar.png    |  Bin 0 -> 12318 bytes
 .../lib/home/images/white-paper.png             |  Bin 0 -> 15148 bytes
 .../modules/distribution/lib/home/index.html    |  140 +++
 .../lib/home/js/jquery-1.5.1.min.js             |   16 +
 .../lib/home/js/jquery.orbit-1.2.3.min.js       |   17 +
 .../distribution/lib/home/js/orbit-1.2.3.css    |  223 ++++
 .../lib/home/js/orbit/left-arrow.png            |  Bin 0 -> 860 bytes
 .../distribution/lib/home/js/orbit/loading.gif  |  Bin 0 -> 2608 bytes
 .../lib/home/js/orbit/mask-black.png            |  Bin 0 -> 705 bytes
 .../lib/home/js/orbit/right-arrow.png           |  Bin 0 -> 825 bytes
 .../lib/home/js/orbit/rotator-black.png         |  Bin 0 -> 733 bytes
 .../lib/home/js/orbit/timer-black.png           |  Bin 0 -> 705 bytes
 .../modules/distribution/lib/home/style.css     |  181 +++
 products/stratos/modules/distribution/pom.xml   |  683 +++++++++++
 .../distribution/qpid-resources/etc/config.xml  |  101 ++
 .../qpid-resources/etc/jmxremote.access         |   23 +
 .../qpid-resources/etc/virtualhosts.xml         |   62 +
 .../distribution/qpid-resources/qpid.xml        |   25 +
 .../modules/distribution/release-notes.html     |  134 ++
 .../modules/distribution/src/assembly/bin.xml   |  793 ++++++++++++
 .../distribution/src/assembly/filter.properties |   26 +
 .../distribution/src/bin/add_entry_zone_file.sh |   70 ++
 .../src/bin/git-folder-structure.sh             |   67 +
 .../distribution/src/bin/manage-git-repo.sh     |  138 +++
 .../src/bin/remove_entry_zone_file.sh           |   75 ++
 .../distribution/src/bin/set-mysql-password.sh  |   65 +
 .../modules/distribution/src/bin/stratos.bat    |  170 +++
 .../modules/distribution/src/bin/stratos.sh     |  304 +++++
 .../distribution/src/bin/update-instance.sh     |   54 +
 .../main/autoscale-policies/economyPolicy.xml   |   28 +
 .../distribution/src/main/conf/autoscaler.xml   |   45 +
 .../distribution/src/main/conf/axis2.xml        |  702 +++++++++++
 .../src/main/conf/cartridge-config.properties   |   27 +
 .../src/main/conf/cipher-text.properties        |   29 +
 .../src/main/conf/cipher-tool.properties        |   36 +
 .../distribution/src/main/conf/jndi.properties  |    3 +
 .../distribution/src/main/conf/log4j.properties |  172 +++
 .../distribution/src/main/conf/mincheck.drl     |   79 ++
 .../distribution/src/main/conf/scaling.drl      |  182 +++
 .../distribution/src/main/conf/terminateall.drl |   44 +
 .../deployment-policies/economy-deployment.xml  |   25 +
 .../distribution/src/main/license/LICENSE       | 1152 ++++++++++++++++++
 .../modules/distribution/src/main/notice/NOTICE |  702 +++++++++++
 .../src/main/partitions/partitions.xml          |   39 +
 .../distribution/src/main/resources/launch.ini  |  250 ++++
 products/stratos/modules/integration/pom.xml    |  163 +++
 .../integration/tests/LoginLogoutTestCase.java  |   49 +
 .../tests/SecurityVerificationTestCase.java     |   27 +
 .../tests/StratosManagerTestServerManager.java  |   54 +
 .../integration/tests/TenantMgtTestCase.java    |   92 ++
 .../src/test/resources/instrumentation.txt      |    2 +
 .../src/test/resources/keys/wso2carbon.jks      |  Bin 0 -> 33260 bytes
 .../integration/src/test/resources/testng.xml   |   39 +
 .../modules/p2-profile-gen/carbon.product       |   34 +
 products/stratos/modules/p2-profile-gen/pom.xml |  991 +++++++++++++++
 .../payload/user-data/ssl-cert-snakeoil.key     |   16 +
 .../payload/user-data/ssl-cert-snakeoil.pem     |   14 +
 products/stratos/pom.xml                        |  335 +++++
 .../resources/allthemes/Dark/admin/logo.gif     |  Bin 0 -> 3476 bytes
 .../resources/allthemes/Dark/admin/main.css     |  253 ++++
 .../allthemes/Dark/admin/powered-stratos.gif    |  Bin 0 -> 1515 bytes
 .../allthemes/Dark/admin/right-logo.gif         |  Bin 0 -> 2325 bytes
 .../allthemes/Dark/admin/theme-header-bg.gif    |  Bin 0 -> 4245 bytes
 .../Dark/admin/theme-header-region-bg.gif       |  Bin 0 -> 793 bytes
 .../allthemes/Dark/admin/theme-menu-header.gif  |  Bin 0 -> 261 bytes
 .../Dark/admin/theme-menu-panel-l-bg.gif        |  Bin 0 -> 312 bytes
 .../Dark/admin/theme-menu-table-bg.gif          |  Bin 0 -> 5671 bytes
 .../Dark/admin/theme-right-links-bg.gif         |  Bin 0 -> 1005 bytes
 .../stratos/resources/allthemes/Dark/thumb.png  |  Bin 0 -> 19546 bytes
 .../allthemes/Default/admin/def-body-bg.gif     |  Bin 0 -> 419 bytes
 .../allthemes/Default/admin/def-header-bg.gif   |  Bin 0 -> 17875 bytes
 .../Default/admin/def-header-region-bg.gif      |  Bin 0 -> 22784 bytes
 .../resources/allthemes/Default/admin/logo.gif  |  Bin 0 -> 3476 bytes
 .../resources/allthemes/Default/admin/main.css  |  250 ++++
 .../allthemes/Default/admin/powered-stratos.gif |  Bin 0 -> 1515 bytes
 .../allthemes/Default/admin/right-logo.gif      |  Bin 0 -> 3629 bytes
 .../resources/allthemes/Default/thumb.png       |  Bin 0 -> 24432 bytes
 .../resources/allthemes/Light/admin/logo.gif    |  Bin 0 -> 3476 bytes
 .../resources/allthemes/Light/admin/main.css    |  250 ++++
 .../allthemes/Light/admin/menu_header.gif       |  Bin 0 -> 243 bytes
 .../allthemes/Light/admin/powered-stratos.gif   |  Bin 0 -> 1515 bytes
 .../allthemes/Light/admin/right-links-bg.gif    |  Bin 0 -> 1191 bytes
 .../allthemes/Light/admin/right-logo.gif        |  Bin 0 -> 2325 bytes
 .../allthemes/Light/admin/theme-header-bg.gif   |  Bin 0 -> 3792 bytes
 .../Light/admin/theme-header-region-b-bg.gif    |  Bin 0 -> 121 bytes
 .../Light/admin/theme-header-region-bg.gif      |  Bin 0 -> 534 bytes
 .../Light/admin/theme-menu-panel-l-bg.gif       |  Bin 0 -> 772 bytes
 .../Light/admin/theme-menu-table-bg.gif         |  Bin 0 -> 5991 bytes
 .../stratos/resources/allthemes/Light/thumb.png |  Bin 0 -> 18102 bytes
 .../cloud-services-icons/appserver.gif          |  Bin 0 -> 2086 bytes
 .../resources/cloud-services-icons/bam.gif      |  Bin 0 -> 1773 bytes
 .../resources/cloud-services-icons/bps.gif      |  Bin 0 -> 1531 bytes
 .../resources/cloud-services-icons/brs-old.gif  |  Bin 0 -> 1772 bytes
 .../resources/cloud-services-icons/brs.gif      |  Bin 0 -> 2170 bytes
 .../resources/cloud-services-icons/cep.png      |  Bin 0 -> 3218 bytes
 .../resources/cloud-services-icons/cg.gif       |  Bin 0 -> 2385 bytes
 .../cloud-services-icons/csg-inactive.gif       |  Bin 0 -> 3188 bytes
 .../resources/cloud-services-icons/csg.gif      |  Bin 0 -> 3176 bytes
 .../resources/cloud-services-icons/ds.gif       |  Bin 0 -> 2012 bytes
 .../resources/cloud-services-icons/esb.gif      |  Bin 0 -> 1787 bytes
 .../resources/cloud-services-icons/gadget.gif   |  Bin 0 -> 2242 bytes
 .../cloud-services-icons/governance.gif         |  Bin 0 -> 1977 bytes
 .../resources/cloud-services-icons/identity.gif |  Bin 0 -> 1936 bytes
 .../cloud-services-icons/inactive-appserver.gif |  Bin 0 -> 1957 bytes
 .../cloud-services-icons/inactive-bam.gif       |  Bin 0 -> 1647 bytes
 .../cloud-services-icons/inactive-brs.gif       |  Bin 0 -> 1874 bytes
 .../cloud-services-icons/inactive-cep.png       |  Bin 0 -> 2959 bytes
 .../cloud-services-icons/inactive-esb.gif       |  Bin 0 -> 1656 bytes
 .../cloud-services-icons/inactive-gadget.gif    |  Bin 0 -> 2087 bytes
 .../inactive-governance.gif                     |  Bin 0 -> 1850 bytes
 .../cloud-services-icons/inactive-identity.gif  |  Bin 0 -> 1794 bytes
 .../cloud-services-icons/inactive-mashup.gif    |  Bin 0 -> 1772 bytes
 .../cloud-services-icons/inactive-mb.png        |  Bin 0 -> 2746 bytes
 .../resources/cloud-services-icons/mashup.gif   |  Bin 0 -> 1850 bytes
 .../resources/cloud-services-icons/mb.png       |  Bin 0 -> 3139 bytes
 .../resources/cloud-services-icons/pom.xml      |   58 +
 .../resources/cloud-services-icons/ss.gif       |  Bin 0 -> 2432 bytes
 .../resources/cloud-services-icons/ts.gif       |  Bin 0 -> 2475 bytes
 .../powerded-by-logos/appserver-logo.gif        |  Bin 0 -> 1473 bytes
 .../resources/powerded-by-logos/bam-logo.gif    |  Bin 0 -> 1690 bytes
 .../resources/powerded-by-logos/bps-logo.gif    |  Bin 0 -> 1606 bytes
 .../resources/powerded-by-logos/brs-logo.gif    |  Bin 0 -> 1596 bytes
 .../resources/powerded-by-logos/csg-logo.gif    |  Bin 0 -> 2030 bytes
 .../resources/powerded-by-logos/ds-logo.gif     |  Bin 0 -> 1528 bytes
 .../resources/powerded-by-logos/esb-logo.gif    |  Bin 0 -> 1598 bytes
 .../resources/powerded-by-logos/gadget-logo.gif |  Bin 0 -> 1368 bytes
 .../powerded-by-logos/governance-logo.gif       |  Bin 0 -> 1525 bytes
 .../powerded-by-logos/identity-logo.gif         |  Bin 0 -> 1398 bytes
 .../resources/powerded-by-logos/mashup-logo.gif |  Bin 0 -> 1440 bytes
 .../pom.xml                                     |    2 +-
 .../pom.xml                                     |   12 +-
 tools/puppet3-agent/config.sh                   |    8 +-
 tools/puppet3-agent/puppetinstall/puppetinstall |   38 +-
 tools/puppet3/manifests/nodes.pp                |   53 +-
 .../lb/templates/conf/axis2/axis2.xml.erb       |    4 +-
 tools/puppet3/modules/mysql/manifests/init.pp   |   26 +
 .../modules/mysql/templates/000-default.erb     |   41 +
 .../puppet3/modules/mysql/templates/my.cnf.erb  |  127 ++
 tools/puppet3/modules/tomcat/manifests/init.pp  |   41 +-
 .../modules/tomcat/templates/server.xml.erb     |  143 +++
 312 files changed, 18249 insertions(+), 644 deletions(-)
----------------------------------------------------------------------