You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/07/21 15:18:56 UTC
git commit: Added stratos controller to products and updated licenses
and artifact names
Updated Branches:
refs/heads/master 7ed88c4f7 -> 40184888f
Added stratos controller to products and updated licenses and artifact names
Signed-off-by: Lakmal Warusawithana <la...@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/40184888
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/40184888
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/40184888
Branch: refs/heads/master
Commit: 40184888fba46e0cd864178f73eef667248aff18
Parents: 7ed88c4
Author: Imesh Gunaratne <im...@wso2.com>
Authored: Sun Jul 21 15:46:16 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Sun Jul 21 18:48:33 2013 +0530
----------------------------------------------------------------------
.../distribution/src/main/bin/stratos.bat | 37 ++++++++++----------
.../distribution/src/main/bin/stratos.sh | 33 +++++++++--------
products/pom.xml | 1 +
.../src/main/assembly/filter.properties | 2 +-
.../distribution/src/main/bin/stratos.bat | 37 ++++++++++----------
.../distribution/src/main/bin/stratos.sh | 33 +++++++++--------
products/stratos_cli/distribution/pom.xml | 2 +-
products/stratos_cli/pom.xml | 2 +-
8 files changed, 72 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/40184888/products/elb/modules/distribution/src/main/bin/stratos.bat
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/bin/stratos.bat b/products/elb/modules/distribution/src/main/bin/stratos.bat
index 3274bc6..8f29ea9 100644
--- a/products/elb/modules/distribution/src/main/bin/stratos.bat
+++ b/products/elb/modules/distribution/src/main/bin/stratos.bat
@@ -1,27 +1,26 @@
@echo off
-REM ---------------------------------------------------------------------------
-REM Copyright 2005-2009 WSO2, Inc. http://www.wso2.org
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-
rem ---------------------------------------------------------------------------
-rem Main Script for WSO2 Carbon
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements. See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership. The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
rem
-rem Environment Variable Prequisites
+rem Unless required by applicable law or agreed to in writing,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied. See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+rem ---------------------------------------------------------------------------
+rem Main Script for Apache Stratos
rem
-rem CARBON_HOME Home of CARBON installation. If not set I will try
-rem to figure it out.
+rem Environment Variable Prerequisites
rem
rem JAVA_HOME Must point at your Java Development Kit installation.
rem
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/40184888/products/elb/modules/distribution/src/main/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/bin/stratos.sh b/products/elb/modules/distribution/src/main/bin/stratos.sh
index 338b7d4..4c6260c 100644
--- a/products/elb/modules/distribution/src/main/bin/stratos.sh
+++ b/products/elb/modules/distribution/src/main/bin/stratos.sh
@@ -1,33 +1,32 @@
#!/bin/sh
# ----------------------------------------------------------------------------
-# Copyright WSO2, Inc. http://www.wso2.org
-#
-# 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
+# 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.
-
+# 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.
# ----------------------------------------------------------------------------
-# Main Script for the WSO2 Carbon Server
-#
-# Environment Variable Prequisites
+# Main Script for the Apache Stratos
#
-# CARBON_HOME Home of WSO2 Carbon installation. If not set I will try
-# to figure it out.
+# Environment Variable Prerequisites
#
# JAVA_HOME Must point at your Java Development Kit installation.
#
# JAVA_OPTS (Optional) Java runtime options used when the commands
# is executed.
#
-# NOTE: Borrowed generously from Apache Tomcat startup scripts.
+# NOTE: Borrowed generously from Apache Tomcat startup scripts.
# -----------------------------------------------------------------------------
# OS specific support. $var _must_ be set to either true or false.
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/40184888/products/pom.xml
----------------------------------------------------------------------
diff --git a/products/pom.xml b/products/pom.xml
index 75c4089..593bba5 100644
--- a/products/pom.xml
+++ b/products/pom.xml
@@ -38,6 +38,7 @@
<module>elb</module>
<module>stratos_agent</module>
<module>stratos_cli</module>
+ <module>stratos_controller</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/40184888/products/stratos_agent/modules/distribution/src/main/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/stratos_agent/modules/distribution/src/main/assembly/filter.properties b/products/stratos_agent/modules/distribution/src/main/assembly/filter.properties
index b031036..11f6d81 100644
--- a/products/stratos_agent/modules/distribution/src/main/assembly/filter.properties
+++ b/products/stratos_agent/modules/distribution/src/main/assembly/filter.properties
@@ -1,4 +1,4 @@
-product.name=WSO2 Stratos Agent
+product.name=Apache Stratos Agent
product.key=Agent
product.version=1.0.0
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/40184888/products/stratos_agent/modules/distribution/src/main/bin/stratos.bat
----------------------------------------------------------------------
diff --git a/products/stratos_agent/modules/distribution/src/main/bin/stratos.bat b/products/stratos_agent/modules/distribution/src/main/bin/stratos.bat
index 3274bc6..989483f 100644
--- a/products/stratos_agent/modules/distribution/src/main/bin/stratos.bat
+++ b/products/stratos_agent/modules/distribution/src/main/bin/stratos.bat
@@ -1,27 +1,26 @@
@echo off
-REM ---------------------------------------------------------------------------
-REM Copyright 2005-2009 WSO2, Inc. http://www.wso2.org
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-
rem ---------------------------------------------------------------------------
-rem Main Script for WSO2 Carbon
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements. See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership. The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
rem
-rem Environment Variable Prequisites
+rem Unless required by applicable law or agreed to in writing,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied. See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+rem ---------------------------------------------------------------------------
+rem Main Script for Apache Stratos
rem
-rem CARBON_HOME Home of CARBON installation. If not set I will try
-rem to figure it out.
+rem Environment Variable Prerequisites
rem
rem JAVA_HOME Must point at your Java Development Kit installation.
rem
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/40184888/products/stratos_agent/modules/distribution/src/main/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/stratos_agent/modules/distribution/src/main/bin/stratos.sh b/products/stratos_agent/modules/distribution/src/main/bin/stratos.sh
index 338b7d4..4c6260c 100644
--- a/products/stratos_agent/modules/distribution/src/main/bin/stratos.sh
+++ b/products/stratos_agent/modules/distribution/src/main/bin/stratos.sh
@@ -1,33 +1,32 @@
#!/bin/sh
# ----------------------------------------------------------------------------
-# Copyright WSO2, Inc. http://www.wso2.org
-#
-# 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
+# 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.
-
+# 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.
# ----------------------------------------------------------------------------
-# Main Script for the WSO2 Carbon Server
-#
-# Environment Variable Prequisites
+# Main Script for the Apache Stratos
#
-# CARBON_HOME Home of WSO2 Carbon installation. If not set I will try
-# to figure it out.
+# Environment Variable Prerequisites
#
# JAVA_HOME Must point at your Java Development Kit installation.
#
# JAVA_OPTS (Optional) Java runtime options used when the commands
# is executed.
#
-# NOTE: Borrowed generously from Apache Tomcat startup scripts.
+# NOTE: Borrowed generously from Apache Tomcat startup scripts.
# -----------------------------------------------------------------------------
# OS specific support. $var _must_ be set to either true or false.
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/40184888/products/stratos_cli/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/pom.xml b/products/stratos_cli/distribution/pom.xml
index 8889d6a..35de0f9 100644
--- a/products/stratos_cli/distribution/pom.xml
+++ b/products/stratos_cli/distribution/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>apaches2cli</artifactId>
<packaging>pom</packaging>
- <name>Apache Stratos CLI</name>
+ <name>Apache Stratos - CLI</name>
<url>http://apache.org/cloud/stratos/</url>
<description>Apache Stratos CLI Distribution</description>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/40184888/products/stratos_cli/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_cli/pom.xml b/products/stratos_cli/pom.xml
index 9dd2434..792ccba 100644
--- a/products/stratos_cli/pom.xml
+++ b/products/stratos_cli/pom.xml
@@ -31,7 +31,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-s2cli-parent</artifactId>
<packaging>pom</packaging>
- <name>Apache Stratos CLI - Distribution</name>
+ <name>Apache Stratos - CLI - Distribution</name>
<url>http://apache.org/cloud/stratos/</url>
<description>Apache Stratos CLI</description>