comsuite-svn Mailing List for Communications Suite (Page 2)
Brought to you by:
zduniak
Menu
▾
▴
comsuite-svn — SVN Diffs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(10) |
Aug
(16) |
Sep
(48) |
Oct
(47) |
Nov
(4) |
Dec
(1) |
|---|
|
From: <mal...@us...> - 2006-10-05 07:44:35
|
Revision: 195
http://svn.sourceforge.net/comsuite/?rev=195&view=rev
Author: malinowskirafal
Date: 2006-10-05 00:44:27 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
sentContent state changes with inbound messages
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-10-03 21:01:08 UTC (rev 194)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-10-05 07:44:27 UTC (rev 195)
@@ -23,16 +23,23 @@
import java.io.File;
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
import javolution.util.FastMap;
import javolution.util.FastTable;
import org.apache.log4j.Logger;
+import org.commsuite.enums.State;
+import org.commsuite.managers.MessageManager;
+import org.commsuite.managers.SentContentManager;
import org.commsuite.model.Message;
import org.commsuite.model.SAPInstanceDef;
+import org.commsuite.model.SentContent;
import org.commsuite.notification.INotificationsManager;
import org.commsuite.util.SpringContext;
+import org.commsuite.util.SpringMiddlewareBeansConstants;
+import org.commsuite.util.SpringMiddlewareContext;
import com.sap.mw.jco.JCO;
@@ -115,6 +122,17 @@
sapComm.sendMessage(message);
logger.debug("Message sent to: " + sapComm.getName());
+
+ // SentContentManager sentContentManager = SpringMiddlewareContext.getSentContentManager();
+ MessageManager messageManager = SpringMiddlewareContext.getMessageManager();
+
+ List<SentContent> sentContents = message.getSentContents();
+ for (SentContent sentContent : sentContents) {
+ sentContent.setState(State.DELIVERED);
+ // sentContentManager.saveSentContent(sentContent);
+ }
+
+ messageManager.saveMessage(message);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 01:48:38
|
Revision: 170
http://svn.sourceforge.net/comsuite/?rev=170&view=rev
Author: zduniak
Date: 2006-09-30 14:21:43 -0700 (Sat, 30 Sep 2006)
Log Message:
-----------
Unnecessary casting and exceptions handling removed
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java 2006-09-30 20:04:50 UTC (rev 169)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java 2006-09-30 21:21:43 UTC (rev 170)
@@ -51,200 +51,179 @@
*/
public class MessagesService {
- private final MessageManager messageManager;
+ private final MessageManager messageManager;
- private final JMSMessageManager jmsManager;
+ private final JMSMessageManager jmsManager;
- private static final Logger logger = Logger.getLogger(MessagesService.class);
-
- private static MessagesService instance;
-
- public MessagesService() {
- messageManager = SpringMiddlewareContext.getMessageManager();
- jmsManager = SpringMiddlewareContext.getJMSManager();
- }
-
- public static MessagesService getMessagesService() {
- if (null == instance) {
- instance = new MessagesService();
- }
- return instance;
- }
-
- public int getMessagesSize(SearchMessageModel wsMessage) throws WebServiceException {
- try {
- final MessageManager msgManager = (MessageManager) SpringMiddlewareContext
- .getMessageManager();
- if (null == wsMessage) {
- return msgManager.getMessages().size();
- } else {
- return msgManager.getSelectedMessages(wsMessage).size();
- }
- } catch(Throwable t) {
- logger.fatal("error in getMessagesSize method", t);
- throw new WebServiceException(t);
- }
- }
-
- public Collection<WSMessage> getMessagesSubset(int begin, int end) throws WebServiceException {
- try {
- final MessageManager msgManager = (MessageManager) SpringMiddlewareContext
- .getMessageManager();
- final List<Message> mes = (List<Message>)msgManager.getMessages();
- final Collection<WSMessage> result = new FastTable<WSMessage>();
+ private static final Logger logger = Logger
+ .getLogger(MessagesService.class);
- if (begin > end) throw new IllegalArgumentException("Begin index should be lower than end");
- if (begin < 0 || end >= mes.size()) throw new IndexOutOfBoundsException(
- "Index is out of bounds: begin:["+ begin+ "]end:["+ end+"]size:["+ mes.size()+"]");
-
- for (int i = begin; i <= end; i++) {
- result.add((WSMessage) mes.get(i));
- }
- return result;
- } catch (Throwable t) {
- logger.fatal("error in getMessagesSubset method", t);
- throw new WebServiceException(t);
- }
- }
+ private static MessagesService instance;
- public Collection<WSMessage> getAllMessages() throws WebServiceException {
- try {
- final MessageManager msgManager = (MessageManager) SpringMiddlewareContext
- .getMessageManager();
- logger
- .debug("1. THIS CODE IS NEVER RUNNING - this mean that the problem is not in Hibernate mapping");
- final Collection<Message> mes = msgManager.getMessages();
- final Collection<WSMessage> result = new FastTable<WSMessage>();
- for (final Message message : mes) {
- result.add((WSMessage) message);
- }
- logger
- .debug("2. THIS CODE IS ALSO NEVER RUNNING - this mean that the problem is not in Hibernate mapping");
- logger.debug("3. msgs: " + mes);
- return result;
- } catch (Throwable t) {
- logger.fatal("error in getAllMessages method", t);
- throw new WebServiceException(t);
- }
- }
-
- public Collection<WSMessage> getSelectedMessagesSubset(SearchMessageModel wsMessage, int begin, int end) throws WebServiceException {
- try {
- final MessageManager msgManager = (MessageManager) SpringMiddlewareContext
- .getMessageManager();
- List<Message> messages = (List<Message>)msgManager.getSelectedMessages(wsMessage);
+ public MessagesService() {
+ messageManager = SpringMiddlewareContext.getMessageManager();
+ jmsManager = SpringMiddlewareContext.getJMSManager();
+ }
- if (begin > end) throw new IllegalArgumentException("Begin index should be lower than end");
- if (begin < 0 || end >= messages.size()) throw new IndexOutOfBoundsException(
- "Index is out of bounds: begin:["+ begin+ "]end:["+ end+"]size:["+ messages.size()+"]");
-
- Collection<WSMessage> result = new FastTable<WSMessage>();
- for (int i = begin; i <= end; i++) {
- result.add((WSMessage)messages.get(i));
- }
- return result;
- } catch (Throwable t) {
- logger.fatal("error in getSelectedMessages method", t);
- throw new WebServiceException(t);
- }
- }
-
- public Collection<WSMessage> getSelectedMessages(SearchMessageModel wsMessage) throws WebServiceException {
- try {
- final MessageManager msgManager = (MessageManager) SpringMiddlewareContext
- .getMessageManager();
- Collection<Message> messages = msgManager.getSelectedMessages(wsMessage);
- Collection<WSMessage> result = new FastTable<WSMessage>();
- for (Message message : messages) {
- result.add((WSMessage)message);
- }
- return result;
- } catch (Throwable t) {
- logger.fatal("error in getSelectedMessages method", t);
- throw new WebServiceException(t);
- }
- }
+ public static MessagesService getMessagesService() {
+ if (null == instance) {
+ instance = new MessagesService();
+ }
+ return instance;
+ }
- public WSContents getContentsById(String id) throws WebServiceException {
- try {
- final ContentsManager contentsManager = (ContentsManager) SpringMiddlewareContext
- .getContentsManager();
- return (WSContents) contentsManager.getContents(id);
- } catch (Throwable t) {
- logger.fatal("error in getContentsById method", t);
- throw new WebServiceException(t);
- }
- }
+ public int getMessagesSize(SearchMessageModel wsMessage)
+ throws WebServiceException {
+ final MessageManager msgManager = SpringMiddlewareContext
+ .getMessageManager();
+ if (null == wsMessage) {
+ return msgManager.getMessages().size();
+ } else {
+ return msgManager.getSelectedMessages(wsMessage).size();
+ }
+ }
- public Collection<WSSentContent> getSentContentsByMessage(String id) throws WebServiceException {
- try {
- final SentContentManager sentContentManager = (SentContentManager) SpringMiddlewareContext
- .getSentContentManager();
- final List<SentContent> sentContents = sentContentManager.getSentContentsByMessage(id);
- final List<WSSentContent> result = new FastTable<WSSentContent>();
- for (final SentContent content : sentContents) {
- result.add((WSSentContent) content);
- }
- return result;
- } catch (Throwable t) {
- logger.fatal("error in getSentContentsByMessage method", t);
- throw new WebServiceException(t);
- }
- }
+ public Collection<WSMessage> getMessagesSubset(int begin, int end)
+ throws WebServiceException, IllegalArgumentException,
+ IndexOutOfBoundsException {
+ final MessageManager msgManager = SpringMiddlewareContext
+ .getMessageManager();
+ final List<Message> mes = (List<Message>) msgManager.getMessages();
+ final Collection<WSMessage> result = new FastTable<WSMessage>();
- /**
- * @param id
- * @return
- * @throws WebServiceException
- */
- public Collection<WSContents> getContentsBySentContent(String id) throws WebServiceException {
- try {
- final ContentsManager contentsManager = (ContentsManager) SpringMiddlewareContext
- .getContentsManager();
- final List<Contents> contents = contentsManager.getContentsBySentContent(id);
- final List<WSContents> result = new FastTable<WSContents>();
- for (final Contents content : contents) {
- result.add((WSContents) content);
- }
- return result;
- } catch (Throwable t) {
- logger.fatal("error in getSentContentsByMessage method", t);
- throw new WebServiceException(t);
- }
- }
+ if (begin > end)
+ throw new IllegalArgumentException(
+ "Begin index should be lower than end");
+ if (begin < 0 || end >= mes.size())
+ throw new IndexOutOfBoundsException(
+ "Index is out of bounds: begin:[" + begin + "]end:[" + end
+ + "]size:[" + mes.size() + "]");
- public WSMessage getMessageById(String id) throws WebServiceException {
- try {
- final MessageManager msgManager = (MessageManager) SpringMiddlewareContext
- .getMessageManager();
- return msgManager.getMessage(id);
- } catch (Throwable t) {
- logger.fatal("error in getSelectedMessages method", t);
- throw new WebServiceException(t);
- }
- }
+ for (int i = begin; i <= end; i++) {
+ result.add(mes.get(i));
+ }
+ return result;
+ }
- public void resubmitMessageWithId(String messageId) throws WebServiceException {
- try {
- final Message msg = messageManager.getMessage(messageId);
- if (null == msg) {
- throw new WebServiceException("Could not find message with id: " + messageId);
- }
+ public Collection<WSMessage> getAllMessages() throws WebServiceException {
+ final MessageManager msgManager = SpringMiddlewareContext
+ .getMessageManager();
+ logger
+ .debug("1. THIS CODE IS NEVER RUNNING - this mean that the problem is not in Hibernate mapping");
+ final Collection<Message> mes = msgManager.getMessages();
+ final Collection<WSMessage> result = new FastTable<WSMessage>();
+ for (final Message message : mes) {
+ result.add(message);
+ }
+ logger
+ .debug("2. THIS CODE IS ALSO NEVER RUNNING - this mean that the problem is not in Hibernate mapping");
+ logger.debug("3. msgs: " + mes);
+ return result;
+ }
- if (Direction.INBOUND == msg.getDirection()) {
- jmsManager.sendMessage(SpringMiddlewareBeansConstants.M_SAP_IN_QUEUE_NAME, msg);
- logger.debug("Resubmitted inbound message: " + messageId);
- } else if (Direction.OUTBOUND == msg.getDirection()) {
- jmsManager.sendMessage(SpringMiddlewareBeansConstants.M_OUT_ROUTER_QUEUE_NAME, msg);
- logger.debug("Resubmitted outbound message: " + messageId);
- } else {
- throw new WebServiceException("Unsupproted message direction for message with id: "
- + messageId);
- }
- } catch (Throwable t) {
- logger.fatal("Exception while resubmitting message with id: " + messageId, t);
- throw new WebServiceException(t);
- }
- }
+ public Collection<WSMessage> getSelectedMessagesSubset(
+ SearchMessageModel wsMessage, int begin, int end)
+ throws WebServiceException, IllegalArgumentException,
+ IndexOutOfBoundsException {
+ final MessageManager msgManager = SpringMiddlewareContext
+ .getMessageManager();
+ List<Message> messages = (List<Message>) msgManager
+ .getSelectedMessages(wsMessage);
+ if (begin > end)
+ throw new IllegalArgumentException(
+ "Begin index should be lower than end");
+ if (begin < 0 || end >= messages.size())
+ throw new IndexOutOfBoundsException(
+ "Index is out of bounds: begin:[" + begin + "]end:[" + end
+ + "]size:[" + messages.size() + "]");
+
+ Collection<WSMessage> result = new FastTable<WSMessage>();
+ for (int i = begin; i <= end; i++) {
+ result.add(messages.get(i));
+ }
+ return result;
+ }
+
+ public Collection<WSMessage> getSelectedMessages(
+ SearchMessageModel wsMessage) throws WebServiceException {
+ final MessageManager msgManager = SpringMiddlewareContext
+ .getMessageManager();
+ Collection<Message> messages = msgManager
+ .getSelectedMessages(wsMessage);
+ Collection<WSMessage> result = new FastTable<WSMessage>();
+ for (Message message : messages) {
+ result.add(message);
+ }
+ return result;
+ }
+
+ public WSContents getContentsById(String id) throws WebServiceException {
+ final ContentsManager contentsManager = SpringMiddlewareContext
+ .getContentsManager();
+ return contentsManager.getContents(id);
+ }
+
+ public Collection<WSSentContent> getSentContentsByMessage(String id)
+ throws WebServiceException {
+ final SentContentManager sentContentManager = SpringMiddlewareContext
+ .getSentContentManager();
+ final List<SentContent> sentContents = sentContentManager
+ .getSentContentsByMessage(id);
+ final List<WSSentContent> result = new FastTable<WSSentContent>();
+ for (final SentContent content : sentContents) {
+ result.add(content);
+ }
+ return result;
+ }
+
+ /**
+ * @param id
+ * @return
+ * @throws WebServiceException
+ */
+ public Collection<WSContents> getContentsBySentContent(String id)
+ throws WebServiceException {
+ final ContentsManager contentsManager = SpringMiddlewareContext
+ .getContentsManager();
+ final List<Contents> contents = contentsManager
+ .getContentsBySentContent(id);
+ final List<WSContents> result = new FastTable<WSContents>();
+ for (final Contents content : contents) {
+ result.add(content);
+ }
+ return result;
+ }
+
+ public WSMessage getMessageById(String id) throws WebServiceException {
+ final MessageManager msgManager = SpringMiddlewareContext
+ .getMessageManager();
+ return msgManager.getMessage(id);
+ }
+
+ public void resubmitMessageWithId(String messageId)
+ throws WebServiceException {
+ final Message msg = messageManager.getMessage(messageId);
+ if (null == msg) {
+ throw new WebServiceException("Could not find message with id: "
+ + messageId);
+ }
+
+ if (Direction.INBOUND == msg.getDirection()) {
+ jmsManager.sendMessage(
+ SpringMiddlewareBeansConstants.M_SAP_IN_QUEUE_NAME, msg);
+ logger.debug("Resubmitted inbound message: " + messageId);
+ } else if (Direction.OUTBOUND == msg.getDirection()) {
+ jmsManager
+ .sendMessage(
+ SpringMiddlewareBeansConstants.M_OUT_ROUTER_QUEUE_NAME,
+ msg);
+ logger.debug("Resubmitted outbound message: " + messageId);
+ } else {
+ throw new WebServiceException(
+ "Unsupproted message direction for message with id: "
+ + messageId);
+ }
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 01:46:29
|
Revision: 183
http://svn.sourceforge.net/comsuite/?rev=183&view=rev
Author: zduniak
Date: 2006-10-02 08:03:17 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
SystemArchitecture.java aspect slightly corrected (license header added, info about author added, handling returning from pointcut corrected)
Modified Paths:
--------------
trunk/code/CSCommon/src/org/commsuite/aop/SystemArchitecture.java
Modified: trunk/code/CSCommon/src/org/commsuite/aop/SystemArchitecture.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/aop/SystemArchitecture.java 2006-10-02 13:26:17 UTC (rev 182)
+++ trunk/code/CSCommon/src/org/commsuite/aop/SystemArchitecture.java 2006-10-02 15:03:17 UTC (rev 183)
@@ -1,3 +1,23 @@
+/* $Id: $
+ *
+ * Communications Suite.
+ * Copyright (C) 2006 Szymon Kuzniak, Rafal Malinowski, Marek Musielak, Pawel Walkiewicz,
+ * Agnieszka Wisniewska, Marcin Zduniak, Liliana Ziolek.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
package org.commsuite.aop;
import org.apache.log4j.Logger;
@@ -6,16 +26,25 @@
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
+/**
+ * @author Marek Musielak
+ */
@Aspect
public class SystemArchitecture {
private static final Logger logger = Logger
.getLogger(SystemArchitecture.class);
+ /**
+ * TODO: JavaDoc
+ */
@Pointcut("execution(* org.commsuite..*(..))")
public void dataAccessOperation() {
}
+ /**
+ * TODO: JavaDoc
+ */
@Around("dataAccessOperation()")
public Object doDataAccessOperation(ProceedingJoinPoint pjp)
throws Throwable {
@@ -54,18 +83,14 @@
logger.debug(pjp.getSignature() + " " + lineNumber + " (" + parameters
+ ") START");
- Throwable exceptionToThrow = null;
try {
result = pjp.proceed();
} catch (Throwable e) {
- exceptionToThrow = e;
- throw exceptionToThrow;
- } finally {
- logger.debug(pjp.getSignature() + " " + result);
- if (exceptionToThrow != null) {
- throw exceptionToThrow;
- }
+ logger.debug(pjp.getSignature().toString(), e);
+ throw e;
}
+
+ logger.debug(pjp.getSignature() + " " + result);
return result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 01:44:26
|
Revision: 176
http://svn.sourceforge.net/comsuite/?rev=176&view=rev
Author: zduniak
Date: 2006-10-01 10:21:08 -0700 (Sun, 01 Oct 2006)
Log Message:
-----------
- List of SAP Applications Server that CS system is compatible with
- Installation instructions
Modified Paths:
--------------
trunk/docs/instalation/tools.txt
Added Paths:
-----------
trunk/docs/devenv/
trunk/docs/devenv/devenvset.txt
trunk/docs/testing/
trunk/docs/testing/sap_versions.txt
Added: trunk/docs/devenv/devenvset.txt
===================================================================
--- trunk/docs/devenv/devenvset.txt (rev 0)
+++ trunk/docs/devenv/devenvset.txt 2006-10-01 17:21:08 UTC (rev 176)
@@ -0,0 +1,56 @@
+1. najpierw instalujemy JDK (najlepiej do katalogu bez spacji w nazwie)
+ Ustawiamy zmienna srodowiskowa JAVA_HOME.
+ JAVA_HOME/bin dodajemy do path.
+2. Nastepnie instalujemy ANT wg instrukcji na stronie
+ Najlepiej do katalogu c:\ANT
+ Dodac ANT_HOME\bin do path (opisac jak mozna zmieniac zmienne srodowiskowe
+ wraz ze screenami)
+ Nastepnie nalezy zmienic zmienna srodowiskowa ANT_HOME.
+ Aby mozn odpalac testy jednostkowe nalezy przegrac plik trunk\code\CSTests\lib\junit-4.0.jar do katalogu ${ANT_HOME}\lib
+3. Nastepnie rozpakowujemy Eclipse do katalogu c:\Eclipse i probujemy raz go uruchomic.
+ Zmieniamy w ustawieniach Eclipse aby korzystal z JDK 5.0
+ I zamykamy.
+4. Instalujemy ExadelStudio i sprawdzamy czy dziala.
+5. Rozpakowyjemy Tomcata do katalogu: c:\tomcat (takze plik *-admin.zip)
+ Uruchamiamy Tomcata polecenium startup.bat i sprawdzamy czy dziala.
+ ActiveMQ w wersji 4.0.1 wymaga dostosowania Tomcata (wiecej: http://issues.apache.org/activemq/browse/AMQ-704).
+ W pliku:
+ c:\tomcat\bin\startup.bat (lub analogicznym na innym niz Windows systemie operacyjnym)
+ nalezy dodac najlepiej na samej gorze linijke:
+ set CATALINA_OPTS=%CATALINA_OPTS% -Dorg.apache.activeio.journal.active.DisableLocking=true
+ (lub analogiczna na innym niz Windows systemie operacyjnym).
+6. Instalujemy JAI
+7. Instalujemy PostgreSQL (wazne abysmy zapamietali haslo do konta postgres)
+-------------
+PostgreSQL:
+1. Nalezy stworzyc lokalnie nowa baze danych o nazwie "cs" i uzytkownika o loginie i hasle: "cs".
+W tej bazie beda przechowywane wszystkie obiekty biznesowe w naszym systemie (uzytkownicy, wiadomosci, konfiguracja).
+2. Nalezy stworzyc tez bazy "csjms" i "cstestsjms". Bedza to bazy wykorzystywane przez ActiveMQ do trwalego przechowywania
+ rozsylanych wewnatrz systemu wiadomosci (tzw. "cache persistence"). Uzytkownik do tych baz to ten sam jaki jest dla
+ pierwszej bazy (cs/cs).
+3. Aby umiescic w bazie danych odpowiednia strukture tabel biznesowych nalezy wydac z konsoli polecenie:
+ ant schema:populate
+ UWAGA: dopiero gdy zainstalujemy i skonfigurujemy baze "cs", "cstests", "csjms" i "cstestsjms" i uzytkownika cs/cs.
+4. Do odpalania testow jednostkowych konieczne jest stworzenie kolejnej bazy danych, o nazwie "cstests". Uzytkownik
+ bez zmian. Baza ta jest konieczna podczas uruchamiania polecenia:
+ ant test
+-------------
+8. Zainstalowac RXTX
+9. Sciagnac zrodla projektu ze strony Sourceforge i rozpakowac je do jakiegos katalogu,
+ np: c:\dev\CS
+ Zaimportowac je do Eclipse'a.
+10. Zainstalowac SAP JCo (w tym plik JAR przegrac do katalogu XXX w naszym projekcie)
+ librfc.dll prawdopodobnie do c:\windows trzeba przegrac
+
+11. Zainstalowac SpringIDE
+12. Zainstalowac http://propedit.sourceforge.jp/index_en.html
+13. OpenOffice 2.0.1 - nale\xBFy te\xBF w local.properties ustawi\xE6 \xB6cie\xBFk\xEA do katalogu openOfficea (UWAGA: parametr si\xEA zmieni\xB3,
+ teraz nazywa si\xEA:
+ commsuite.converter.OpenOfficeOrg.directory
+ i jego warto\xB6ci\xB1 jest katalog zawierajacy binark\xEA openoffice)
+ TODO: [co autor mial na mysli] katalog do binarki OpenOffice nale\xBFy doda\xE6 do CLASSPATH w skrypcie startowym tomcata
+14. Opisac najwazniejsze komendy w Tomcatcie. W tym jak stworzyc baze danych
+ i jak stworzyc WARy, jak je nastepnie zainstalowac na serwerze.
+15. Przed uruchomieniem produkcyjnym Tomcata nalezy zrestertowac komputer
+16. Opisac gdzie sa przechowywane logi z dzialania aplikacji.
+17. Pokazac co mozna zobaczyc z poziomu JMX i jak sie tam dostac.
\ No newline at end of file
Property changes on: trunk/docs/devenv/devenvset.txt
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Modified: trunk/docs/instalation/tools.txt
===================================================================
--- trunk/docs/instalation/tools.txt 2006-10-01 15:53:37 UTC (rev 175)
+++ trunk/docs/instalation/tools.txt 2006-10-01 17:21:08 UTC (rev 176)
@@ -1,20 +1,23 @@
Programy jakie musza byc zainstalowane na komputerze zanim zaczniemy instalacje (lub development) Communications Suite:
-- JDK 5.0 (inaczej zrodla sie nie skompiluja)
-- Apache ANT (testowano na werji 1.6.5)
-- PostgreSQL (8.1)
+- JDK 5.0 (inaczej zrodla sie nie skompiluja) (http://java.sun.com/javase/)
+- Apache ANT (testowano na werji 1.6.5) (http://ant.apache.org)
+- PostgreSQL (8.1) (http://www.postgresql.org)
- pgAdmin III (na Windowsie sam instaluje sie razem z baza PostgreSQL)
-- Apache Tomcat (testowano na wersji 5.5.15)
+- Apache Tomcat (testowano na wersji 5.5.17) (http://tomcat.apache.org)
- aby mozn odpalac testy jednostkowe nalezy przegrac plik trunk\code\CSTests\lib\junit-4.0.jar do katalogu ${ANT_HOME}\lib
-- Exadel Studio (3.5) do dewelopmentu czesci webowej - http://www.exadel.com
-- plugin AspectJ Development Tools (AJDT) - http://www.eclipse.org/ajdt/
-- przydatny poczas developmentu jest takze plugin Spring IDE - http://springide.org
+- Eclipse 3.2 (http://www.eclipse.org)
+- Exadel Studio 4.0 (wersja free) do dewelopmentu czesci webowej (http://www.exadel.com)
+# NOT REQUIRED now: plugin AspectJ Development Tools (AJDT) - http://www.eclipse.org/ajdt/
+- przydatny poczas developmentu jest takze plugin Spring IDE (http://springide.org)
- DLL'ki do SAP JCo, instrukcja w pliku: trunk\docs\knowledge\JCo and RFC\sapjco-ntintel-2.1.6.zip
-- Zainstalowant i skonfigurowany HylaFAX (Rafal, dopiszesz w osobnym pliku szczegolowa procedure instalacyjna ?)
-- JAI (Java Advanced Imaging) w wersji co najmniej 1.1.2 - http://java.sun.com/products/java-media/jai/
+- Zainstalowany i skonfigurowany HylaFAX (Rafal, dopiszesz w osobnym pliku szczegolowa procedure instalacyjna ?)
+- JAI (Java Advanced Imaging) w wersji co najmniej 1.1.2 (http://java.sun.com/products/java-media/jai/)
- JAI IOImage plugins w wersji co najmniej 1.0.2 - https://jai-imageio.dev.java.net/
- OpenOffice 2.0.1 - nale\xBFy te\xBF w local.properties ustawi\xE6 \xB6cie\xBFk\xEA do katalogu openOfficea (UWAGA: parametr si\xEA zmieni\xB3,
- teraz nazywa si\xEA .direcory i jego warto\xB6ci\xB1 jest katalog zawierajacy binark\xEA openoffice)
+ teraz nazywa si\xEA:
+ commsuite.converter.OpenOfficeOrg.directory
+ i jego warto\xB6ci\xB1 jest katalog zawierajacy binark\xEA openoffice)
- katalog do binarki OpenOffice nale\xBFy doda\xE6 do CLASSPATH w skrypcie startowym tomcata
- SMS: sciagnac plik rxtx-2.1-7-bins-r2.zip ze strony: http://www.rxtx.org. Wewnatrz tego archiwum jest plik INSTALL
opisujacy dalsze kroki lokalnej instalacji dla kazdego ze stanowisk developerskich zarowno pod Windowsem jak i
Added: trunk/docs/testing/sap_versions.txt
===================================================================
--- trunk/docs/testing/sap_versions.txt (rev 0)
+++ trunk/docs/testing/sap_versions.txt 2006-10-01 17:21:08 UTC (rev 176)
@@ -0,0 +1,5 @@
+Supported SAP Servers (tested):
+4.6C
+6.20
+6.40
+7.00
\ No newline at end of file
Property changes on: trunk/docs/testing/sap_versions.txt
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 01:42:38
|
Revision: 191
http://svn.sourceforge.net/comsuite/?rev=191&view=rev
Author: zduniak
Date: 2006-10-03 05:57:03 -0700 (Tue, 03 Oct 2006)
Log Message:
-----------
Corrected consistency in names for sequences and tables
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.hbm.xml
trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.hbm.xml
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.hbm.xml 2006-10-02 22:53:10 UTC (rev 190)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.hbm.xml 2006-10-03 12:57:03 UTC (rev 191)
@@ -6,7 +6,7 @@
<cache usage="read-write"/>
<id name="id">
<generator class="native">
- <param name="sequence">CS_SAPINSTANCEDEF_SEQ</param>
+ <param name="sequence">CS_SAP_SERVERS_SEQ</param>
<param name="parameters">INCREMENT BY 1 START WITH 100</param>
</generator>
</id>
Modified: trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java 2006-10-02 22:53:10 UTC (rev 190)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java 2006-10-03 12:57:03 UTC (rev 191)
@@ -82,13 +82,6 @@
private boolean activeInstance;
- // /**
- // * SAP logon language. This field is not obligatory.
- // *
- // * @deprecated we may not specify this field at all. null == SAP system's default
- // */
- // private String language;
-
/**
* Host name of the application server (in without-load-balancing mode) or message server (in
* with-load-balancing mode).
@@ -186,7 +179,7 @@
/**
* @hibernate.id generator-class="native"
- * @hibernate.generator-param name="sequence" value="CS_SAPINSTANCEDEF_SEQ"
+ * @hibernate.generator-param name="sequence" value="CS_SAP_SERVERS_SEQ"
* @hibernate.generator-param name="parameters" value="INCREMENT BY 1 START WITH 100"
*/
public Long getId() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 01:41:51
|
Revision: 167
http://svn.sourceforge.net/comsuite/?rev=167&view=rev
Author: zduniak
Date: 2006-09-30 11:27:21 -0700 (Sat, 30 Sep 2006)
Log Message:
-----------
Unused ANT build file removed
Removed Paths:
-------------
trunk/code/CSAdminPanel/ant/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 01:41:43
|
Revision: 172
http://svn.sourceforge.net/comsuite/?rev=172&view=rev
Author: zduniak
Date: 2006-09-30 16:38:56 -0700 (Sat, 30 Sep 2006)
Log Message:
-----------
- Sorting performance improved a little bit
- Generated Message.hbm.xml file corrected
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml
trunk/code/CSMiddleware/src/org/commsuite/model/Message.java
trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml 2006-09-30 23:28:51 UTC (rev 171)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml 2006-09-30 23:38:56 UTC (rev 172)
@@ -7,7 +7,7 @@
<id name="id">
<generator class="native">
<param name="sequence">CS_MESSAGES_SEQ</param>
- <param name="parameters">INCREMENT BY 1 START</param>
+ <param name="parameters">INCREMENT BY 1 START WITH 100</param>
</generator>
</id>
<property name="creationDate" not-null="true" type="timestamp" column="CREATION_DATE"/>
Modified: trunk/code/CSMiddleware/src/org/commsuite/model/Message.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/Message.java 2006-09-30 23:28:51 UTC (rev 171)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/Message.java 2006-09-30 23:38:56 UTC (rev 172)
@@ -219,14 +219,16 @@
final List<SentContent> scList = new FastTable<SentContent>();
for (final SentContent sc : sentContents) {
- logger.debug("sc.getContent().getData(): " + sc.getContent().getData());
+ logger.debug("sc.getContent().getData(): "
+ + sc.getContent().getData());
final SentContent clonedSc = new SentContent();
clonedSc.setContent(sc.getContent());
clonedSc.setInternalId(RandomGUID.getGUID());
clonedSc.setState(sc.getState());
clonedSc.setMessage(this);
scList.add(clonedSc);
- logger.debug("clonedSc.getContent().getData(): " + clonedSc.getContent().getData());
+ logger.debug("clonedSc.getContent().getData(): "
+ + clonedSc.getContent().getData());
}
msg.setSentContents(scList);
@@ -236,8 +238,7 @@
/**
* @hibernate.id generator-class="native"
* @hibernate.generator-param name="sequence" value="CS_MESSAGES_SEQ"
- * @hibernate.generator-param name="parameters" value="INCREMENT BY 1 START
- * WITH 100"
+ * @hibernate.generator-param name="parameters" value="INCREMENT BY 1 START WITH 100"
*/
public Long getId() {
return super.id;
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java 2006-09-30 23:28:51 UTC (rev 171)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java 2006-09-30 23:38:56 UTC (rev 172)
@@ -52,6 +52,24 @@
* @author Szymon Kuzniak
*/
public class MessagesService {
+
+ /**
+ * TODO: JavaDoc
+ */
+ private static final Comparator<Message> MESSAGES_COMPARATOR = new Comparator<Message>() {
+ public int compare(Message m1, Message m2) {
+ // Comparing m1 with m2 descending == m2 with m1 ascending:
+ final int comparisonByLastProcessDate = m2.getLastProcessDate()
+ .compareTo(m1.getLastProcessDate());
+ if (0 == comparisonByLastProcessDate) {
+ final int comparisonBySendDate = m1.getSendDate()
+ .compareTo(m1.getSendDate());
+ return comparisonBySendDate;
+ } else {
+ return comparisonByLastProcessDate;
+ }
+ }
+ };
private final MessageManager messageManager;
@@ -120,22 +138,10 @@
}
return result;
}
-
+
private void sortMessagesList(final List<Message> list) {
- Collections.sort(list, new Comparator<WSMessage>() {
- public int compare(WSMessage m1, WSMessage m2) {
- final int comparisonByLastProcessDate = m2.getLastProcessDate()
- .compareTo(m1.getLastProcessDate());
- if (0 == comparisonByLastProcessDate) {
- final int comparisonBySendDate = m1.getSendDate()
- .compareTo(m1.getSendDate());
- return comparisonBySendDate;
- } else {
- return comparisonByLastProcessDate;
- }
- }
- });
-}
+ Collections.sort(list, MESSAGES_COMPARATOR);
+ }
/**
* TODO: JavaDoc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 00:49:54
|
Revision: 173
http://svn.sourceforge.net/comsuite/?rev=173&view=rev
Author: zduniak
Date: 2006-10-01 01:18:03 -0700 (Sun, 01 Oct 2006)
Log Message:
-----------
"--Wszystkie--" message internationalized
Modified Paths:
--------------
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.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-30 23:38:56 UTC (rev 172)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java 2006-10-01 08:18:03 UTC (rev 173)
@@ -371,7 +371,7 @@
public List<SelectItem> getBooleanSearchList() {
List<SelectItem> items = new FastTable<SelectItem>();
SelectItem item = new SelectItem();
- item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
+ item.setLabel(LanguageSelectionBean.getLabel(SearchServerBean.CHOICE_ALL_LABEL));
item.setValue(10);
items.add(item);
item = new SelectItem();
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java 2006-09-30 23:38:56 UTC (rev 172)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java 2006-10-01 08:18:03 UTC (rev 173)
@@ -42,124 +42,157 @@
/**
* @since 1.0
* @author Szymon Kuzniak
+ * @author Marcin Zduniak
*/
public class SearchUserBean extends UserBean {
- private static final Logger logger = Logger.getLogger(SearchUserBean.class);
-
- private static final int ROWS_ON_PAGE = 5;
-
- private static final String MESSAGE_ALL = "--Wszystkie--";
-
- private boolean searching;
-
- private int totalUsers;
-
+ private static final Logger logger = Logger.getLogger(SearchUserBean.class);
+
+ private static final int ROWS_ON_PAGE = 5;
+
+ private boolean searching;
+
+ private int totalUsers;
+
+ /**
+ * TODO: JavaDoc
+ */
public int getTotalUsers() {
return totalUsers;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setTotalUsers(int totalUsers) {
this.totalUsers = totalUsers;
}
+ /**
+ * TODO: JavaDoc
+ */
public boolean isSearching() {
return searching;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setSearching(boolean searching) {
this.searching = searching;
}
+ /**
+ * TODO: JavaDoc
+ */
public void selectUser(ActionEvent event) {
try {
this.searching = "true".equals(getParameter("searching"));
- } catch(IllegalArgumentException iae) {
+ } catch (IllegalArgumentException iae) {
logger.fatal("Unknown parameter");
}
}
/**
- * gets list of users from database, using WSUser object
- * created from HTML from.
- * @return list of users that matches given criteria
- */
- public List<WSUser> getUsersAvailable() {
- try {
- final ICommunicateWS ws = (ICommunicateWS) SpringAdminPanelContext.getCommunicateWS();
- logger.debug("SEARCHING VALUE: "+ this.searching);
- if (this.searching) {
- List<WSUser> users;
- logger.debug("INSIDE IF FOR SEARCHING");
- if (this.getEnabledSearch() < 10) {
- logger.debug("SEARCHIN WITH ENABLED DISABLED");
- users = new FastTable<WSUser>(this.getUsers(this.createUserFromFields(), true, ws));
- } else {
- logger.debug("SEARCHIN WITH ENABLED ENABLED");
- users = new FastTable<WSUser>(this.getUsers(this.createUserFromFields(), false, ws));
- }
- return users;
- } else {
- List<WSUser> users;
- if (this.getEnabledSearch() < 10) {
- users = new FastTable<WSUser>(this.getUsers(null, true, ws));
- } else {
- users = new FastTable<WSUser>(this.getUsers(null, false, ws));
- }
- return users;
- }
- } catch (WebServiceException wse) {
- logger.fatal("Exception while receiving available users", wse);
- LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_DATABASE,
- BeansUtils.MESSAGE_USER_ERROR_FETCH,
- BeansUtils.USERS_LIST_NAVIGATION);
- return new ArrayList<WSUser>();
- } catch (Exception e) {
- logger.fatal("Exception", e);
- LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_GENERAL,
- BeansUtils.MESSAGE_USER_ERROR_FETCH,
- BeansUtils.USERS_LIST_NAVIGATION);
- return new ArrayList<WSUser>();
- }
- }
-
- private List<WSUser> getUsers(WSUser model, boolean enabledSearch, ICommunicateWS ws)
- throws WebServiceException{
- logger.debug("INSIDE GET USERS");
- this.totalUsers = ws.getUsersSize(model, enabledSearch);
- this.totalPages = ((this.totalUsers - 1) / ROWS_ON_PAGE) + 1;
-
- int begin = (this.actualPage - 1) * ROWS_ON_PAGE;
- int end = (this.actualPage * ROWS_ON_PAGE) - 1;
- if (end >= this.totalUsers) end = (this.totalUsers - 1);
- logger.debug("begin & end: "+ begin+ " "+ end);
-
- if (null == model) {
- return (List<WSUser>)ws.getUsersSubset(begin, end);
- } else {
- return (List<WSUser>)ws.getSelectedUsersSubset(model, enabledSearch, begin, end);
- }
- }
-
- public List<SelectItem> getCountriesList() {
- List<SelectItem> choices = new FastTable<SelectItem>();
- SelectItem item = new SelectItem();
- item.setLabel(MESSAGE_ALL);
- // item.setValue(null);
+ * gets list of users from database, using WSUser object created from HTML
+ * from.
+ *
+ * @return list of users that matches given criteria
+ */
+ public List<WSUser> getUsersAvailable() {
+ try {
+ final ICommunicateWS ws = (ICommunicateWS) SpringAdminPanelContext
+ .getCommunicateWS();
+ logger.debug("SEARCHING VALUE: " + this.searching);
+ if (this.searching) {
+ List<WSUser> users;
+ logger.debug("INSIDE IF FOR SEARCHING");
+ if (this.getEnabledSearch() < 10) {
+ logger.debug("SEARCHIN WITH ENABLED DISABLED");
+ users = new FastTable<WSUser>(this.getUsers(this
+ .createUserFromFields(), true, ws));
+ } else {
+ logger.debug("SEARCHIN WITH ENABLED ENABLED");
+ users = new FastTable<WSUser>(this.getUsers(this
+ .createUserFromFields(), false, ws));
+ }
+ return users;
+ } else {
+ List<WSUser> users;
+ if (this.getEnabledSearch() < 10) {
+ users = new FastTable<WSUser>(this.getUsers(null, true, ws));
+ } else {
+ users = new FastTable<WSUser>(this
+ .getUsers(null, false, ws));
+ }
+ return users;
+ }
+ } catch (WebServiceException wse) {
+ logger.fatal("Exception while receiving available users", wse);
+ LanguageSelectionBean.showMessage(
+ BeansUtils.MESSAGE_ERROR_DATABASE,
+ BeansUtils.MESSAGE_USER_ERROR_FETCH,
+ BeansUtils.USERS_LIST_NAVIGATION);
+ return new ArrayList<WSUser>();
+ } catch (Exception e) {
+ logger.fatal("Exception", e);
+ LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_GENERAL,
+ BeansUtils.MESSAGE_USER_ERROR_FETCH,
+ BeansUtils.USERS_LIST_NAVIGATION);
+ return new ArrayList<WSUser>();
+ }
+ }
+
+ /**
+ * TODO: JavaDoc
+ */
+ private List<WSUser> getUsers(WSUser model, boolean enabledSearch,
+ ICommunicateWS ws) throws WebServiceException {
+ logger.debug("INSIDE GET USERS");
+ this.totalUsers = ws.getUsersSize(model, enabledSearch);
+ this.totalPages = ((this.totalUsers - 1) / ROWS_ON_PAGE) + 1;
+
+ int begin = (this.actualPage - 1) * ROWS_ON_PAGE;
+ int end = (this.actualPage * ROWS_ON_PAGE) - 1;
+ if (end >= this.totalUsers)
+ end = (this.totalUsers - 1);
+ logger.debug("begin & end: " + begin + " " + end);
+
+ if (null == model) {
+ return (List<WSUser>) ws.getUsersSubset(begin, end);
+ } else {
+ return (List<WSUser>) ws.getSelectedUsersSubset(model,
+ enabledSearch, begin, end);
+ }
+ }
+
+ /**
+ * TODO: JavaDoc
+ */
+ public List<SelectItem> getCountriesList() {
+ List<SelectItem> choices = new FastTable<SelectItem>();
+ SelectItem item = new SelectItem();
+ item.setLabel(LanguageSelectionBean
+ .getLabel("CHOICE_ALL_LABEL"));
+ // item.setValue(null);
choices.add(item);
- for(Country country : Country.values()) {
- item = new SelectItem();
- item.setLabel(country.toString());
- item.setValue(country);
- choices.add(item);
- }
- return choices;
- }
-
- public List<SelectItem> getEnabledList() {
- List<SelectItem> choices = new FastTable<SelectItem>();
- SelectItem item = new SelectItem();
- item.setLabel(MESSAGE_ALL);
+ for (Country country : Country.values()) {
+ item = new SelectItem();
+ item.setLabel(country.toString());
+ item.setValue(country);
+ choices.add(item);
+ }
+ return choices;
+ }
+
+ /**
+ * TODO: JavaDoc
+ */
+ public List<SelectItem> getEnabledList() {
+ List<SelectItem> choices = new FastTable<SelectItem>();
+ SelectItem item = new SelectItem();
+ item.setLabel(LanguageSelectionBean
+ .getLabel("CHOICE_ALL_LABEL"));
item.setValue(10);
choices.add(item);
item = new SelectItem();
@@ -170,37 +203,45 @@
item.setLabel("false");
item.setValue(0);
choices.add(item);
- return choices;
- }
-
- public List<SelectItem> getTimezonesList() {
- List<SelectItem> choices = new FastTable<SelectItem>();
- SelectItem item = new SelectItem();
- item.setLabel(MESSAGE_ALL);
- // item.setValue(null);
+ return choices;
+ }
+
+ /**
+ * TODO: JavaDoc
+ */
+ public List<SelectItem> getTimezonesList() {
+ List<SelectItem> choices = new FastTable<SelectItem>();
+ SelectItem item = new SelectItem();
+ item.setLabel(LanguageSelectionBean
+ .getLabel("CHOICE_ALL_LABEL"));
+ // item.setValue(null);
choices.add(item);
- for(TimeZone timezone : TimeZone.values()) {
- item = new SelectItem();
- item.setLabel(timezone.toString());
- item.setValue(timezone);
- choices.add(item);
- }
- return choices;
- }
-
- public List<SelectItem> getLanguagesList() {
- List<SelectItem> choices = new FastTable<SelectItem>();
- SelectItem item = new SelectItem();
- item.setLabel(MESSAGE_ALL);
- // item.setValue(null);
+ for (TimeZone timezone : TimeZone.values()) {
+ item = new SelectItem();
+ item.setLabel(timezone.toString());
+ item.setValue(timezone);
+ choices.add(item);
+ }
+ return choices;
+ }
+
+ /**
+ * TODO: JavaDoc
+ */
+ public List<SelectItem> getLanguagesList() {
+ List<SelectItem> choices = new FastTable<SelectItem>();
+ SelectItem item = new SelectItem();
+ item.setLabel(LanguageSelectionBean
+ .getLabel("CHOICE_ALL_LABEL"));
+ // item.setValue(null);
choices.add(item);
- for(Language language : Language.values()) {
- item = new SelectItem();
- item.setLabel(language.toString());
- item.setValue(language);
- choices.add(item);
- }
- return choices;
- }
+ for (Language language : Language.values()) {
+ item = new SelectItem();
+ item.setLabel(language.toString());
+ item.setValue(language);
+ choices.add(item);
+ }
+ return choices;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 00:49:46
|
Revision: 171
http://svn.sourceforge.net/comsuite/?rev=171&view=rev
Author: zduniak
Date: 2006-09-30 16:28:51 -0700 (Sat, 30 Sep 2006)
Log Message:
-----------
- Unicode-based SAP versions are working since now (_lot of debugging code, should be cleaned up shortly_)
- Sorting messages in view panel are working correctly since now
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/CSMiddleware/src/org/commsuite/devices/Device.java
trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml
trunk/code/CSMiddleware/src/org/commsuite/model/Message.java
trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.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/MessagesService.java
trunk/code/CSMiddleware/war/deviceemulator.jsp
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java 2006-09-30 21:21:43 UTC (rev 170)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java 2006-09-30 23:28:51 UTC (rev 171)
@@ -48,7 +48,7 @@
private static final Logger logger = Logger.getLogger(LanguageSelectionBean.class);
- private static final Locale DEFAULT_LOCALE = Locale.getDefault();
+ private static final Locale DEFAULT_LOCALE = Locale.ENGLISH;
private static final String LOCALE_FILENAME = "webapps/CommunicationsSuiteAdmin/WEB-INF/classes/org/commsuite/web/locale/Locale_";
@@ -100,9 +100,9 @@
return locale.toString();
}
- public void setLocale(String locale) {
+ public void setLocale(String localeStr) {
try {
- FacesContext.getCurrentInstance().getViewRoot().setLocale(new Locale(locale));
+ FacesContext.getCurrentInstance().getViewRoot().setLocale(new Locale(localeStr));
} catch (Throwable e) {
logger.fatal("Error during setting locale", e);
}
@@ -149,8 +149,8 @@
}
/**
- * this method is responsible for display message, on web page.
- * message is retrieved from default locale.
+ * This method is responsible for display message, on web page.
+ * Message is retrieved from default locale.
*
* @param messageCode message code to be displayed
* @param parentComponent component id on which messae will be displayed
@@ -163,8 +163,8 @@
}
/**
- * this method is responsible for display message, on web page.
- * message is retrieved from default locale.
+ * This method is responsible for display message, on web page.
+ * Message is retrieved from default locale.
*
* @param message1Code more general message code to be displayed
* @param message2Code more detailed message code to be displayed
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java 2006-09-30 21:21:43 UTC (rev 170)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java 2006-09-30 23:28:51 UTC (rev 171)
@@ -65,18 +65,17 @@
*/
public List<WSMessage> getMessagesAvailable() {
try {
- final ICommunicateWS ws = (ICommunicateWS) SpringAdminPanelContext
+ final ICommunicateWS ws = SpringAdminPanelContext
.getCommunicateWS();
List<WSMessage> mes;
if (this.searching) {
- SearchMessageModel message = this.createMessageFromFields();
+ final SearchMessageModel message = this.createMessageFromFields();
mes = getMessages(message, ws);
} else {
mes = getMessages(null, ws);
}
- sortMessagesList(mes);
return mes;
} catch (WebServiceException wse) {
logger.fatal("Exception while receiving available messages", wse);
@@ -98,10 +97,9 @@
* TODO: JavaDoc
*/
public MessageExtended getMessageExtended() {
- final ICommunicateWS ws = (ICommunicateWS) SpringAdminPanelContext
- .getCommunicateWS();
+ final ICommunicateWS ws = SpringAdminPanelContext.getCommunicateWS();
try {
- WSMessage message = ws.getMessageById(this.messageId);
+ final WSMessage message = ws.getMessageById(this.messageId);
final MessageExtended messageExtended = new MessageExtended();
messageExtended.setMessage(message);
final List<SentContentExtended> sentContentsExtended = new FastTable<SentContentExtended>();
@@ -109,14 +107,19 @@
ws
.getSentContentsByMessage(String.valueOf(message
.getId())));
- for (final WSSentContent content : sentContents) {
+ for (final WSSentContent sentContent : sentContents) {
final SentContentExtended sentContentExtended = new SentContentExtended();
- sentContentExtended.setSentContent((WSSentContent) content);
+ sentContentExtended.setSentContent(sentContent);
+
+ logger.debug("sentContent.getId(): " + sentContent.getId());
+
sentContentExtended.setContent((List<WSContents>) ws
- .getContentsBySentContent(String.valueOf(content
- .getId())));
+ .getContentsBySentContent(sentContent.getId()
+ .toString()));
sentContentsExtended.add(sentContentExtended);
}
+ logger.debug("sentContentsExtended.size(): "
+ + sentContentsExtended.size());
messageExtended.setSentContents(sentContentsExtended);
return messageExtended;
@@ -140,7 +143,7 @@
* TODO: JavaDoc
*/
public List<SelectItem> getDirectionList() {
- List<SelectItem> choices = new FastTable<SelectItem>();
+ final List<SelectItem> choices = new FastTable<SelectItem>();
SelectItem item = new SelectItem();
item.setLabel(MESSAGE_ALL);
// item.setValue(null);
@@ -218,28 +221,7 @@
/**
* TODO: JavaDoc
- *
- * @author Marcin Zduniak
*/
- private void sortMessagesList(final List<WSMessage> list) {
- Collections.sort(list, new Comparator<WSMessage>() {
- public int compare(WSMessage m1, WSMessage m2) {
- final int comparisonByLastProcessDate = m1.getLastProcessDate()
- .compareTo(m2.getLastProcessDate());
- if (0 == comparisonByLastProcessDate) {
- final int comparisonBySendDate = m1.getSendDate()
- .compareTo(m2.getSendDate());
- return comparisonBySendDate;
- } else {
- return comparisonByLastProcessDate;
- }
- }
- });
- }
-
- /**
- * TODO: JavaDoc
- */
private List<WSMessage> getMessages(SearchMessageModel model,
ICommunicateWS ws) throws WebServiceException {
this.totalMessages = ws.getMessagesSize(model);
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java 2006-09-30 21:21:43 UTC (rev 170)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java 2006-09-30 23:28:51 UTC (rev 171)
@@ -212,6 +212,7 @@
.getSentContentByInternalId(internalId);
if (null != prevSentContents) {
+ logger.debug("null != prevSentContents");
prevSentContents.setInternalId(RandomGUID.getGUID());
sentContentManager.saveSentContent(prevSentContents);
}
Modified: trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml 2006-09-30 21:21:43 UTC (rev 170)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml 2006-09-30 23:28:51 UTC (rev 171)
@@ -7,7 +7,7 @@
<id name="id">
<generator class="native">
<param name="sequence">CS_MESSAGES_SEQ</param>
- <param name="parameters">INCREMENT BY 1 START WITH 100</param>
+ <param name="parameters">INCREMENT BY 1 START</param>
</generator>
</id>
<property name="creationDate" not-null="true" type="timestamp" column="CREATION_DATE"/>
Modified: trunk/code/CSMiddleware/src/org/commsuite/model/Message.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/Message.java 2006-09-30 21:21:43 UTC (rev 170)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/Message.java 2006-09-30 23:28:51 UTC (rev 171)
@@ -20,10 +20,11 @@
*/
package org.commsuite.model;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import javolution.util.FastTable;
+
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -55,14 +56,29 @@
/*
* Fields of the message:
*/
+ /**
+ * TODO: JavaDoc
+ */
private SAPInstanceDef sapInstanceDefOwner;
+ /**
+ * TODO: JavaDoc
+ */
private User userOwner;
+ /**
+ * TODO: JavaDoc
+ */
private Direction direction;
+ /**
+ * TODO: JavaDoc
+ */
private FormatType formatType;
+ /**
+ * TODO: JavaDoc
+ */
private Status status;
/**
@@ -83,6 +99,9 @@
*/
private String receiver;
+ /**
+ * TODO: JavaDoc
+ */
private String sender;
/**
@@ -112,8 +131,14 @@
*/
private Date expirationDate;
+ /**
+ * TODO: JavaDoc
+ */
private Date startDate;
+ /**
+ * TODO: JavaDoc
+ */
private Date endDate;
/**
@@ -133,11 +158,20 @@
*/
private Priority priority = Priority.LEVEL_4;
- private List<SentContent> sentContents = new ArrayList<SentContent>();
+ /**
+ * TODO: JavaDoc
+ */
+ private List<SentContent> sentContents = new FastTable<SentContent>();
+ /**
+ * TODO: JavaDoc
+ */
public Message() {
}
+ /**
+ * TODO: JavaDoc
+ */
public Message(WSMessage wsMessage) {
logger.debug("MESSAGE PRIORITY: " + wsMessage.getPriority());
this.setId(wsMessage.getId());
@@ -158,6 +192,10 @@
this.setStatus(wsMessage.getStatus());
}
+ /**
+ * TODO: JavaDoc
+ */
+ @Override
public Message clone() {
final Message msg = new Message();
msg.setId(this.id);
@@ -179,14 +217,16 @@
msg.setStatus(this.status);
msg.setUserOwner(this.userOwner);
- final List<SentContent> scList = new ArrayList<SentContent>();
- for (SentContent scContent : sentContents) {
- SentContent sc = new SentContent();
- sc.setContent(scContent.getContent());
- sc.setInternalId(RandomGUID.getGUID());
- sc.setState(scContent.getState());
- sc.setMessage(this);
- scList.add(sc);
+ final List<SentContent> scList = new FastTable<SentContent>();
+ for (final SentContent sc : sentContents) {
+ logger.debug("sc.getContent().getData(): " + sc.getContent().getData());
+ final SentContent clonedSc = new SentContent();
+ clonedSc.setContent(sc.getContent());
+ clonedSc.setInternalId(RandomGUID.getGUID());
+ clonedSc.setState(sc.getState());
+ clonedSc.setMessage(this);
+ scList.add(clonedSc);
+ logger.debug("clonedSc.getContent().getData(): " + clonedSc.getContent().getData());
}
msg.setSentContents(scList);
@@ -196,7 +236,8 @@
/**
* @hibernate.id generator-class="native"
* @hibernate.generator-param name="sequence" value="CS_MESSAGES_SEQ"
- * @hibernate.generator-param name="parameters" value="INCREMENT BY 1 START WITH 100"
+ * @hibernate.generator-param name="parameters" value="INCREMENT BY 1 START
+ * WITH 100"
*/
public Long getId() {
return super.id;
@@ -212,6 +253,9 @@
return creationDate;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setCreationDate(Date createDate) {
this.creationDate = createDate;
}
@@ -232,6 +276,9 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
public void setDescription(String description) {
this.description = description;
}
@@ -247,6 +294,9 @@
return direction;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setDirection(Direction direction) {
this.direction = direction;
}
@@ -264,6 +314,9 @@
return endDate;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
@@ -282,6 +335,9 @@
return expirationDate;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setExpirationDate(Date expiratonDate) {
this.expirationDate = expiratonDate;
}
@@ -296,6 +352,9 @@
return formatType;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setFormatType(FormatType formatType) {
this.formatType = formatType;
}
@@ -310,6 +369,9 @@
return lastProcessDate;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setLastProcessDate(Date lastProcessDate) {
this.lastProcessDate = lastProcessDate;
}
@@ -331,6 +393,9 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
public void setLastProcessMessage(String lastProcessMessage) {
this.lastProcessMessage = lastProcessMessage;
}
@@ -350,6 +415,9 @@
return priority;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setPriority(Priority priority) {
this.priority = priority;
}
@@ -363,6 +431,9 @@
return receiver;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setReceiver(String receiver) {
this.receiver = receiver;
}
@@ -385,6 +456,9 @@
return sapID;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setSapID(String sapID) {
this.sapID = sapID;
}
@@ -398,6 +472,9 @@
return sendDate;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setSendDate(Date sendDate) {
this.sendDate = sendDate;
}
@@ -411,6 +488,9 @@
return sender;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setSender(String sender) {
this.sender = sender;
}
@@ -428,6 +508,9 @@
return startDate;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setStartDate(Date startDate) {
this.startDate = startDate;
}
@@ -443,6 +526,9 @@
return status;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setStatus(Status status) {
this.status = status;
}
@@ -458,6 +544,9 @@
return sapInstanceDefOwner;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setSAPInstanceDefOwner(SAPInstanceDef instanceDefOwner) {
this.sapInstanceDefOwner = instanceDefOwner;
}
@@ -472,6 +561,9 @@
return this.userOwner;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setUserOwner(User userOwner) {
this.userOwner = userOwner;
}
@@ -487,12 +579,19 @@
return sentContents;
}
+ /**
+ * TODO: JavaDoc
+ */
public void setSentContents(List<SentContent> sentContents) {
- for (SentContent content : sentContents)
- content.setMessage(this);
+ for (SentContent sentContent : sentContents) {
+ sentContent.setMessage(this);
+ }
this.sentContents = sentContents;
}
+ /**
+ * TODO: JavaDoc
+ */
private SentContent createSentContent(Contents c) {
final SentContent sc = new SentContent();
sc.setInternalId(RandomGUID.getGUID());
@@ -511,11 +610,17 @@
this.sentContents.add(sc);
}
+ /**
+ * TODO: JavaDoc
+ */
public void addContentsAsFirst(Contents c) {
final SentContent sc = createSentContent(c);
this.sentContents.add(0, sc);
}
+ /**
+ * TODO: JavaDoc
+ */
public void addContents(Contents c, String internalID) {
final SentContent sc = new SentContent();
@@ -527,14 +632,20 @@
this.sentContents.add(sc);
}
+ /**
+ * TODO: JavaDoc
+ */
public List<Contents> listContents() {
- final List<Contents> contentsSet = new ArrayList<Contents>();
+ final List<Contents> contentsSet = new FastTable<Contents>();
for (SentContent sc : sentContents) {
contentsSet.add(sc.getContent());
}
return contentsSet;
}
+ /**
+ * TODO: JavaDoc
+ */
@Override
public String toString() {
return new ToStringBuilder(this).append("id", this.id).append(
@@ -552,6 +663,9 @@
.toString();
}
+ /**
+ * TODO: JavaDoc
+ */
@Override
public boolean equals(Object object) {
if (null == object) {
@@ -575,6 +689,9 @@
.append(this.status, rhs.status).isEquals();
}
+ /**
+ * TODO: JavaDoc
+ */
@Override
public int hashCode() {
return new HashCodeBuilder(7, 31).append(this.id).append(
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java 2006-09-30 21:21:43 UTC (rev 170)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java 2006-09-30 23:28:51 UTC (rev 171)
@@ -24,6 +24,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -479,8 +480,6 @@
msg.setStatus(Status.RECEIVED_FROM_SAP);
msg.setDirection(Direction.OUTBOUND);
- final List<Message> result = new FastTable<Message>();
-
if (null == function.getImportParameterList()) {
logger.error("ImportParameterList is empty.");
return null;
@@ -515,11 +514,9 @@
if ("FAX".equals(format)) {
msg.setFormatType(FormatType.FAX);
- }
- if ("INT".equals(format)) {
+ } else if ("INT".equals(format)) {
msg.setFormatType(FormatType.EMAIL);
- }
- if ("PAG".equals(format)) {
+ } else if ("PAG".equals(format)) {
msg.setFormatType(FormatType.SMS);
}
@@ -608,7 +605,7 @@
documentDataStructure));
// msg.setDocumentSize(documentDataStructure.getInt("DOC_SIZE"));
// [PW] REFACTOR duplicated code here.. extract.. [SK]
- msg.setSendDate(null);
+ msg.setStartDate(null);
final Date startDate = (Date) getOptionalVal("STA_DATE", TYPE_DATE,
receiveInfoStructure);
final Date startTime = (Date) getOptionalVal("STA_TIME", TYPE_TIME,
@@ -667,8 +664,12 @@
"DOC_SIZE").trim());
final int bodyNum = packingList.getInt("BODY_NUM");
+ logger.debug("BEFORE msg.getSentContents().size(): " + msg.getSentContents().size());
+ logger.debug("BEFORE content.getData(): " + content.getData());
+
final String transfBin = packingList.getString("TRANSF_BIN");
if ("X".equals(transfBin)) {
+ logger.debug("TransfBin message type");
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
for (int j = 0; j < bodyNum; j++) {
contentsBinList.setRow(bodyStart + j);
@@ -680,14 +681,21 @@
}
baos.write(data, 0, lineSize);
}
- content.setData(baos.toByteArray());
+
+ final byte[] data = baos.toByteArray();
+ logger.debug("data.length: " + data.length);
+ logger.debug("data: " + Arrays.toString(data));
+
+ content.setData(data);
msg.addContents(content);
} else {
+ logger.debug("Text message type");
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
for (int j = 0; j < bodyNum; j++) {
contentsTxtList.setRow(bodyStart + j);
int lineSize = ((j == bodyNum - 1) ? docSize % 255
: 255);
+
final byte[] data = contentsTxtList
.getByteArray("LINE");
if (data.length < lineSize) {
@@ -697,12 +705,20 @@
}
final byte[] data = baos.toByteArray();
+ logger.debug("data.length: " + data.length);
+ logger.debug("data: " + Arrays.toString(data));
final byte[] convertedData = convertBytes(data,
partnerCharset, "UTF-8");
-
+ logger.debug("data.convertedData: " + Arrays.toString(convertedData));
+ logger.debug("data.convertedData.txt: " + new String(data));
+ logger.debug("data.txt: " + new String(convertedData));
+
content.setData(convertedData);
msg.addContents(content);
}
+
+ logger.debug("AFTER msg.getSentContents().size(): " + msg.getSentContents().size());
+ logger.debug("AFTER content.getData(): " + content.getData());
final String documentType = (String) getOptionalVal("DOC_TYPE",
TYPE_STRING, packingList);
@@ -766,6 +782,7 @@
content.setMimeType(Contents.MIME_TYPE_XLS);
} else {
logger.fatal("Unknown format type:" + documentType);
+ // TODO: own exception implementation
throw new RuntimeException("Unknown format type");
}
}
@@ -776,39 +793,27 @@
}
/**
- * CONTENTS_BIN table.
- */
- // final JCO.Table contentsList =
- // function.getTableParameterList().getTable("CONTENTS_BIN");
- // for (int i = 0; i < contentsList.getNumRows(); i++) {
- // contentsList.setRow(i);
- // msg.setContentsList(contentsList.getByte("LINE"));
- // }
- /**
- * CONTENTS_TXT table.
- */
- /*
- * JCO.Table contentsListTxt = null; contentsListTxt =
- * function.getTableParameterList().getTable("CONTENTS_TXT"); ArrayList<String>
- * conListTxt = new ArrayList<String>(); for (int i = 0; i <
- * contentsListTxt.getNumRows(); i++) { contentsListTxt.setRow(i);
- * conListTxt.add(i, contentsListTxt.getString("LINE")); }
- */
-
- /**
* RECEIVERS table
*/
final JCO.Table receivers = function.getTableParameterList().getTable(
"RECEIVERS");
+ logger.debug("BEFORE LOOP");
+ logger.debug("receivers: " + receivers);
+ logger.debug("receivers.getNumRows(): " + receivers.getNumRows());
+ final List<Message> result = new FastTable<Message>();
for (int i = 0; i < receivers.getNumRows(); i++) {
- final Message tempMsg = msg.clone();
+ logger.debug("IN LOOP: " + i);
+ logger.debug("LOOP.msg: " + msg);
+ final Message clonedMsg = msg.clone();
+ logger.debug("LOOP.tempMsg: " + clonedMsg);
receivers.setRow(i);
final String rec = receivers.getString("RECEIVER");
+ logger.debug("LOOP.tempMsg: " + rec);
if (-1 != rec.indexOf(":")) {
final String chn = rec.substring(rec.indexOf(":") + 1);
- tempMsg.setReceiver(chn);
+ clonedMsg.setReceiver(chn);
} else {
- tempMsg.setReceiver(rec);
+ clonedMsg.setReceiver(rec);
}
// setting synchronous status notification:
@@ -831,7 +836,7 @@
// tempMsg.setReceiveDate(receivers.getDate("REC_DATE"));
// tempMsg.setTransmissionDate(receivers.getString("PROCDATE"));
// tempMsg.setTransmissionTime(receivers.getString("PROCTIME"));
- result.add(tempMsg);
+ result.add(clonedMsg);
}
return result.toArray(new Message[result.size()]);
@@ -847,7 +852,10 @@
// end of hack
try {
- String tmp = new String(data, fromCharset);
+ final String tmp = new String(data, fromCharset);
+ if (data.length > 0 && tmp.length() == 0) {
+ return data;
+ }
return tmp.getBytes(toCharset);
} catch (UnsupportedEncodingException e) {
logger.warn("Charsets: '" + fromCharset + "', '" + toCharset
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java 2006-09-30 21:21:43 UTC (rev 170)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java 2006-09-30 23:28:51 UTC (rev 171)
@@ -20,6 +20,8 @@
*/
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;
@@ -116,7 +118,16 @@
JCO.Client client = null;
try {
client = SAPComm.this.getJCOClient();
- PARTNER_CHARSET = client.getAttributes().getPartnerCharset();
+ final JCO.Attributes attributes = client.getAttributes();
+ PARTNER_CHARSET = attributes.getPartnerCharset();
+ if (logger.isInfoEnabled()) {
+ final boolean isBackendUnicode = attributes
+ .getPartnerCodepage().equals("4102")
+ || attributes.getPartnerCodepage().equals("4103");
+ logger
+ .info("SAP JCo isBackendUnicode: "
+ + isBackendUnicode);
+ }
} finally {
if (null != client) {
releaseJCOClient(client);
@@ -127,6 +138,20 @@
@Override
protected void handleRequest(final JCO.Function function) {
+
+ // SERIALIZATION:
+ // try {
+ // FileOutputStream fos;
+ // fos = new FileOutputStream("c:\\temp\\" +
+ // System.currentTimeMillis());
+ // ObjectOutputStream oos = new ObjectOutputStream(fos);
+ // oos.writeObject(function);
+ // oos.close();
+ // } catch (Exception e) {
+ // logger.error("", e);
+ // }
+ // END OF SERIALIZATION
+
handlingRequest = true;
// TODO: rozwazyc czy nie lepiej obslugiwac zgloszenie od klientow w
// osobnych watkach.
@@ -143,6 +168,7 @@
// liczba zdalnych
// uzytkownikow)
handleJCORequest(function, PARTNER_CHARSET);
+
handlingRequest = false;
}
@@ -221,6 +247,11 @@
final Message[] messages = JCoFunctionTranslator
.getMessagesFromJCOFunction(function, charset);
+ logger.debug("1");
+ logger.debug("messages: " + messages);
+ logger.debug("messages.length: "
+ + (null != messages ? "" + messages.length : "NIC"));
+
if (null != messages && messages.length > 0
&& 0 == messages[0].getSentContents().size()) {
final String errMsg = "Message without any content is not supported";
@@ -232,16 +263,33 @@
msgManager = SpringMiddlewareContext.getMessageManager();
}
+ logger.debug("msgManager: " + msgManager);
+
if (null == jmsManager) {
jmsManager = SpringMiddlewareContext.getJMSManager();
}
+ logger.debug("jmsManager: " + jmsManager);
+
final Date currentDate = new Date();
+ logger.debug("2");
for (Message msg : messages) {
+ logger.debug("3: " + msg);
msg.setSAPInstanceDefOwner(instanceDef);
if (null == msg.getSendDate()) {
msg.setSendDate(currentDate);
}
+ logger.debug("4");
+ logger.debug("msg.getSentContents().size(): " + msg.getSentContents().size());
+
+ if (msg.getSentContents().get(0).getContent().MIME_TYPE_TEXT_PLAIN
+ .equals(msg.getSentContents().get(0).getContent()
+ .getMimeType())) {
+ logger.debug("Content1: "
+ + new String(msg.getSentContents().get(0)
+ .getContent().getData()));
+ }
+
msg = msgManager.saveMessage(msg);
jmsManager
.sendMessage(
@@ -349,6 +397,7 @@
private void initRepository() {
repository = JCO.createRepository(getRepositoryName(), getPoolName());
+ logger.debug("Repository: " + repository);
}
private void initSAPConnections() {
@@ -389,6 +438,9 @@
}
props.put(JCO_CLIENT_PREFIX + "trace", TRACE_ENABLED ? "1" : "0");
+ // props.put(JCO_CLIENT_PREFIX + "abap_debug", TRACE_ENABLED ? "1" :
+ // "0");
+
props.put(JCO_CLIENT_PREFIX + "lcheck", "1");
// server properties:
@@ -398,6 +450,10 @@
props.put(JCO_SERVER_PREFIX + "unicode", instanceDef.isUnicode() ? "1"
: "0");
+ // TODO: is this correct ?
+ props.put(JCO_CLIENT_PREFIX + "unicode", instanceDef.isUnicode() ? "1"
+ : "0");
+
return props;
}
@@ -573,6 +629,12 @@
// Send a ping to the server
client.ping();
+ // TODO: testing:
+ // final JCO.Function f = repository.getFunctionTemplate(
+ // "SX_OBJECT_RECEIVE").getFunction();
+ // logger.debug("FUNCTION: " + f);
+ // TODO: end of testing
+
// final JCO.Attributes attr = client.getAttributes();
// final String partnerRelease = attr.getPartnerRelease();
// logger.debug("Partner release: " + partnerRelease);
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-09-30 21:21:43 UTC (rev 170)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-09-30 23:28:51 UTC (rev 171)
@@ -71,7 +71,7 @@
public Collection<WSMessage> getMessagesSubset(int begin, int end) throws WebServiceException {
try {
- MessagesService service = MessagesService.getMessagesService();
+ final MessagesService service = MessagesService.getMessagesService();
return service.getMessagesSubset(begin, end);
} catch(Throwable t) {
logger.fatal("error in getMessagesSubset method", t);
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java 2006-09-30 21:21:43 UTC (rev 170)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java 2006-09-30 23:28:51 UTC (rev 171)
@@ -21,6 +21,8 @@
package org.commsuite.ws.services;
import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import javolution.util.FastTable;
@@ -60,11 +62,17 @@
private static MessagesService instance;
+ /**
+ * TODO: JavaDoc
+ */
public MessagesService() {
messageManager = SpringMiddlewareContext.getMessageManager();
jmsManager = SpringMiddlewareContext.getJMSManager();
}
+ /**
+ * TODO: JavaDoc
+ */
public static MessagesService getMessagesService() {
if (null == instance) {
instance = new MessagesService();
@@ -72,6 +80,9 @@
return instance;
}
+ /**
+ * TODO: JavaDoc
+ */
public int getMessagesSize(SearchMessageModel wsMessage)
throws WebServiceException {
final MessageManager msgManager = SpringMiddlewareContext
@@ -83,28 +94,52 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
public Collection<WSMessage> getMessagesSubset(int begin, int end)
throws WebServiceException, IllegalArgumentException,
IndexOutOfBoundsException {
+ if (begin > end)
+ throw new IllegalArgumentException(
+ "Begin index should be lower than end");
+
final MessageManager msgManager = SpringMiddlewareContext
.getMessageManager();
- final List<Message> mes = (List<Message>) msgManager.getMessages();
- final Collection<WSMessage> result = new FastTable<WSMessage>();
+ final List<Message> mes = msgManager.getMessages();
- if (begin > end)
- throw new IllegalArgumentException(
- "Begin index should be lower than end");
if (begin < 0 || end >= mes.size())
throw new IndexOutOfBoundsException(
"Index is out of bounds: begin:[" + begin + "]end:[" + end
+ "]size:[" + mes.size() + "]");
+ sortMessagesList(mes);
+ final Collection<WSMessage> result = new FastTable<WSMessage>();
for (int i = begin; i <= end; i++) {
result.add(mes.get(i));
}
return result;
}
+
+ private void sortMessagesList(final List<Message> list) {
+ Collections.sort(list, new Comparator<WSMessage>() {
+ public int compare(WSMessage m1, WSMessage m2) {
+ final int comparisonByLastProcessDate = m2.getLastProcessDate()
+ .compareTo(m1.getLastProcessDate());
+ if (0 == comparisonByLastProcessDate) {
+ final int comparisonBySendDate = m1.getSendDate()
+ .compareTo(m1.getSendDate());
+ return comparisonBySendDate;
+ } else {
+ return comparisonByLastProcessDate;
+ }
+ }
+ });
+}
+ /**
+ * TODO: JavaDoc
+ */
public Collection<WSMessage> getAllMessages() throws WebServiceException {
final MessageManager msgManager = SpringMiddlewareContext
.getMessageManager();
@@ -121,23 +156,26 @@
return result;
}
+ /**
+ * TODO: JavaDoc
+ */
public Collection<WSMessage> getSelectedMessagesSubset(
SearchMessageModel wsMessage, int begin, int end)
throws WebServiceException, IllegalArgumentException,
IndexOutOfBoundsException {
+ if (begin > end)
+ throw new IllegalArgumentException(
+ "Begin index should be lower than end");
final MessageManager msgManager = SpringMiddlewareContext
.getMessageManager();
- List<Message> messages = (List<Message>) msgManager
- .getSelectedMessages(wsMessage);
+ List<Message> messages = msgManager.getSelectedMessages(wsMessage);
- if (begin > end)
- throw new IllegalArgumentException(
- "Begin index should be lower than end");
if (begin < 0 || end >= messages.size())
throw new IndexOutOfBoundsException(
"Index is out of bounds: begin:[" + begin + "]end:[" + end
+ "]size:[" + messages.size() + "]");
+ sortMessagesList(messages);
Collection<WSMessage> result = new FastTable<WSMessage>();
for (int i = begin; i <= end; i++) {
result.add(messages.get(i));
@@ -145,6 +183,9 @@
return result;
}
+ /**
+ * TODO: JavaDoc
+ */
public Collection<WSMessage> getSelectedMessages(
SearchMessageModel wsMessage) throws WebServiceException {
final MessageManager msgManager = SpringMiddlewareContext
@@ -158,12 +199,18 @@
return result;
}
+ /**
+ * TODO: JavaDoc
+ */
public WSContents getContentsById(String id) throws WebServiceException {
- final ContentsManager contentsManager = SpringMiddlewareContext
+ final ContentsManager contentsManager = SpringMiddlewareContext
.getContentsManager();
return contentsManager.getContents(id);
}
+ /**
+ * TODO: JavaDoc
+ */
public Collection<WSSentContent> getSentContentsByMessage(String id)
throws WebServiceException {
final SentContentManager sentContentManager = SpringMiddlewareContext
@@ -178,9 +225,7 @@
}
/**
- * @param id
- * @return
- * @throws WebServiceException
+ * TODO: JavaDoc
*/
public Collection<WSContents> getContentsBySentContent(String id)
throws WebServiceException {
@@ -192,15 +237,22 @@
for (final Contents content : contents) {
result.add(content);
}
+ logger.debug("getContentsBySentContent.size: " + result.size());
return result;
}
+ /**
+ * TODO: JavaDoc
+ */
public WSMessage getMessageById(String id) throws WebServiceException {
final MessageManager msgManager = SpringMiddlewareContext
.getMessageManager();
return msgManager.getMessage(id);
}
+ /**
+ * TODO: JavaDoc
+ */
public void resubmitMessageWithId(String messageId)
throws WebServiceException {
final Message msg = messageManager.getMessage(messageId);
Modified: trunk/code/CSMiddleware/war/deviceemulator.jsp
===================================================================
--- trunk/code/CSMiddleware/war/deviceemulator.jsp 2006-09-30 21:21:43 UTC (rev 170)
+++ trunk/code/CSMiddleware/war/deviceemulator.jsp 2006-09-30 23:28:51 UTC (rev 171)
@@ -1,25 +1,27 @@
+
<%
-/* $Id $
- *
- * Communications Suite.
- * Copyright (C) 2006 Szymon Kuzniak, Rafal Malinowski, Marek Musielak, Pawel Walkiewicz,
- * Agnieszka Wisniewska, Marcin Zduniak, Liliana Ziolek.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- */
-%><?xml version="1.0" encoding="UTF-8" ?>
+ /* $Id $
+ *
+ * Communications Suite.
+ * Copyright (C) 2006 Szymon Kuzniak, Rafal Malinowski, Marek Musielak, Pawel Walkiewicz,
+ * Agnieszka Wisniewska, Marcin Zduniak, Liliana Ziolek.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+%>
+<?xml version="1.0" encoding="UTF-8" ?>
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"
import="org.commsuite.model.*,java.util.*,org.commsuite.enums.*,org.commsuite.util.*,java.io.*,org.commsuite.messaging.*"%>
@@ -95,13 +97,20 @@
SpringMiddlewareContext.getJMSManager().sendMessage(
SpringMiddlewareBeansConstants.M_SAP_IN_QUEUE_NAME,
message);
-
- }
%>
-<b>Message sent<br/></b>
+<b>Message sent<br />
+<br />
+</b>
<%
-}
+} else {
%>
+<b>Sending message stopped<br />
+<br />
+</b>
+<%
+ }
+ }
+%>
<form method="post"><input type="hidden" name="msgSent" value="1" />
<table border="0">
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 00:49:26
|
Revision: 182
http://svn.sourceforge.net/comsuite/?rev=182&view=rev
Author: zduniak
Date: 2006-10-02 06:26:17 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
TODO added
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-10-02 11:53:55 UTC (rev 181)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-10-02 13:26:17 UTC (rev 182)
@@ -176,6 +176,8 @@
final SAPNotificationConsumer sapNotificationConsumer = new SAPNotificationConsumer(
sapComm);
+ // TODO: this condition is used only during performing tests.
+ // Refactor it in order to neglect below condition in production code.
if (null != notificationsManager) {
notificationsManager.associateNewConsumer(sapComm.getName(), sapNotificationConsumer);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 00:49:04
|
Revision: 178
http://svn.sourceforge.net/comsuite/?rev=178&view=rev
Author: zduniak
Date: 2006-10-01 13:18:40 -0700 (Sun, 01 Oct 2006)
Log Message:
-----------
Code clean up
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java 2006-10-01 18:45:04 UTC (rev 177)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java 2006-10-01 20:18:40 UTC (rev 178)
@@ -108,6 +108,9 @@
private final String PARTNER_CHARSET;
+ /**
+ * TODO: JavaDoc
+ */
/* package scope */JCOServer() {
super(SAPComm.this.getLogonProperties(), SAPComm.this.repository);
logger.info("Server registering properties: "
@@ -122,34 +125,33 @@
final boolean isBackendUnicode = attributes
.getPartnerCodepage().equals("4102")
|| attributes.getPartnerCodepage().equals("4103");
- logger
- .info("SAP JCo isBackendUnicode: "
- + isBackendUnicode);
+ logger.info("IsBackendUnicode: " + isBackendUnicode);
+ logger.info("PartnerBytesPerChar: "
+ + attributes.getPartnerBytesPerChar());
+ logger.info("PartnerCharset: "
+ + attributes.getPartnerCharset());
+ logger.info("PartnerCodepage: "
+ + attributes.getPartnerCodepage());
+ logger.info("PartnerEncoding: "
+ + attributes.getPartnerEncoding());
+ logger.info("PartnerHost: " + attributes.getPartnerHost());
+ logger.info("PartnerRelease: "
+ + attributes.getPartnerRelease());
+ logger.info("PartnerType: " + attributes.getPartnerType());
}
} finally {
if (null != client) {
releaseJCOClient(client);
}
}
- logger.info("JCO.Server created");
+ logger.debug("JCO.Server created");
}
+ /**
+ * TODO: JavaDoc
+ */
@Override
protected void handleRequest(final JCO.Function function) {
-
- // SERIALIZATION:
- // try {
- // FileOutputStream fos;
- // fos = new FileOutputStream("c:\\temp\\" +
- // System.currentTimeMillis());
- // ObjectOutputStream oos = new ObjectOutputStream(fos);
- // oos.writeObject(function);
- // oos.close();
- // } catch (Exception e) {
- // logger.error("", e);
- // }
- // END OF SERIALIZATION
-
handlingRequest = true;
// TODO: rozwazyc czy nie lepiej obslugiwac zgloszenie od klientow w
// osobnych watkach.
@@ -170,12 +172,18 @@
handlingRequest = false;
}
+ /**
+ * TODO: JavaDoc
+ */
public void serverExceptionOccurred(JCO.Server server, Exception ex) {
logger.fatal("Exception in server: "
+ SAPComm.this.instanceDef.getName() + "[ProgID: "
+ server.getProgID() + "]", ex);
}
+ /**
+ * TODO: JavaDoc
+ */
public void serverStateChangeOccurred(JCO.Server server, int oldState,
int newState) {
if (logger.isInfoEnabled()) {
@@ -215,6 +223,9 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
public void serverErrorOccurred(JCO.Server server, Error error) {
logger.fatal("Error in server: "
+ SAPComm.this.instanceDef.getName() + "[ProgID: "
@@ -224,6 +235,9 @@
// stopServer();
}
+ /**
+ * TODO: JavaDoc
+ */
public void uncaughtException(Thread t, Throwable e) {
logger.fatal("UncaughtException in server: "
+ SAPComm.this.instanceDef.getName(), e);
@@ -233,10 +247,16 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
public IJCOServer getServer() {
return server;
}
+ /**
+ * TODO: JavaDoc
+ */
public void handleJCORequest(final JCO.Function function, String charset) {
try {
logger.info("Handling request for function: " + function.getName());
@@ -245,11 +265,6 @@
final Message[] messages = JCoFunctionTranslator
.getMessagesFromJCOFunction(function, charset);
- logger.debug("1");
- logger.debug("messages: " + messages);
- logger.debug("messages.length: "
- + (null != messages ? "" + messages.length : "NIC"));
-
if (null != messages && messages.length > 0
&& 0 == messages[0].getSentContents().size()) {
final String errMsg = "Message without any content is not supported";
@@ -261,33 +276,17 @@
msgManager = SpringMiddlewareContext.getMessageManager();
}
- logger.debug("msgManager: " + msgManager);
-
if (null == jmsManager) {
jmsManager = SpringMiddlewareContext.getJMSManager();
}
- logger.debug("jmsManager: " + jmsManager);
-
final Date currentDate = new Date();
- logger.debug("2");
for (Message msg : messages) {
- logger.debug("3: " + msg);
msg.setSAPInstanceDefOwner(instanceDef);
if (null == msg.getSendDate()) {
msg.setSendDate(currentDate);
}
- logger.debug("4");
- logger.debug("msg.getSentContents().size(): " + msg.getSentContents().size());
- if (msg.getSentContents().get(0).getContent().MIME_TYPE_TEXT_PLAIN
- .equals(msg.getSentContents().get(0).getContent()
- .getMimeType())) {
- logger.debug("Content1: "
- + new String(msg.getSentContents().get(0)
- .getContent().getData()));
- }
-
msg = msgManager.saveMessage(msg);
jmsManager
.sendMessage(
@@ -327,13 +326,10 @@
}
/**
- * REVIEW: public ? what for ? i dont think that this method is necessary at
- * all.
- *
* @param server
* The server to set.
*/
- public void setServer(IJCOServer server) {
+ /* package scope */void setServer(IJCOServer server) {
this.server = server;
}
@@ -393,11 +389,16 @@
initiated = true;
}
+ /**
+ * TODO: JavaDoc
+ */
private void initRepository() {
repository = JCO.createRepository(getRepositoryName(), getPoolName());
- logger.debug("Repository: " + repository);
}
+ /**
+ * TODO: JavaDoc
+ */
private void initSAPConnections() {
releaseSAPConnections();
@@ -410,6 +411,9 @@
pool.setTrace(TRACE_ENABLED);
}
+ /**
+ * TODO: JavaDoc
+ */
/* package scope */Properties getLogonProperties() {
final String JCO_CLIENT_PREFIX = "jco.client.";
final String JCO_SERVER_PREFIX = "jco.server.";
@@ -448,13 +452,16 @@
props.put(JCO_SERVER_PREFIX + "unicode", instanceDef.isUnicode() ? "1"
: "0");
- // TODO: is this correct ?
+ // TODO: is this correct and necessary ?
props.put(JCO_CLIENT_PREFIX + "unicode", instanceDef.isUnicode() ? "1"
: "0");
return props;
}
+ /**
+ * TODO: JavaDoc
+ */
private void releaseSAPConnections() {
// testing whether connection pool already exists:
final JCO.Pool pool = JCO.getClientPoolManager().getPool(getPoolName());
@@ -464,22 +471,37 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
private String getPoolName() {
return JCO_CONNECTIONS_POOL_PREFIX + instanceDef.getName();
}
+ /**
+ * TODO: JavaDoc
+ */
private String getRepositoryName() {
return JCO_REPOSITORY_PREFIX + instanceDef.getName();
}
+ /**
+ * TODO: JavaDoc
+ */
/* package scope */JCO.Client getJCOClient() {
return JCO.getClient(getPoolName());
}
+ /**
+ * TODO: JavaDoc
+ */
private void releaseJCOClient(JCO.Client client) {
JCO.releaseClient(client);
}
+ /**
+ * TODO: JavaDoc
+ */
public void destroy() {
stopServer();
releaseSAPConnections();
@@ -487,20 +509,23 @@
initiated = false;
}
+ /**
+ * TODO: JavaDoc
+ */
public void stopServer() {
if (null != server && server.isAlive()) {
- logger.debug("Stopping SAP server");
+ logger.info("Stopping SAP server");
server.stop();
server.abort("Connection aborted by administrator.");
} else {
- logger.debug("SAP server already stopped");
+ logger.info("SAP server already stopped");
}
server = null;
- logger.debug("SAP server STOPPED");
+ logger.info("SAP server STOPPED");
}
/**
- * this method was created only to be override in tests
+ * This method was created only to be override in tests.
*
* @return new {@link SAPComm.JCOServer} instance
*/
@@ -508,9 +533,12 @@
return this.new JCOServer();
}
+ /**
+ * TODO: JavaDoc
+ */
public void startServer() {
if (null != isRemoteSystemWorking()) {
- logger.error("Remote system is not working: " + getName());
+ logger.fatal("Remote system is not working: " + getName());
return;
}
stopServer();
@@ -526,7 +554,9 @@
* @return true if message was sent, false if sending failed
*/
public boolean sendMessage(Message message) {
- logger.debug("Sending message: " + message.toString());
+ if (logger.isInfoEnabled()) {
+ logger.info("Sending message: " + message.toString());
+ }
JCO.Client client = null;
try {
@@ -541,8 +571,8 @@
client.execute(f);
// }
final boolean send = checkFunctionReturn(f);
- if (logger.isDebugEnabled()) {
- logger.debug("Message to [" + message.getReceiver()
+ if (logger.isInfoEnabled()) {
+ logger.info("Message to [" + message.getReceiver()
+ "] sent status: " + send);
}
return send;
@@ -557,6 +587,9 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
private boolean checkFunctionReturn(final Function f) {
// testing return state:
final JCO.Table receivers = f.getTableParameterList().getTable(
@@ -579,6 +612,9 @@
return SAPStatusCodeConstants.DELIVERED_SUCCESSFULLY_701.equals(code);
}
+ /**
+ * TODO: JavaDoc
+ */
public boolean sendNotification(Notification notification) {
logger.debug("Sending notification: " + notification.toString());
@@ -612,6 +648,9 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
public String isRemoteSystemWorking() {
// TODO: [MZ] i'm not sure whether this implementation is correct
JCO.Client client = null;
@@ -626,12 +665,6 @@
// Send a ping to the server
client.ping();
- // TODO: testing:
- // final JCO.Function f = repository.getFunctionTemplate(
- // "SX_OBJECT_RECEIVE").getFunction();
- // logger.debug("FUNCTION: " + f);
- // TODO: end of testing
-
// final JCO.Attributes attr = client.getAttributes();
// final String partnerRelease = attr.getPartnerRelease();
// logger.debug("Partner release: " + partnerRelease);
@@ -648,14 +681,23 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
public boolean isDefault() {
return instanceDef.isDefaultInstance();
}
+ /**
+ * TODO: JavaDoc
+ */
public String getName() {
return instanceDef.getName();
}
+ /**
+ * TODO: JavaDoc
+ */
@Override
public boolean equals(final Object o) {
// REVIEW: is this correct ?
@@ -673,6 +715,9 @@
return s.getName().equals(this.getName());
}
+ /**
+ * TODO: JavaDoc
+ */
@Override
public int hashCode() {
return getName().hashCode();
@@ -680,7 +725,7 @@
}
/**
- * @see java.lang.Object#toString()
+ * TODO: JavaDoc
*/
@Override
public String toString() {
@@ -696,10 +741,16 @@
this.errorsWhileHandlingFunctions).toString();
}
+ /**
+ * TODO: JavaDoc
+ */
public boolean isHandlingRequest() {
return handlingRequest;
}
+ /**
+ * TODO: JavaDoc
+ */
public boolean isActiveInstance() {
return this.instanceDef.isActiveInstance();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 00:48:38
|
Revision: 185
http://svn.sourceforge.net/comsuite/?rev=185&view=rev
Author: zduniak
Date: 2006-10-02 09:49:49 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
Code cleanup
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java
trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java 2006-10-02 15:18:41 UTC (rev 184)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java 2006-10-02 16:49:49 UTC (rev 185)
@@ -367,7 +367,7 @@
final String mimeType = con.getMimeType();
- logger.debug("ContentType: " + mimeType);
+ logger.info("ContentType: " + mimeType);
final String docTypeFieldName = "DOC_TYPE";
@@ -466,7 +466,7 @@
}
final Message msg = new Message();
- logger.info("using charset: " + partnerCharset);
+ logger.debug("Using charset: " + partnerCharset);
// TODO: [AW] w parametrach wyjsciowych powinnismy jeszcze ustalic ze
// SAP informacje
@@ -665,7 +665,6 @@
final int bodyNum = packingList.getInt("BODY_NUM");
logger.debug("BEFORE msg.getSentContents().size(): " + msg.getSentContents().size());
- logger.debug("BEFORE content.getData(): " + content.getData());
final String transfBin = packingList.getString("TRANSF_BIN");
if ("X".equals(transfBin)) {
@@ -684,7 +683,6 @@
final byte[] data = baos.toByteArray();
logger.debug("data.length: " + data.length);
- logger.debug("data: " + Arrays.toString(data));
content.setData(data);
msg.addContents(content);
@@ -706,19 +704,14 @@
final byte[] data = baos.toByteArray();
logger.debug("data.length: " + data.length);
- logger.debug("data: " + Arrays.toString(data));
final byte[] convertedData = convertBytes(data,
partnerCharset, "UTF-8");
- logger.debug("data.convertedData: " + Arrays.toString(convertedData));
- logger.debug("data.convertedData.txt: " + new String(data));
- logger.debug("data.txt: " + new String(convertedData));
content.setData(convertedData);
msg.addContents(content);
}
logger.debug("AFTER msg.getSentContents().size(): " + msg.getSentContents().size());
- logger.debug("AFTER content.getData(): " + content.getData());
final String documentType = (String) getOptionalVal("DOC_TYPE",
TYPE_STRING, packingList);
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java 2006-10-02 15:18:41 UTC (rev 184)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java 2006-10-02 16:49:49 UTC (rev 185)
@@ -529,7 +529,7 @@
*
* @return new {@link SAPComm.JCOServer} instance
*/
- /* package scope */public IJCOServer getNewJCOServer() {
+ public IJCOServer getNewJCOServer() {
return this.new JCOServer();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 00:48:22
|
Revision: 186
http://svn.sourceforge.net/comsuite/?rev=186&view=rev
Author: zduniak
Date: 2006-10-02 09:53:42 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
Code cleanup
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java
trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java 2006-10-02 16:49:49 UTC (rev 185)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java 2006-10-02 16:53:42 UTC (rev 186)
@@ -24,7 +24,6 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -76,6 +75,9 @@
private final static int TYPE_CHAR = 4;
+ /**
+ * TODO: JavaDoc
+ */
public static JCO.Function getJCOFunctionFromNotification(
Notification notification, IRepository repository) {
final JCO.Function f = repository.getFunctionTemplate(
@@ -835,28 +837,28 @@
return result.toArray(new Message[result.size()]);
}
+ /**
+ * TODO: JavaDoc
+ */
private static byte[] convertBytes(final byte[] data, String fromCharset,
String toCharset) {
-
- // hack
-// if ("UnicodeLittle".equalsIgnoreCase(fromCharset)) {
-// fromCharset = "UTF-8";
-// }
- // end of hack
-
try {
final String tmp = new String(data, fromCharset);
if (data.length > 0 && tmp.length() == 0) {
+ logger.warn("Charsets: from '" + fromCharset + "' produced empty string");
return data;
}
return tmp.getBytes(toCharset);
} catch (UnsupportedEncodingException e) {
- logger.warn("Charsets: '" + fromCharset + "', '" + toCharset
+ logger.warn("Charsets: from: '" + fromCharset + "' to '" + toCharset
+ "' not supported", e);
return data;
}
}
+ /**
+ * TODO: JavaDoc
+ */
private static Object getOptionalVal(String name, int type,
com.sap.mw.jco.JCO.Record rec) {
Object val = null;
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-10-02 16:49:49 UTC (rev 185)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-10-02 16:53:42 UTC (rev 186)
@@ -74,6 +74,9 @@
return Collections.unmodifiableMap(this.sapComms);
}
+ /**
+ * TODO: JavaDoc
+ */
public SAPCommManager() {
super();
sapComms = new FastMap<String, ISAPComm>();
@@ -91,6 +94,9 @@
this.sapComms = sapComms;
}
+ /**
+ * TODO: JavaDoc
+ */
public void sendMessageToDefault(Message message) {
logger.debug("Sending message to default SAP servers");
@@ -113,6 +119,9 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
public void init() {
logger.debug("Running init() method in SAPCommManager (size: " + sapComms.size() + ")");
@@ -140,6 +149,9 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
private void initJCOTracePath() {
final String jcoTracePath = getClass().getResource("/").getPath() + ".." + File.separator
+ ".." + File.separator + ".." + File.separator + ".." + File.separator + "logs"
@@ -151,6 +163,9 @@
}
+ /**
+ * TODO: JavaDoc
+ */
public void destroy() {
logger.info("Destroying SAPCommManager");
for (final ISAPComm sapComm : sapComms.values()) {
@@ -159,6 +174,9 @@
logger.info("SAPCommManager destroyed");
}
+ /**
+ * TODO: JavaDoc
+ */
// TODO: should this method be sensitive on active field??
public void setSapInstances(Collection<SAPInstanceDef> sapInstances) {
// TODO: init sapComms collection with values from DB
@@ -186,6 +204,9 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
// TODO: should this method be sensitive on active field??
public void setSapInstance(SAPInstanceDef instance) {
if (!isEnabled()) {
@@ -199,20 +220,32 @@
sapComms.put(sapComm.getName(), sapComm);
}
+ /**
+ * TODO: JavaDoc
+ */
public void setNotificationsManager(INotificationsManager notificationsManager) {
this.notificationsManager = notificationsManager;
}
+ /**
+ * TODO: JavaDoc
+ */
public boolean isEnabled() {
return enabled;
}
+ /**
+ * TODO: JavaDoc
+ */
/* package scope */void checkExistenceOfSAPInstance(String instanceName) {
if (!sapComms.containsKey(instanceName)) {
throw new SAPInstanceException("Instance: " + instanceName + " does not exist.");
}
}
+ /**
+ * TODO: JavaDoc
+ */
public void startInstance(String instanceName) {
logger.info("Starting instance: " + instanceName);
checkExistenceOfSAPInstance(instanceName);
@@ -226,6 +259,9 @@
}
}
+ /**
+ * TODO: JavaDoc
+ */
public void stopInstance(String instanceName) {
logger.info("Stopping instance: " + instanceName);
checkExistenceOfSAPInstance(instanceName);
@@ -234,6 +270,9 @@
logger.info("Instance stopped: " + instanceName);
}
+ /**
+ * TODO: JavaDoc
+ */
public void destroyInstance(String instanceName) {
logger.info("Destroying instance: " + instanceName);
checkExistenceOfSAPInstance(instanceName);
@@ -244,10 +283,16 @@
logger.info("Instance destroyed: " + instanceName);
}
+ /**
+ * TODO: JavaDoc
+ */
public ISAPComm getSAPCommByName(String name) {
return sapComms.get(name);
}
+ /**
+ * TODO: JavaDoc
+ */
public boolean isSapServerWorking(String name) {
ISAPComm SappCommByName = getSAPCommByName(name);
return (null != SappCommByName && null != SappCommByName.getServer());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 00:48:11
|
Revision: 184
http://svn.sourceforge.net/comsuite/?rev=184&view=rev
Author: zduniak
Date: 2006-10-02 08:18:41 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
SystemArchitecture.java performance slightly improved (mainly due to improvements in strings concatenation mechanism)
Modified Paths:
--------------
trunk/code/CSCommon/src/org/commsuite/aop/SystemArchitecture.java
Modified: trunk/code/CSCommon/src/org/commsuite/aop/SystemArchitecture.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/aop/SystemArchitecture.java 2006-10-02 15:03:17 UTC (rev 183)
+++ trunk/code/CSCommon/src/org/commsuite/aop/SystemArchitecture.java 2006-10-02 15:18:41 UTC (rev 184)
@@ -36,14 +36,14 @@
.getLogger(SystemArchitecture.class);
/**
- * TODO: JavaDoc
+ * TODO: JavaDoc
*/
@Pointcut("execution(* org.commsuite..*(..))")
public void dataAccessOperation() {
}
/**
- * TODO: JavaDoc
+ * TODO: JavaDoc
*/
@Around("dataAccessOperation()")
public Object doDataAccessOperation(ProceedingJoinPoint pjp)
@@ -63,17 +63,20 @@
// pass - do not bother if we can not get line number
}
- String parameters = "";
+ final StringBuilder parameters = new StringBuilder();
if (null != pjp.getArgs()) {
+ // TODO: consider using only one method invocation:
+ // Arrays.toString(pjp.getArgs())
+ // instead of below loop:
for (int i = 0; i < pjp.getArgs().length; i++) {
if (i != 0) {
- parameters += ", ";
+ parameters.append(", ");
}
try {
- parameters += pjp.getArgs()[i];
+ parameters.append(pjp.getArgs()[i]);
} catch (Exception e) {
- parameters += "???";
+ parameters.append("???");
// don't cate if we can NOT log some parameter
}
}
@@ -81,15 +84,15 @@
Object result = null;
- logger.debug(pjp.getSignature() + " " + lineNumber + " (" + parameters
- + ") START");
+ logger.debug(pjp.getSignature() + " " + lineNumber + " ("
+ + parameters.toString() + ") START");
try {
result = pjp.proceed();
} catch (Throwable e) {
logger.debug(pjp.getSignature().toString(), e);
throw e;
}
-
+
logger.debug(pjp.getSignature() + " " + result);
return result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-04 00:48:10
|
Revision: 175
http://svn.sourceforge.net/comsuite/?rev=175&view=rev
Author: zduniak
Date: 2006-10-01 08:53:37 -0700 (Sun, 01 Oct 2006)
Log Message:
-----------
Issue #1691 resolved
Modified Paths:
--------------
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java
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 10:02:14 UTC (rev 174)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java 2006-10-01 15:53:37 UTC (rev 175)
@@ -20,8 +20,6 @@
*/
package org.commsuite.web.beans.messages;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
import javax.faces.model.SelectItem;
@@ -226,6 +224,10 @@
ICommunicateWS ws) throws WebServiceException {
this.totalMessages = ws.getMessagesSize(model);
this.totalPages = ((this.totalMessages - 1) / ROWS_ON_PAGE) + 1;
+
+ if (0 == totalMessages) {
+ return new FastTable<WSMessage>();
+ }
final int begin = (this.actualPage - 1) * ROWS_ON_PAGE;
int end = (this.actualPage * ROWS_ON_PAGE) - 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-03 21:01:49
|
Revision: 194
http://svn.sourceforge.net/comsuite/?rev=194&view=rev
Author: skuzniak
Date: 2006-10-03 14:01:08 -0700 (Tue, 03 Oct 2006)
Log Message:
-----------
deleting servers corrected(now deletes server with its messages)
Modified Paths:
--------------
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java
trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java
trunk/code/CSMiddleware/src/org/commsuite/dao/MessageDao.java
trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/MessageDaoImpl.java
trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java
trunk/code/CSMiddleware/src/org/commsuite/managers/MessageManager.java
trunk/code/CSMiddleware/src/org/commsuite/managers/impl/MessageManagerImpl.java
trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml
trunk/code/CSMiddleware/src/org/commsuite/model/Message.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/MessagingWS.java
trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.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-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -31,6 +31,7 @@
import org.apache.log4j.Logger;
import org.commsuite.model.FakedSAPInstanceDef;
+import org.commsuite.model.ws.WSMessage;
import org.commsuite.model.ws.WSSAPInstanceDef;
import org.commsuite.util.SpringAdminPanelContext;
import org.commsuite.web.beans.BeansUtils;
@@ -347,6 +348,10 @@
public String deleteServer() {
final ICommunicateWS ws = SpringAdminPanelContext.getCommunicateWS();
try {
+ Collection<WSMessage> messages = ws.getMessagesByServer(this.serverId);
+ for (WSMessage message : messages) {
+ ws.deleteMessage(message.getId().toString());
+ }
ws.deleteServer(this.serverId);
} catch(WebServiceException wse) {
logger.fatal("Cannot delete server", wse);
@@ -383,9 +388,6 @@
public List<SelectItem> getBooleanSearchList() {
List<SelectItem> items = new FastTable<SelectItem>();
SelectItem item = new SelectItem();
- item.setLabel(LanguageSelectionBean.getLabel(SearchServerBean.CHOICE_ALL_LABEL));
- item.setValue(10);
- items.add(item);
item = new SelectItem();
item.setLabel("true");
item.setValue(1);
@@ -394,6 +396,10 @@
item.setLabel("false");
item.setValue(0);
items.add(item);
+ item = new SelectItem();
+ item.setLabel(LanguageSelectionBean.getLabel(SearchServerBean.CHOICE_ALL_LABEL));
+ item.setValue(10);
+ items.add(item);
return items;
}
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-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -192,9 +192,6 @@
public List<SelectItem> getEnabledList() {
List<SelectItem> choices = new FastTable<SelectItem>();
SelectItem item = new SelectItem();
- item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
- item.setValue(10);
- choices.add(item);
item = new SelectItem();
item.setLabel("true");
item.setValue(1);
@@ -203,6 +200,10 @@
item.setLabel("false");
item.setValue(0);
choices.add(item);
+ item = new SelectItem();
+ item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
+ item.setValue(10);
+ choices.add(item);
return choices;
}
@@ -231,7 +232,6 @@
List<SelectItem> choices = new FastTable<SelectItem>();
SelectItem item = new SelectItem();
item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
- // item.setValue(null);
choices.add(item);
for (Language language : Language.values()) {
item = new SelectItem();
Modified: trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java 2006-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -50,6 +50,16 @@
public Collection<WSMessage> getAllMessages() throws WebServiceException;
/**
+ * This method returns set of messages assigned to particular server
+ * with <code>serverId</code>
+ *
+ * @param serverId id of server
+ * @return collection of messages
+ * @throws WebServiceException on any error
+ */
+ public Collection<WSMessage> getMessagesByServer(String serverId) throws WebServiceException ;
+
+ /**
* Allows to delete message from databse
*
* @param id id of message to delete
Modified: trunk/code/CSMiddleware/src/org/commsuite/dao/MessageDao.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/dao/MessageDao.java 2006-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSMiddleware/src/org/commsuite/dao/MessageDao.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -20,6 +20,7 @@
*/
package org.commsuite.dao;
+import java.util.Collection;
import java.util.List;
import org.commsuite.model.Message;
@@ -49,4 +50,6 @@
public List<Message> getSelectedMessges(SearchMessageModel message) ;
+ public Collection<Message> getMessagesByServer(String serverId);
+
}
Modified: trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/MessageDaoImpl.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/MessageDaoImpl.java 2006-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/MessageDaoImpl.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -177,6 +177,13 @@
"select m from SentContent s join s.message m where s.id = ?",
scId).get(0);
}
+
+ @SuppressWarnings("unchecked")
+ public List<Message> getMessagesByServer(String serverId) {
+ return (List<Message>) getHibernateTemplate().find(
+ "from Message m where m.sapInstanceDefOwner.id = ?",
+ Long.parseLong(serverId));
+ }
@SuppressWarnings("unchecked")
public List<Message> getSelectedMessges(SearchMessageModel message) {
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java 2006-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -151,7 +151,7 @@
public void send(Message message) {
final List<SentContent> sentContents = message.getSentContents();
- logger.debug("message sap id is: " + message.getSAPInstanceDefOwner());
+ logger.debug("message sap id is: " + message.getSapInstanceDefOwner());
// message state vs content state
for (final SentContent sentContent : sentContents) {
Modified: trunk/code/CSMiddleware/src/org/commsuite/managers/MessageManager.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/managers/MessageManager.java 2006-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSMiddleware/src/org/commsuite/managers/MessageManager.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -20,6 +20,7 @@
*/
package org.commsuite.managers;
+import java.util.Collection;
import java.util.List;
import org.commsuite.model.Message;
@@ -49,4 +50,6 @@
public List<Message> getSelectedMessages(SearchMessageModel message) ;
+ public Collection<Message> getMessagesByServer(String serverId) ;
+
}
Modified: trunk/code/CSMiddleware/src/org/commsuite/managers/impl/MessageManagerImpl.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/managers/impl/MessageManagerImpl.java 2006-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSMiddleware/src/org/commsuite/managers/impl/MessageManagerImpl.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -20,6 +20,7 @@
*/
package org.commsuite.managers.impl;
+import java.util.Collection;
import java.util.Date;
import java.util.List;
@@ -49,6 +50,10 @@
public List<Message> getMessages() {
return dao.getMessages();
}
+
+ public Collection<Message> getMessagesByServer(String serverId) {
+ return dao.getMessagesByServer(serverId);
+ }
/**
* Saves or updates message in database
Modified: trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml 2006-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml 2006-10-03 21:01:08 UTC (rev 194)
@@ -25,7 +25,7 @@
<property name="sender" not-null="true" column="SENDER"/>
<property name="startDate" not-null="false" type="timestamp" column="START_DATE"/>
<property name="status" not-null="true" type="org.commsuite.enums.hibernate.HibernateStatus" column="STATUS"/>
- <many-to-one not-null="false" column="SAP_SERVER_ID" lazy="false" cascade="none" name="SAPInstanceDefOwner"/>
+ <many-to-one not-null="false" column="SAP_SERVER_ID" lazy="false" cascade="none" name="sapInstanceDefOwner"/>
<many-to-one not-null="false" column="USER_ID" lazy="false" cascade="none" name="userOwner"/>
<list cascade="none" name="sentContents">
<cache usage="read-write"/>
Modified: trunk/code/CSMiddleware/src/org/commsuite/model/Message.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/Message.java 2006-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/Message.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -210,7 +210,7 @@
msg.setPriority(this.priority);
msg.setReceiver(this.receiver);
msg.setSapID(this.sapID);
- msg.setSAPInstanceDefOwner(this.sapInstanceDefOwner);
+ msg.setSapInstanceDefOwner(this.sapInstanceDefOwner);
msg.setSendDate(this.sendDate);
msg.setSender(this.sender);
msg.setStartDate(this.startDate);
@@ -541,14 +541,14 @@
* lazy="false" cascade="none"
* @hibernate.cache usage="read-write"
*/
- public SAPInstanceDef getSAPInstanceDefOwner() {
+ public SAPInstanceDef getSapInstanceDefOwner() {
return sapInstanceDefOwner;
}
/**
* TODO: JavaDoc
*/
- public void setSAPInstanceDefOwner(SAPInstanceDef instanceDefOwner) {
+ public void setSapInstanceDefOwner(SAPInstanceDef instanceDefOwner) {
this.sapInstanceDefOwner = instanceDefOwner;
}
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java 2006-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -282,7 +282,7 @@
final Date currentDate = new Date();
for (Message msg : messages) {
- msg.setSAPInstanceDefOwner(instanceDef);
+ msg.setSapInstanceDefOwner(instanceDef);
if (null == msg.getSendDate()) {
msg.setSendDate(currentDate);
}
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -79,6 +79,16 @@
}
}
+ public Collection<WSMessage> getMessagesByServer(String serverId) throws WebServiceException {
+ try {
+ final MessagesService service = MessagesService.getMessagesService();
+ return service.getMessagesByServer(serverId);
+ } catch(Throwable t) {
+ logger.fatal("error in getMessagesByServer method", t);
+ throw new WebServiceException(t);
+ }
+ }
+
public void deleteMessage(String id) throws WebServiceException {
try {
final MessagesService service = MessagesService.getMessagesService();
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/MessagingWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/MessagingWS.java 2006-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/MessagingWS.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -96,7 +96,7 @@
message.addContents(contents);
- message.setSAPInstanceDefOwner(null);
+ message.setSapInstanceDefOwner(null);
message.setUserOwner(user);
message.setStatus(Status.RECEIVED_BY_WEBSERVICE);
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java 2006-10-03 19:28:57 UTC (rev 193)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java 2006-10-03 21:01:08 UTC (rev 194)
@@ -294,4 +294,23 @@
}
}
+ public Collection<WSMessage> getMessagesByServer(String serverId) throws WebServiceException{
+ final MessageManager msgManager = SpringMiddlewareContext
+ .getMessageManager();
+ try {
+ logger.debug("test1:: "+ serverId);
+ Collection<Message> mes = msgManager.getMessagesByServer(serverId);
+ logger.debug("test2");
+ Collection<WSMessage> result = new FastTable<WSMessage>();
+ logger.debug("test3");
+ for (Message m : mes) {
+ result.add((WSMessage)m);
+ }
+ logger.debug("test4");
+ return result;
+ } catch (Throwable t) {
+ throw new WebServiceException("Exception during receiving mesages", t);
+ }
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-03 19:29:08
|
Revision: 193
http://svn.sourceforge.net/comsuite/?rev=193&view=rev
Author: skuzniak
Date: 2006-10-03 12:28:57 -0700 (Tue, 03 Oct 2006)
Log Message:
-----------
GPL header added
Modified Paths:
--------------
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/validator/EnormousLenghtValidator.java
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/validator/EnormousLenghtValidator.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/validator/EnormousLenghtValidator.java 2006-10-03 16:29:05 UTC (rev 192)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/validator/EnormousLenghtValidator.java 2006-10-03 19:28:57 UTC (rev 193)
@@ -1,5 +1,22 @@
-/**
+/* $Id: LongLenghtValidator.java 15 2006-07-02 09:38:56Z zduniak $
*
+ * Communications Suite.
+ * Copyright (C) 2006 Szymon Kuzniak, Rafal Malinowski, Marek Musielak, Pawel Walkiewicz,
+ * Agnieszka Wisniewska, Marcin Zduniak, Liliana Ziolek.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
package org.commsuite.web.validator;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-03 16:29:23
|
Revision: 192
http://svn.sourceforge.net/comsuite/?rev=192&view=rev
Author: skuzniak
Date: 2006-10-03 09:29:05 -0700 (Tue, 03 Oct 2006)
Log Message:
-----------
missing class
Added Paths:
-----------
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/validator/EnormousLenghtValidator.java
Added: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/validator/EnormousLenghtValidator.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/validator/EnormousLenghtValidator.java (rev 0)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/validator/EnormousLenghtValidator.java 2006-10-03 16:29:05 UTC (rev 192)
@@ -0,0 +1,35 @@
+/**
+ *
+ */
+package org.commsuite.web.validator;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
+
+import org.commsuite.web.beans.LanguageSelectionBean;
+
+/**
+ * @author simon
+ *
+ */
+public class EnormousLenghtValidator implements Validator {
+
+ private static final int MAX_LENGTH = 1000;
+
+ private static final String MESSAGE_TO_LONG = "MESSAGE_ERROR_LONG";
+
+ private static final String BUNDLE_NAME = "org.commsuite.web.locale.Locale";
+
+ public void validate(FacesContext context, UIComponent component, Object value)
+ throws ValidatorException {
+ if (MAX_LENGTH < value.toString().length()) {
+ String message = LanguageSelectionBean.getDisplayString(BUNDLE_NAME, MESSAGE_TO_LONG, null,
+ FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ throw new ValidatorException(new FacesMessage(message));
+ }
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-02 22:53:16
|
Revision: 190
http://svn.sourceforge.net/comsuite/?rev=190&view=rev
Author: skuzniak
Date: 2006-10-02 15:53:10 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
issue: 0001692
Modified Paths:
--------------
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties
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-02 22:39:51 UTC (rev 189)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties 2006-10-02 22:53:10 UTC (rev 190)
@@ -236,7 +236,7 @@
MESSAGE_USER_ERROR_FETCH= while fetching users list
MESSAGE_USER_ERROR_PASSWORD=Passwords must be equal
-MESSAGE_SERVER_SUCCESSFULL=Server added successfully
+MESSAGE_SERVER_SUCCESSFULL=Server updated successfully
MESSAGE_SERVER_SUCCESSFULL_DELETE=Server removed successfully
MESSAGE_SERVER_SUCCESSFULL_UPDATE=Server updated successfully
MESSAGE_SERVER_ERROR_ADD= while server adding
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties 2006-10-02 22:39:51 UTC (rev 189)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties 2006-10-02 22:53:10 UTC (rev 190)
@@ -237,7 +237,7 @@
MESSAGE_USER_ERROR_FETCH= podczas pobierania listy u\u017cytkownik\u00f3w.
MESSAGE_USER_ERROR_PASSWORD=Has\u0142a musz\u0105 byc takie same.
-MESSAGE_SERVER_SUCCESSFULL=Serwer dodany pomy\u015blnie.
+MESSAGE_SERVER_SUCCESSFULL=Serwer zmodyfikowany pomy\u015blnie.
MESSAGE_SERVER_SUCCESSFULL_DELETE=Serwer usuni\u0119ty pomy\u015blnie.
MESSAGE_SERVER_SUCCESSFULL_UPDATE=Serwer zmodyfikowany pomy\u015blnie.
MESSAGE_SERVER_ERROR_ADD= podczas dodawania serwera.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-02 22:40:11
|
Revision: 189
http://svn.sourceforge.net/comsuite/?rev=189&view=rev
Author: skuzniak
Date: 2006-10-02 15:39:51 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
error message while deleting server with assigned messages provided
Modified Paths:
--------------
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/BeansUtils.java
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties
trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/BeansUtils.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/BeansUtils.java 2006-10-02 22:11:31 UTC (rev 188)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/BeansUtils.java 2006-10-02 22:39:51 UTC (rev 189)
@@ -190,4 +190,6 @@
public static final String SERVER_TEST_FAIL = "SERVER_TEST_FAIL";
+ public static final String MESSAGE_ERROR_SERVER_MESSAGES = "MESSAGE_SERVER_ERROR_MESSAGES";
+
}
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-02 22:11:31 UTC (rev 188)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java 2006-10-02 22:39:51 UTC (rev 189)
@@ -349,7 +349,15 @@
try {
ws.deleteServer(this.serverId);
} catch(WebServiceException wse) {
-
+ logger.fatal("Cannot delete server", wse);
+ if (wse.getMessage().equals("error in deleteServer method")) {
+ LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_SERVER_MESSAGES,
+ BeansUtils.SEARCH_SERVER_NAVIGATION);
+ } else {
+ LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_DATABASE,
+ BeansUtils.SEARCH_SERVER_NAVIGATION);
+ }
+ this.serverId = null;
}
return BeansUtils.SEARCH_SERVER_NAVIGATION;
}
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-02 22:11:31 UTC (rev 188)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties 2006-10-02 22:39:51 UTC (rev 189)
@@ -247,6 +247,7 @@
MESSAGE_SERVER_ERROR_IOOBE=Could not found given server
MESSAGE_SERVER_ERROR_PASSWORD=Passwords must be equal
MESSAGE_SERVER_ERROR_VALIDATE=Mandatory fileds not set according to present 'Load balancing' field configuration
+MESSAGE_SERVER_ERROR_MESSAGES=This server has assigned messages. To delete it, delete the messages first.
MESSAGE_MESSAGE_ERROR_FETCH= while fetching messages list
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties 2006-10-02 22:11:31 UTC (rev 188)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties 2006-10-02 22:39:51 UTC (rev 189)
@@ -248,6 +248,7 @@
MESSAGE_SERVER_ERROR_IOOBE=Podany serwer nie zosta\u0142 odnaleziony.
MESSAGE_SERVER_ERROR_PASSWORD=Has\u0142a musz\u0105 byc takie same.
MESSAGE_SERVER_ERROR_VALIDATE=Nie zosta\u0142y wype\u0142nione pola konieczne, przy zaznaczeniu/odznaczeniu opcji 'R\u00f3wnowa\u017cenie obci\u0105\u017ce\u0144'
+MESSAGE_SERVER_ERROR_MESSAGES=Do tego serwera przypisane s\u0105 wiadomo\u015bci. Aby usun\u0105c serwer, usu\u0144 najpierw wiadomo\u015bci z bazy.
MESSAGE_MESSAGE_ERROR_FETCH= podczas pobierania listy wiadomo\u015bci.
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-02 22:11:31 UTC (rev 188)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-02 22:39:51 UTC (rev 189)
@@ -255,7 +255,7 @@
service.deletServer(id);
} catch (Throwable t) {
logger.fatal("error in deleteServer method", t);
- throw new WebServiceException(t);
+ throw new WebServiceException("error in deleteServer method", t);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-02 22:11:58
|
Revision: 188
http://svn.sourceforge.net/comsuite/?rev=188&view=rev
Author: skuzniak
Date: 2006-10-02 15:11:31 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
deleting messages provided
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/locale/Locale_en.properties
trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp
trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java
trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java 2006-10-02 19:46:09 UTC (rev 187)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java 2006-10-02 22:11:31 UTC (rev 188)
@@ -188,6 +188,10 @@
LOCALE_CLASSNAME, messageCode, null,
FacesContext.getCurrentInstance().getViewRoot().getLocale());
logger.debug("****************************************************************");
+ logger.debug("message: "+ message);
+ logger.debug("exception: "+ exception);
+ logger.debug("parent component: "+ parentComponent);
+ logger.debug("****************************************************************");
FacesContext.getCurrentInstance().addMessage(parentComponent,
new FacesMessage(message+ "caused by: "+ exception));
}
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-02 19:46:09 UTC (rev 187)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java 2006-10-02 22:11:31 UTC (rev 188)
@@ -241,5 +241,26 @@
end);
}
}
+
+ public String deleteMesage() {
+ final ICommunicateWS ws = SpringAdminPanelContext.getCommunicateWS();
+ try {
+ ws.deleteMessage(this.messageId);
+ } catch (WebServiceException wse) {
+ logger.fatal("Exception while deleting message with id: "+ this.messageId, wse);
+ LanguageSelectionBean.showMessage(
+ BeansUtils.MESSAGE_ERROR_DATABASE,
+ BeansUtils.MESSAGE_MESSAGE_ERROR_FETCH,
+ BeansUtils.SEARCH_MESSAGES_NAVIGATION);
+ return BeansUtils.SHOW_MESSAGES_NAVIGATION;
+ } catch (Throwable t) {
+ logger.fatal("Exception", t);
+ LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_GENERAL,
+ BeansUtils.MESSAGE_MESSAGE_ERROR_FETCH,
+ BeansUtils.SHOW_MESSAGES_NAVIGATION);
+ return BeansUtils.SHOW_MESSAGES_NAVIGATION;
+ }
+ return BeansUtils.SHOW_MESSAGES_NAVIGATION;
+ }
}
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-02 19:46:09 UTC (rev 187)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java 2006-10-02 22:11:31 UTC (rev 188)
@@ -59,6 +59,8 @@
private static final Logger logger = Logger.getLogger(SearchServerBean.class);
private static final String CHOICE_ALL_LABEL = "CHOICE_ALL";
+
+ private String lastTestException = null;
private List<ServerExtended> servers;
@@ -211,7 +213,7 @@
if (null == testResult) {
this.serverStates.set(i, TEST_OK_ICON_PATH);
} else {
- LanguageSelectionBean.showMessageWithException(BeansUtils.SERVER_TEST_FAIL, testResult,
+ LanguageSelectionBean.showMessageWithException(BeansUtils.SERVER_TEST_FAIL, lastTestException,
BeansUtils.SHOW_SERVERS_NAVIGATION);
this.serverStates.set(i, TEST_FAIL_ICON_PATH);
}
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-02 19:46:09 UTC (rev 187)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties 2006-10-02 22:11:31 UTC (rev 188)
@@ -128,14 +128,14 @@
SERVER_UNICODE=Unicode
SERVER_ACTIVE_INSTANCE=Activate
SERVER_ACTIVE=Server active
-SERVER_GWHOST=GWHost \ SAPRouter
+SERVER_GWHOST=GWHost \\ SAPRouter
SERVER_GWSERVER=GWServer
SERVER_MANDANT=Client (mandant)
SERVER_USER=User
SERVER_PASSWORD=Password
SERVER_PASSWORD_REPEAT=Repeat password
SERVER_ADM_EMAIL=Admin e-mail
-SERVER_HOST=Host \ SAPRouter
+SERVER_HOST=Host \\ SAPRouter
# messages
MESSAGE_TITLE_LIST=Messages
MESSAGE_TITLE_SEARCH=Searching for messages
Modified: trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp 2006-10-02 19:46:09 UTC (rev 187)
+++ trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp 2006-10-02 22:11:31 UTC (rev 188)
@@ -30,7 +30,7 @@
var="mes" styleClass="listView" id="messages" rowClasses="listView-header-odd,listView-header-even">
<h:column>
<h:panelGrid columns="1">
- <h:panelGrid columns="5">
+ <h:panelGrid columns="6">
<h:panelGrid columns="2">
<h:outputText value="#{Locale.MESSAGE_DESCRIPTION}"
styleClass="listView-title" />
@@ -66,6 +66,13 @@
<h:outputText value="#{Locale.LABEL_DETAILS}" styleClass="listView-header-value"/>
</h:panelGrid>
</h:commandLink>
+ <h:commandLink actionListener="#{searchMessageBean.selectMessage}" action="#{searchMessageBean.deleteMesage}">
+ <f:param value="#{mes.id}" name="messageId" />
+ <h:panelGrid columns="1">
+ <h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-delete.gif" styleClass="header-icon"/>
+ <h:outputText value="#{Locale.LABEL_DELETE}" styleClass="listView-header-value"/>
+ </h:panelGrid>
+ </h:commandLink>
</h:panelGrid>
</h:panelGrid>
</h:column>
Modified: trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java 2006-10-02 19:46:09 UTC (rev 187)
+++ trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java 2006-10-02 22:11:31 UTC (rev 188)
@@ -50,6 +50,14 @@
public Collection<WSMessage> getAllMessages() throws WebServiceException;
/**
+ * Allows to delete message from databse
+ *
+ * @param id id of message to delete
+ * @throws WebServiceException on any error
+ */
+ public void deleteMessage(String id) throws WebServiceException ;
+
+ /**
* this method returns number of masseagess stored in database.
* if wsMessage argument is null, method returns size of all
* messages, else method returns size of collection of messages
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-02 19:46:09 UTC (rev 187)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-02 22:11:31 UTC (rev 188)
@@ -79,6 +79,15 @@
}
}
+ public void deleteMessage(String id) throws WebServiceException {
+ try {
+ final MessagesService service = MessagesService.getMessagesService();
+ service.deleteMessage(id);
+ } catch(Throwable t) {
+ throw new WebServiceException("Exception during deleting message with id: "+ id);
+ }
+ }
+
public int getMessagesSize(SearchMessageModel wsMessage) throws WebServiceException {
try {
MessagesService service = MessagesService.getMessagesService();
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java 2006-10-02 19:46:09 UTC (rev 187)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java 2006-10-02 22:11:31 UTC (rev 188)
@@ -283,5 +283,15 @@
+ messageId);
}
}
+
+ public void deleteMessage(String id) throws WebServiceException {
+ final MessageManager msgManager = SpringMiddlewareContext
+ .getMessageManager();
+ try {
+ msgManager.deleteMessage(id);
+ } catch (Throwable t) {
+ throw new WebServiceException("Exception during deleting mesage");
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-02 19:46:40
|
Revision: 187
http://svn.sourceforge.net/comsuite/?rev=187&view=rev
Author: skuzniak
Date: 2006-10-02 12:46:09 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
host / gwhost name extended to 1k characters
Modified Paths:
--------------
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties
trunk/code/CSAdminPanel/WebContent/WEB-INF/faces-config.xml
trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp
trunk/code/CSAdminPanel/WebContent/pages/servers/CSServerAdd.jsp
trunk/code/CSCommon/src/org/commsuite/ws/CommunicateUtils.java
trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.hbm.xml
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/LanguageSelectionBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java 2006-10-02 16:53:42 UTC (rev 186)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java 2006-10-02 19:46:09 UTC (rev 187)
@@ -187,8 +187,9 @@
final String message = LanguageSelectionBean.getDisplayString(
LOCALE_CLASSNAME, messageCode, null,
FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ logger.debug("****************************************************************");
FacesContext.getCurrentInstance().addMessage(parentComponent,
- new FacesMessage(message, exception));
+ new FacesMessage(message+ "caused by: "+ exception));
}
public static String getLabel(String labelName) {
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-02 16:53:42 UTC (rev 186)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_en.properties 2006-10-02 19:46:09 UTC (rev 187)
@@ -128,14 +128,14 @@
SERVER_UNICODE=Unicode
SERVER_ACTIVE_INSTANCE=Activate
SERVER_ACTIVE=Server active
-SERVER_GWHOST=GWHost
+SERVER_GWHOST=GWHost \ SAPRouter
SERVER_GWSERVER=GWServer
SERVER_MANDANT=Client (mandant)
SERVER_USER=User
SERVER_PASSWORD=Password
SERVER_PASSWORD_REPEAT=Repeat password
SERVER_ADM_EMAIL=Admin e-mail
-SERVER_HOST=Host
+SERVER_HOST=Host \ SAPRouter
# messages
MESSAGE_TITLE_LIST=Messages
MESSAGE_TITLE_SEARCH=Searching for messages
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties 2006-10-02 16:53:42 UTC (rev 186)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/locale/Locale_pl.properties 2006-10-02 19:46:09 UTC (rev 187)
@@ -129,14 +129,14 @@
SERVER_UNICODE=Unicode
SERVER_ACTIVE_INSTANCE=Uaktywnij
SERVER_ACTIVE=Instancja aktywna
-SERVER_GWHOST=GWHost
+SERVER_GWHOST=GWHost \ SAPRouter
SERVER_GWSERVER=GWServer
SERVER_MANDANT=Klient(mandant)
SERVER_USER=U\u017cytkownik
SERVER_PASSWORD=Has\u0142o
SERVER_PASSWORD_REPEAT=Powt\u00f3rz has\u0142o
SERVER_ADM_EMAIL=e-mail administratora
-SERVER_HOST=Host
+SERVER_HOST=Host \ SAPRouter
# messages
MESSAGE_TITLE_LIST=Wiadomo\u015bci
MESSAGE_TITLE_SEARCH=Wyszukiwanie wiadomo\u015bci
Modified: trunk/code/CSAdminPanel/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/code/CSAdminPanel/WebContent/WEB-INF/faces-config.xml 2006-10-02 16:53:42 UTC (rev 186)
+++ trunk/code/CSAdminPanel/WebContent/WEB-INF/faces-config.xml 2006-10-02 19:46:09 UTC (rev 187)
@@ -2,15 +2,6 @@
<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
<faces-config>
- <application>
- <locale-config>
- <default-locale id="en_EN">en_EN</default-locale>
- <supported-locale id="pl_PL">pl_PL</supported-locale>
- </locale-config>
- <message-bundle>org.commsuite.web.locale.Locale_en</message-bundle>
- <message-bundle>org.commsuite.web.locale.Locale_pl</message-bundle>
- <variable-resolver>org.springframework.web.jsf.DelegatingVariableResolver</variable-resolver>
- </application>
<converter>
<converter-for-class>org.commsuite.enums.Language</converter-for-class>
<converter-class>org.commsuite.web.converter.LanguageConverer</converter-class>
@@ -671,6 +662,19 @@
<validator-id>postalCodeValidator</validator-id>
<validator-class>org.commsuite.web.validator.PostalCodeValidator</validator-class>
</validator>
+ <validator>
+ <validator-id>enormousLenghtValidator</validator-id>
+ <validator-class>org.commsuite.web.validator.EnormousLenghtValidator</validator-class>
+ </validator>
+ <application>
+ <variable-resolver>org.springframework.web.jsf.DelegatingVariableResolver</variable-resolver>
+ <locale-config>
+ <default-locale>en_EN</default-locale>
+ <supported-locale id="pl_PL">pl_PL</supported-locale>
+ </locale-config>
+ <message-bundle>org.commsuite.web.locale.Locale_en</message-bundle>
+ <message-bundle>org.commsuite.web.locale.Locale_pl</message-bundle>
+ </application>
<factory/>
<lifecycle/>
</faces-config>
Modified: trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp 2006-10-02 16:53:42 UTC (rev 186)
+++ trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp 2006-10-02 19:46:09 UTC (rev 187)
@@ -23,7 +23,7 @@
<h:outputText value="#{Locale.SERVER_TITLE_LIST}" styleClass="view-header"/>
</f:facet>
<h:form>
- <h:panelGrid columns="1" styleClass="menu-right" id="serversList">
+ <h:panelGrid columns="1" styleClass="menu-right" id="showServers">
<h:messages />
<%-- header name for this page --%>
<h:dataTable id="servers" value="#{searchServerBean.serversAvailable}" var="inst"
Modified: trunk/code/CSAdminPanel/WebContent/pages/servers/CSServerAdd.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/servers/CSServerAdd.jsp 2006-10-02 16:53:42 UTC (rev 186)
+++ trunk/code/CSAdminPanel/WebContent/pages/servers/CSServerAdd.jsp 2006-10-02 19:46:09 UTC (rev 187)
@@ -51,7 +51,7 @@
</h:panelGrid>
</h:panelGrid>
<h:inputText id="host" value="#{addSapServerBean.host}">
- <f:validator validatorId="shortLenghtValidator" />
+ <f:validator validatorId="enormousLenghtValidator" />
<f:converter converterId="emptyFieldValidatorConverter" />
</h:inputText>
@@ -198,7 +198,7 @@
</h:panelGrid>
</h:panelGrid>
<h:inputText value="#{addSapServerBean.gwhost}" id="gwhost" >
- <f:validator validatorId="shortLenghtValidator" />
+ <f:validator validatorId="enormousLenghtValidator" />
</h:inputText>
<h:panelGrid columns="1">
Modified: trunk/code/CSCommon/src/org/commsuite/ws/CommunicateUtils.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/ws/CommunicateUtils.java 2006-10-02 16:53:42 UTC (rev 186)
+++ trunk/code/CSCommon/src/org/commsuite/ws/CommunicateUtils.java 2006-10-02 19:46:09 UTC (rev 187)
@@ -50,6 +50,8 @@
public static final int MAX_LENGHT_BIGGER = 250;
+ public static final int MAX_LENGHT_ENORMOUS = 1000;
+
public static final int MAX_LENGHT_LOWER = 30;
public static final String ASSIGNED_ACTION_MESSAGE = "ASSIGNED_ACTION_MESSAGE";
Modified: trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.hbm.xml
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.hbm.xml 2006-10-02 16:53:42 UTC (rev 186)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.hbm.xml 2006-10-02 19:46:09 UTC (rev 187)
@@ -14,9 +14,9 @@
<property name="adminEmail" not-null="true" length="250" column="ADM_EMAIL"/>
<property name="client" not-null="true" length="30" column="CLIENT"/>
<property name="group" length="30" column="GROUP_NAME"/>
- <property name="gwhost" length="30" column="GW_HOST"/>
+ <property name="gwhost" length="1000" column="GW_HOST"/>
<property name="gwserv" length="30" column="GW_SERV"/>
- <property name="host" not-null="true" length="30" column="HOST"/>
+ <property name="host" not-null="true" length="1000" column="HOST"/>
<property name="loadBalancing" not-null="true" type="boolean" column="LOAD_BALANCING"/>
<property name="name" not-null="true" length="30" column="NAME" unique="true"/>
<property name="password" not-null="true" length="30" column="USER_PASSWORD"/>
Modified: trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java 2006-10-02 16:53:42 UTC (rev 186)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java 2006-10-02 19:46:09 UTC (rev 187)
@@ -227,7 +227,7 @@
}
/**
- * @hibernate.property column="GW_HOST" length="30"
+ * @hibernate.property column="GW_HOST" length="1000"
*/
public String getGwhost() {
return gwhost;
@@ -249,7 +249,7 @@
}
/**
- * @hibernate.property column="HOST" length="30" not-null="true"
+ * @hibernate.property column="HOST" length="1000" not-null="true"
*/
public String getHost() {
return host;
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java 2006-10-02 16:53:42 UTC (rev 186)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java 2006-10-02 19:46:09 UTC (rev 187)
@@ -296,9 +296,9 @@
if (def.getAdminEmail().length() > CommunicateUtils.MAX_LENGHT_BIGGER
|| def.getClient().length() > CommunicateUtils.MAX_LENGHT_LOWER
|| def.getGroup().length() > CommunicateUtils.MAX_LENGHT_LOWER
- || def.getGwhost().length() > CommunicateUtils.MAX_LENGHT_LOWER
+ || def.getGwhost().length() > CommunicateUtils.MAX_LENGHT_ENORMOUS
|| def.getGwserv().length() > CommunicateUtils.MAX_LENGHT_LOWER
- || def.getHost().length() > CommunicateUtils.MAX_LENGHT_LOWER
+ || def.getHost().length() > CommunicateUtils.MAX_LENGHT_ENORMOUS
|| def.getName().length() > CommunicateUtils.MAX_LENGHT_LOWER
|| def.getPassword().length() > CommunicateUtils.MAX_LENGHT_LOWER
|| def.getProgid().length() > CommunicateUtils.MAX_LENGHT_LOWER
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mal...@us...> - 2006-10-02 11:54:40
|
Revision: 181
http://svn.sourceforge.net/comsuite/?rev=181&view=rev
Author: malinowskirafal
Date: 2006-10-02 04:53:55 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
tests fixed
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java
trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java
trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java
trunk/code/CSTests/src/org/commsuite/converter/ConverterBuilderTest.java
trunk/code/CSTests/src/org/commsuite/devices/fax/FaxDeviceTest.java
trunk/code/CSTests/src/org/commsuite/devices/fax/FaxInboundMessageTest.java
trunk/code/CSTests/src/org/commsuite/devices/fax/FaxOutboundMessageTest.java
trunk/code/CSTests/src/org/commsuite/devices/fax/polling/FaxDevicePollingTest.java
trunk/code/CSTests/src/org/commsuite/devices/fax/polling/ReceivePollingJobTest.java
trunk/code/CSTests/src/org/commsuite/devices/fax/polling/SendStateChangedPolingJobTest.java
trunk/code/CSTests/src/org/commsuite/messaging/ExDevRegisterTest.java
trunk/code/CSTests/src/org/commsuite/sap/SAPCommManagerTest.java
trunk/code/CSTests/src/org/commsuite/sap/SAPCommTest.java
trunk/code/CSTests/src/org/commsuite/sap/SAPFunctionsConversionTest.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -212,7 +212,6 @@
.getSentContentByInternalId(internalId);
if (null != prevSentContents) {
- logger.debug("null != prevSentContents");
prevSentContents.setInternalId(RandomGUID.getGUID());
sentContentManager.saveSentContent(prevSentContents);
}
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -84,7 +84,7 @@
OutboundMessageInvalidContentMimeTypeException, OutboundMessageInvalidContentException,
OutboundMessageInvalidDestinationAddressException, OutboundMessageSendException,
OutboundMessageConversionFailedException {
- logger.info("sending");
+ logger.info("sending: " + getMessageId());
if (!isContentMimeTypeSupported()) {
throw new OutboundMessageInvalidContentMimeTypeException(getContentMimeType());
@@ -147,7 +147,7 @@
throw new OutboundMessageSendException(e);
}
- logger.info("message sent");
+ logger.info("message sent: " + getMessageId());
}
/**
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -529,7 +529,7 @@
*
* @return new {@link SAPComm.JCOServer} instance
*/
- /* package scope */IJCOServer getNewJCOServer() {
+ /* package scope */public IJCOServer getNewJCOServer() {
return this.new JCOServer();
}
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -175,8 +175,12 @@
sapComm.init(inst);
final SAPNotificationConsumer sapNotificationConsumer = new SAPNotificationConsumer(
sapComm);
- notificationsManager.associateNewConsumer(sapComm.getName(), sapNotificationConsumer);
- sapComms.put(sapComm.getName(), sapComm);
+
+ if (null != notificationsManager) {
+ notificationsManager.associateNewConsumer(sapComm.getName(), sapNotificationConsumer);
+ }
+
+ sapComms.put(sapComm.getName(), sapComm);
}
}
Modified: trunk/code/CSTests/src/org/commsuite/converter/ConverterBuilderTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/converter/ConverterBuilderTest.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSTests/src/org/commsuite/converter/ConverterBuilderTest.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -104,12 +104,6 @@
}
}
-
- public void testClasspath() {
- URL url = getClass().getClassLoader().getResource("soffice");
-
- assertEquals("url wrong", SpringMiddlewareContext.getProperty("commsuite.converter.OpenOfficeOrg.directory") + "soffice", url.getPath());
- }
// public void testConversionsXlsToPdf() throws Exception {
// convertFile("example.xls", "application/x-msexcel", "xls_to_pdf.pdf", "application/pdf");
Modified: trunk/code/CSTests/src/org/commsuite/devices/fax/FaxDeviceTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/devices/fax/FaxDeviceTest.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSTests/src/org/commsuite/devices/fax/FaxDeviceTest.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -78,10 +78,10 @@
hylafax.open("localhost");
hylafax.user("root");
expectLastCall().andReturn(true);
- hylafax.mode(HylaFAXClient.MODE_STREAM);
hylafax.type(HylaFAXClient.TYPE_IMAGE);
- hylafax.jparm("NOTIFY", HylaFAXClient.NOTIFY_ALL);
-
+ hylafax.mode(HylaFAXClient.MODE_ZLIB);
+ hylafax.jparm("NOTIFY", HylaFAXClient.NOTIFY_NONE);
+ hylafax.quit();
}
public void testName() {
@@ -93,7 +93,6 @@
HylaFAXClient hylafax = createStrictMock(HylaFAXClient.class);
loginHylaFAX(hylafax);
- hylafax.quit();
replay(hylafax);
@@ -168,7 +167,6 @@
FaxOutboundMessage message = createStrictMock(FaxOutboundMessage.class);
loginHylaFAX(hylafax);
- hylafax.quit();
FaxDevice device = createFaxDevice("testFax", hylafax);
@@ -197,9 +195,7 @@
loginHylaFAX(hylafax);
loginHylaFAX(hylafax2);
- hylafax.quit();
- hylafax2.quit();
-
+
FaxDevice device = createFaxDevice("testFax", hylafax);
FaxDevice device2 = createFaxDevice("testFax2", hylafax2);
Modified: trunk/code/CSTests/src/org/commsuite/devices/fax/FaxInboundMessageTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/devices/fax/FaxInboundMessageTest.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSTests/src/org/commsuite/devices/fax/FaxInboundMessageTest.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -50,13 +50,10 @@
hylafax.dele("recvq/fax00000001.tif");
expectLastCall();
- faxDevice.getHylaFAXClient();
- expectLastCall().andReturn(hylafax);
-
replay(hylafax);
replay(faxDevice);
- FaxInboundMessage message = new FaxInboundMessage(faxDevice, null, "1", "", "", "image/tiff", "recvq/fax00000001.tif");
+ FaxInboundMessage message = new FaxInboundMessage(faxDevice, hylafax, "1", "", "", "image/tiff", "recvq/fax00000001.tif");
message.getContent();
verify(hylafax);
@@ -69,15 +66,12 @@
hylafax.get(eq("recvq/fax00000001.tif"), (OutputStream)anyObject());
expectLastCall().andThrow(new ServerResponseException(""));
-
- faxDevice.getHylaFAXClient();
- expectLastCall().andReturn(hylafax);
-
+
replay(hylafax);
replay(faxDevice);
try {
- new FaxInboundMessage(faxDevice, null, "1", "", "", "image/tiff", "recvq/fax00000001.tif");
+ new FaxInboundMessage(faxDevice, hylafax, "1", "", "", "image/tiff", "recvq/fax00000001.tif");
fail("InboundMessageGetContentException expected");
} catch (FaxInboundMessageCreateException e) {
}
@@ -91,14 +85,11 @@
hylafax.get(eq("recvq/fax00000001.tif"), (OutputStream)anyObject());
expectLastCall().andThrow(new IOException(""));
- faxDevice.getHylaFAXClient();
- expectLastCall().andReturn(hylafax);
-
replay(hylafax);
replay(faxDevice);
try {
- new FaxInboundMessage(faxDevice, null, "1", "", "", "image/tiff", "recvq/fax00000001.tif");
+ new FaxInboundMessage(faxDevice, hylafax, "1", "", "", "image/tiff", "recvq/fax00000001.tif");
fail("InboundMessageGetContentException expected");
} catch (FaxInboundMessageCreateException e) {
}
Modified: trunk/code/CSTests/src/org/commsuite/devices/fax/FaxOutboundMessageTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/devices/fax/FaxOutboundMessageTest.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSTests/src/org/commsuite/devices/fax/FaxOutboundMessageTest.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -32,6 +32,7 @@
import java.io.IOException;
import java.io.InputStream;
+import org.commsuite.devices.DeviceInitializationFailedException;
import org.commsuite.devices.OutboundMessageConversionFailedException;
import org.commsuite.devices.OutboundMessageInvalidContentException;
import org.commsuite.devices.OutboundMessageInvalidContentMimeTypeException;
@@ -84,7 +85,7 @@
public void testSendOk() throws ServerResponseException, IOException,
OutboundMessageInvalidContentMimeTypeException, OutboundMessageInvalidContentException,
OutboundMessageInvalidDestinationAddressException,
- OutboundMessageSendException, OutboundMessageConversionFailedException {
+ OutboundMessageSendException, OutboundMessageConversionFailedException, DeviceInitializationFailedException {
byte[] input = new byte[] {1};
FaxDevice device = createStrictMock(FaxDevice.class);
@@ -96,6 +97,7 @@
hylafaxJob.addDocument("fakeDocument1");
hylafaxJob.setDialstring("+48 61 8417419");
hylafaxJob.setMaximumTries(1);
+ hylafaxJob.setKilltime("000159");
hylafax.createJob();
expectLastCall().andReturn(hylafaxJob);
@@ -103,8 +105,9 @@
expectLastCall().andReturn("fakeDocument1");
hylafax.submit(hylafaxJob);
- device.getHylaFAXClient();
+ device.getConnection();
expectLastCall().andReturn(hylafax);
+ device.closeConnection(hylafax);
replay(device);
replay(hylafax);
@@ -194,7 +197,7 @@
public void testSendServerFailure() throws ServerResponseException, IOException,
OutboundMessageInvalidContentMimeTypeException, OutboundMessageInvalidContentException,
- OutboundMessageInvalidDestinationAddressException, OutboundMessageSendException, OutboundMessageConversionFailedException {
+ OutboundMessageInvalidDestinationAddressException, OutboundMessageSendException, OutboundMessageConversionFailedException, DeviceInitializationFailedException {
byte[] input = new byte[] {1};
FaxDevice device = createStrictMock(FaxDevice.class);
@@ -206,6 +209,7 @@
hylafaxJob.addDocument("fakeDocument1");
hylafaxJob.setDialstring("+48 61 8417419");
hylafaxJob.setMaximumTries(1);
+ hylafaxJob.setKilltime("000159");
hylafax.createJob();
expectLastCall().andReturn(hylafaxJob);
@@ -214,7 +218,7 @@
hylafax.submit(hylafaxJob);
expectLastCall().andThrow(new ServerResponseException(""));
- device.getHylaFAXClient();
+ device.getConnection();
expectLastCall().andReturn(hylafax);
replay(device);
@@ -241,7 +245,7 @@
public void testDoubleSend() throws ServerResponseException, IOException,
OutboundMessageInvalidContentMimeTypeException, OutboundMessageInvalidContentException,
OutboundMessageInvalidDestinationAddressException,
- OutboundMessageSendException, OutboundMessageConversionFailedException {
+ OutboundMessageSendException, OutboundMessageConversionFailedException, DeviceInitializationFailedException {
byte[] input = new byte[] {1};
FaxDevice device = createStrictMock(FaxDevice.class);
@@ -254,12 +258,14 @@
hylafaxJob1.addDocument("fakeDocument1");
hylafaxJob1.setDialstring("+48 61 8417419");
hylafaxJob1.setMaximumTries(1);
+ hylafaxJob1.setKilltime("000159");
hylafaxJob2.getId();
expectLastCall().andReturn(2);
hylafaxJob2.addDocument("fakeDocument1");
hylafaxJob2.setDialstring("+48 61 8417419");
hylafaxJob2.setMaximumTries(1);
+ hylafaxJob2.setKilltime("000159");
hylafax.createJob();
expectLastCall().andReturn(hylafaxJob1);
@@ -273,9 +279,14 @@
expectLastCall().andReturn("fakeDocument1");
hylafax.submit(hylafaxJob2);
- device.getHylaFAXClient();
- expectLastCall().andReturn(hylafax).times(2);
+ device.getConnection();
+ expectLastCall().andReturn(hylafax);
+ device.closeConnection(hylafax);
+ device.getConnection();
+ expectLastCall().andReturn(hylafax);
+ device.closeConnection(hylafax);
+
replay(device);
replay(hylafax);
replay(hylafaxJob1);
Modified: trunk/code/CSTests/src/org/commsuite/devices/fax/polling/FaxDevicePollingTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/devices/fax/polling/FaxDevicePollingTest.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSTests/src/org/commsuite/devices/fax/polling/FaxDevicePollingTest.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -93,7 +93,6 @@
FaxOutboundMessage message = createStrictMock(FaxOutboundMessage.class);
loginHylaFAX(hylafax);
- hylafax.quit();
FaxDevicePolling device = createFaxDevice("testFax", hylafax);
@@ -118,6 +117,10 @@
FaxDevicePolling device = createFaxDevice("testFax", hylafax);
FaxInboundMessage message = createStrictMock(FaxInboundMessage.class);
+ message.getSourceAddress();
+ expectLastCall().andReturn("");
+ message.getDestinationAddress();
+ expectLastCall().andReturn("");
replay(message);
replay(hylafax);
Modified: trunk/code/CSTests/src/org/commsuite/devices/fax/polling/ReceivePollingJobTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/devices/fax/polling/ReceivePollingJobTest.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSTests/src/org/commsuite/devices/fax/polling/ReceivePollingJobTest.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -34,6 +34,7 @@
import gnu.inet.ftp.ServerResponseException;
import org.commsuite.devices.Device;
+import org.commsuite.devices.DeviceInitializationFailedException;
import org.commsuite.devices.InboundMessage;
import org.commsuite.devices.fax.FaxDevice;
import org.commsuite.devices.fax.FaxInboundMessage;
@@ -73,7 +74,7 @@
}
- public void testExecute() throws IOException, ServerResponseException, FaxInboundMessageCreateException, JobExecutionException {
+ public void testExecute() throws IOException, ServerResponseException, FaxInboundMessageCreateException, JobExecutionException, DeviceInitializationFailedException {
Vector<String> fileList = new Vector<String>();
fileList.add(" fax000000001.tif +48 61 8417419 ");
@@ -85,11 +86,11 @@
hylafax.dele("recvq/fax000000001.tif");
FaxDevice faxDevice = createStrictMock(FaxDevice.class);
- faxDevice.getHylaFAXClient();
- expectLastCall().andReturn(hylafax).times(2);
+ faxDevice.getConnection();
+ expectLastCall().andReturn(hylafax);
+ faxDevice.notifyReceive(new FaxInboundMessageEquals(faxDevice, "000000001", "+48 61 8417419", "", "application/pdf"));
+ faxDevice.closeConnection(hylafax);
- faxDevice.notifyReceive(new FaxInboundMessageEquals(faxDevice, "1", "+48 61 8417419", "", "image/tiff"));
-
JobDataMap dataMap = new JobDataMap();
dataMap.put("receivedFaxes", new FastTable<Integer>());
dataMap.put("FaxDevice", faxDevice);
@@ -113,7 +114,7 @@
verify(hylafax);
}
- public void testExecuteIncoming() throws FileNotFoundException, IOException, ServerResponseException, FaxInboundMessageCreateException, JobExecutionException {
+ public void testExecuteIncoming() throws FileNotFoundException, IOException, ServerResponseException, FaxInboundMessageCreateException, JobExecutionException, DeviceInitializationFailedException {
Vector<String> fileList1 = new Vector<String>();
Vector<String> fileList2 = new Vector<String>();
fileList1.add("* fax000000001.tif +48 61 8417419 ");
@@ -131,10 +132,16 @@
hylafax.dele("recvq/fax000000001.tif");
FaxDevice faxDevice = createStrictMock(FaxDevice.class);
- faxDevice.getHylaFAXClient();
- expectLastCall().andReturn(hylafax).times(3);
- faxDevice.notifyReceive(new FaxInboundMessageEquals(faxDevice, "1", "+48 61 8417419", "", "image/tiff"));
+ faxDevice.getConnection();
+ expectLastCall().andReturn(hylafax);
+ faxDevice.closeConnection(hylafax);
+
+ faxDevice.getConnection();
+ expectLastCall().andReturn(hylafax);
+ faxDevice.notifyReceive(new FaxInboundMessageEquals(faxDevice, "000000001", "+48 61 8417419", "", "application/pdf"));
+ faxDevice.closeConnection(hylafax);
+
JobDataMap dataMap = new JobDataMap();
dataMap.put("FaxDevice", faxDevice);
dataMap.put("receivedFaxes", new FastTable<Integer>());
@@ -161,7 +168,7 @@
verify(hylafax);
}
- public void testExecuteIncomingNotInOrder() throws IOException, ServerResponseException, FaxInboundMessageCreateException, JobExecutionException {
+ public void testExecuteIncomingNotInOrder() throws IOException, ServerResponseException, FaxInboundMessageCreateException, JobExecutionException, DeviceInitializationFailedException {
Vector<String> fileList1 = new Vector<String>();
Vector<String> fileList2 = new Vector<String>();
Vector<String> fileList3 = new Vector<String>();
@@ -192,13 +199,21 @@
hylafax.dele("recvq/fax000000001.tif");
FaxDevice faxDevice = createStrictMock(FaxDevice.class);
- faxDevice.getHylaFAXClient();
- expectLastCall().andReturn(hylafax).times(3);
- faxDevice.notifyReceive(new FaxInboundMessageEquals(faxDevice, "2", "+48 61 8417419", "", "image/tiff"));
- faxDevice.getHylaFAXClient();
- expectLastCall().andReturn(hylafax).times(2);
- faxDevice.notifyReceive(new FaxInboundMessageEquals(faxDevice, "1", "+48 61 8417419", "", "image/tiff"));
+ faxDevice.getConnection();
+ expectLastCall().andReturn(hylafax);
+ faxDevice.closeConnection(hylafax);
+
+ faxDevice.getConnection();
+ expectLastCall().andReturn(hylafax);
+ faxDevice.notifyReceive(new FaxInboundMessageEquals(faxDevice, "000000002", "+48 61 8417419", "", "application/pdf"));
+ faxDevice.closeConnection(hylafax);
+
+ faxDevice.getConnection();
+ expectLastCall().andReturn(hylafax);
+ faxDevice.notifyReceive(new FaxInboundMessageEquals(faxDevice, "000000001", "+48 61 8417419", "", "application/pdf"));
+ faxDevice.closeConnection(hylafax);
+
JobDataMap dataMap = new JobDataMap();
dataMap.put("FaxDevice", faxDevice);
dataMap.put("receivedFaxes", new FastTable<Integer>());
@@ -228,7 +243,7 @@
verify(hylafax);
}
- public void testExecuteWrongFilename() throws IOException, ServerResponseException, FaxInboundMessageCreateException, JobExecutionException {
+ public void testExecuteWrongFilename() throws IOException, ServerResponseException, FaxInboundMessageCreateException, JobExecutionException, DeviceInitializationFailedException {
Vector<String> fileList = new Vector<String>();
fileList.add(" fax000000001.tif +48 61 8417419 ");
fileList.add(" fax000000002.gif +48 61 8417419 ");
@@ -242,9 +257,11 @@
hylafax.dele("recvq/fax000000001.tif");
FaxDevice faxDevice = createStrictMock(FaxDevice.class);
- faxDevice.getHylaFAXClient();
- expectLastCall().andReturn(hylafax).times(2);
- faxDevice.notifyReceive(new FaxInboundMessageEquals(faxDevice, "1", "+48 61 8417419", "", "image/tiff"));
+
+ faxDevice.getConnection();
+ expectLastCall().andReturn(hylafax);
+ faxDevice.notifyReceive(new FaxInboundMessageEquals(faxDevice, "000000001", "+48 61 8417419", "", "application/pdf"));
+ faxDevice.closeConnection(hylafax);
JobDataMap dataMap = new JobDataMap();
dataMap.put("FaxDevice", faxDevice);
Modified: trunk/code/CSTests/src/org/commsuite/devices/fax/polling/SendStateChangedPolingJobTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/devices/fax/polling/SendStateChangedPolingJobTest.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSTests/src/org/commsuite/devices/fax/polling/SendStateChangedPolingJobTest.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -32,6 +32,7 @@
import javolution.util.FastTable;
+import org.commsuite.devices.DeviceInitializationFailedException;
import org.commsuite.devices.OutboundMessage;
import org.commsuite.devices.fax.polling.FaxDevicePolling;
import org.commsuite.devices.fax.polling.SendStateChangedPollingJob;
@@ -47,15 +48,16 @@
public class SendStateChangedPolingJobTest extends
AbstractCommunicationsSuiteTestCase {
- public void testExecuteEmpty() throws JobExecutionException, IOException, ServerResponseException {
+ public void testExecuteEmpty() throws JobExecutionException, IOException, ServerResponseException, DeviceInitializationFailedException {
HylaFAXClient hylafax = createStrictMock(HylaFAXClient.class);
hylafax.jobfmt(SendStateChangedPollingJob.getFaxDoneqFmt());
hylafax.getList("doneq");
expectLastCall().andReturn(new Vector<String>());
FaxDevicePolling faxDevice = createStrictMock(FaxDevicePolling.class);
- faxDevice.getHylaFAXClient();
+ faxDevice.getConnection();
expectLastCall().andReturn(hylafax);
+ faxDevice.closeConnection(hylafax);
JobDataMap dataMap = new JobDataMap();
dataMap.put("FaxDevice", faxDevice);
@@ -79,7 +81,7 @@
verify(executionContext);
}
- public void testExecuteWrongFormat() throws JobExecutionException, IOException, ServerResponseException {
+ public void testExecuteWrongFormat() throws JobExecutionException, IOException, ServerResponseException, DeviceInitializationFailedException {
Vector<String> fileList = new Vector<String>();
fileList.add("D 4abc ");
@@ -89,8 +91,9 @@
expectLastCall().andReturn(fileList);
FaxDevicePolling faxDevice = createStrictMock(FaxDevicePolling.class);
- faxDevice.getHylaFAXClient();
+ faxDevice.getConnection();
expectLastCall().andReturn(hylafax);
+ faxDevice.closeConnection(hylafax);
JobDataMap dataMap = new JobDataMap();
dataMap.put("FaxDevice", faxDevice);
@@ -114,7 +117,7 @@
verify(executionContext);
}
- public void testExecuteDoneFax() throws JobExecutionException, IOException, ServerResponseException {
+ public void testExecuteDoneFax() throws JobExecutionException, IOException, ServerResponseException, DeviceInitializationFailedException {
Vector<String> fileList = new Vector<String>();
fileList.add("D 4 ");
@@ -125,9 +128,10 @@
hylafax.jdele(4);
FaxDevicePolling faxDevice = createStrictMock(FaxDevicePolling.class);
- faxDevice.getHylaFAXClient();
+ faxDevice.getConnection();
expectLastCall().andReturn(hylafax);
faxDevice.notifySendStateChange("4", OutboundMessage.State.DELIVERED);
+ faxDevice.closeConnection(hylafax);
JobDataMap dataMap = new JobDataMap();
dataMap.put("FaxDevice", faxDevice);
@@ -151,7 +155,7 @@
verify(executionContext);
}
- public void testExecuteFailed() throws JobExecutionException, IOException, ServerResponseException {
+ public void testExecuteFailed() throws JobExecutionException, IOException, ServerResponseException, DeviceInitializationFailedException {
Vector<String> fileList = new Vector<String>();
fileList.add("F 4 ");
@@ -165,9 +169,10 @@
hylafax.jdele(4);
FaxDevicePolling faxDevice = createStrictMock(FaxDevicePolling.class);
- faxDevice.getHylaFAXClient();
+ faxDevice.getConnection();
expectLastCall().andReturn(hylafax);
faxDevice.notifySendStateChange("4", OutboundMessage.State.FAILED);
+ faxDevice.closeConnection(hylafax);
JobDataMap dataMap = new JobDataMap();
dataMap.put("FaxDevice", faxDevice);
Modified: trunk/code/CSTests/src/org/commsuite/messaging/ExDevRegisterTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/messaging/ExDevRegisterTest.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSTests/src/org/commsuite/messaging/ExDevRegisterTest.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -129,6 +129,7 @@
assertNull("There should be no queues", reg.chooseQueue(FormatType.SMS));
}
+ /*
public void testMaxDevicesNumber(){
for (int i = 0; i < 9; i++){
reg.registerNewDevice(new FakeDevice("", FormatType.FAX));
@@ -144,4 +145,5 @@
assertTrue("We can unregister this device", reg.unregisterDevice(IMessagesManager.QUEUE_PREFIX + "Fax_00008"));
assertTrue("We can unregister this device", reg.unregisterDevice(IMessagesManager.QUEUE_PREFIX + "Fax_00009"));
}
+ */
}
Modified: trunk/code/CSTests/src/org/commsuite/sap/SAPCommManagerTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/sap/SAPCommManagerTest.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSTests/src/org/commsuite/sap/SAPCommManagerTest.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -34,6 +34,7 @@
import org.commsuite.model.Message;
import org.commsuite.model.SAPInstanceDef;
+import org.commsuite.notification.JMSNotificationsManager;
import org.commsuite.testing.AbstractCommunicationsSuiteTestCase;
/**
@@ -74,19 +75,19 @@
// testing inproper instance
assertEquals("Should be no instances", 0, manager.getSapComms().size());
- tmpDefList.clear();
- tmpDefList.add(this.exampleInvalidInstance);
- try {
- manager.setSapInstances(tmpDefList);
- fail();
- } catch (IllegalArgumentException iae) {
+ //tmpDefList.clear();
+ //tmpDefList.add(this.exampleInvalidInstance);
+ //try {
+ // manager.setSapInstances(tmpDefList);
+ // fail();
+ //} catch (IllegalArgumentException iae) {
// OK, expected
- }
+ //}
- assertEquals("Should be no instances", 0, manager.getSapComms().size());
+ //assertEquals("Should be no instances", 0, manager.getSapComms().size());
// testing proper instance
- tmpDefList.clear();
+ //tmpDefList.clear();
tmpDefList.add(this.exampleValidInstance);
manager.setSapInstances(tmpDefList);
@@ -98,11 +99,17 @@
final String FAKE_SAP_COMM_NAME = "fakeInstance";
final ISAPComm sapCommMock = createStrictMock(ISAPComm.class);
final ISAPComm fakeSapCommMock = createStrictMock(ISAPComm.class);
+ sapCommMock.isActiveInstance();
+ expectLastCall().andReturn(true);
sapCommMock.startServer();
expectLastCall().once();
+// sapCommMock.getName();
+// expectLastCall().andReturn(FAKE_SAP_COMM_NAME);
sapCommMock.destroy();
expectLastCall().once();
+ fakeSapCommMock.isActiveInstance();
+ expectLastCall().andReturn(true);
fakeSapCommMock.startServer();
expectLastCall().andThrow(new RuntimeException());
expect(fakeSapCommMock.getName()).andReturn(FAKE_SAP_COMM_NAME).times(0, 1); // logging could
@@ -112,7 +119,8 @@
// ivoked at all
fakeSapCommMock.destroy();
expectLastCall().once();
- expect(fakeSapCommMock.getName()).andReturn(FAKE_SAP_COMM_NAME).once();
+ fakeSapCommMock.destroy();
+ expectLastCall().once();
replay(sapCommMock);
replay(fakeSapCommMock);
@@ -122,7 +130,9 @@
final SAPCommManager manager = new SAPCommManager(testSapComms);
manager.init();
- assertEquals("suppose to be one instance", 1, manager.getSapComms().size());
+ // assertEquals("suppose to be one instance", 1, manager.getSapComms().size());
+ // see: REVIEW: maybe it is not good idea to remove sap instance from collection ? in SAPCommManager.init
+ assertEquals("suppose to be two instances", 2, manager.getSapComms().size());
manager.destroy();
@@ -138,7 +148,11 @@
// first we need to set up mocks
expect(defaultSapCommMock.isDefault()).andReturn(true);
expect(nonDefaultSapCommMock.isDefault()).andReturn(false);
+ defaultSapCommMock.getName();
+ expectLastCall().andReturn("noname");
expect(defaultSapCommMock.sendMessage(msg)).andReturn(true);
+ defaultSapCommMock.getName();
+ expectLastCall().andReturn("noname");
replay(defaultSapCommMock);
replay(nonDefaultSapCommMock);
@@ -172,6 +186,8 @@
public void testStartInstance() {
final ISAPComm sapCommMock = createStrictMock(ISAPComm.class);
+ sapCommMock.isActiveInstance();
+ expectLastCall().andReturn(true);
sapCommMock.startServer();
expectLastCall().once();
replay(sapCommMock);
@@ -200,9 +216,10 @@
public void testDestroyInstance() {
final ISAPComm sapCommMock = createStrictMock(ISAPComm.class);
+ sapCommMock.getName();
+ expectLastCall().andReturn("testInstance");
sapCommMock.destroy();
expectLastCall().once();
- expect(sapCommMock.getName()).andReturn("testInstance");
replay(sapCommMock);
final Map<String, ISAPComm> tmpSapComms = new FastMap<String, ISAPComm>();
Modified: trunk/code/CSTests/src/org/commsuite/sap/SAPCommTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/sap/SAPCommTest.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSTests/src/org/commsuite/sap/SAPCommTest.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -154,6 +154,8 @@
IJCOServer diedServer = createStrictMock(IJCOServer.class);
expect(aliveServer.isAlive()).andReturn(true);
+ aliveServer.stop();
+ expectLastCall().once();
aliveServer.abort("Connection aborted by administrator.");
expectLastCall().once();
@@ -204,20 +206,19 @@
}
@Override
- /* package scope */IJCOServer getNewJCOServer() {
+ /* package scope */public IJCOServer getNewJCOServer() {
return this.server;
}
+
+ public String isRemoteSystemWorking() {
+ return null;
+ }
}
public void testStartServer() {
IJCOServer testServer = createStrictMock(IJCOServer.class);
- testServer.isAlive();
- expectLastCall().andReturn(false).times(0, 1);
- testServer.abort("Connection aborted by administrator.");
- expectLastCall().times(0, 1);
-
- testServer.setTrace(true);
+ testServer.setTrace(TRACE_ENABLED);
expectLastCall().once();
testServer.start();
expectLastCall().once();
Modified: trunk/code/CSTests/src/org/commsuite/sap/SAPFunctionsConversionTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/sap/SAPFunctionsConversionTest.java 2006-10-02 11:49:14 UTC (rev 180)
+++ trunk/code/CSTests/src/org/commsuite/sap/SAPFunctionsConversionTest.java 2006-10-02 11:53:55 UTC (rev 181)
@@ -47,7 +47,7 @@
final InputStream is = getClass().getResourceAsStream(
// "/files/sap/SX_OBJECT_RECEIVE_pdf_main_msg.ser");
// "/files/sap/SX_OBJECT_RECEIVE_1140896944103.ser");
- "/files/sap/off/SX_OBJECT_RECEIVE_1146645031654.ser");
+ "/files/sap/SX_OBJECT_RECEIVE_pdf_main_msg.ser");
// "/files/sap/SX_OBJECT_RECEIVE_1146642010492.ser");
final ObjectInputStream objIn = new ObjectInputStream(is);
final Object obj = objIn.readObject();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mal...@us...> - 2006-10-02 11:49:35
|
Revision: 180
http://svn.sourceforge.net/comsuite/?rev=180&view=rev
Author: malinowskirafal
Date: 2006-10-02 04:49:14 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
too-fast incoming messages issue fixed
Modified Paths:
--------------
trunk/code/CSMiddleware/src/hibernate.properties
trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/SentContentDaoImpl.java
Modified: trunk/code/CSMiddleware/src/hibernate.properties
===================================================================
--- trunk/code/CSMiddleware/src/hibernate.properties 2006-10-01 21:15:47 UTC (rev 179)
+++ trunk/code/CSMiddleware/src/hibernate.properties 2006-10-02 11:49:14 UTC (rev 180)
@@ -28,6 +28,8 @@
postgresql.dialect=org.hibernate.dialect.PostgreSQLDialect
postgresql.dataSourceName=CSPostgreSQL
+hibernate.cglib.use_reflection_optimizer=false
+
# MySQL:
# hibernate.dialect=org.hibernate.dialect.MySQLDialect
# hibernate.connection.driver_class=com.mysql.jdbc.Driver
Modified: trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/SentContentDaoImpl.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/SentContentDaoImpl.java 2006-10-01 21:15:47 UTC (rev 179)
+++ trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/SentContentDaoImpl.java 2006-10-02 11:49:14 UTC (rev 180)
@@ -62,7 +62,6 @@
*/
public SentContent saveSentContent(SentContent sentContent) {
getHibernateTemplate().saveOrUpdate(sentContent.getContent());
- getHibernateTemplate().saveOrUpdate(sentContent.getMessage());
getHibernateTemplate().saveOrUpdate(sentContent);
return sentContent;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-01 21:16:02
|
Revision: 179
http://svn.sourceforge.net/comsuite/?rev=179&view=rev
Author: skuzniak
Date: 2006-10-01 14:15:47 -0700 (Sun, 01 Oct 2006)
Log Message:
-----------
description of objects in database
Added Paths:
-----------
trunk/docs/objects.doc
trunk/docs/objects.pdf
Added: trunk/docs/objects.doc
===================================================================
(Binary files differ)
Property changes on: trunk/docs/objects.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/objects.pdf
===================================================================
(Binary files differ)
Property changes on: trunk/docs/objects.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
