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 2014/03/27 17:37:00 UTC
[1/2] git commit: changing out sequence regex. Regex is expecting a
port, but when apps are running on default ports, URL don't have a port
Repository: incubator-stratos
Updated Branches:
refs/heads/master 71c537954 -> 623e37eb1
changing out sequence regex. Regex is expecting a port, but when apps are running on default ports, URL don't have a port
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4ea2a281
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4ea2a281
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4ea2a281
Branch: refs/heads/master
Commit: 4ea2a28181913a05a78290321339feb20576f6af
Parents: e20b3ea
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Mar 27 12:35:11 2014 -0400
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Mar 27 12:35:11 2014 -0400
----------------------------------------------------------------------
.../src/main/conf/synapse-configs/default/sequences/main.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4ea2a281/products/load-balancer/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml b/products/load-balancer/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
index 39c67f3..5e24684 100644
--- a/products/load-balancer/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
+++ b/products/load-balancer/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
@@ -40,10 +40,10 @@
<!-- Updating location value in response header -->
<filter regex=".+" source="$trp:Location">
- <property expression="$ctx:SERVICE_PREFIX" group="2" name="LB_SP_HOST_NAME" pattern="(^http.?://\b)(.*):(\d*)(.*)"/>
- <property expression="$trp:Location" group="1" name="EP_RESPONSE_LOC_PROTOCOL" pattern="(^http.?://\b)(.*):(\d*)(.*)"/>
- <property expression="$trp:Location" group="2" name="EP_RESPONSE_LOC_HOST_NAME" pattern="(^http.?://\b)(.*):(\d*)(.*)"/>
- <property expression="$trp:Location" group="4" name="EP_RESPONSE_LOC_PATH" pattern="(^http.?://\b)(.*):(\d*)(.*)"/>
+ <property expression="$ctx:SERVICE_PREFIX" group="2" name="LB_SP_HOST_NAME" pattern="(^http.?:\/\/\b)(\d*.\d.\d.\d*.\d*)(?::(\d*))?(.*)"/>
+ <property expression="$trp:Location" group="1" name="EP_RESPONSE_LOC_PROTOCOL" pattern="(^http.?:\/\/\b)(\d*.\d.\d.\d*.\d*)(?::(\d*))?(.*)"/>
+ <property expression="$trp:Location" group="2" name="EP_RESPONSE_LOC_HOST_NAME" pattern="(^http.?:\/\/\b)(\d*.\d.\d.\d*.\d*)(?::(\d*))?(.*)"/>
+ <property expression="$trp:Location" group="4" name="EP_RESPONSE_LOC_PATH" pattern="(^http.?:\/\/\b)(\d*.\d.\d.\d*.\d*)(?::(\d*))?(.*)"/>
<switch source="fn:lower-case($ctx:EP_RESPONSE_LOC_PROTOCOL)">
<case regex="https://">
[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/623e37eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/623e37eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/623e37eb
Branch: refs/heads/master
Commit: 623e37eb1e1a0fa995f57ca715f085228270feed
Parents: 4ea2a28 71c5379
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Mar 27 12:36:17 2014 -0400
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Mar 27 12:36:17 2014 -0400
----------------------------------------------------------------------
.../topology/TopologyEventMessageQueue.java | 21 +-
.../java/org/apache/stratos/cli/Command.java | 2 +-
.../stratos/cli/CommandLineApplication.java | 10 +-
.../apache/stratos/cli/CommandLineService.java | 10 +-
.../apache/stratos/cli/GenericRestClient.java | 15 +-
.../java/org/apache/stratos/cli/RestClient.java | 73 ++--
.../stratos/cli/RestCommandLineService.java | 198 +++++-----
.../apache/stratos/cli/StratosApplication.java | 67 +++-
.../apache/stratos/cli/WebClientWrapper.java | 1 +
.../stratos/cli/commands/SyncCommand.java | 8 +-
.../console/controllers/mycartridges.jag | 15 +
.../console/data/clusters.json | 391 +++++--------------
.../themes/theme1/partials/cartridges.hbs | 107 +++--
.../themes/theme1/partials/mycartridges.hbs | 86 ++--
.../themes/theme1/renderers/cartridges.js | 30 +-
.../console/themes/theme1/renderers/index.js | 45 ++-
.../console/themes/theme1/ui/css/main.css | 9 +
.../console/themes/theme1/ui/js/mycartridges.js | 11 +
.../console/util/utility.jag | 6 +
.../repository/RepositoryNotification.java | 39 +-
.../ClusterCreatedMessageProcessor.java | 16 +-
.../ClusterRemovedMessageProcessor.java | 17 +-
.../InstanceSpawnedMessageProcessor.java | 31 +-
.../MemberActivatedMessageProcessor.java | 26 +-
.../MemberMaintenanceModeProcessor.java | 21 +-
.../MemberReadyToShutdownMessageProcessor.java | 21 +-
.../topology/MemberStartedMessageProcessor.java | 21 +-
.../MemberSuspendedMessageProcessor.java | 21 +-
.../MemberTerminatedMessageProcessor.java | 25 +-
.../ServiceCreatedMessageProcessor.java | 19 +-
.../ServiceRemovedMessageProcessor.java | 15 +-
.../topology/TopologyMessageProcessorChain.java | 1 +
.../topology/TopologyEventMessageDelegator.java | 2 +-
.../rest/endpoint/services/ServiceUtils.java | 15 +
.../rest/endpoint/services/StratosAdmin.java | 11 +
tools/puppet3/manifests/nodes.pp | 1 +
.../jndi.properties.activemq.template.erb | 25 --
.../conf/templates/jndi.properties.template.erb | 15 +-
tools/puppet3/modules/lb/manifests/init.pp | 1 +
.../conf/templates/jndi.properties.template.erb | 33 ++
40 files changed, 781 insertions(+), 700 deletions(-)
----------------------------------------------------------------------