Author: tveronezi
Date: Fri Nov 23 22:30:24 2012
New Revision: 1413094
URL: http://svn.apache.org/viewvc?rev=1413094&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-607
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/command/impl/RunInstaller.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-status.handlebars
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/status.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/command/impl/RunInstaller.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/command/impl/RunInstaller.java?rev=1413094&r1=1413093&r2=1413094&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/command/impl/RunInstaller.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/command/impl/RunInstaller.java
Fri Nov 23 22:30:24 2012
@@ -65,6 +65,25 @@ public class RunInstaller implements Com
json.put("warnings", installer.getAlerts().getWarnings());
json.put("infos", installer.getAlerts().getInfos());
+ final Map<String, Object> test = new HashMap<String, Object>();
+ test.put("hashHome", false);
+ test.put("doesHomeExist", false);
+ test.put("isHomeDirectory", false);
+ test.put("hasLibDirectory", false);
+
+ json.put("test", test);
+
+ final String homePath = System.getProperty("openejb.home");
+ if(homePath != null) {
+ final File homeDir = new File(homePath);
+ test.put("doesHomeExist", homeDir.exists());
+ if(homeDir.exists()) {
+ test.put("isHomeDirectory", homeDir.isDirectory());
+ final File libDir = new File(homeDir, "lib");
+ test.put("hasLibDirectory", libDir.exists());
+ }
+ }
+
return json;
}
}
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-status.handlebars
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-status.handlebars?rev=1413094&r1=1413093&r2=1413094&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-status.handlebars
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-status.handlebars
Fri Nov 23 22:30:24 2012
@@ -3,12 +3,9 @@
<div class="navbar navbar-inverse bbar">
<div class="navbar-inner">
<div class="buttons">
- <button class="btn btn-primary hidden install">
+ <button class="btn btn-primary install" disabled>
<span>{{i18n "application.status.install"}}</span>
</button>
- <button class="btn btn-primary hidden reinstall">
- <span>{{i18n "application.status.reinstall"}}</span>
- </button>
</div>
</div>
</div>
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/status.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/status.js?rev=1413094&r1=1413093&r2=1413094&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/status.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/status.js
Fri Nov 23 22:30:24 2012
@@ -109,22 +109,12 @@ TOMEE.ApplicationTabStatus = function ()
buttons.find('.install').each(function (index, element) {
var btn = $(element);
if (data.output.isAgentInstalled || data.output.isAgentInstalled) {
- btn.addClass('hidden');
+ btn.prop('disabled', true);
} else {
- btn.removeClass('hidden');
+ btn.prop('disabled', false);
}
});
- buttons.find('.reinstall').each(function (index, element) {
- var btn = $(element);
- if (!data.output.isAgentInstalled &&
!data.output.isListenerInstalled) {
- btn.addClass('hidden');
- } else {
- btn.removeClass('hidden');
- }
- });
-
-
showAlert([
TOMEE.I18N.get('application.status.isAgentInstalled', {
message:data.output.isAgentInstalled + ''
