You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2005/12/29 10:48:16 UTC
svn commit: r359766 - in /james/server/trunk/src: conf/
java/org/apache/james/remotemanager/
Author: bago
Date: Thu Dec 29 01:48:08 2005
New Revision: 359766
URL: http://svn.apache.org/viewcvs?rev=359766&view=rev
Log:
Added an optional "prompt" configuration to the Remote Manager handler (Verified and applied patch JAMES-423 by Arjan Veenstra)
Modified:
james/server/trunk/src/conf/james-config.xml
james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.java
james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java
Modified: james/server/trunk/src/conf/james-config.xml
URL: http://svn.apache.org/viewcvs/james/server/trunk/src/conf/james-config.xml?rev=359766&r1=359765&r2=359766&view=diff
==============================================================================
--- james/server/trunk/src/conf/james-config.xml (original)
+++ james/server/trunk/src/conf/james-config.xml Thu Dec 29 01:48:08 2005
@@ -577,6 +577,10 @@
<account login="root" password="root"/>
</administrator_accounts>
<connectiontimeout> 60000 </connectiontimeout>
+ <!-- The prompt directive adds a prompt to every output from RemoteManager -->
+ <!--
+ <prompt>james></prompt>
+ -->
</handler>
</remotemanager>
Modified: james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.java
URL: http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.java?rev=359766&r1=359765&r2=359766&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.java (original)
+++ james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.java Thu Dec 29 01:48:08 2005
@@ -66,6 +66,11 @@
private UsersRepository users;
/**
+ * The service prompt to be displayed when waiting for input.
+ */
+ private String prompt = "";
+
+ /**
* The reference to the internal MailServer service
*/
private MailServer mailServer;
@@ -122,6 +127,10 @@
adminAccounts.put( accounts[ i ].getAttribute( "login" ),
accounts[ i ].getAttribute( "password" ) );
}
+ Configuration promtConfiguration = handlerConfiguration.getChild("prompt", false);
+ if (promtConfiguration != null) prompt = promtConfiguration.getValue();
+ if (prompt == null) prompt = "";
+ else if (!prompt.equals("") && !prompt.endsWith(" ")) prompt += " ";
}
}
@@ -259,6 +268,13 @@
*/
public HashMap getAdministrativeAccountData() {
return RemoteManager.this.adminAccounts;
+ }
+
+ /**
+ * @see org.apache.james.remotemanager.RemoteManagerHandlerConfigurationData#getPrompt()
+ */
+ public String getPrompt() {
+ return RemoteManager.this.prompt;
}
}
Modified: james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
URL: http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java?rev=359766&r1=359765&r2=359766&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java (original)
+++ james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java Thu Dec 29 01:48:08 2005
@@ -298,9 +298,13 @@
}
try {
+ out.print(theConfigData.getPrompt());
+ out.flush();
theWatchdog.start();
while (parseCommand(in.readLine())) {
theWatchdog.reset();
+ out.print(theConfigData.getPrompt());
+ out.flush();
}
theWatchdog.stop();
} catch (IOException ioe) {
Modified: james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java
URL: http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java?rev=359766&r1=359765&r2=359766&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java (original)
+++ james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java Thu Dec 29 01:48:08 2005
@@ -67,4 +67,11 @@
*/
HashMap getAdministrativeAccountData();
+ /**
+ * Returns the prompt to be displayed when waiting for input. e.g. "james> ".
+ *
+ * @return the configured prompt, or an empty string when the prompt is not configured.
+ */
+ String getPrompt();
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org