You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/09/03 06:29:18 UTC
[1/2] git commit: Removing wso2server.sh from Stratos Controller
Updated Branches:
refs/heads/master 55cab1e4a -> f7f2ae098
Removing wso2server.sh from Stratos Controller
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/930fad81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/930fad81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/930fad81
Branch: refs/heads/master
Commit: 930fad811f4d71e657c1a17c64366f5333e0bfa4
Parents: 48b34e1
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Sep 3 09:56:23 2013 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Sep 3 09:56:23 2013 +0530
----------------------------------------------------------------------
.../modules/distribution/src/assembly/bin.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/930fad81/products/stratos-controller/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/distribution/src/assembly/bin.xml b/products/stratos-controller/modules/distribution/src/assembly/bin.xml
index ba2abbe..3d0b9b5 100755
--- a/products/stratos-controller/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos-controller/modules/distribution/src/assembly/bin.xml
@@ -29,7 +29,7 @@
<outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
<excludes>
<exclude>**/*.sh</exclude>
- <exclude>**/wso2server.bat</exclude>
+ <exclude>**/wso2server.bat</exclude>
<exclude>**/axis2services/sample01.aar</exclude>
<exclude>**/axis2services/echo/**</exclude>
<exclude>**/axis2services/version/**</exclude>
@@ -74,9 +74,9 @@
<outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
<excludes>
<exclude>**/daemon.sh</exclude>
- <exclude>**/stratos.bat</exclude>
- <exclude>**/stratos.sh</exclude>
- <exclude>**/log4j.properties</exclude>
+ <exclude>**/log4j.properties</exclude>
+ <exclude>**/wso2server.sh</exclude>
+ <exclude>**/wso2server.bat</exclude>
</excludes>
<includes>
<include>**/*.sh</include>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@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/f7f2ae09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f7f2ae09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f7f2ae09
Branch: refs/heads/master
Commit: f7f2ae09843e253ab9d1ad54f286bf7c5cc47f3c
Parents: 930fad8 55cab1e
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Sep 3 09:58:49 2013 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Sep 3 09:58:49 2013 +0530
----------------------------------------------------------------------
products/cloud-controller/LICENSE | 614 ++++++++
products/cloud-controller/LICENSE.txt | 614 --------
.../distribution/src/main/assembly/bin.xml | 11 +-
.../distribution/src/main/license/LICENSE | 924 ++++++++++++
.../modules/distribution/src/main/notice/NOTICE | 114 ++
products/elb/LICENSE.txt | 386 -----
.../distribution/src/main/assembly/bin.xml | 10 +-
.../distribution/src/main/license/LICENSE | 1320 ++++++++++++++++++
.../modules/distribution/src/main/notice/NOTICE | 777 +++++++++++
.../modules/distribution/src/assembly/bin.xml | 9 +-
.../modules/distribution/src/main/notice/NOTICE | 702 ++++++++++
.../modules/p2-profile-gen/pom.xml | 8 +-
tools/cartridge_create/create_kvm_image.sh | 23 +-
13 files changed, 4502 insertions(+), 1010 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7f2ae09/products/stratos-controller/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------