You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2013/09/05 15:35:17 UTC
[1/2] git commit: Change license headers in stratos-installer
Updated Branches:
refs/heads/master fcb9cc2ed -> ea2028e29
Change license headers in stratos-installer
Signed-off-by: Manula Thantriwatte <ma...@wso2.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7cacaa6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7cacaa6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7cacaa6c
Branch: refs/heads/master
Commit: 7cacaa6c0730ed3f52f4ccc5d1e5858b10162866
Parents: 98cb9df
Author: Dinesh Bandara <di...@wso2.com>
Authored: Thu Sep 5 17:52:33 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Thu Sep 5 19:03:48 2013 +0530
----------------------------------------------------------------------
.../repository/conf/etc/cassandra-component.xml | 28 +++++++++++---------
.../config/is/repository/conf/tenant-mgt.xml | 16 ++++++-----
.../sc/repository/conf/etc/logging-config.xml | 15 ++++++-----
3 files changed, 33 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7cacaa6c/tools/stratos-installer/config/bam/repository/conf/etc/cassandra-component.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/bam/repository/conf/etc/cassandra-component.xml b/tools/stratos-installer/config/bam/repository/conf/etc/cassandra-component.xml
index de95fdb..3944730 100644
--- a/tools/stratos-installer/config/bam/repository/conf/etc/cassandra-component.xml
+++ b/tools/stratos-installer/config/bam/repository/conf/etc/cassandra-component.xml
@@ -1,19 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2009-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~ 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
~
- ~ Licensed 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
~
- ~ 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.
--->
+ ~ 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.
+ -->
+
<Cassandra>
<Cluster>
<Name>Test Cluster</Name>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7cacaa6c/tools/stratos-installer/config/is/repository/conf/tenant-mgt.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/is/repository/conf/tenant-mgt.xml b/tools/stratos-installer/config/is/repository/conf/tenant-mgt.xml
index fa5cab5..3cd0ac1 100644
--- a/tools/stratos-installer/config/is/repository/conf/tenant-mgt.xml
+++ b/tools/stratos-installer/config/is/repository/conf/tenant-mgt.xml
@@ -1,12 +1,13 @@
<!--
- ~ Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~ 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
~
- ~ WSO2 Inc. 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
+ ~ 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
@@ -15,6 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
+
<!--TenantManager class="org.wso2.carbon.user.core.tenant.JDBCTenantManager">
</TenantManager-->
<!--If the product is using LDAP user store in MT mode, use following tenant manager.-->
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7cacaa6c/tools/stratos-installer/config/sc/repository/conf/etc/logging-config.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/sc/repository/conf/etc/logging-config.xml b/tools/stratos-installer/config/sc/repository/conf/etc/logging-config.xml
index 1c3cd1c..6c51885 100644
--- a/tools/stratos-installer/config/sc/repository/conf/etc/logging-config.xml
+++ b/tools/stratos-installer/config/sc/repository/conf/etc/logging-config.xml
@@ -1,12 +1,13 @@
<!--
- ~ Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~ 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
~
- ~ WSO2 Inc. 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
+ ~ 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
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ma...@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/ea2028e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ea2028e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ea2028e2
Branch: refs/heads/master
Commit: ea2028e295bd168880f476cb9ef1a22ebd7a2c72
Parents: 7cacaa6 fcb9cc2
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Thu Sep 5 19:04:46 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Thu Sep 5 19:04:46 2013 +0530
----------------------------------------------------------------------
.../distribution/src/main/assembly/bin.xml | 4 -
.../cloud-controller/modules/p2-profile/pom.xml | 176 ++-----------------
2 files changed, 14 insertions(+), 166 deletions(-)
----------------------------------------------------------------------