You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2018/01/24 15:30:45 UTC
[1/2] tomee git commit: better handle retrieving provider location
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x e3867f851 -> f43a2d2cd
better handle retrieving provider location
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ab87365f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ab87365f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ab87365f
Branch: refs/heads/tomee-1.7.x
Commit: ab87365f6040dfe66d70839a1b7ed0061e11fe64
Parents: 8b2ef1f
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Wed Jan 24 13:24:48 2018 -0200
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Wed Jan 24 13:28:40 2018 -0200
----------------------------------------------------------------------
tomee/tomee-webapp/src/main/webapp/app.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/ab87365f/tomee/tomee-webapp/src/main/webapp/app.js
----------------------------------------------------------------------
diff --git a/tomee/tomee-webapp/src/main/webapp/app.js b/tomee/tomee-webapp/src/main/webapp/app.js
index 4c4638e..5dcbf09 100644
--- a/tomee/tomee-webapp/src/main/webapp/app.js
+++ b/tomee/tomee-webapp/src/main/webapp/app.js
@@ -62,7 +62,7 @@ $(function () {
$('.ux-server-ready-panel').removeClass('ux-hidden');
var providerLink = $($('.ux-provider-url').get(0));
providerLink.attr('href', window.location.href + 'ejb');
- providerLink.html(window.location.href + 'ejb');
+ providerLink.html(window.location.origin + window.location.pathname + 'ejb');
} else if (systemStatus.status === 'REBOOT_REQUIRED') {
$('.ux-installer-reboot-panel').removeClass('ux-hidden');
} else {
[2/2] tomee git commit: Merge branch 'tomee-1.7.x' of
https://git-wip-us.apache.org/repos/asf/tomee into 17x
Posted by tv...@apache.org.
Merge branch 'tomee-1.7.x' of https://git-wip-us.apache.org/repos/asf/tomee into 17x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f43a2d2c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f43a2d2c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f43a2d2c
Branch: refs/heads/tomee-1.7.x
Commit: f43a2d2cdaff62c6ba545fae237f47f7997d42a2
Parents: ab87365 e3867f8
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Wed Jan 24 13:29:49 2018 -0200
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Wed Jan 24 13:29:49 2018 -0200
----------------------------------------------------------------------
.../openejb/assembler/classic/AppInfo.java | 1 -
.../openejb/assembler/classic/Assembler.java | 7 +-
.../assembler/classic/ContainerInfo.java | 1 +
.../apache/openejb/config/AppInfoBuilder.java | 16 ++-
.../apache/openejb/config/ContainerUtils.java | 6 +
.../openejb/config/ApplicationWideTest.java | 116 +++++++++++++++++++
6 files changed, 133 insertions(+), 14 deletions(-)
----------------------------------------------------------------------