Thread: [Comsuite-svn] SF.net SVN: comsuite: [111] trunk/code/CSMiddleware
Brought to you by:
zduniak
Menu
▾
▴
comsuite-svn
|
From: <ma...@us...> - 2006-08-07 18:57:27
|
Revision: 111 Author: marasm Date: 2006-08-07 11:57:07 -0700 (Mon, 07 Aug 2006) ViewCVS: http://svn.sourceforge.net/comsuite/?rev=111&view=rev Log Message: ----------- middleware no longer depends on cstest message mapping corrected Modified Paths: -------------- trunk/code/CSMiddleware/build.xml trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml trunk/code/CSMiddleware/src/org/commsuite/model/Message.java Modified: trunk/code/CSMiddleware/build.xml =================================================================== --- trunk/code/CSMiddleware/build.xml 2006-08-03 06:00:35 UTC (rev 110) +++ trunk/code/CSMiddleware/build.xml 2006-08-07 18:57:07 UTC (rev 111) @@ -223,7 +223,6 @@ </copy> <!-- SQL --> <copy file="${sql.middleware.import}" tofile="${tmp.sql.middleware.import}" failonerror="true" overwrite="true" /> - <copy file="${sql.unit-tests.import}" tofile="${tmp.sql.unit-tests.import}" failonerror="true" overwrite="true" /> <antcall target="compile:middleware:javac" /> <copy todir="${tmp.build.middleware.dir}" filtering="true"> @@ -280,6 +279,7 @@ <target name="build:unit-tests" description="Compile main source tree java files for Unit-tests project into class files, generate jar files. You MUST manually invoke 'init' task."> <!-- Copying files (firstly: common ones, then project-specific) --> <!-- SRC --> + <copy file="${sql.unit-tests.import}" tofile="${tmp.sql.unit-tests.import}" failonerror="true" overwrite="true" /> <copy todir="${tmp.src.unit-tests.dir}"> <fileset dir="${src.common.dir}" /> </copy> Modified: trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml =================================================================== --- trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml 2006-08-03 06:00:35 UTC (rev 110) +++ trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml 2006-08-07 18:57:07 UTC (rev 111) @@ -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-08-03 06:00:35 UTC (rev 110) +++ trunk/code/CSMiddleware/src/org/commsuite/model/Message.java 2006-08-07 18:57:07 UTC (rev 111) @@ -196,8 +196,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; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sku...@us...> - 2006-08-19 10:37:30
|
Revision: 114 Author: skuzniak Date: 2006-08-19 03:36:10 -0700 (Sat, 19 Aug 2006) ViewCVS: http://svn.sourceforge.net/comsuite/?rev=114&view=rev Log Message: ----------- images moved from css catalog, to files, active field added to cs_sap_servers table Modified Paths: -------------- trunk/code/CSAdminPanel/WebContent/pages/css/mainStyle.css trunk/code/CSMiddleware/import.sql 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/sap/SAPCommManager.java trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java Added Paths: ----------- trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/ trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/banner_1.gif trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/banner_2.gif trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/banner_bez_logo.gif trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/menu-background.jpg trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/page-background.jpg trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/pasek_1.gif trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/pasek_2.gif trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/tlo_1.gif trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/tlo_2.gif Removed Paths: ------------- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/servlet/JSPHandlerServlet.java trunk/code/CSAdminPanel/WebContent/pages/css/banner_1.gif trunk/code/CSAdminPanel/WebContent/pages/css/banner_2.gif trunk/code/CSAdminPanel/WebContent/pages/css/banner_bez_logo.gif trunk/code/CSAdminPanel/WebContent/pages/css/menu-background.jpg trunk/code/CSAdminPanel/WebContent/pages/css/page-background.jpg trunk/code/CSAdminPanel/WebContent/pages/css/pasek_1.gif trunk/code/CSAdminPanel/WebContent/pages/css/pasek_2.gif trunk/code/CSAdminPanel/WebContent/pages/css/tlo_1.gif trunk/code/CSAdminPanel/WebContent/pages/css/tlo_2.gif Deleted: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/servlet/JSPHandlerServlet.java =================================================================== --- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/servlet/JSPHandlerServlet.java 2006-08-17 18:03:48 UTC (rev 113) +++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/servlet/JSPHandlerServlet.java 2006-08-19 10:36:10 UTC (rev 114) @@ -1,19 +0,0 @@ -/** - * - */ -package org.commsuite.web.servlet; - -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * @author Szymon Kuzniak - * - */ -public class JSPHandlerServlet extends HttpServlet { - - public void doService(HttpServletRequest req, HttpServletResponse res) { - - } -} Deleted: trunk/code/CSAdminPanel/WebContent/pages/css/banner_1.gif =================================================================== (Binary files differ) Deleted: trunk/code/CSAdminPanel/WebContent/pages/css/banner_2.gif =================================================================== (Binary files differ) Deleted: trunk/code/CSAdminPanel/WebContent/pages/css/banner_bez_logo.gif =================================================================== (Binary files differ) Modified: trunk/code/CSAdminPanel/WebContent/pages/css/mainStyle.css =================================================================== --- trunk/code/CSAdminPanel/WebContent/pages/css/mainStyle.css 2006-08-17 18:03:48 UTC (rev 113) +++ trunk/code/CSAdminPanel/WebContent/pages/css/mainStyle.css 2006-08-19 10:36:10 UTC (rev 114) @@ -29,7 +29,7 @@ } .header-menu-banner{ - background-image:url(../css/banner_2.gif); + background-image:url(../files/background/banner_2.gif); width:1000px; height:80px; display:block; @@ -72,7 +72,7 @@ } .menu{ - background-image:url(../css/tlo_2.gif); + background-image:url(../files/background/tlo_2.gif); width:205px; height:435px; display:block; Deleted: trunk/code/CSAdminPanel/WebContent/pages/css/menu-background.jpg =================================================================== (Binary files differ) Deleted: trunk/code/CSAdminPanel/WebContent/pages/css/page-background.jpg =================================================================== (Binary files differ) Deleted: trunk/code/CSAdminPanel/WebContent/pages/css/pasek_1.gif =================================================================== (Binary files differ) Deleted: trunk/code/CSAdminPanel/WebContent/pages/css/pasek_2.gif =================================================================== (Binary files differ) Deleted: trunk/code/CSAdminPanel/WebContent/pages/css/tlo_1.gif =================================================================== (Binary files differ) Deleted: trunk/code/CSAdminPanel/WebContent/pages/css/tlo_2.gif =================================================================== (Binary files differ) Added: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/banner_1.gif =================================================================== (Binary files differ) Property changes on: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/banner_1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/banner_2.gif =================================================================== (Binary files differ) Property changes on: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/banner_2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/banner_bez_logo.gif =================================================================== (Binary files differ) Property changes on: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/banner_bez_logo.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/menu-background.jpg =================================================================== (Binary files differ) Property changes on: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/menu-background.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/page-background.jpg =================================================================== (Binary files differ) Property changes on: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/page-background.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/pasek_1.gif =================================================================== (Binary files differ) Property changes on: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/pasek_1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/pasek_2.gif =================================================================== (Binary files differ) Property changes on: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/pasek_2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/tlo_1.gif =================================================================== (Binary files differ) Property changes on: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/tlo_1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/tlo_2.gif =================================================================== (Binary files differ) Property changes on: trunk/code/CSAdminPanel/WebContent/pages/files/gif/background/tlo_2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/code/CSMiddleware/import.sql =================================================================== --- trunk/code/CSMiddleware/import.sql 2006-08-17 18:03:48 UTC (rev 113) +++ trunk/code/CSMiddleware/import.sql 2006-08-19 10:36:10 UTC (rev 114) @@ -1,5 +1,5 @@ --DO NOT ADD ROWS WITH ID GREATER THEN 99 -INSERT INTO cs_sap_servers (id, adm_email, client, gw_host, gw_Serv, host, load_balancing, name, user_password, prog_id, system_number, unicode, user_name, default_instance, max_connections_in_pool, group_name, r3_name) VALUES (123456,'mar...@bc...','100','bcz.bcc.com.pl','sapgw44','bcz.bcc.com.pl',FALSE,'BCC_BCZ_100_DB','changeme','ZTESTJCO','44',FALSE,'cstest',TRUE,5,'',''); +INSERT INTO cs_sap_servers (id, active_instance, adm_email, client, gw_host, gw_Serv, host, load_balancing, name, user_password, prog_id, system_number, unicode, user_name, default_instance, max_connections_in_pool, group_name, r3_name) VALUES (123456, 'true', 'mar...@bc...','100','bcz.bcc.com.pl','sapgw44','bcz.bcc.com.pl',FALSE,'BCC_BCZ_100_DB','changeme','ZTESTJCO','44',FALSE,'cstest',TRUE,5,'',''); INSERT INTO cs_actions (id, name, description) VALUES (1, 'Action_JMX_UseJmx', 'Using JMX'); INSERT INTO cs_actions (id, name, description) VALUES (2, 'Action_RemoteClient_UseRemoteClient', 'Using RemoteClient'); Modified: trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.hbm.xml =================================================================== --- trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.hbm.xml 2006-08-17 18:03:48 UTC (rev 113) +++ trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.hbm.xml 2006-08-19 10:36:10 UTC (rev 114) @@ -10,6 +10,7 @@ <param name="parameters">INCREMENT BY 1 START WITH 100</param> </generator> </id> + <property name="activeInstance" not-null="true" type="boolean" column="ACTIVE_INSTANCE"/> <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"/> Modified: trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java =================================================================== --- trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java 2006-08-17 18:03:48 UTC (rev 113) +++ trunk/code/CSMiddleware/src/org/commsuite/model/SAPInstanceDef.java 2006-08-19 10:36:10 UTC (rev 114) @@ -79,6 +79,8 @@ * SAP logon client (so-called mandant). */ private String client; + + private boolean activeInstance = true; // /** // * SAP logon language. This field is not obligatory. @@ -145,6 +147,17 @@ private String adminEmail; /** + * @hibernate.property column="ACTIVE_INSTANCE" not-null="true" type="boolean" + */ + public boolean isActiveInstance() { + return activeInstance; + } + + public void setActiveInstance(boolean activeInstance) { + this.activeInstance = activeInstance; + } + + /** * Default constructor. */ public SAPInstanceDef() { Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java =================================================================== --- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-08-17 18:03:48 UTC (rev 113) +++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-08-19 10:36:10 UTC (rev 114) @@ -230,8 +230,9 @@ logger.info("Destroying instance: " + instanceName); checkExistenceOfSAPInstance(instanceName); final ISAPComm instance = sapComms.get(instanceName); + logger.debug("INSTANCE: "+ instance); + sapComms.remove(instance.getName()); instance.destroy(); - sapComms.remove(instance.getName()); logger.info("Instance destroyed: " + instanceName); } Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java =================================================================== --- trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java 2006-08-17 18:03:48 UTC (rev 113) +++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/ServersService.java 2006-08-19 10:36:10 UTC (rev 114) @@ -36,6 +36,9 @@ import org.commsuite.ws.WebServiceException; /** + * This class provides all functionality connected with servers. It contains adding, + * and modyfing servers, deleting servers, and receiving servers list. + * * @since 1.0 * @author Szymon Kuzniak * @author Marcin Zduniak @@ -57,6 +60,18 @@ return instance; } + /** + * Returns servers list size. If def argument is null, then returns number + * of all servers, othrwise returns number of servers that matches def + * object + * + * @param def pattern for matching + * @param defaultSearch whether the default property should be contained in pattern + * @param loadSearch wether the loadBalancing propert should be contained in pattern + * @param unicodeSearch whether the unicode property should be contained in pattern + * @return number of servers matching criteria + * @throws WebServiceException when something goes wrong + */ public int getInstancesSize(WSSAPInstanceDef def, boolean defaultSearch, boolean loadSearch, boolean unicodeSearch) throws WebServiceException { try { @@ -73,6 +88,13 @@ } } + /** + * returns subset of all servers. subset contains instances from begin index to end + * @param begin index to start creating subset + * @param end index to end creatind subset + * @return list of servers from begin to end + * @throws WebServiceException when something goes wrong + */ public Collection<WSSAPInstanceDef> getInstancesSubset(int begin, int end) throws WebServiceException { try { final SAPInstanceDefManager instManager = (SAPInstanceDefManager) SpringMiddlewareContext @@ -90,6 +112,11 @@ } } + /** + * returns all server instances + * @return list of SAPInstanceDef objects + * @throws WebServiceException when something goes wrong + */ public Collection<WSSAPInstanceDef> getAllInstances() throws WebServiceException { try { final SAPInstanceDefManager instManager = (SAPInstanceDefManager) SpringMiddlewareContext @@ -107,6 +134,16 @@ } } + /** + * returns instances that matches pattern(def) + * + * @param def pattern for matching + * @param defaultSearch whether the default property should be contained in pattern + * @param loadSearch wether the loadBalancing propert should be contained in pattern + * @param unicodeSearch whether the unicode property should be contained in pattern + * @return list of SAPServerDef object that matches criteria + * @throws WebServiceException when something goes wrong + */ public Collection<WSSAPInstanceDef> getSelectedInstances(WSSAPInstanceDef def, boolean defaultSearch, boolean loadSearch, boolean unicodeSearch) throws WebServiceException { try { @@ -127,6 +164,18 @@ } + /** + * returns subset of instances that matches pattern(def). + * + * @param def pattern for matching + * @param defaultSearch whether the default property should be contained in pattern + * @param loadSearch wether the loadBalancing propert should be contained in pattern + * @param unicodeSearch whether the unicode property should be contained in pattern + * @param begin index to start creating subset + * @param end index to end creatind subset + * @return list of selected instances + * @throws WebServiceException when something goes wrong + */ public Collection<WSSAPInstanceDef> getSelectedInstancesSubset(WSSAPInstanceDef def, boolean defaultSearch, boolean loadSearch, boolean unicodeSearch, int begin, int end) throws WebServiceException { @@ -148,6 +197,12 @@ } + /** + * saves instance to database via SAPInstanceDefManager + * @param wsInstance instance to save + * @return saved instance + * @throws WebServiceException when something goes wrong + */ public WSSAPInstanceDef saveNewInstance(WSSAPInstanceDef wsInstance) throws WebServiceException { try { final SAPInstanceDefManager instManager = (SAPInstanceDefManager) SpringMiddlewareContext @@ -174,6 +229,12 @@ } } + /** + * test instance + * @param serverName name of instance to test + * @return true if test is OK, false otherwise + * @throws WebServiceException when something goes wrong(ie. no instance found) + */ public boolean testServer(String serverName) throws WebServiceException { try { final ISAPCommManager sapMgr = SpringMiddlewareContext.getSAPCommManager(); @@ -191,6 +252,12 @@ } } + /** + * returns instance by id + * @param id id of desired instance + * @return instance of given id, if instance is not present returns null + * @throws WebServiceException when something goes wrong + */ public WSSAPInstanceDef getInstanceById(String id) throws WebServiceException { try { final SAPInstanceDefManager instManager = (SAPInstanceDefManager) SpringMiddlewareContext @@ -203,6 +270,11 @@ } } + /** + * checks if all fields are properly filled + * @param def instance to validate + * @return true of fields are filled properly, false otherwise + */ private boolean validateInstance(WSSAPInstanceDef def) { boolean result = true; @@ -255,6 +327,12 @@ return result; } + /** + * tests if server isworking currently + * @param serverName name of serber to test + * @return true if server os working, false otherwise + * @throws WebServiceException when something goes wrong + */ public boolean isSapServerWorking(String serverName) throws WebServiceException { try { final ISAPCommManager sapMgr = SpringMiddlewareContext.getSAPCommManager(); @@ -268,6 +346,11 @@ } } + /** + * starts server if is stopped + * @param serverName server name to start + * @throws WebServiceException when something goes wrong + */ public void startSapServer(String serverName) throws WebServiceException { try { final ISAPCommManager sapMgr = SpringMiddlewareContext.getSAPCommManager(); @@ -278,6 +361,11 @@ } } + /** + * stops server if is working + * @param serverName server name to stop + * @throws WebServiceException when something goes wrong + */ public void stopSapServer(String serverName) throws WebServiceException { try { final ISAPCommManager sapMgr = SpringMiddlewareContext.getSAPCommManager(); @@ -288,6 +376,11 @@ } } + /** + * sets attributes for server + * @param wsInstance instance from attributes are taken + * @param instance instance to set attributes + */ private void setServerAttrs(WSSAPInstanceDef wsInstance, SAPInstanceDef instance) { instance.setAdminEmail(wsInstance.getAdminEmail()); instance.setClient(wsInstance.getClient()); @@ -307,15 +400,24 @@ instance.setUser(wsInstance.getUser()); } + /** + * deletes server from database + * @param id server id to delete + * @throws WebServiceException when something goes wrong + */ public void deletServer(String id) throws WebServiceException{ try { final SAPInstanceDefManager instManager = (SAPInstanceDefManager) SpringMiddlewareContext .getSAPInstanceDefManager(); -// final ISAPCommManager sapMgr = SpringMiddlewareContext.getSAPCommManager(); -// sapMgr.destroyInstance(instManager.getSAPInstanceDef(id).getName()); + logger.debug("destroy instance, id: "+ id); + final ISAPCommManager sapMgr = SpringMiddlewareContext.getSAPCommManager(); + SAPInstanceDef instance = instManager.getSAPInstanceDef(id); + + sapMgr.destroyInstance(instance.getName()); + logger.debug("destroy successfull, serverId: "+ id); instManager.deleteSAPInstanceDef(id); } catch(Throwable t) { - logger.fatal("error in getInstancesSize method", t); + logger.fatal("error in deleteServer method", t); throw new WebServiceException(t); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <zd...@us...> - 2006-09-21 21:09:14
|
Revision: 142
http://svn.sourceforge.net/comsuite/?rev=142&view=rev
Author: zduniak
Date: 2006-09-21 14:06:39 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
SAPEmulator moved to more appropriate package.
Modified Paths:
--------------
trunk/code/CSMiddleware/src/sapContext.xml
trunk/code/CSMiddleware/war/WEB-INF/web.xml
Added Paths:
-----------
trunk/code/CSMiddleware/src/org/commsuite/tests/
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/SAPEmulatingServlet.java
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_FAX_z-PL-literkami.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_HTM_Mantis.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_ODP.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_RTF.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_SMS_z-PL-literkami.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_TIFF-kilka-w-zalaczniku.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_TXT-wyslane-jako-SMS_w_jednym_dlugim_zalaczniku.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_TXT-wyslane-jako-fax.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_TXT_wyslane-jako-SMS-3-zalaczniki.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_XLS.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_bmp.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_doc.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_doc_InnyDokument.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_doc_Word60.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_gif.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_htm.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_jpeg.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_jpg.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_ods.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_odt.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_pdf_main_msg.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_png.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_pps.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_ppt.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxc.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxd.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxi.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxw_wersja1.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxw_wersja2.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_to_powinien_byc_SMS.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_to_powinien_byc_SMS_do_Agniesi.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_to_powinien_byc_SMS_do_Marcina.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_to_powinien_byc_SMS_do_Rafala.ser
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/XCHGVERSION_1140895388800.ser
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/SAPEmulatingServlet.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/SAPEmulatingServlet.java (rev 0)
+++ trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/SAPEmulatingServlet.java 2006-09-21 21:06:39 UTC (rev 142)
@@ -0,0 +1,109 @@
+/* $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.tests.emulator;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.commsuite.sap.ISAPComm;
+import org.commsuite.sap.SAPComm;
+import org.commsuite.util.SpringMiddlewareContext;
+
+import com.sap.mw.jco.JCO;
+
+/**
+ * @since 1.0
+ * @author Marcin Zduniak
+ */
+public class SAPEmulatingServlet extends HttpServlet {
+
+ private static final long serialVersionUID = 9071969523995027656L;
+
+ public SAPEmulatingServlet() {
+ super();
+ }
+
+ @Override
+ protected void service(HttpServletRequest req, HttpServletResponse res)
+ throws ServletException, IOException {
+ final String action = req.getParameter("a");
+ final PrintWriter out = res.getWriter();
+ out.print("<html>");
+ if (null == action) {
+ showAllFiles(out);
+ } else {
+ try {
+ simulateJCOFunction(action);
+ out.print("Messages sent");
+ } catch (Throwable e) {
+ out.print("Exception: ");
+ out.print(e.getMessage());
+ e.printStackTrace();
+ }
+ }
+ out.print("</html>");
+ }
+
+ private void simulateJCOFunction(String action) throws IOException, ClassNotFoundException {
+ final String path = getResPath() + "/" + action;
+ final InputStream is = new FileInputStream(new File(path));
+ final ObjectInputStream objIn = new ObjectInputStream(is);
+ final Object obj = objIn.readObject();
+
+ if (obj instanceof JCO.Function) {
+ final JCO.Function function = (JCO.Function) obj;
+ for (ISAPComm isapComm : SpringMiddlewareContext.getSAPCommManager().getSapComms().values()) {
+ final SAPComm sapComm = (SAPComm) isapComm;
+ sapComm.handleJCORequest(function, "ISO8859_2");
+ }
+ }
+ }
+
+ private String getResPath() {
+ final String path = this.getClass().getResource("/").getPath() + "/"
+ + this.getClass().getPackage().getName().replace('.', '/') + "/res";
+ return path;
+ }
+
+ private void showAllFiles(PrintWriter out) {
+ final File resPath = new File(getResPath());
+
+ if (null == resPath) {
+ out.append("Could not find path to files.");
+ return;
+ }
+
+ out.append("Available test messages:<br/><br/>");
+ for (String name : resPath.list()) {
+ out.append("<a href='?a=" + name + "'>" + name + "</a><br/>");
+ }
+ }
+
+}
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/SAPEmulatingServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_FAX_z-PL-literkami.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_FAX_z-PL-literkami.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_HTM_Mantis.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_HTM_Mantis.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_ODP.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_ODP.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_RTF.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_RTF.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_SMS_z-PL-literkami.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_SMS_z-PL-literkami.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_TIFF-kilka-w-zalaczniku.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_TIFF-kilka-w-zalaczniku.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_TXT-wyslane-jako-SMS_w_jednym_dlugim_zalaczniku.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_TXT-wyslane-jako-SMS_w_jednym_dlugim_zalaczniku.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_TXT-wyslane-jako-fax.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_TXT-wyslane-jako-fax.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_TXT_wyslane-jako-SMS-3-zalaczniki.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_TXT_wyslane-jako-SMS-3-zalaczniki.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_XLS.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_XLS.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_bmp.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_bmp.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_doc.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_doc.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_doc_InnyDokument.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_doc_InnyDokument.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_doc_Word60.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_doc_Word60.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_gif.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_gif.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_htm.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_htm.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_jpeg.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_jpeg.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_jpg.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_jpg.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_ods.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_ods.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_odt.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_odt.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_pdf_main_msg.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_pdf_main_msg.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_png.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_png.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_pps.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_pps.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_ppt.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_ppt.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxc.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxc.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxd.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxd.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxi.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxi.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxw_wersja1.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxw_wersja1.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxw_wersja2.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_sxw_wersja2.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_to_powinien_byc_SMS.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_to_powinien_byc_SMS.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_to_powinien_byc_SMS_do_Agniesi.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_to_powinien_byc_SMS_do_Agniesi.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_to_powinien_byc_SMS_do_Marcina.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_to_powinien_byc_SMS_do_Marcina.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_to_powinien_byc_SMS_do_Rafala.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/SX_OBJECT_RECEIVE_to_powinien_byc_SMS_do_Rafala.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/XCHGVERSION_1140895388800.ser
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/XCHGVERSION_1140895388800.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/code/CSMiddleware/src/sapContext.xml
===================================================================
--- trunk/code/CSMiddleware/src/sapContext.xml 2006-09-21 20:46:12 UTC (rev 141)
+++ trunk/code/CSMiddleware/src/sapContext.xml 2006-09-21 21:06:39 UTC (rev 142)
@@ -12,11 +12,6 @@
<bean factory-bean="sapInstanceDefManager"
factory-method="getSAPInstances">
</bean>
- <!--
- <bean
- class="org.commsuite.scratchpad.zduniakm.SAPInstancesSupplier"
- factory-method="obtainSAPInstances" />
- -->
</property>
</bean>
Modified: trunk/code/CSMiddleware/war/WEB-INF/web.xml
===================================================================
--- trunk/code/CSMiddleware/war/WEB-INF/web.xml 2006-09-21 20:46:12 UTC (rev 141)
+++ trunk/code/CSMiddleware/war/WEB-INF/web.xml 2006-09-21 21:06:39 UTC (rev 142)
@@ -149,7 +149,7 @@
<servlet>
<servlet-name>SAPEmulator</servlet-name>
<servlet-class>
- org.commsuite.scratchpad.zduniakm.sapemulator.SAPEmulatingServlet
+ org.commsuite.tests.emulator.SAPEmulatingServlet
</servlet-class>
</servlet>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-09-26 12:02:49
|
Revision: 162
http://svn.sourceforge.net/comsuite/?rev=162&view=rev
Author: zduniak
Date: 2006-09-26 05:02:23 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
- Devices emulator implemented - working just fine
- Minor improvements in SAP-related module
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/devices/Device.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/sap/SAPCommManager.java
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/SAPEmulatingServlet.java
Added Paths:
-----------
trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/sample.pdf
trunk/code/CSMiddleware/war/deviceemulator.jsp
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java 2006-09-24 12:42:52 UTC (rev 161)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java 2006-09-26 12:02:23 UTC (rev 162)
@@ -236,7 +236,6 @@
notifySendStateChange(messageId, OutboundMessage.State.FAILED);
}
-
}
/**
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java 2006-09-24 12:42:52 UTC (rev 161)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/JCoFunctionTranslator.java 2006-09-26 12:02:23 UTC (rev 162)
@@ -174,7 +174,7 @@
// [PW] REFACTOR this method is defenitely too long.. [SK]
// Cyclomatic Complexity of 26
public static JCO.Function getJCOFunctionFromMessage(Message message,
- IRepository repository) {
+ IRepository repository, String mainReceiver) {
final JCO.Function f = repository
.getFunctionTemplate(SX_OBJECT_RECEIVE).getFunction();
if (null == f) {
@@ -427,7 +427,7 @@
receivers.appendRow();
// RECEIVER field must contains valid, SAP-instance-server unique e-mail
// address:
- receivers.setValue(message.getReceiver(), "RECEIVER");
+ receivers.setValue(mainReceiver != null ? mainReceiver : message.getReceiver(), "RECEIVER");
receivers.setValue("INT", "ADR_TYP");
receivers.setValue("X", "EXPRESS");
receivers.setValue("X", "NOTIF_DEL");
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java 2006-09-24 12:42:52 UTC (rev 161)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java 2006-09-26 12:02:23 UTC (rev 162)
@@ -225,8 +225,7 @@
&& 0 == messages[0].getSentContents().size()) {
final String errMsg = "Message without any content is not supported";
logger.error(errMsg);
- throw new JCO.AbapException("INTERNAL",
- errMsg);
+ throw new JCO.AbapException("INTERNAL", errMsg);
}
if (null == msgManager) {
@@ -477,12 +476,10 @@
JCO.Client client = null;
try {
- // setting correct receiver:
- message.setReceiver(instanceDef.getAdminEmail());
-
// converting message to JCO.Function:
final JCO.Function f = JCoFunctionTranslator
- .getJCOFunctionFromMessage(message, repository);
+ .getJCOFunctionFromMessage(message, repository, instanceDef
+ .getAdminEmail());
// REVIEW: is below synchronization necessary ?
// synchronized (this) {
@@ -490,8 +487,10 @@
client.execute(f);
// }
final boolean send = checkFunctionReturn(f);
- logger.debug("Message to [" + message.getReceiver()
- + "] sent status: " + send);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Message to [" + message.getReceiver()
+ + "] sent status: " + send);
+ }
return send;
} catch (Throwable t) {
logger.fatal("Exception during sending the message to SAP server",
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-09-24 12:42:52 UTC (rev 161)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-09-26 12:02:23 UTC (rev 162)
@@ -37,7 +37,7 @@
import com.sap.mw.jco.JCO;
/**
- * TODO: [MZ] implement! REVIEW: [MZ] synchronize in appropriate scope TODO: [MZ] Complete comments.
+ * REVIEW: [MZ] synchronize in appropriate scope
*
* @since 1.0
* @author Marcin Zduniak
@@ -45,7 +45,7 @@
*/
public class SAPCommManager implements ISAPCommManager {
- // TODO: przeniesc do pliku properties
+ // TODO: move to properties file
private final static int TRACE_LEVEL = 10;
private static final Logger logger = Logger.getLogger(SAPCommManager.class);
Modified: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/SAPEmulatingServlet.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/SAPEmulatingServlet.java 2006-09-24 12:42:52 UTC (rev 161)
+++ trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/SAPEmulatingServlet.java 2006-09-26 12:02:23 UTC (rev 162)
@@ -44,66 +44,71 @@
*/
public class SAPEmulatingServlet extends HttpServlet {
- private static final long serialVersionUID = 9071969523995027656L;
+ private static final long serialVersionUID = 9071969523995027656L;
- public SAPEmulatingServlet() {
- super();
- }
+ public SAPEmulatingServlet() {
+ super();
+ }
- @Override
- protected void service(HttpServletRequest req, HttpServletResponse res)
- throws ServletException, IOException {
- final String action = req.getParameter("a");
- final PrintWriter out = res.getWriter();
- out.print("<html>");
- if (null == action) {
- showAllFiles(out);
- } else {
- try {
- simulateJCOFunction(action);
- out.print("Messages sent");
- } catch (Throwable e) {
- out.print("Exception: ");
- out.print(e.getMessage());
- e.printStackTrace();
- }
- }
- out.print("</html>");
- }
+ @Override
+ protected void service(HttpServletRequest req, HttpServletResponse res)
+ throws ServletException, IOException {
+ final String action = req.getParameter("a");
+ final PrintWriter out = res.getWriter();
+ out.print("<html>");
+ if (null == action) {
+ showAllFiles(out);
+ } else {
+ try {
+ simulateJCOFunction(action);
+ out.print("Messages sent");
+ } catch (Throwable e) {
+ out.print("Exception: ");
+ out.print(e.getMessage());
+ e.printStackTrace();
+ }
+ }
+ out.print("</html>");
+ }
- private void simulateJCOFunction(String action) throws IOException, ClassNotFoundException {
- final String path = getResPath() + "/" + action;
- final InputStream is = new FileInputStream(new File(path));
- final ObjectInputStream objIn = new ObjectInputStream(is);
- final Object obj = objIn.readObject();
+ private void simulateJCOFunction(String action) throws IOException,
+ ClassNotFoundException {
+ final String path = getResPath() + "/" + action;
+ final InputStream is = new FileInputStream(new File(path));
+ final ObjectInputStream objIn = new ObjectInputStream(is);
+ final Object obj = objIn.readObject();
- if (obj instanceof JCO.Function) {
- final JCO.Function function = (JCO.Function) obj;
- for (ISAPComm isapComm : SpringMiddlewareContext.getSAPCommManager().getSapComms().values()) {
- final SAPComm sapComm = (SAPComm) isapComm;
- sapComm.handleJCORequest(function, "ISO8859_2");
- }
- }
- }
+ if (obj instanceof JCO.Function) {
+ final JCO.Function function = (JCO.Function) obj;
+ for (ISAPComm isapComm : SpringMiddlewareContext
+ .getSAPCommManager().getSapComms().values()) {
+ final SAPComm sapComm = (SAPComm) isapComm;
+ sapComm.handleJCORequest(function, "ISO8859_2");
+ }
+ }
+ }
- private String getResPath() {
- final String path = this.getClass().getResource("/").getPath() + "/"
- + this.getClass().getPackage().getName().replace('.', '/') + "/res";
- return path;
- }
+ private String getResPath() {
+ final String path = this.getClass().getResource("/").getPath() + "/"
+ + this.getClass().getPackage().getName().replace('.', '/')
+ + "/res";
+ return path;
+ }
- private void showAllFiles(PrintWriter out) {
- final File resPath = new File(getResPath());
-
- if (null == resPath) {
- out.append("Could not find path to files.");
- return;
- }
-
- out.append("Available test messages:<br/><br/>");
- for (String name : resPath.list()) {
- out.append("<a href='?a=" + name + "'>" + name + "</a><br/>");
- }
- }
+ private void showAllFiles(PrintWriter out) {
+ final File resPath = new File(getResPath());
+ if (null == resPath) {
+ out.append("Could not find path to files.");
+ return;
+ }
+
+ out.append("Available test messages:<br/><br/>");
+ for (String name : resPath.list()) {
+ if (name.endsWith(".ser")) {
+ out.append("<a href='?a=" + name + "'>" + name + "</a><br/>");
+ }
+ }
+ }
+
}
Added: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/sample.pdf
===================================================================
(Binary files differ)
Property changes on: trunk/code/CSMiddleware/src/org/commsuite/tests/emulator/res/sample.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/pdf
Added: trunk/code/CSMiddleware/war/deviceemulator.jsp
===================================================================
--- trunk/code/CSMiddleware/war/deviceemulator.jsp (rev 0)
+++ trunk/code/CSMiddleware/war/deviceemulator.jsp 2006-09-26 12:02:23 UTC (rev 162)
@@ -0,0 +1,133 @@
+<%
+/* $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.*"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Device emulator</title>
+</head>
+<body>
+<h3>Device emulator</h3>
+<%
+ if (null != request.getParameter("msgSent")) {
+ final boolean faxType = "FAX".equalsIgnoreCase(request
+ .getParameter("type"));
+
+ final Message message = new Message();
+ message.setCreationDate(new Date());
+ message
+ .setDescription("Message received from emulated device: "
+ + request.getParameter("type"));
+ message.setDirection(Direction.INBOUND);
+
+ message.setEndDate(null);
+
+ message.setExpirationDate(null);
+
+ message
+ .setFormatType(faxType ? FormatType.FAX
+ : FormatType.SMS);
+ message.setLastProcessDate(new Date());
+ message.setLastProcessMessage(message.getDescription());
+
+ message.setPriority(Priority.LEVEL_4);
+
+ message.setReceiver(request.getParameter("receiver"));
+ message.setSapID(RandomGUID.getGUID());
+
+ message.setSendDate(new Date());
+ message.setSender(request.getParameter("sender"));
+ message.setStartDate(new Date());
+ message.setStatus(Status.RECEIVED_FROM_EXTERNAL_DEVICE);
+
+ final Contents contents = new Contents();
+ if (faxType) {
+ // FAX:
+ final String pathToSamplePDF = "/org/commsuite/tests/emulator/res/sample.pdf";
+ final InputStream is = getClass().getResourceAsStream(
+ pathToSamplePDF);
+ contents.setData(IOUtil.convertIS2Bytes(is));
+ contents.setMimeType(Contents.MIME_TYPE_PDF);
+ } else {
+ // SMS:
+ contents.setData(request.getParameter("smstxt").getBytes());
+ contents.setMimeType(Contents.MIME_TYPE_TEXT_PLAIN);
+ }
+ contents.setDescription(message.getDescription());
+
+ message.addContents(contents);
+
+ SpringMiddlewareContext.getMessageManager()
+ .saveMessage(message);
+
+ // processing external filters (plugins):
+ boolean stopProcessing = false;
+ final FilterManager filterManager = SpringMiddlewareContext
+ .getFilterManager();
+ if (!filterManager.processMessage(message)) {
+ stopProcessing = true;
+ }
+
+ if (!stopProcessing) {
+ SpringMiddlewareContext.getJMSManager().sendMessage(
+ SpringMiddlewareBeansConstants.M_SAP_IN_QUEUE_NAME,
+ message);
+
+ }
+%>
+<b>Message sent<br/></b>
+<%
+}
+%>
+<form method="post"><input type="hidden" name="msgSent" value="1" />
+<table border="0">
+ <tr>
+ <td>Sender:</td>
+ <td><input type="text" name="sender" value="48600123456" /></td>
+ </tr>
+ <tr>
+ <td>Receiver:</td>
+ <td><input type="text" name="receiver" value="48600654321" /></td>
+ </tr>
+ <tr>
+ <td>Fax/SMS:</td>
+ <td><input type="radio" name="type" value="FAX" checked /> Fax<br />
+ <input type="radio" name="type" value="SMS" /> SMS<br />
+ </td>
+ </tr>
+ <tr>
+ <td>SMS text:</td>
+ <td><input type="text" name="smstxt"
+ value="Hello world of SMS funs" /></td>
+ </tr>
+ <tr>
+ <td>FAX file:</td>
+ <td>For faxes appropriate sample PDF file will be used</td>
+ </tr>
+</table>
+<input type="submit" value="Send" /></form>
+</body>
+</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X