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 2012/12/04 19:45:15 UTC
svn commit: r1417111 - in /openejb/trunk/openejb/tomee/tomee-webapp/src/main:
java/org/apache/tomee/webapp/ java/org/apache/tomee/webapp/command/impl/
webapp/app/js/ webapp/app/js/templates/ webapp/app/js/util/
webapp/app/js/view/panels/
Author: tveronezi
Date: Tue Dec 4 18:45:13 2012
New Revision: 1417111
URL: http://svn.apache.org/viewvc?rev=1417111&view=rev
Log:
Use dynamic port and protocol values.
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/Application.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/command/impl/Login.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console-sample.handlebars
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/Application.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/Application.java?rev=1417111&r1=1417110&r2=1417111&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/Application.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/Application.java Tue Dec 4 18:45:13 2012
@@ -88,10 +88,11 @@ public class Application {
return context;
}
- public Context login(String user, String pass) {
+ public Context login(String user, String pass, String protocol, String port) {
+ final String addr = protocol + "://127.0.0.1:" + port + "/" + this.rootFolder.getName() + "/ejb";
final Properties props = new Properties();
props.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
- props.put("java.naming.provider.url", "http://127.0.0.1:8080/" + this.rootFolder.getName() + "/ejb");
+ props.put("java.naming.provider.url", addr);
props.setProperty(Context.SECURITY_PRINCIPAL, user);
props.setProperty(Context.SECURITY_CREDENTIALS, pass);
try {
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/command/impl/Login.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/command/impl/Login.java?rev=1417111&r1=1417110&r2=1417111&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/command/impl/Login.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/command/impl/Login.java Tue Dec 4 18:45:13 2012
@@ -31,10 +31,12 @@ public class Login implements Command {
final Application.Session session = Application.getInstance().getSession(sessionId);
final String user = (String) params.get("user");
final String pass = (String) params.get("pass");
+ final String port = (String) params.get("port");
+ final String protocol = (String) params.get("protocol");
final Map<String, Object> result = new HashMap<String, Object>();
- if (session.login(user, pass) == null) {
+ if (session.login(user, pass, protocol, port) == null) {
result.put("loginSuccess", Boolean.FALSE);
} else {
result.put("loginSuccess", Boolean.TRUE);
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js?rev=1417111&r1=1417110&r2=1417111&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js Tue Dec 4 18:45:13 2012
@@ -47,7 +47,13 @@ TOMEE.ApplicationController = function (
model.sendMessage({
cmdName:'Login',
user:data.user,
- pass:data.pass
+ pass:data.pass,
+ port:window.location.port,
+ protocol: (function() {
+ var protocol = window.location.protocol;
+ protocol = protocol.replace(':', '');
+ return protocol;
+ })()
});
});
@@ -91,7 +97,7 @@ TOMEE.ApplicationController = function (
growl.showNotification(TOMEE.I18N.get('application.console.run.error'), 'error');
});
- channel.bind('ui-actions', 'show-notification', function(data) {
+ channel.bind('ui-actions', 'show-notification', function (data) {
growl.showNotification(data.message, data.messageType);
});
@@ -106,7 +112,7 @@ TOMEE.ApplicationController = function (
channel.bind('server-command-callback-success', 'Login', function (params) {
if (params.output.loginSuccess) {
growl.showNotification(TOMEE.I18N.get('application.log.hello', {
- userName: params.params.user
+ userName:params.params.user
}), 'success');
} else {
growl.showNotification(TOMEE.I18N.get('application.log.bad'), 'error');
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console-sample.handlebars
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console-sample.handlebars?rev=1417111&r1=1417110&r2=1417111&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console-sample.handlebars (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console-sample.handlebars Tue Dec 4 18:45:13 2012
@@ -5,11 +5,12 @@ var myImports = new JavaImporter(
);
with (myImports) {
+ var port = TomcatHelper.getServer().getPort();
var p = new Properties();
p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
- p.put("java.naming.provider.url", "http://localhost:8080/tomee/ejb");
- p.put("java.naming.security.principal", "tomee");
- p.put("java.naming.security.credentials", "tomee");
+ p.put("java.naming.provider.url", "{{protocol}}://localhost:{{port}}/tomee/ejb");
+ p.put("java.naming.security.principal", "{{name}}");
+ p.put("java.naming.security.credentials", "{{password}}");
var ctx = new InitialContext(p);
var myBean = ctx.lookup("openejb/UserBusinessRemote");
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js?rev=1417111&r1=1417110&r2=1417111&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js Tue Dec 4 18:45:13 2012
@@ -44,6 +44,7 @@ TOMEE.I18N = (function () {
'application.console.run.error':'Script error.',
'application.console.clear.output':'Clear output',
'application.console.done':'Script executed.',
+ 'application.console.password':'[Your password goes here]',
'application.console.run.time':'Time',
'application.console.run.output.empty':'Empty',
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js?rev=1417111&r1=1417110&r2=1417111&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js Tue Dec 4 18:45:13 2012
@@ -30,6 +30,14 @@ TOMEE.ApplicationTabConsole = function (
var active = false;
var locked = true;
var delayedContainerResize = TOMEE.DelayedTask();
+ var userName = null;
+
+ channel.bind('server-command-callback-success', 'Login', function (params) {
+ userName = params.params.user;
+ });
+ channel.bind('server-command-callback-success', 'session', function (params) {
+ userName = params.data.userName;
+ });
function setLocked(value) {
locked = value;
@@ -163,7 +171,16 @@ TOMEE.ApplicationTabConsole = function (
if (!codeArea) {
codeArea = CodeMirror(container.children('.tomee-code').get(0), {
lineNumbers:true,
- value:TOMEE.ApplicationTemplates.getValue('application-tab-console-sample', {})
+ value:TOMEE.ApplicationTemplates.getValue('application-tab-console-sample', {
+ port:window.location.port,
+ protocol: (function() {
+ var protocol = window.location.protocol;
+ protocol = protocol.replace(':', '');
+ return protocol;
+ })(),
+ name: userName,
+ password:TOMEE.I18N.get('application.console.password')
+ })
});
}
codeArea.focus();