[Comsuite-svn] SF.net SVN: comsuite: [151] trunk/code

[<sku...@us...>]

Revision: 151
          http://svn.sourceforge.net/comsuite/?rev=151&view=rev
Author:   skuzniak
Date:     2006-09-23 07:21:37 -0700 (Sat, 23 Sep 2006)

Log Message:
-----------
multiple languages enabled, some other changes

Modified Paths:
--------------
    trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java
    trunk/code/CSAdminPanel/WebContent/pages/CSHeader.jsp
    trunk/code/CSAdminPanel/WebContent/pages/CSMainPanel.jsp
    trunk/code/CSCommon/src/org/commsuite/model/ws/WSSAPInstanceDef.java
    trunk/code/CSMiddleware/src/org/commsuite/dao/SAPInstanceDefDao.java
    trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/SAPInstanceDefDaoImpl.java
    trunk/code/CSMiddleware/src/org/commsuite/managers/impl/SAPInstanceDefManagerImpl.java
    trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java
    trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java

Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java	2006-09-23 12:42:16 UTC (rev 150)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java	2006-09-23 14:21:37 UTC (rev 151)
@@ -121,6 +121,7 @@
         instance.setR3name(this.r3name);
         instance.setSystemNumber(this.systemNumber);
         instance.setUser(this.user);
+        instance.setActiveInstance(this.activeInstance);
         
         if (1 == this.getUnicodeSearchIndex()) {
         	instance.setUnicode(true);

Modified: trunk/code/CSAdminPanel/WebContent/pages/CSHeader.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/CSHeader.jsp	2006-09-23 12:42:16 UTC (rev 150)
+++ trunk/code/CSAdminPanel/WebContent/pages/CSHeader.jsp	2006-09-23 14:21:37 UTC (rev 151)
@@ -5,7 +5,7 @@
 <f:subview id="CSHeader">
 	<f:loadBundle basename="org.commsuite.web.locale.Locale" var="Locale" />
 	<h:form id="lang">
-		<h:panelGrid columns="2" styleClass="header">
+		<h:panelGrid columns="3" styleClass="header">
 			<h:panelGrid id="headerName" columns="1" styleClass="header-menu-banner">
 			
 				<h:panelGrid columns="7" styleClass="header-menu-icons">
@@ -62,7 +62,7 @@
 				</h:panelGrid>
 			
 			</h:panelGrid>
-			<%--
+			
 			<h:panelGroup id="headerLangCombo" styleClass="header-lang">
 				<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/preferences-desktop-locale.gif" />
 				<h:selectOneMenu value="#{languageSelectionBean.locale}">
@@ -70,7 +70,7 @@
 				</h:selectOneMenu>
 				<h:commandButton value="Go!" />
 			</h:panelGroup>
-			--%>
+			
 			<h:panelGrid columns="1">
 				<h:outputText value="[#{sessionBean.currentlyLogged}]" styleClass="header-user"/>
 				<h:commandLink value="Logout" action="#{sessionBean.logout}" />

Modified: trunk/code/CSAdminPanel/WebContent/pages/CSMainPanel.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/CSMainPanel.jsp	2006-09-23 12:42:16 UTC (rev 150)
+++ trunk/code/CSAdminPanel/WebContent/pages/CSMainPanel.jsp	2006-09-23 14:21:37 UTC (rev 151)
@@ -21,7 +21,7 @@
 				<h:commandLink action="showServers" styleClass="header-link">
 					<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/network-server64.gif" styleClass="header-icon"/>
 				</h:commandLink>
-				<h:panelGrid columns="1">
+				<h:panelGrid columns="1" styleClass="listView-header-odd">
 					<h:outputText value="#{Locale.MENU_SERVERS}" styleClass="header-command"/>
 					<h:outputText value="#{Locale.INFO_SERVERS}" />
 				</h:panelGrid>
@@ -29,7 +29,7 @@
 				<h:commandLink action="showMessages" styleClass="header-link">
 					<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/mail-message-new64.gif" styleClass="header-icon"/>
 				</h:commandLink>
-				<h:panelGrid columns="1">
+				<h:panelGrid columns="1" styleClass="listView-header-even">
 					<h:outputText value="#{Locale.MENU_INBOX}" styleClass="header-command"/>
 					<h:outputText value="#{Locale.INFO_MESSAGES}" />
 				</h:panelGrid>
@@ -37,7 +37,7 @@
 				<h:commandLink action="searchUser" styleClass="header-link">
 					<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/contact-new64.gif" styleClass="header-icon"/>
 				</h:commandLink>
-				<h:panelGrid columns="1">
+				<h:panelGrid columns="1" styleClass="listView-header-odd">
 					<h:outputText value="#{Locale.MENU_USERS}" styleClass="header-command"/>
 					<h:outputText value="#{Locale.INFO_USERS}" />
 				</h:panelGrid>
@@ -45,7 +45,7 @@
 				<h:commandLink action="searchRole" styleClass="header-link">
 					<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/preferences-desktop-theme64.gif" styleClass="header-icon"/>
 				</h:commandLink>
-				<h:panelGrid columns="1">
+				<h:panelGrid columns="1" styleClass="listView-header-even">
 					<h:outputText value="#{Locale.MENU_ROLES}" styleClass="header-command"/>
 					<h:outputText value="#{Locale.INFO_ROLES}" />
 				</h:panelGrid>
@@ -53,7 +53,7 @@
 				<h:commandLink action="searchAction" styleClass="header-link">
 					<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/video-x-generic64.gif" styleClass="header-icon"/>
 				</h:commandLink>
-				<h:panelGrid columns="1">
+				<h:panelGrid columns="1" styleClass="listView-header-odd">
 					<h:outputText value="#{Locale.MENU_ACTIONS}" styleClass="header-command"/>
 					<h:outputText value="#{Locale.INFO_ACTIONS}" />
 				</h:panelGrid>
@@ -61,7 +61,7 @@
 				<h:commandLink action="searchGroup" styleClass="header-link">
 					<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/x-office-address-book64.gif" styleClass="header-icon"/>
 				</h:commandLink>
-				<h:panelGrid columns="1">
+				<h:panelGrid columns="1" styleClass="listView-header-even">
 					<h:outputText value="#{Locale.MENU_GROUPS}" styleClass="header-command"/>
 					<h:outputText value="#{Locale.INFO_GROUPS}" />
 				</h:panelGrid>

Modified: trunk/code/CSCommon/src/org/commsuite/model/ws/WSSAPInstanceDef.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/model/ws/WSSAPInstanceDef.java	2006-09-23 12:42:16 UTC (rev 150)
+++ trunk/code/CSCommon/src/org/commsuite/model/ws/WSSAPInstanceDef.java	2006-09-23 14:21:37 UTC (rev 151)
@@ -92,7 +92,7 @@
 
     public void setMaxConnectionsInPool(int maxConnectionsInPool);
     
-    public void setActiveInstance(boolean active);
+    public void setActiveInstance(boolean activeInstance);
 
 	public boolean isActiveInstance();
 

Modified: trunk/code/CSMiddleware/src/org/commsuite/dao/SAPInstanceDefDao.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/dao/SAPInstanceDefDao.java	2006-09-23 12:42:16 UTC (rev 150)
+++ trunk/code/CSMiddleware/src/org/commsuite/dao/SAPInstanceDefDao.java	2006-09-23 14:21:37 UTC (rev 151)
@@ -34,7 +34,7 @@
 	public List<SAPInstanceDef> getSAPInstances();
 	
 	public List<SAPInstanceDef> getMatchingServers(SAPInstanceDef instance,
-			boolean defaultSearch, boolean loadSearech, boolean unicodeSearch);
+			boolean defaultSearch, boolean loadSearech, boolean unicodeSearch, boolean activeSearch);
 
 	public SAPInstanceDef getSAPInstanceDef(Long id);
 

Modified: trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/SAPInstanceDefDaoImpl.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/SAPInstanceDefDaoImpl.java	2006-09-23 12:42:16 UTC (rev 150)
+++ trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/SAPInstanceDefDaoImpl.java	2006-09-23 14:21:37 UTC (rev 151)
@@ -138,55 +138,28 @@
 	 */
 	@SuppressWarnings("unchecked")
 	public List<SAPInstanceDef> getMatchingServers(SAPInstanceDef instance,
-			boolean defaultSearch, boolean loadSearch, boolean unicodeSearch) {
-		logger.debug("INSTANCE: " + instance);
-		String query = "select s from SAPInstanceDef s where"
-				+ " s.name like '%"
-				+ instance.getName()
-				+ "%'"
-				+ (defaultSearch ? " and s.defaultInstance = "
-						+ instance.isDefaultInstance() : "")
-				+ (0 != instance.getMaxConnectionsInPool() ? "  and s.maxConnectionsInPool = "
-						+ instance.getMaxConnectionsInPool()
-						: "")
-				+ (instance.getUser().trim().length() != 0 ? " and s.user like '%"
-						+ instance.getUser() + "%'"
-						: "")
-				+ (instance.getPassword().trim().length() != 0 ? " and s.password like '%"
-						+ instance.getPassword() + "%'"
-						: "")
-				+ (instance.getClient().trim().length() != 0 ? " and s.client like '%"
-						+ instance.getClient() + "%'"
-						: "")
-				+ (instance.getHost().trim().length() != 0 ? " and s.host like '%"
-						+ instance.getHost() + "%'"
-						: "")
-				+ (instance.getR3name().trim().length() != 0 ? " and s.r3name like '%"
-						+ instance.getR3name() + "%'"
-						: "")
-				+ (instance.getGroup().trim().length() != 0 ? " and s.group like '%"
-						+ instance.getGroup() + "%'"
-						: "")
-				+ (instance.getSystemNumber().trim().length() != 0 ? " and s.systemNumber like '%"
-						+ instance.getSystemNumber() + "%'"
-						: "")
-				+ (loadSearch ? " and s.loadBalancing = "
-						+ instance.isLoadBalancing() : "")
-				+ (instance.getGwhost().trim().length() != 0 ? " and s.gwhost like '%"
-						+ instance.getGwhost() + "%'"
-						: "")
-				+ (instance.getGwserv().trim().length() != 0 ? " and s.gwserv like '%"
-						+ instance.getGwserv() + "%'"
-						: "")
-				+ (instance.getProgid().trim().length() != 0 ? " and s.progid like '%"
-						+ instance.getProgid() + "%'"
-						: "")
-				+ (unicodeSearch ? " and s.unicode = " + instance.isUnicode()
-						: "")
-				+ (instance.getAdminEmail().trim().length() != 0 ? " and s.name like '%"
-						+ instance.getAdminEmail() + "%'"
-						: "");
-		logger.debug("QUERY: " + query);
+			boolean defaultSearch, boolean loadSearch, boolean unicodeSearch,
+			boolean activeSearch) {
+		logger.debug("INSTANCE: "+ instance);
+		String query = "select s from SAPInstanceDef s where" +
+			" s.name like '%" +instance.getName()+ "%'"+
+			(defaultSearch ? " and s.defaultInstance = "+ instance.isDefaultInstance() : "")+
+			(0 != instance.getMaxConnectionsInPool() ? "  and s.maxConnectionsInPool = "+ instance.getMaxConnectionsInPool() : "")+
+			(instance.getUser().trim().length() != 0 ? " and s.user like '%" +instance.getUser()+ "%'" : "")+
+			(instance.getPassword().trim().length() != 0 ? " and s.password like '%" +instance.getPassword()+ "%'" : "")+
+			(instance.getClient().trim().length() != 0 ? " and s.client like '%" +instance.getClient()+ "%'" : "")+
+			(instance.getHost().trim().length() != 0 ? " and s.host like '%" +instance.getHost()+ "%'" : "")+
+			(instance.getR3name().trim().length() != 0 ? " and s.r3name like '%" +instance.getR3name()+ "%'" : "")+
+			(instance.getGroup().trim().length() != 0 ? " and s.group like '%" +instance.getGroup()+ "%'" : "")+
+			(instance.getSystemNumber().trim().length() != 0 ? " and s.systemNumber like '%" +instance.getSystemNumber()+ "%'" : "")+
+			(loadSearch ? " and s.loadBalancing = "+ instance.isLoadBalancing() : "")+
+			(activeSearch ? " and s.activeInstance = "+ instance.isActiveInstance() : "")+
+			(instance.getGwhost().trim().length() != 0 ? " and s.gwhost like '%" +instance.getGwhost()+ "%'" : "")+
+			(instance.getGwserv().trim().length() != 0 ? " and s.gwserv like '%" +instance.getGwserv()+ "%'" : "")+
+			(instance.getProgid().trim().length() != 0 ? " and s.progid like '%" +instance.getProgid()+ "%'" : "")+
+			(unicodeSearch ? " and s.unicode = "+ instance.isUnicode() : "")+
+			(instance.getAdminEmail().trim().length() != 0 ? " and s.name like '%" +instance.getAdminEmail()+ "%'" : "");
+		logger.debug("QUERY: "+ query);
 		final List list = getHibernateTemplate().find(query);
 		logger.debug("SIZE OF INSTANCES MATCHING TO GIVES PATTERN: "
 				+ list.size());

Modified: trunk/code/CSMiddleware/src/org/commsuite/managers/impl/SAPInstanceDefManagerImpl.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/managers/impl/SAPInstanceDefManagerImpl.java	2006-09-23 12:42:16 UTC (rev 150)
+++ trunk/code/CSMiddleware/src/org/commsuite/managers/impl/SAPInstanceDefManagerImpl.java	2006-09-23 14:21:37 UTC (rev 151)
@@ -47,7 +47,7 @@
 	 */
 	public List<SAPInstanceDef> getSelectedSAPInstances(SAPInstanceDef instance, 
 			boolean defaultSearch, boolean loadSearch, boolean unicodeSearch, boolean activeSearch) {
-		return dao.getMatchingServers(instance, defaultSearch, loadSearch, unicodeSearch);
+		return dao.getMatchingServers(instance, defaultSearch, loadSearch, unicodeSearch, activeSearch);
 	}
 
 	/**

Modified: trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java	2006-09-23 12:42:16 UTC (rev 150)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java	2006-09-23 14:21:37 UTC (rev 151)
@@ -80,7 +80,7 @@
      */
     private String client;
     
-    private boolean activeInstance = true;
+    private boolean activeInstance;
 
     // /**
     // * SAP logon language. This field is not obligatory.

Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java	2006-09-23 12:42:16 UTC (rev 150)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java	2006-09-23 14:21:37 UTC (rev 151)
@@ -398,6 +398,7 @@
         instance.setSystemNumber(wsInstance.getSystemNumber());
         instance.setUnicode(wsInstance.isUnicode());
         instance.setUser(wsInstance.getUser());
+        instance.setActiveInstance(wsInstance.isActiveInstance());
     }
 
     /**


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