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 2014/04/02 13:05:44 UTC
[1/3] git commit: Added Apache License Header to files inside products
Repository: incubator-stratos
Updated Branches:
refs/heads/master 201120b17 -> e7d590ca3
Added Apache License Header to files inside products
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/38ba2229
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/38ba2229
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/38ba2229
Branch: refs/heads/master
Commit: 38ba2229b9a08bf9bc8c55a7abec2fa082d9cf6a
Parents: 201120b
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Wed Apr 2 16:34:03 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Wed Apr 2 16:34:03 2014 +0530
----------------------------------------------------------------------
.../distribution/src/main/resources/launch.ini | 19 +++++++++++++++++++
.../distribution/src/main/resources/launch.ini | 19 +++++++++++++++++++
.../modules/p2-profile-gen/carbon.product | 20 ++++++++++++++++++++
3 files changed, 58 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/38ba2229/products/autoscaler/modules/distribution/src/main/resources/launch.ini
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/src/main/resources/launch.ini b/products/autoscaler/modules/distribution/src/main/resources/launch.ini
index 8cf9c14..774a240 100644
--- a/products/autoscaler/modules/distribution/src/main/resources/launch.ini
+++ b/products/autoscaler/modules/distribution/src/main/resources/launch.ini
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
# Eclipse Runtime Configuration Overrides
# These properties are loaded prior to starting the framework and can also be used to override System Properties
# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/38ba2229/products/stratos/modules/distribution/src/main/resources/launch.ini
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/resources/launch.ini b/products/stratos/modules/distribution/src/main/resources/launch.ini
index 137b7b4..53dbec5 100644
--- a/products/stratos/modules/distribution/src/main/resources/launch.ini
+++ b/products/stratos/modules/distribution/src/main/resources/launch.ini
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
# Eclipse Runtime Configuration Overrides
# These properties are loaded prior to starting the framework and can also be used to override System Properties
# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/38ba2229/products/stratos/modules/p2-profile-gen/carbon.product
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/carbon.product b/products/stratos/modules/p2-profile-gen/carbon.product
index 7a7329b..7c49dfe 100644
--- a/products/stratos/modules/p2-profile-gen/carbon.product
+++ b/products/stratos/modules/p2-profile-gen/carbon.product
@@ -1,4 +1,24 @@
<?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.
+
+-->
<?pde version="3.5"?>
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.2.0" useFeatures="true" includeLaunchers="true">
[2/3] git commit: Added Apache License Header to
org.apache.stratos.rest.endpoint.feature's p2.inf file
Posted by is...@apache.org.
Added Apache License Header to org.apache.stratos.rest.endpoint.feature's p2.inf 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/93121b09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/93121b09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/93121b09
Branch: refs/heads/master
Commit: 93121b092facf81fead92e9e5ce38ec9ef105b8c
Parents: 38ba222
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Wed Apr 2 16:34:48 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Wed Apr 2 16:34:48 2014 +0530
----------------------------------------------------------------------
.../src/main/resources/p2.inf | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/93121b09/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
index fc828ae..91fef8c 100644
--- a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
+++ b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
@@ -1,3 +1,20 @@
+# 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.
+
instructions.configure = \
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/cxf,target:${installFolder}/../../../lib/runtimes/cxf,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/web-app/stratos.war,target:${installFolder}/../../deployment/server/webapps/stratos.war,overwrite:true);\
[3/3] git commit: Removed unnecessary files
Posted by is...@apache.org.
Removed unnecessary files
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e7d590ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e7d590ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e7d590ca
Branch: refs/heads/master
Commit: e7d590ca3ee7a6a11f2d5c49d3690db494b5bd03
Parents: 93121b0
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Wed Apr 2 16:35:30 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Wed Apr 2 16:35:30 2014 +0530
----------------------------------------------------------------------
.../distribution/src/main/bin/version.txt | 1 -
products/stratos-manager/conf/README-STRATOS | 90 --------------------
products/stratos/conf/README-STRATOS | 90 --------------------
3 files changed, 181 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e7d590ca/products/stratos-cli/distribution/src/main/bin/version.txt
----------------------------------------------------------------------
diff --git a/products/stratos-cli/distribution/src/main/bin/version.txt b/products/stratos-cli/distribution/src/main/bin/version.txt
deleted file mode 100644
index 8a868c8..0000000
--- a/products/stratos-cli/distribution/src/main/bin/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-Apache Stratos CLI 4.0.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e7d590ca/products/stratos-manager/conf/README-STRATOS
----------------------------------------------------------------------
diff --git a/products/stratos-manager/conf/README-STRATOS b/products/stratos-manager/conf/README-STRATOS
deleted file mode 100755
index f41daf5..0000000
--- a/products/stratos-manager/conf/README-STRATOS
+++ /dev/null
@@ -1,90 +0,0 @@
-CARBON_HOME/repository/conf directory contains all the Stratos configuration files.
-carbon/products/manager/conf contains all the Stratos specific configuration files,
- in the source tree structure.
-
-1. announcement.xml
- Originally added to customize the announcement using the announcement module. Not used as of now.
-
-2. bam.xml
- The configuration for billing and metering.
-
-3. billing-config.xml
- Defines the database and the Task for billing. Multi-tenancy billing rules (by default, uses
- multitenancy-billing-rules.drl) and email for billing notifications (by default, uses
- email-billing-notifications.xml) are specified here.
-
-4. cloud-services-desc.xml
- This has the configurations for the cloud services.
- Label, link, icon, description, and the other similar information for each of the services are
- given here.
-
-5. email-admin-config.xml
- Contains the body of the mail that to be sent upon the tenant configuration request by the admin
- of the tenant. This includes the password reset link, for the forgotten passwords.
-
-6. email-billing-notifications.xml
- Contains the body of the mail that to be sent as the invoice of the tenant for the period.
-
-7. email-new-tenant-activation.xml
- Contains the body of the mail that to be sent to the super admin or a given admin email address,
- when a new tenant activates their unactivated account.
-
-8. email-new-tenant-registration.xml
- Contains the body of the mail that to be sent to the super admin or a given admin email address,
- when a new tenant registers for an account.
-
-9. email-password-reset.xml
- Contains the body of the mail that to be sent when the tenant admin's password is reset, mostly
- by a service administrator, known as the super-tenant in Stratos-world.
-
-10. email-registration.xml
- Contains the body of the mail to be sent for the tenant registration validation.
- This mail has the registration validation link to validate the email too.
-
-11. email-registration-complete.xml
- Contains the mail that to be sent upon successful registration and the successful validation
- of the email.
-
-12. email-update.xml
- Contains the body of the mail that to be sent upon receiving an email change request from the
- account management. The new email address will be notified of this change.
-
-13. eula.xml
- Contains the End User License Agreement for Stratos. Will be displayed during the self-registration
- of the tenant.
-
-14. identity.xml
- Security, SSO store, Personal certificate stores of the user, authentication, and the other
- identity related parameters can be configured from here.
-
-15. metering-config-non-manager.xml
- This file contains configuration related to the metering.
-
-16. multitenancy-billing-rules
- This file defines the rules for the billing for multiple tenants.
-
-17. multitenancy-packages.xml
- This contains the subscription types and the respective limits of parameters for each of the
- packages.
-
-18. README-STRATOS
- This file. This has the information about the stratos specific configurations files.
-
-19. samples-desc.xml
- This has the description of the platform sample (currently included, shopping cart sample).
-
-20. stratos.xml
- This is the configuration file for Stratos specific constants.
- Feel free to add your custom parameters and constants here.
-
-21. tenant-reg-agent.xml
- tenantRegListenerServers configuration
-
-22. throttling-config.xml
- Configuration file for throttling.
-
-23. throttling-rules.drl
- Defines the throttling rules.
-
-24. user-mgt.xml
- The User Manager configuration file used for configuring user management details.
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e7d590ca/products/stratos/conf/README-STRATOS
----------------------------------------------------------------------
diff --git a/products/stratos/conf/README-STRATOS b/products/stratos/conf/README-STRATOS
deleted file mode 100755
index f41daf5..0000000
--- a/products/stratos/conf/README-STRATOS
+++ /dev/null
@@ -1,90 +0,0 @@
-CARBON_HOME/repository/conf directory contains all the Stratos configuration files.
-carbon/products/manager/conf contains all the Stratos specific configuration files,
- in the source tree structure.
-
-1. announcement.xml
- Originally added to customize the announcement using the announcement module. Not used as of now.
-
-2. bam.xml
- The configuration for billing and metering.
-
-3. billing-config.xml
- Defines the database and the Task for billing. Multi-tenancy billing rules (by default, uses
- multitenancy-billing-rules.drl) and email for billing notifications (by default, uses
- email-billing-notifications.xml) are specified here.
-
-4. cloud-services-desc.xml
- This has the configurations for the cloud services.
- Label, link, icon, description, and the other similar information for each of the services are
- given here.
-
-5. email-admin-config.xml
- Contains the body of the mail that to be sent upon the tenant configuration request by the admin
- of the tenant. This includes the password reset link, for the forgotten passwords.
-
-6. email-billing-notifications.xml
- Contains the body of the mail that to be sent as the invoice of the tenant for the period.
-
-7. email-new-tenant-activation.xml
- Contains the body of the mail that to be sent to the super admin or a given admin email address,
- when a new tenant activates their unactivated account.
-
-8. email-new-tenant-registration.xml
- Contains the body of the mail that to be sent to the super admin or a given admin email address,
- when a new tenant registers for an account.
-
-9. email-password-reset.xml
- Contains the body of the mail that to be sent when the tenant admin's password is reset, mostly
- by a service administrator, known as the super-tenant in Stratos-world.
-
-10. email-registration.xml
- Contains the body of the mail to be sent for the tenant registration validation.
- This mail has the registration validation link to validate the email too.
-
-11. email-registration-complete.xml
- Contains the mail that to be sent upon successful registration and the successful validation
- of the email.
-
-12. email-update.xml
- Contains the body of the mail that to be sent upon receiving an email change request from the
- account management. The new email address will be notified of this change.
-
-13. eula.xml
- Contains the End User License Agreement for Stratos. Will be displayed during the self-registration
- of the tenant.
-
-14. identity.xml
- Security, SSO store, Personal certificate stores of the user, authentication, and the other
- identity related parameters can be configured from here.
-
-15. metering-config-non-manager.xml
- This file contains configuration related to the metering.
-
-16. multitenancy-billing-rules
- This file defines the rules for the billing for multiple tenants.
-
-17. multitenancy-packages.xml
- This contains the subscription types and the respective limits of parameters for each of the
- packages.
-
-18. README-STRATOS
- This file. This has the information about the stratos specific configurations files.
-
-19. samples-desc.xml
- This has the description of the platform sample (currently included, shopping cart sample).
-
-20. stratos.xml
- This is the configuration file for Stratos specific constants.
- Feel free to add your custom parameters and constants here.
-
-21. tenant-reg-agent.xml
- tenantRegListenerServers configuration
-
-22. throttling-config.xml
- Configuration file for throttling.
-
-23. throttling-rules.drl
- Defines the throttling rules.
-
-24. user-mgt.xml
- The User Manager configuration file used for configuring user management details.