comsuite-svn Mailing List for Communications Suite (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 177
          http://svn.sourceforge.net/comsuite/?rev=177&view=rev
Author:   skuzniak
Date:     2006-10-01 11:45:04 -0700 (Sun, 01 Oct 2006)

Log Message:
-----------
full internationalization added to messages and users,some other changes

Modified Paths:
--------------
    trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java
    trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java
    trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java
    trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java
    trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties
    trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java
    trunk/code/CSMiddleware/src/org/commsuite/sap/ISAPComm.java
    trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
    trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
    trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java

Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java
===================================================================

--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java	2006-10-01 17:21:08 UTC (rev 176)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java	2006-10-01 18:45:04 UTC (rev 177)
@@ -20,15 +20,11 @@
  */
 package org.commsuite.web.beans;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.MissingResourceException;
-import java.util.Properties;
 import java.util.ResourceBundle;
 
 import javax.faces.application.FacesMessage;
@@ -50,12 +46,8 @@
 
     private static final Locale DEFAULT_LOCALE = Locale.ENGLISH;
     
-    private static final String LOCALE_FILENAME = "webapps/CommunicationsSuiteAdmin/WEB-INF/classes/org/commsuite/web/locale/Locale_";
-    
     private static final String LOCALE_CLASSNAME = "org.commsuite.web.locale.Locale";
 
-	private static final String LOCALE_EXTENSION = ".properties";
-
     private List<SelectItem> supportedLanguages;
 
     /**
@@ -200,22 +192,6 @@
     }
     
     public static String getLabel(String labelName) {
-    	/*String locale = FacesContext.getCurrentInstance().getViewRoot()
-    			.getLocale().toString();
-    	Properties p = new Properties();
-    	String tomcatCatalog = new File(".").getAbsolutePath();
-    	tomcatCatalog = tomcatCatalog.replace('\\', '/');
-    	String file = tomcatCatalog.substring(0, tomcatCatalog.length()- 6)+ "/"+ LOCALE_FILENAME+ locale+ LOCALE_EXTENSION;
-    	
-    	try {
-    		p.load(new FileInputStream(file));
-    	} catch(IOException ioe) {
-    		logger.fatal("Cannot open locale filename: "+ file);
-    	}
-    	logger.debug("Label name: "+ labelName);
-    	logger.debug("Property value: "+ p.getProperty(labelName));
-    	logger.debug(p.keySet());
-    	return (null == p.getProperty(labelName)) ? "" : p.getProperty(labelName);*/
     	return LanguageSelectionBean.getDisplayString(
                 LOCALE_CLASSNAME, labelName, null, 
                 		FacesContext.getCurrentInstance().getViewRoot().getLocale());

Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java	2006-10-01 17:21:08 UTC (rev 176)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java	2006-10-01 18:45:04 UTC (rev 177)
@@ -51,10 +51,9 @@
 	private static final Logger logger = Logger
 			.getLogger(SearchMessageBean.class);
 
-	// TODO: [SK] i18n
-	private static final String MESSAGE_ALL = "-- Wsysztkie --";
-
 	private static final int ROWS_ON_PAGE = 5;
+	
+	private static final String CHOICE_ALL_LABEL = "CHOICE_ALL";
 
 	/**
 	 * This method is used to get all messages from database via webservice.
@@ -143,7 +142,7 @@
 	public List<SelectItem> getDirectionList() {
 		final List<SelectItem> choices = new FastTable<SelectItem>();
 		SelectItem item = new SelectItem();
-		item.setLabel(MESSAGE_ALL);
+		item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
 		// item.setValue(null);
 		choices.add(item);
 		for (Direction direction : Direction.values()) {
@@ -161,7 +160,7 @@
 	public List<SelectItem> getPriorityList() {
 		List<SelectItem> choices = new FastTable<SelectItem>();
 		SelectItem item = new SelectItem();
-		item.setLabel(MESSAGE_ALL);
+		item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
 		// item.setValue(null);
 		choices.add(item);
 		for (Priority priority : Priority.values()) {
@@ -179,7 +178,7 @@
 	public List<SelectItem> getStatusList() {
 		List<SelectItem> choices = new FastTable<SelectItem>();
 		SelectItem item = new SelectItem();
-		item.setLabel(MESSAGE_ALL);
+		item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
 		// item.setValue(null);
 		choices.add(item);
 		for (Status status : Status.values()) {
@@ -197,7 +196,7 @@
 	public List<SelectItem> getFormatList() {
 		List<SelectItem> choices = new FastTable<SelectItem>();
 		SelectItem item = new SelectItem();
-		item.setLabel(MESSAGE_ALL);
+		item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
 		// item.setValue(null);
 		choices.add(item);
 		for (FormatType format : FormatType.values()) {

Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java	2006-10-01 17:21:08 UTC (rev 176)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java	2006-10-01 18:45:04 UTC (rev 177)
@@ -206,12 +206,12 @@
                     this.servers.add(i, new ServerExtended(def, this.serverStates.get(i), 
                     		workingIcon, label, active));
                 } else if (null != this.serverId && def.getId().toString().equals(this.serverId)) {
-                    final boolean testResult = ws.serverTest(def.getName());
+                    final String testResult = ws.serverTest(def.getName());
                     logger.debug("Result of SAP server testing: " + testResult);
-                    if (testResult) {
+                    if (null == testResult) {
                     	this.serverStates.set(i, TEST_OK_ICON_PATH);
                     } else {
-                    	LanguageSelectionBean.showMessageWithException(BeansUtils.SERVER_TEST_FAIL, "",
+                    	LanguageSelectionBean.showMessageWithException(BeansUtils.SERVER_TEST_FAIL, testResult,
                     			BeansUtils.SHOW_SERVERS_NAVIGATION);
                     	this.serverStates.set(i, TEST_FAIL_ICON_PATH);
                     }
@@ -270,43 +270,43 @@
         }
     }
 
-    public String testSapServer() {
-        final ICommunicateWS ws = SpringAdminPanelContext.getCommunicateWS();
-        boolean testResult = false;
-    //    int index = -1;
-
-        try {
-            for (ServerExtended server : this.servers) {
-                if (this.serverId.equals(String.valueOf(server.getInstance().getId()))) {
-                //    index = this.servers.indexOf(server);
-                    testResult = ws.serverTest(server.getInstance().getName());
-                    logger.debug("Result of SAP server testing: " + testResult);
-                }
-            }
-        /*    if (testResult) {
-            //    this.serverStatePages.get(this.actualPage-1).set(index, TEST_OK_ICON_PATH);
-            	this.serverStates.set(index, TEST_OK_ICON_PATH);
-            } else {
-                //	this.serverStatePages.get(this.actualPage-1).set(index, TEST_FAIL_ICON_PATH);
-                this.serverStates.set(index, TEST_FAIL_ICON_PATH);
-            }
-         //   this.servers.get(index).setState(this.serverStatePages.get(this.actualPage-1).get(index));
-            this.servers.get(index).setState(this.serverStates.get(index));*/
-        } catch (WebServiceException wse) {
-            logger.fatal("Exception while testing server instance", wse);
-            LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_DATABASE, 
-            		BeansUtils.MESSAGE_SERVER_ERROR_TEST, 
-            		BeansUtils.SEARCH_SERVER_NAVIGATION);
-            // wyjatek IOOBE nie mogl byc rzucony,dlatego zrezygnowalem z jego przechwytywania
-        } catch (Exception e) {
-            logger.fatal("Exception", e);
-
-            LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_DATABASE, 
-            		BeansUtils.MESSAGE_SERVER_ERROR_TEST, 
-            		BeansUtils.SEARCH_SERVER_NAVIGATION);
-        }
-        return BeansUtils.SEARCH_SERVER_NAVIGATION;
-    }
+//    public String testSapServer() {
+//        final ICommunicateWS ws = SpringAdminPanelContext.getCommunicateWS();
+//        String testResult = "";
+//    //    int index = -1;
+//
+//        try {
+//            for (ServerExtended server : this.servers) {
+//                if (this.serverId.equals(String.valueOf(server.getInstance().getId()))) {
+//                //    index = this.servers.indexOf(server);
+//                    testResult = ws.serverTest(server.getInstance().getName());
+//                    logger.debug("Result of SAP server testing: " + testResult);
+//                }
+//            }
+//        /*    if (testResult) {
+//            //    this.serverStatePages.get(this.actualPage-1).set(index, TEST_OK_ICON_PATH);
+//            	this.serverStates.set(index, TEST_OK_ICON_PATH);
+//            } else {
+//                //	this.serverStatePages.get(this.actualPage-1).set(index, TEST_FAIL_ICON_PATH);
+//                this.serverStates.set(index, TEST_FAIL_ICON_PATH);
+//            }
+//         //   this.servers.get(index).setState(this.serverStatePages.get(this.actualPage-1).get(index));
+//            this.servers.get(index).setState(this.serverStates.get(index));*/
+//        } catch (WebServiceException wse) {
+//            logger.fatal("Exception while testing server instance", wse);
+//            LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_DATABASE, 
+//            		BeansUtils.MESSAGE_SERVER_ERROR_TEST, 
+//            		BeansUtils.SEARCH_SERVER_NAVIGATION);
+//            // wyjatek IOOBE nie mogl byc rzucony,dlatego zrezygnowalem z jego przechwytywania
+//        } catch (Exception e) {
+//            logger.fatal("Exception", e);
+//
+//            LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_DATABASE, 
+//            		BeansUtils.MESSAGE_SERVER_ERROR_TEST, 
+//            		BeansUtils.SEARCH_SERVER_NAVIGATION);
+//        }
+//        return BeansUtils.SEARCH_SERVER_NAVIGATION;
+//    }
     
     public String startStopServer() {
     	final ICommunicateWS ws = SpringAdminPanelContext.getCommunicateWS();

Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java	2006-10-01 17:21:08 UTC (rev 176)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java	2006-10-01 18:45:04 UTC (rev 177)
@@ -49,6 +49,8 @@
 	private static final Logger logger = Logger.getLogger(SearchUserBean.class);
 
 	private static final int ROWS_ON_PAGE = 5;
+	
+	private static final String CHOICE_ALL_LABEL = "CHOICE_ALL";
 
 	private boolean searching;
 
@@ -172,8 +174,7 @@
 	public List<SelectItem> getCountriesList() {
 		List<SelectItem> choices = new FastTable<SelectItem>();
 		SelectItem item = new SelectItem();
-		item.setLabel(LanguageSelectionBean
-				.getLabel("CHOICE_ALL_LABEL"));
+		item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
 		// item.setValue(null);
 		choices.add(item);
 		for (Country country : Country.values()) {
@@ -191,8 +192,7 @@
 	public List<SelectItem> getEnabledList() {
 		List<SelectItem> choices = new FastTable<SelectItem>();
 		SelectItem item = new SelectItem();
-		item.setLabel(LanguageSelectionBean
-				.getLabel("CHOICE_ALL_LABEL"));
+		item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
 		item.setValue(10);
 		choices.add(item);
 		item = new SelectItem();
@@ -212,8 +212,7 @@
 	public List<SelectItem> getTimezonesList() {
 		List<SelectItem> choices = new FastTable<SelectItem>();
 		SelectItem item = new SelectItem();
-		item.setLabel(LanguageSelectionBean
-				.getLabel("CHOICE_ALL_LABEL"));
+		item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
 		// item.setValue(null);
 		choices.add(item);
 		for (TimeZone timezone : TimeZone.values()) {
@@ -231,8 +230,7 @@
 	public List<SelectItem> getLanguagesList() {
 		List<SelectItem> choices = new FastTable<SelectItem>();
 		SelectItem item = new SelectItem();
-		item.setLabel(LanguageSelectionBean
-				.getLabel("CHOICE_ALL_LABEL"));
+		item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
 		// item.setValue(null);
 		choices.add(item);
 		for (Language language : Language.values()) {

Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties	2006-10-01 17:21:08 UTC (rev 176)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties	2006-10-01 18:45:04 UTC (rev 177)
@@ -103,7 +103,8 @@
 ROLE_CURRENT_ACTIONS=Actions assigned to selected role
 ROLE_CURRENT_USERS=Users assigned to selected role
 ROLE_FOUND=Found roles:
-# server 
+# server
+SERVER_TEST_FAIL=Testing server failed
 SERVER_TITLE_ADD=Add server
 SERVER_TITLE_EDIT=Edit server
 SERVER_TITLE_SEARCH=Searching for servers

Modified: trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java	2006-10-01 17:21:08 UTC (rev 176)
+++ trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java	2006-10-01 18:45:04 UTC (rev 177)
@@ -596,14 +596,12 @@
 
     /**
      * This method allows test server with known ID
-     * 
-     * TODO: [SK] change name of this method to not starting with "test*"
-     * 
-     * @param serverName
-     * @return
+     *  
+     * @param serverName name of server to test
+     * @return null if test is succesfull, part of exception message otherwise
      * @throws WebServiceException
      */
-    public boolean serverTest(String serverName) throws WebServiceException;
+    public String serverTest(String serverName) throws WebServiceException;
 
     /**
      * resubmits message, to be sent once again.

Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/ISAPComm.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/ISAPComm.java	2006-10-01 17:21:08 UTC (rev 176)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/ISAPComm.java	2006-10-01 18:45:04 UTC (rev 177)
@@ -39,7 +39,7 @@
 
     public abstract void init(SAPInstanceDef instanceDef);
     
-    public abstract boolean isRemoteSystemWorking();
+    public abstract String isRemoteSystemWorking();
 
     public abstract void destroy();
 

Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java	2006-10-01 17:21:08 UTC (rev 176)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java	2006-10-01 18:45:04 UTC (rev 177)
@@ -20,8 +20,6 @@
  */
 package org.commsuite.sap;
 
-import java.io.FileOutputStream;
-import java.io.ObjectOutputStream;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.Date;
 import java.util.Properties;
@@ -511,7 +509,7 @@
 	}
 
 	public void startServer() {
-		if (!isRemoteSystemWorking()) {
+		if (null != isRemoteSystemWorking()) {
 			logger.error("Remote system is not working: " + getName());
 			return;
 		}
@@ -614,16 +612,15 @@
 		}
 	}
 
-	public boolean isRemoteSystemWorking() {
+	public String isRemoteSystemWorking() {
 		// TODO: [MZ] i'm not sure whether this implementation is correct
 		JCO.Client client = null;
 		try {
 			client = getJCOClient();
 
 			if (null == client) {
-				logger
-						.warn("Cannot obtain JCO.Client object from pool during testing SAP server's state.");
-				return false;
+				logger.warn("Cannot obtain JCO.Client object from pool during testing SAP server's state.");
+				return "Cannot obtain JCO.Client object from pool during testing SAP server's state.";
 			}
 
 			// Send a ping to the server
@@ -640,10 +637,10 @@
 			// logger.debug("Partner release: " + partnerRelease);
 			// return (null != partnerRelease) && (partnerRelease.length() > 0);
 
-			return true;
+			return null;
 		} catch (Throwable t) {
 			logger.error("Exception during testing SAP server's state", t);
-			return false;
+			return (t.getMessage().length() > 32 ? t.getMessage().substring(0, 32) : t.getMessage());
 		} finally {
 			if (null != client) {
 				releaseJCOClient(client);

Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java	2006-10-01 17:21:08 UTC (rev 176)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java	2006-10-01 18:45:04 UTC (rev 177)
@@ -458,7 +458,7 @@
         }
     }
 
-    public boolean serverTest(String serverName) throws WebServiceException {
+    public String serverTest(String serverName) throws WebServiceException {
         try {
             ServersService service = ServersService.getInstance();
             return service.testServer(serverName);

Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java	2006-10-01 17:21:08 UTC (rev 176)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java	2006-10-01 18:45:04 UTC (rev 177)
@@ -235,15 +235,15 @@
      * @return true if test is OK, false otherwise
      * @throws WebServiceException when something goes wrong(ie. no instance found)
      */
-    public boolean testServer(String serverName) throws WebServiceException {
+    public String testServer(String serverName) throws WebServiceException {
         try {
             final ISAPCommManager sapMgr = SpringMiddlewareContext.getSAPCommManager();
             final ISAPComm sapComm = sapMgr.getSAPCommByName(serverName);
             if (null == sapComm) {
                 logger.warn("During testing - cannot find SAP server with name: " + serverName);
-                return false;
+                return "During testing - cannot find SAP server with name: " + serverName;
             }
-            final boolean isRemoteSystemWorking = sapComm.isRemoteSystemWorking();
+            final String isRemoteSystemWorking = sapComm.isRemoteSystemWorking();
             logger.debug("Result of SAP server testing: " + isRemoteSystemWorking);
             return isRemoteSystemWorking;
         } catch (Throwable t) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




comsuite-svn Mailing List for Communications Suite (Page 3)

comsuite-svn — SVN Diffs