You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/08/01 04:29:14 UTC
[1/3] stratos git commit: removed wso2-as.json
Repository: stratos
Updated Branches:
refs/heads/master 171709053 -> 6332853cd
removed wso2-as.json
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6332853c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6332853c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6332853c
Branch: refs/heads/master
Commit: 6332853cd174ef613a02b73c22da6722049edf00
Parents: 88321ad
Author: WSO2 Cloud <cl...@wso2.com>
Authored: Wed Jul 29 10:21:04 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Aug 1 07:59:00 2015 +0530
----------------------------------------------------------------------
samples/cartridges/kubernetes/wso2-as.json | 57 -------------------------
1 file changed, 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6332853c/samples/cartridges/kubernetes/wso2-as.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/wso2-as.json b/samples/cartridges/kubernetes/wso2-as.json
deleted file mode 100755
index 52e4fea..0000000
--- a/samples/cartridges/kubernetes/wso2-as.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
- "type": "wso2as",
- "provider": "wso2",
- "category": "framework",
- "host": "wso2as.stratos.org",
- "displayName": "WSO2 AS 5.2.1",
- "description": "WSO2 AS 5.2.1 Cartridge",
- "version": "5.2.1",
- "multiTenant": "false",
- "loadBalancingIPType": "public",
- "portMapping": [
- {
- "name": "http-9763",
- "protocol": "http",
- "port": "9763",
- "proxyPort": "8280"
- },
- {
- "name": "http-9443",
- "protocol": "https",
- "port": "9443",
- "proxyPort": "8243"
- }
-
- ],
- "deployment": {
- "baseDir": "/var/www"
- },
- "iaasProvider": [
- {
- "type": "kubernetes",
- "imageId": "wso2/as:5.2.1",
- "networkInterfaces": [
- ],
- "property": [
- ]
- }
- ],
- "property": [
- {
- "name": "KUBERNETES_CONTAINER_CPU",
- "value": "0"
- },
- {
- "name": "KUBERNETES_CONTAINER_MEMORY",
- "value": "0"
- },
- {
- "name": "KUBERNETES_SERVICE_SESSION_AFFINITY",
- "value": "ClientIP"
- },
- {
- "name": "payload_parameter.START_CMD",
- "value": "PCA"
- }
- ]
-}
[2/3] stratos git commit: fixed git clone issue by removing unwanted
space from password
Posted by im...@apache.org.
fixed git clone issue by removing unwanted space from password
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/88321ad4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/88321ad4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/88321ad4
Branch: refs/heads/master
Commit: 88321ad4bbffabf1d3889db3cc61929fcb2881db
Parents: 30dcd78
Author: WSO2 Cloud <cl...@wso2.com>
Authored: Wed Jul 29 10:15:46 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Aug 1 07:59:00 2015 +0530
----------------------------------------------------------------------
.../cartridge.agent/modules/artifactmgt/git/agentgithandler.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/88321ad4/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
index c23d33b..c00e07e 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
@@ -255,15 +255,15 @@ class AgentGitHandler:
return repo_info.repo_url
else:
# credentials wrong, need to replace
- return str(url_split[0] + "//" + repo_info.repo_username + ":" + repo_info.repo_password + "@" +
+ return str(url_split[0] + "//" + repo_info.repo_username + ":" + repo_info.repo_password.strip() + "@" +
at_split[1])
else:
# only username is provided, need to include password
- return str(url_split[0] + "//" + repo_info.repo_username + ":" + repo_info.repo_password + "@" +
+ return str(url_split[0] + "//" + repo_info.repo_username + ":" + repo_info.repo_password.strip() + "@" +
at_split[1])
else:
# no credentials in the url, need to include username and password
- return str(url_split[0] + "//" + repo_info.repo_username + ":" + repo_info.repo_password + "@" +
+ return str(url_split[0] + "//" + repo_info.repo_username + ":" + repo_info.repo_password.strip() + "@" +
url_split[1])
# no credentials specified, return as is
return repo_info.repo_url
[3/3] stratos git commit: adding wso-as.json
Posted by im...@apache.org.
adding wso-as.json
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/30dcd78d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/30dcd78d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/30dcd78d
Branch: refs/heads/master
Commit: 30dcd78def18c2936642cfdc12a2fdcd3e0ac074
Parents: 1717090
Author: Punnadi Gunarathna <pu...@wso2.com>
Authored: Wed Jun 24 14:09:07 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Aug 1 07:59:00 2015 +0530
----------------------------------------------------------------------
samples/cartridges/kubernetes/wso2-as.json | 57 +++++++++++++++++++++++++
1 file changed, 57 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/30dcd78d/samples/cartridges/kubernetes/wso2-as.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/wso2-as.json b/samples/cartridges/kubernetes/wso2-as.json
new file mode 100755
index 0000000..52e4fea
--- /dev/null
+++ b/samples/cartridges/kubernetes/wso2-as.json
@@ -0,0 +1,57 @@
+{
+ "type": "wso2as",
+ "provider": "wso2",
+ "category": "framework",
+ "host": "wso2as.stratos.org",
+ "displayName": "WSO2 AS 5.2.1",
+ "description": "WSO2 AS 5.2.1 Cartridge",
+ "version": "5.2.1",
+ "multiTenant": "false",
+ "loadBalancingIPType": "public",
+ "portMapping": [
+ {
+ "name": "http-9763",
+ "protocol": "http",
+ "port": "9763",
+ "proxyPort": "8280"
+ },
+ {
+ "name": "http-9443",
+ "protocol": "https",
+ "port": "9443",
+ "proxyPort": "8243"
+ }
+
+ ],
+ "deployment": {
+ "baseDir": "/var/www"
+ },
+ "iaasProvider": [
+ {
+ "type": "kubernetes",
+ "imageId": "wso2/as:5.2.1",
+ "networkInterfaces": [
+ ],
+ "property": [
+ ]
+ }
+ ],
+ "property": [
+ {
+ "name": "KUBERNETES_CONTAINER_CPU",
+ "value": "0"
+ },
+ {
+ "name": "KUBERNETES_CONTAINER_MEMORY",
+ "value": "0"
+ },
+ {
+ "name": "KUBERNETES_SERVICE_SESSION_AFFINITY",
+ "value": "ClientIP"
+ },
+ {
+ "name": "payload_parameter.START_CMD",
+ "value": "PCA"
+ }
+ ]
+}