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 20:48:16 UTC
git commit: Fixed indentation, licenses, xml begin tags,
shell scripts in stratos cli module
Updated Branches:
refs/heads/master 40184888f -> 7399b37c4
Fixed indentation, licenses, xml begin tags, shell scripts in stratos cli module
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/7399b37c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7399b37c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7399b37c
Branch: refs/heads/master
Commit: 7399b37c4b3ec127ad284c89e72122221d0f0a14
Parents: 4018488
Author: Imesh Gunaratne <im...@wso2.com>
Authored: Sun Jul 21 22:02:49 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Mon Jul 22 00:17:49 2013 +0530
----------------------------------------------------------------------
products/elb/LICENSE.txt | 2 +-
products/elb/pom.xml | 1 -
products/pom.xml | 37 ++++++-----
products/stratos_cli/LICENSE.txt | 70 ++++++++++----------
products/stratos_cli/distribution/pom.xml | 35 +++++-----
.../distribution/src/main/assembly/bin.xml | 32 ++++-----
.../distribution/src/main/bin/stratos.bat | 40 +++++------
.../distribution/src/main/bin/stratos.sh | 32 ++++-----
.../distribution/src/main/bin/version.txt | 2 +-
products/stratos_cli/pom.xml | 34 +++++-----
10 files changed, 146 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7399b37c/products/elb/LICENSE.txt
----------------------------------------------------------------------
diff --git a/products/elb/LICENSE.txt b/products/elb/LICENSE.txt
index f826a50..28a67cc 100644
--- a/products/elb/LICENSE.txt
+++ b/products/elb/LICENSE.txt
@@ -1,5 +1,5 @@
-This product is licensed by WSO2 Inc. under Apache License 2.0. The license
+This product is licensed by Apache under Apache License 2.0. The license
can be downloaded from the following locations:
http://www.apache.org/licenses/LICENSE-2.0.html
http://www.apache.org/licenses/LICENSE-2.0.txt
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7399b37c/products/elb/pom.xml
----------------------------------------------------------------------
diff --git a/products/elb/pom.xml b/products/elb/pom.xml
index aa05340..6f7ee3f 100755
--- a/products/elb/pom.xml
+++ b/products/elb/pom.xml
@@ -17,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7399b37c/products/pom.xml
----------------------------------------------------------------------
diff --git a/products/pom.xml b/products/pom.xml
index 593bba5..676613c 100644
--- a/products/pom.xml
+++ b/products/pom.xml
@@ -1,21 +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.
- -->
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7399b37c/products/stratos_cli/LICENSE.txt
----------------------------------------------------------------------
diff --git a/products/stratos_cli/LICENSE.txt b/products/stratos_cli/LICENSE.txt
index 128d81e..4287729 100644
--- a/products/stratos_cli/LICENSE.txt
+++ b/products/stratos_cli/LICENSE.txt
@@ -1,5 +1,5 @@
-This product is licensed by Apache Org. under Apache License 2.0. The license
+This product is licensed by Apache under Apache License 2.0. The license
can be downloaded from the following locations:
http://www.apache.org/licenses/LICENSE-2.0.html
http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -10,37 +10,37 @@ Following are the dependencies for this product.
Artifact Version
----------------------------------------------------------------------
-avalon-framework:avalon-framework 4.1.3
-com.google.code.gson:gson 2.1
-commons-beanutils:commons-beanutils 1.8.0
-commons-cli:commons-cli 1.2
-commons-codec:commons-codec 1.2
-commons-digester:commons-digester 1.8
-commons-httpclient:commons-httpclient 3.0.1
-commons-io:commons-io 2.0
-commons-logging:commons-logging 1.1
-commons-validator:commons-validator 1.4.0
-javax.servlet:servlet-api 2.3
-jaxen:jaxen 1.1.1
-jline:jline 2.11
-log4j:log4j 1.2.13
-logkit:logkit 1.0.1
-org.apache.axis2.wso2:axis2 1.6.1.wso2v9
-org.apache.commons:commons-lang3 3.1
-org.apache.geronimo.specs:geronimo-activation_1.1_spec 1.0.2
-org.apache.geronimo.specs:geronimo-javamail_1.4_spec 1.6
-org.apache.geronimo.specs:geronimo-stax-api_1.0_spec 1.0.1
-org.apache.httpcomponents.wso2:httpcore 4.1.0-wso2v1
-org.apache.neethi.wso2:neethi 2.0.4.wso2v4
-org.apache.ws.commons.axiom:axiom-api 1.2.11-wso2v2
-org.apache.ws.commons.axiom:axiom-impl 1.2.11-wso2v2
-org.apache.ws.commons.axiom.wso2:axiom 1.2.11.wso2v4
-org.apache.ws.commons.schema:XmlSchema 1.4.3
-org.apache.ws.commons.schema.wso2:XmlSchema 1.4.7.wso2v2
-org.codehaus.woodstox:wstx-asl 3.2.9
-org.slf4j:slf4j-api 1.7.5
-org.slf4j:slf4j-log4j12 1.7.5
-org.apache.stratos:org.apache.stratos.adc.mgt.stub 4.1.3
-org.wso2.securevault:org.wso2.securevault 1.0.0-wso2v2
-wsdl4j:wsdl4j 1.6.2
-wsdl4j.wso2:wsdl4j 1.6.2.wso2v2
+avalon-framework:avalon-framework 4.1.3
+com.google.code.gson:gson 2.1
+commons-beanutils:commons-beanutils 1.8.0
+commons-cli:commons-cli 1.2
+commons-codec:commons-codec 1.2
+commons-digester:commons-digester 1.8
+commons-httpclient:commons-httpclient 3.0.1
+commons-io:commons-io 2.0
+commons-logging:commons-logging 1.1
+commons-validator:commons-validator 1.4.0
+javax.servlet:servlet-api 2.3
+jaxen:jaxen 1.1.1
+jline:jline 2.11
+log4j:log4j 1.2.13
+logkit:logkit 1.0.1
+org.apache.axis2.wso2:axis2 1.6.1.wso2v9
+org.apache.commons:commons-lang3 3.1
+org.apache.geronimo.specs:geronimo-activation_1.1_spec 1.0.2
+org.apache.geronimo.specs:geronimo-javamail_1.4_spec 1.6
+org.apache.geronimo.specs:geronimo-stax-api_1.0_spec 1.0.1
+org.apache.httpcomponents.wso2:httpcore 4.1.0-wso2v1
+org.apache.neethi.wso2:neethi 2.0.4.wso2v4
+org.apache.ws.commons.axiom:axiom-api 1.2.11-wso2v2
+org.apache.ws.commons.axiom:axiom-impl 1.2.11-wso2v2
+org.apache.ws.commons.axiom.wso2:axiom 1.2.11.wso2v4
+org.apache.ws.commons.schema:XmlSchema 1.4.3
+org.apache.ws.commons.schema.wso2:XmlSchema 1.4.7.wso2v2
+org.codehaus.woodstox:wstx-asl 3.2.9
+org.slf4j:slf4j-api 1.7.5
+org.slf4j:slf4j-log4j12 1.7.5
+org.apache.stratos:org.apache.stratos.adc.mgt.stub 4.1.3
+org.wso2.securevault:org.wso2.securevault 1.0.0-wso2v2
+wsdl4j:wsdl4j 1.6.2
+wsdl4j.wso2:wsdl4j 1.6.2.wso2v2
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7399b37c/products/stratos_cli/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/pom.xml b/products/stratos_cli/distribution/pom.xml
index 35de0f9..44b8c43 100644
--- a/products/stratos_cli/distribution/pom.xml
+++ b/products/stratos_cli/distribution/pom.xml
@@ -1,21 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2013, WSO2 Inc. (http://wso2.com) All Rights Reserved.
- ~
- ~ 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
- ~
- ~ 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.
- -->
+ 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.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7399b37c/products/stratos_cli/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/src/main/assembly/bin.xml b/products/stratos_cli/distribution/src/main/assembly/bin.xml
index 6e31429..f2635bb 100644
--- a/products/stratos_cli/distribution/src/main/assembly/bin.xml
+++ b/products/stratos_cli/distribution/src/main/assembly/bin.xml
@@ -1,19 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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
- ~
- ~ 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.
+ 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.
-->
<assembly>
<formats>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7399b37c/products/stratos_cli/distribution/src/main/bin/stratos.bat
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/src/main/bin/stratos.bat b/products/stratos_cli/distribution/src/main/bin/stratos.bat
index 121e12d..c7aad09 100644
--- a/products/stratos_cli/distribution/src/main/bin/stratos.bat
+++ b/products/stratos_cli/distribution/src/main/bin/stratos.bat
@@ -1,27 +1,29 @@
@echo off
-REM ---------------------------------------------------------------------------
-REM Copyright 2013 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 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 WSO2 Carbon
rem
-rem Environment Variable Prequisites
+rem Environment Variable Prequisites
rem
-rem STRATOS_CLI_HOME Home of Stratos CLI Tool
+rem STRATOS_CLI_HOME Home of Stratos CLI Tool
rem
-rem STRATOS_URL The URL of the Stratos Controller
+rem STRATOS_URL The URL of the Stratos Controller
rem ---------------------------------------------------------------------------
rem ----- Only set STRATOS_CLI_HOME if not already set ----------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7399b37c/products/stratos_cli/distribution/src/main/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/src/main/bin/stratos.sh b/products/stratos_cli/distribution/src/main/bin/stratos.sh
index f088383..3ef1aae 100755
--- a/products/stratos_cli/distribution/src/main/bin/stratos.sh
+++ b/products/stratos_cli/distribution/src/main/bin/stratos.sh
@@ -1,27 +1,29 @@
#!/bin/sh
# ----------------------------------------------------------------------------
-# Copyright 2013 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 Stratos CLI Tool
+# Main Script for the Apache Stratos CLI Tool
#
-# Environment Variable Prequisites
+# Environment Variable Prerequisites
#
-# STRATOS_CLI_HOME Home of Stratos CLI Tool
+# STRATOS_CLI_HOME Home of Stratos CLI Tool
#
-# STRATOS_URL The URL of the Stratos Controller
+# STRATOS_URL The URL of the Stratos Controller
if [ -z $STRATOS_CLI_HOME ] ; then
STRATOS_CLI_HOME="$PWD"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7399b37c/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
index a31005a..e740fa4 100644
--- a/products/stratos_cli/distribution/src/main/bin/version.txt
+++ b/products/stratos_cli/distribution/src/main/bin/version.txt
@@ -1 +1 @@
-WSO2 Stratos CLI 3.0.0-SNAPSHOT
+Apache Stratos CLI 3.0.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7399b37c/products/stratos_cli/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_cli/pom.xml b/products/stratos_cli/pom.xml
index 792ccba..06cb154 100644
--- a/products/stratos_cli/pom.xml
+++ b/products/stratos_cli/pom.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
- ~
- ~ 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
- ~
- ~ 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.
- -->
-
+ 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.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">