You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/03/28 16:47:43 UTC
[1/3] git commit: adding log4j appender for writing published data to
a file
Repository: incubator-stratos
Updated Branches:
refs/heads/master 17fde5487 -> 52fd89941
adding log4j appender for writing published data to a file
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/80e78c79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/80e78c79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/80e78c79
Branch: refs/heads/master
Commit: 80e78c7926d90d043f3d6a34d4269c2feeb2371d
Parents: 71c5379
Author: Nirmal Fernando <ni...@apache.org>
Authored: Fri Mar 28 21:15:36 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Fri Mar 28 21:15:36 2014 +0530
----------------------------------------------------------------------
.../modules/distribution/src/main/conf/log4j.properties | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/80e78c79/products/stratos/modules/distribution/src/main/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/log4j.properties b/products/stratos/modules/distribution/src/main/conf/log4j.properties
index 406e572..54993e3 100644
--- a/products/stratos/modules/distribution/src/main/conf/log4j.properties
+++ b/products/stratos/modules/distribution/src/main/conf/log4j.properties
@@ -156,6 +156,16 @@ log4j.appender.AUDIT_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
log4j.appender.AUDIT_LOGFILE.threshold=INFO
log4j.additivity.AUDIT_LOG=false
+# The event trace logger dumps enough information @INFO level.
+# Writes events received by DataBridge
+log4j.category.LOG_AGGREGATOR_LOGGER=INFO, LOG_AGGREGATOR_FILE_APPENDER
+log4j.additivity.LOG_AGGREGATOR_LOGGER=false
+log4j.appender.LOG_AGGREGATOR_FILE_APPENDER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.LOG_AGGREGATOR_FILE_APPENDER.File=${carbon.home}/repository/logs/${instance.log}/aggregate${instance.log}.log
+log4j.appender.LOG_AGGREGATOR_FILE_APPENDER.Append=true
+log4j.appender.LOG_AGGREGATOR_FILE_APPENDER.layout=org.apache.log4j.PatternLayout
+log4j.appender.LOG_AGGREGATOR_FILE_APPENDER.layout.ConversionPattern=%m%n
+
# Appender config to send Atomikos transaction logs to new log file tm.out.
log4j.appender.ATOMIKOS = org.apache.log4j.RollingFileAppender
log4j.appender.ATOMIKOS.File = repository/logs/tm.out
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ni...@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/52fd8994
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/52fd8994
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/52fd8994
Branch: refs/heads/master
Commit: 52fd899412c3e86454d09b1fe2ab2783ef7601d2
Parents: 4998ef7 17fde54
Author: Nirmal Fernando <ni...@apache.org>
Authored: Fri Mar 28 21:17:05 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Fri Mar 28 21:17:05 2014 +0530
----------------------------------------------------------------------
components/org.apache.stratos.cli/pom.xml | 8 +-
.../stratos/cli/RestCommandLineService.java | 12 +-
.../console/util/utility.jag | 4 +-
.../behaviour/CartridgeMgtBehaviour.java | 21 +-
.../client/CloudControllerServiceClient.java | 4 +
.../category/DefaultLoadBalancerCategory.java | 43 +-
.../lb/category/LoadBalancerCategory.java | 17 +-
.../rest/endpoint/services/ServiceUtils.java | 6 +-
.../rest/endpoint/services/StratosAdmin.java | 4 +-
.../provider/aws-ec2/1.7.1-stratos/README.txt | 8 +
.../provider/aws-ec2/1.7.1-stratos/pom.xml | 151 +++
.../src/main/clojure/org/jclouds/aws/ec2.clj | 62 ++
.../java/org/jclouds/aws/ec2/AWSEC2Api.java | 119 +++
.../org/jclouds/aws/ec2/AWSEC2ApiMetadata.java | 83 ++
.../jclouds/aws/ec2/AWSEC2ProviderMetadata.java | 103 ++
.../BindLaunchSpecificationToFormParams.java | 92 ++
...otInstanceRequestIdsToIndexedFormParams.java | 37 +
.../BindTagFiltersToIndexedFormParams.java | 37 +
.../binders/BindTagsToIndexedFormParams.java | 37 +
.../aws/ec2/compute/AWSEC2ComputeService.java | 160 +++
.../compute/AWSEC2ComputeServiceContext.java | 31 +
.../ec2/compute/AWSEC2TemplateBuilderImpl.java | 51 +
.../aws/ec2/compute/AWSEC2TemplateOptions.java | 793 +++++++++++++++
.../AWSEC2BindComputeSuppliersByClass.java | 34 +
.../AWSEC2ComputeServiceContextModule.java | 182 ++++
.../AWSEC2ComputeServiceDependenciesModule.java | 179 ++++
.../aws/ec2/compute/config/ClusterCompute.java | 37 +
.../aws/ec2/compute/config/ImageQuery.java | 37 +
.../AWSEC2SecurityGroupExtension.java | 220 +++++
.../AWSEC2SecurityGroupToSecurityGroup.java | 50 +
.../AWSRunningInstanceToNodeMetadata.java | 81 ++
.../PresentSpotRequestsAndInstances.java | 95 ++
.../AWSEC2ComputeServiceContextImpl.java | 48 +
.../AWSEC2CreateSecurityGroupIfNeeded.java | 140 +++
.../AWSEC2CreateNodesInGroupThenAddToSet.java | 116 +++
.../strategy/AWSEC2DestroyNodeStrategy.java | 75 ++
.../strategy/AWSEC2GetNodeMetadataStrategy.java | 65 ++
.../strategy/AWSEC2ListNodesStrategy.java | 107 ++
.../strategy/AWSEC2ReviseParsedImage.java | 119 +++
...curityGroupsAsNeededAndReturnRunOptions.java | 190 ++++
.../suppliers/AWSEC2HardwareSupplier.java | 109 ++
.../compute/suppliers/AWSEC2ImageSupplier.java | 162 +++
.../ec2/compute/suppliers/CallForImages.java | 94 ++
.../aws/ec2/config/AWSEC2HttpApiModule.java | 82 ++
.../aws/ec2/domain/AWSRunningInstance.java | 337 +++++++
.../aws/ec2/domain/LaunchSpecification.java | 547 ++++++++++
.../jclouds/aws/ec2/domain/MonitoringState.java | 50 +
.../jclouds/aws/ec2/domain/PlacementGroup.java | 157 +++
.../domain/RegionNameAndPublicKeyMaterial.java | 40 +
.../java/org/jclouds/aws/ec2/domain/Spot.java | 199 ++++
.../aws/ec2/domain/SpotInstanceRequest.java | 474 +++++++++
.../org/jclouds/aws/ec2/features/AWSAMIApi.java | 126 +++
.../aws/ec2/features/AWSInstanceApi.java | 94 ++
.../jclouds/aws/ec2/features/AWSKeyPairApi.java | 88 ++
.../aws/ec2/features/AWSSecurityGroupApi.java | 147 +++
.../jclouds/aws/ec2/features/MonitoringApi.java | 97 ++
.../aws/ec2/features/PlacementGroupApi.java | 162 +++
.../aws/ec2/features/SpotInstanceApi.java | 247 +++++
.../functions/CreatePlacementGroupIfNeeded.java | 81 ++
.../ImportOrReturnExistingKeypair.java | 90 ++
...SpotInstanceRequestToAWSRunningInstance.java | 63 ++
.../ec2/options/AWSDescribeImagesOptions.java | 152 +++
.../aws/ec2/options/AWSRunInstancesOptions.java | 287 ++++++
.../ec2/options/CreateSecurityGroupOptions.java | 63 ++
.../DescribeSpotPriceHistoryOptions.java | 115 +++
.../options/RequestSpotInstancesOptions.java | 139 +++
.../ec2/predicates/PlacementGroupAvailable.java | 69 ++
.../ec2/predicates/PlacementGroupDeleted.java | 66 ++
.../predicates/SpotInstanceRequestActive.java | 75 ++
.../aws/ec2/reference/AWSEC2Constants.java | 39 +
.../AWSDescribeInstancesResponseHandler.java | 110 +++
...C2DescribeSecurityGroupsResponseHandler.java | 125 +++
.../aws/ec2/xml/AWSEC2IpPermissionHandler.java | 94 ++
.../aws/ec2/xml/AWSEC2SecurityGroupHandler.java | 142 +++
.../ec2/xml/AWSRunInstancesResponseHandler.java | 51 +
.../aws/ec2/xml/BaseAWSReservationHandler.java | 251 +++++
.../xml/CreateSecurityGroupResponseHandler.java | 44 +
.../DescribePlacementGroupsResponseHandler.java | 75 ++
...eservedInstancesOfferingResponseHandler.java | 74 ++
...DescribeSpotPriceHistoryResponseHandler.java | 76 ++
.../aws/ec2/xml/LaunchSpecificationHandler.java | 147 +++
.../aws/ec2/xml/MonitoringStateHandler.java | 58 ++
.../aws/ec2/xml/PlacementGroupHandler.java | 70 ++
.../aws/ec2/xml/ProductCodesHandler.java | 51 +
.../xml/ReservedInstancesOfferingHandler.java | 90 ++
.../org/jclouds/aws/ec2/xml/SpotHandler.java | 77 ++
.../aws/ec2/xml/SpotInstanceHandler.java | 152 +++
.../aws/ec2/xml/SpotInstancesHandler.java | 81 ++
.../org.jclouds.providers.ProviderMetadata | 1 +
.../test/clojure/org/jclouds/aws/ec2_test.clj | 32 +
.../aws/ec2/AWSEC2ContextBuilderTest.java | 79 ++
.../org/jclouds/aws/ec2/AWSEC2ProviderTest.java | 33 +
...BindLaunchSpecificationToFormParamsTest.java | 98 ++
.../BindTagsToIndexedFormParamsTest.java | 63 ++
.../compute/AWSEC2ComputeServiceExpectTest.java | 280 ++++++
.../compute/AWSEC2ComputeServiceLiveTest.java | 196 ++++
.../compute/AWSEC2TemplateBuilderLiveTest.java | 367 +++++++
.../AWSEC2ComputeServiceContextModuleTest.java | 65 ++
.../AWSEC2ImageExtensionLiveTest.java | 62 ++
.../AWSEC2SecurityGroupExtensionExpectTest.java | 364 +++++++
.../AWSEC2SecurityGroupExtensionLiveTest.java | 36 +
.../AWSEC2SecurityGroupToSecurityGroupTest.java | 83 ++
.../AWSRunningInstanceToNodeMetadataTest.java | 220 +++++
.../PresentSpotRequestsAndInstancesTest.java | 100 ++
.../BaseAWSEC2ComputeServiceExpectTest.java | 153 +++
.../AWSEC2CreateSecurityGroupIfNeededTest.java | 103 ++
.../options/AWSEC2TemplateOptionsTest.java | 418 ++++++++
.../compute/strategy/AWSEC2ImageParserTest.java | 242 +++++
.../strategy/AWSEC2ReviseParsedImageTest.java | 111 +++
...tyGroupsAsNeededAndReturnRunOptionsTest.java | 957 ++++++++++++++++++
.../aws/ec2/features/AWSAMIApiLiveTest.java | 58 ++
.../jclouds/aws/ec2/features/AWSAMIApiTest.java | 497 ++++++++++
.../ec2/features/AWSInstanceApiLiveTest.java | 60 ++
.../aws/ec2/features/AWSInstanceApiTest.java | 539 ++++++++++
.../aws/ec2/features/AWSKeyPairApiLiveTest.java | 208 ++++
.../aws/ec2/features/AWSKeyPairApiTest.java | 134 +++
.../features/AWSSecurityGroupApiLiveTest.java | 123 +++
.../ec2/features/AWSSecurityGroupApiTest.java | 207 ++++
.../aws/ec2/features/AWSSubnetApiLiveTest.java | 31 +
.../aws/ec2/features/BaseAWSEC2ApiTest.java | 135 +++
.../aws/ec2/features/MonitoringApiLiveTest.java | 65 ++
.../aws/ec2/features/MonitoringApiTest.java | 73 ++
.../features/PlacementGroupApiExpectTest.java | 78 ++
.../ec2/features/PlacementGroupApiLiveTest.java | 221 +++++
.../aws/ec2/features/PlacementGroupApiTest.java | 136 +++
.../ec2/features/SpotInstanceApiExpectTest.java | 78 ++
.../ec2/features/SpotInstanceApiLiveTest.java | 215 ++++
.../aws/ec2/features/SpotInstanceApiTest.java | 100 ++
.../ec2/features/TagSecurityGroupLiveTest.java | 56 ++
.../ImportOrReturnExistingKeypairTest.java | 115 +++
...InstanceRequestToAWSRunningInstanceTest.java | 91 ++
.../options/AWSDescribeImagesOptionsTest.java | 177 ++++
.../ec2/options/AWSRunInstancesOptionsTest.java | 370 +++++++
.../DescribeSpotPriceHistoryOptionsTest.java | 119 +++
.../RequestSpotInstancesOptionsTest.java | 143 +++
.../parse/DescribeInstancesResponseTest.java | 112 +++
.../DescribeSecurityGroupsResponseTest.java | 77 ++
...AWSDescribeInstancesResponseHandlerTest.java | 167 ++++
.../xml/AWSRunInstancesResponseHandlerTest.java | 114 +++
...cribePlacementGroupsResponseHandlerTest.java | 53 +
...vedInstancesOfferingResponseHandlerTest.java | 55 ++
...ribeSpotPriceHistoryResponseHandlerTest.java | 72 ++
.../aws/ec2/xml/MonitoringStateHandlerTest.java | 50 +
.../aws/ec2/xml/ProductCodesHandlerTest.java | 49 +
.../aws/ec2/xml/SpotInstanceHandlerTest.java | 138 +++
.../aws/ec2/xml/SpotInstancesHandlerTest.java | 117 +++
.../src/test/resources/alestic_canonical.xml | 119 +++
.../src/test/resources/amzn_images.xml | 86 ++
.../describe_image_attribute_productCodes.xml | 9 +
.../src/test/resources/describe_images_cc.xml | 31 +
.../src/test/resources/describe_instances_1.xml | 55 ++
.../src/test/resources/describe_instances_2.xml | 986 +++++++++++++++++++
.../src/test/resources/describe_instances_3.xml | 5 +
.../resources/describe_instances_latest.xml | 132 +++
.../resources/describe_instances_pending.xml | 82 ++
.../resources/describe_placement_groups.xml | 10 +
.../describe_reserved_instances_offerings.xml | 15 +
.../resources/describe_security_groups_vpc.xml | 35 +
.../test/resources/describe_spot_instance.xml | 45 +
.../describe_spot_instance_requests.xml | 425 ++++++++
.../resources/describe_spot_instance_tags.xml | 115 +++
.../resources/describe_spot_instances_1.xml | 207 ++++
.../resources/describe_spot_price_history.xml | 27 +
.../src/test/resources/monitoring.xml | 16 +
.../resources/request_spot_instances-ebs.xml | 52 +
.../test/resources/request_spot_instances.xml | 93 ++
.../src/test/resources/rightscale_images.xml | 94 ++
.../src/test/resources/run_instances_1.xml | 54 +
.../1.7.1-stratos/src/test/resources/vostok.xml | 19 +
.../synapse-configs/default/sequences/main.xml | 8 +-
tools/stratos-installer/conf/stratos-setup.conf | 139 +--
tools/stratos-installer/stratos-clean.sh | 104 ++
tools/stratos-installer/stratos-ec2.sh | 49 +-
tools/stratos-installer/stratos-openstack.sh | 37 +-
tools/stratos-installer/stratos-setup.sh | 635 ++++++------
.../stratos-installer/stratos-start-servers.sh | 72 +-
tools/stratos-installer/stratos-vcloud.sh | 37 +-
177 files changed, 22141 insertions(+), 625 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: enabling profiles for CC, SM, AS
Posted by ni...@apache.org.
enabling profiles for CC, SM, AS
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4998ef79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4998ef79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4998ef79
Branch: refs/heads/master
Commit: 4998ef79cc8931945aa017a871be600498607fac
Parents: 80e78c7
Author: Nirmal Fernando <ni...@apache.org>
Authored: Fri Mar 28 21:16:38 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Fri Mar 28 21:16:38 2014 +0530
----------------------------------------------------------------------
products/stratos/modules/p2-profile-gen/pom.xml | 36 ++++++++++++--------
1 file changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4998ef79/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index 73ae179..098ee52 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -175,6 +175,7 @@
<publishArtifacts>true</publishArtifacts>
<publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.logaggregator.feature:1.0.0</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.platform.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.platform.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>
@@ -212,8 +213,8 @@
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>
<featureArtifactDef>org.jaggeryjs:org.jaggeryjs.feature:0.9.0.ALPHA4.wso2v3</featureArtifactDef>
- <featureArtifactDef>caramel:caramel.feature:1.0.0</featureArtifactDef>
- <featureArtifactDef>org.wso2.store:org.wso2.store.feature:1.0.0</featureArtifactDef>
+ <featureArtifactDef>caramel:caramel.feature:1.0.1</featureArtifactDef>
+ <featureArtifactDef>org.wso2.store:org.wso2.store.feature:${store.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:4.2.1</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:4.2.1</featureArtifactDef>
<featureArtifactDef>org.apache.stratos:org.apache.stratos.messaging.feature:${project.version}</featureArtifactDef>
@@ -257,7 +258,7 @@
</configuration>
</execution>
- <!--<execution>
+ <execution>
<id>publishing product</id>
<phase>package</phase>
<goals>
@@ -449,12 +450,12 @@
</feature>
<feature>
<id>caramel.feature.group</id>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</feature>
<feature>
<id>org.wso2.store.feature.group</id>
- <version>1.0.0</version>
- </feature>–>
+ <version>${store.version}</version>
+ </feature>–>
<feature>
<id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
<version>4.2.1</version>
@@ -554,14 +555,14 @@
<id>org.apache.stratos.cloud.controller.feature.group</id>
<version>${project.version}</version>
</feature>
- <!–<feature>
+ <!--<!–<feature>
<id>org.apache.synapse.wso2.feature.group</id>
<version>${synapse.version}</version>
</feature>
<feature>
<id>org.apache.synapse.transport.nhttp.feature.group</id>
<version>${synapse.version}</version>
- </feature>–>
+ </feature>–>-->
<feature>
<id>org.wso2.carbon.task.server.feature.group</id>
<version>${carbon.version}</version>
@@ -570,10 +571,10 @@
<id>org.wso2.carbon.datasource.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
- <feature>
+ <!--feature>
<id>org.wso2.carbon.mediation.initializer.feature.group</id>
<version>${carbon.version}</version>
- </feature>
+ </feature-->
<feature>
<id>org.wso2.carbon.service.mgt.server.feature.group</id>
<version>${carbon.version}</version>
@@ -582,7 +583,7 @@
<id>org.wso2.carbon.transport.mgt.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
- <feature>
+ <!--feature>
<id>org.wso2.carbon.endpoint.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
@@ -597,7 +598,7 @@
<feature>
<id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.version}</version>
- </feature>
+ </feature-->
<feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
<version>${carbon.platform.patch.version.4.2.1}</version>
@@ -627,7 +628,7 @@
</feature>
</features>
</configuration>
- </execution>-->
+ </execution>
<execution>
<id>3-p2-profile-generation</id>
<phase>package</phase>
@@ -643,6 +644,10 @@
</destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
+ <feature>
+ <id>org.wso2.carbon.logaggregator.feature.group</id>
+ <version>1.0.0</version>
+ </feature>
<feature>
<id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
<version>${carbon.platform.patch.version.4.2.2}</version>
@@ -754,11 +759,11 @@
</feature>
<feature>
<id>caramel.feature.group</id>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</feature>
<feature>
<id>org.wso2.store.feature.group</id>
- <version>1.0.0</version>
+ <version>${store.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
@@ -986,6 +991,7 @@
</build>
<properties>
<synapse.version>2.1.2-wso2v3</synapse.version>
+ <store.version>1.0.1</store.version>
</properties>
</project>