You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ch...@apache.org on 2014/07/08 21:55:06 UTC
[1/2] git commit: removing references to 'incubator'
Repository: stratos
Updated Branches:
refs/heads/master ed8258529 -> 87fa88347
removing references to 'incubator'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7b50cd90
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7b50cd90
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7b50cd90
Branch: refs/heads/master
Commit: 7b50cd907dec89aa7d17a4310e4b14d205163cb8
Parents: 2bab7e4
Author: R-Rajkumar <rr...@gmail.com>
Authored: Mon Jul 7 14:37:53 2014 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Mon Jul 7 15:32:48 2014 +0530
----------------------------------------------------------------------
.../src/test/python/README.md | 6 ++---
.../console/error.html | 2 +-
.../src/main/resources/META-INF/product.xml | 6 ++---
pom.xml | 24 +++++++++-----------
products/load-balancer/README.txt | 2 +-
products/stratos-cli/README.txt | 2 +-
6 files changed, 20 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7b50cd90/components/org.apache.stratos.cli/src/test/python/README.md
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/test/python/README.md b/components/org.apache.stratos.cli/src/test/python/README.md
index ec88cef..7799c46 100644
--- a/components/org.apache.stratos.cli/src/test/python/README.md
+++ b/components/org.apache.stratos.cli/src/test/python/README.md
@@ -18,13 +18,13 @@ Set the environment variables CLI_JAR, PYTHONPATH and WIREMOCK_JAR, WIREMOCK_HTT
```
# the stratos CLI_JAR
-export CLI_JAR=~/incubator-stratos/components/org.apache.stratos.cli/target/org.apache.stratos.cli-4.0.0-SNAPSHOT.jar
+export CLI_JAR=~/stratos/components/org.apache.stratos.cli/target/org.apache.stratos.cli-4.0.0-SNAPSHOT.jar
# set the PYTHONPATH to include pexpect
-export PYTHONPATH=$PYTHONPATH:~/incubator-stratos/components/org.apache.stratos.cli/target/pexpect-3.2
+export PYTHONPATH=$PYTHONPATH:~/stratos/components/org.apache.stratos.cli/target/pexpect-3.2
# the wiremock application
-export WIREMOCK_JAR=~/incubator-stratos/components/org.apache.stratos.cli/target/dependency/wiremock-1.46-standalone.jar
+export WIREMOCK_JAR=~/stratos/components/org.apache.stratos.cli/target/dependency/wiremock-1.46-standalone.jar
# wiremock's http port
export WIREMOCK_HTTP_PORT=8080
http://git-wip-us.apache.org/repos/asf/stratos/blob/7b50cd90/components/org.apache.stratos.manager.console/console/error.html
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/error.html b/components/org.apache.stratos.manager.console/console/error.html
index a03d00b..c4436ec 100644
--- a/components/org.apache.stratos.manager.console/console/error.html
+++ b/components/org.apache.stratos.manager.console/console/error.html
@@ -89,7 +89,7 @@
<p>Please report your problem by creating a JIRA at <a href="https://issues.apache.org/jira/browse/STRATOS">https://issues.apache.org/jira/browse/STRATOS</a>.</p>
<p>
Or drop a mail to our developer list as described in
- <a href="http://stratos.incubator.apache.org/community/mailing-lists.html">http://stratos.incubator.apache.org/community/mailing-lists.html</a>
+ <a href="http://stratos.apache.org/community/mailing-lists.html">http://stratos.apache.org/community/mailing-lists.html</a>
</p>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/stratos/blob/7b50cd90/components/org.apache.stratos.manager.styles/src/main/resources/META-INF/product.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.styles/src/main/resources/META-INF/product.xml b/components/org.apache.stratos.manager.styles/src/main/resources/META-INF/product.xml
index e2228bf..5fae283 100644
--- a/components/org.apache.stratos.manager.styles/src/main/resources/META-INF/product.xml
+++ b/components/org.apache.stratos.manager.styles/src/main/resources/META-INF/product.xml
@@ -18,9 +18,9 @@
-->
<product xmlns="http://products.wso2.org/carbon">
<properties>
- <property name="userforum">http://stratos.incubator.apache.org/community/mailing-lists.html</property>
- <property name="userguide">http://stratos.incubator.apache.org/index.html</property>
- <property name="mailinglist">http://stratos.incubator.apache.org/community/mailing-lists.html</property>
+ <property name="userforum">http://stratos.apache.org/community/mailing-lists.html</property>
+ <property name="userguide">http://stratos.apache.org/index.html</property>
+ <property name="mailinglist">http://stratos.apache.org/community/mailing-lists.html</property>
<property name="issuetracker">https://issues.apache.org/jira/browse/STRATOS</property>
<property name="webAdminConsoleTitle">Apache Stratos Controller</property>
</properties>
http://git-wip-us.apache.org/repos/asf/stratos/blob/7b50cd90/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 856a615..e38caf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<version>4.0.0-SNAPSHOT</version>
<name>Apache Stratos</name>
<description>Apache Stratos is an open source polyglot Platform as a Service (PaaS) framework</description>
- <url>http://stratos.incubator.apache.org</url>
+ <url>http://stratos.apache.org</url>
<inceptionYear>2012</inceptionYear>
<licenses>
@@ -57,23 +57,23 @@
<mailingLists>
<mailingList>
<name>Developer List</name>
- <subscribe>dev-subscribe@stratos.incubator.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@stratos.incubator.apache.org</unsubscribe>
- <post>dev@stratos.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-stratos-dev/</archive>
+ <subscribe>dev-subscribe@stratos.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@stratos.apache.org</unsubscribe>
+ <post>dev@stratos.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/stratos-dev/</archive>
</mailingList>
<mailingList>
<name>Commits List</name>
- <subscribe>commits-subscribe@stratos.incubator.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@stratos.incubator.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-stratos-commits/</archive>
+ <subscribe>commits-subscribe@stratos.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@stratos.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/stratos-commits/</archive>
</mailingList>
</mailingLists>
<scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-stratos.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-stratos.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-stratos.git</url>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/stratos.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/stratos.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=stratos.git</url>
<tag>HEAD</tag>
</scm>
@@ -434,8 +434,6 @@
</goals>
<configuration>
<resourceBundles>
- <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1
- </resourceBundle>
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
</resourceBundles>
</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/7b50cd90/products/load-balancer/README.txt
----------------------------------------------------------------------
diff --git a/products/load-balancer/README.txt b/products/load-balancer/README.txt
index 2764c46..c3a5b56 100755
--- a/products/load-balancer/README.txt
+++ b/products/load-balancer/README.txt
@@ -100,7 +100,7 @@ or in the JIRA issue tracker. If you are sending an email to the mailing
list make sure to add the [Apache Stratos] prefix to the subject.
Mailing list subscription:
- dev-subscribe@stratos.incubator.apache.org
+ dev-subscribe@stratos.apache.org
Issue Tracker
http://git-wip-us.apache.org/repos/asf/stratos/blob/7b50cd90/products/stratos-cli/README.txt
----------------------------------------------------------------------
diff --git a/products/stratos-cli/README.txt b/products/stratos-cli/README.txt
index 1f07f8a..d88b2e6 100755
--- a/products/stratos-cli/README.txt
+++ b/products/stratos-cli/README.txt
@@ -97,7 +97,7 @@ or in the JIRA issue tracker. If you are sending an email to the mailing
list make sure to add the [Apache Stratos] prefix to the subject.
Mailing list subscription:
- dev-subscribe@stratos.incubator.apache.org
+ dev-subscribe@stratos.apache.org
Issue Tracker
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos into PR-4
Posted by ch...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos into PR-4
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/87fa8834
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/87fa8834
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/87fa8834
Branch: refs/heads/master
Commit: 87fa88347b6b664ebe6472b6fb1a347620b0842e
Parents: 7b50cd9 ed82585
Author: vagrant <va...@puppet.stratos.com>
Authored: Tue Jul 8 19:53:22 2014 +0000
Committer: vagrant <va...@puppet.stratos.com>
Committed: Tue Jul 8 19:53:22 2014 +0000
----------------------------------------------------------------------
.../extension/api/LoadBalancerExtension.java | 13 +-
.../rest/endpoint/services/StratosAdmin.java | 130 ++++++++++---------
.../stratos/haproxy/extension/HAProxy.java | 3 +
.../haproxy/extension/HAProxyConfigWriter.java | 5 +
.../extension/HAProxyStatisticsReader.java | 5 +-
5 files changed, 85 insertions(+), 71 deletions(-)
----------------------------------------------------------------------