comsuite-svn Mailing List for Communications Suite
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-12-20 19:54:17
|
Revision: 220
http://svn.sourceforge.net/comsuite/?rev=220&view=rev
Author: malinowskirafal
Date: 2006-12-20 11:53:56 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
check if device name contains ':'
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/devices/DeviceManager.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/DeviceManager.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/DeviceManager.java 2006-11-28 15:43:56 UTC (rev 219)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/DeviceManager.java 2006-12-20 19:53:56 UTC (rev 220)
@@ -147,6 +147,11 @@
logger.error("Null device name");
return;
}
+
+ if (device.getName().indexOf(":") != -1) {
+ logger.error("Device name contains ':' character");
+ return;
+ }
if (deviceNames.contains(device.getName())) {
logger.error("Duplicate device name");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mal...@us...> - 2006-11-28 15:49:19
|
Revision: 219
http://svn.sourceforge.net/comsuite/?rev=219&view=rev
Author: malinowskirafal
Date: 2006-11-28 07:43:56 -0800 (Tue, 28 Nov 2006)
Log Message:
-----------
small OOo relaunching fix
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/converter/utils/openoffice/OpenOfficeRunner.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/utils/openoffice/OpenOfficeRunner.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/utils/openoffice/OpenOfficeRunner.java 2006-11-16 22:00:24 UTC (rev 218)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/utils/openoffice/OpenOfficeRunner.java 2006-11-28 15:43:56 UTC (rev 219)
@@ -188,7 +188,13 @@
reset();
throw e;
} catch (IOException e) {
+ logger.error("", e);
+ reset();
throw new Exception(e.toString());
+ } catch (Throwable t) {
+ logger.error("", t);
+ reset();
+ throw new Exception(t.toString());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mal...@us...> - 2006-11-16 22:00:59
|
Revision: 218
http://svn.sourceforge.net/comsuite/?rev=218&view=rev
Author: malinowskirafal
Date: 2006-11-16 14:00:24 -0800 (Thu, 16 Nov 2006)
Log Message:
-----------
javaDoc updates
Modified Paths:
--------------
trunk/code/CSCommon/src/org/commsuite/enums/State.java
trunk/code/CSMiddleware/src/org/commsuite/converter/Conversion.java
trunk/code/CSMiddleware/src/org/commsuite/converter/ImageToImageConverterDescriptor.java
trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverter.java
trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverterDescriptor.java
trunk/code/CSMiddleware/src/org/commsuite/converter/TiffToPdfConverter.java
trunk/code/CSMiddleware/src/org/commsuite/converter/utils/openoffice/XByteArrayInputStream.java
trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java
trunk/code/CSMiddleware/src/org/commsuite/devices/OutboundMessage.java
trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxInboundMessage.java
trunk/code/CSMiddleware/src/org/commsuite/devices/fax/polling/ReceivePollingJob.java
trunk/code/CSMiddleware/src/org/commsuite/devices/sms/ReceivePollingJob.java
trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsDevice.java
trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsOutboundMessage.java
trunk/code/CSMiddleware/src/org/commsuite/messaging/AbstractMessageConsumer.java
trunk/code/CSMiddleware/src/org/commsuite/notification/AbstractNotificationConsumer.java
trunk/code/CSMiddleware/src/org/commsuite/queue/IQueueManager.java
Modified: trunk/code/CSCommon/src/org/commsuite/enums/State.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/enums/State.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSCommon/src/org/commsuite/enums/State.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -27,6 +27,13 @@
* If any of sentContent's status is FAILED then whole message is in FAILED state and notification
* to SAP server is sent.
*
+ * <ul>
+ * <li><code>NOT_SENT</code> sentContent is waiting in one of system queue to send</li>
+ * <li><code>SENT</code> sentContent was sent by device class to external device (mobile) or external program (HylaFAX)</li>
+ * <li><code>DELIVERED</code> sentContent was delivered to receiver</li>
+ * <li><code>FAILED</code> external device/program failed to deliver sentContent to receiver</li>
+ * </ul>
+ *
* @since 1.0
* @author Rafał Malinowski
*/
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/Conversion.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/Conversion.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/Conversion.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -43,6 +43,8 @@
}
/**
+ * Returns mime type of input data of conversion.
+ *
* @return mime type of input data of conversion
*/
public String getInMimeType() {
@@ -50,6 +52,8 @@
}
/**
+ * Returns mime type of output data of conversion.
+ *
* @return mime type of output data of conversion
*/
public String getOutMimeType() {
@@ -57,12 +61,20 @@
}
/**
+ * Returns true if no conversion is needed - in mime type is equal to out mime type.
+ *
* @return true if no conversion is needed - in mime type is equal to out mime type
*/
public boolean isIdentity() {
return inMimeType.equals(outMimeType);
}
+ /**
+ * Returns true if this object is equal to passed object (if inMimeType and outMimeType are equal).
+ *
+ * @param to object to compare with
+ * @return true if this object is equal to passed object
+ */
public boolean equals(Object to) {
if (null == to) {
return false;
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/ImageToImageConverterDescriptor.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/ImageToImageConverterDescriptor.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/ImageToImageConverterDescriptor.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -78,6 +78,7 @@
/**
* Creates ImageToImageConverter that converts image to image in outType (set in constructor).
+ *
* @return ImageToImageConverter that converts image to image in outType (set in constructor).
*/
public SimpleConverter createSimpleConverter() {
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverter.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverter.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverter.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -62,6 +62,8 @@
}
/**
+ * Returns stream of input data for conversion.
+ *
* @return stream of input data for conversion
*/
protected InputStream getContentStream() {
@@ -69,6 +71,8 @@
}
/**
+ * Returns stream of output data of conversion.
+ *
* @return stream of output data of conversion
*/
protected OutputStream getResultStream() {
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverterDescriptor.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverterDescriptor.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverterDescriptor.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -78,6 +78,7 @@
/**
* Returns list of mime types that described converter can convert from.
+ *
* @return list of mime types that described converter can convert from
*/
public List<String> getInMimeTypes() {
@@ -86,6 +87,7 @@
/**
* Returns true if described converter can convert from inMimeType.
+ *
* @param inMimeType checked mime type.
* @return true if described converter can convert from inMimeType
*/
@@ -95,6 +97,7 @@
/**
* Returns mime type that described converter can convert to.
+ *
* @return mime type that described converter can convert to
*/
public String getOutMimeType() {
@@ -103,6 +106,7 @@
/**
* Sets new quality for conversion.
+ *
* @param quality new quality for conversion
*/
public void setQuality(double quality) {
@@ -111,6 +115,7 @@
/**
* Returns quality of conversion.
+ *
* @return quality of conversion
*/
public double getQuality() {
@@ -119,6 +124,7 @@
/**
* Creates real converter object.
+ *
* @return real converter object
*/
public abstract SimpleConverter createSimpleConverter();
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/TiffToPdfConverter.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/TiffToPdfConverter.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/TiffToPdfConverter.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -163,7 +163,8 @@
/**
* Creates PDFInfo from Tiff tags - readed at readTags.
- * @return pdf info
+ *
+ * @return pdf info in form od PDFInfo object
*/
private PDFInfo createPDFInfoFromTags() {
PDFInfo pdfinfo = new PDFInfo();
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/utils/openoffice/XByteArrayInputStream.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/utils/openoffice/XByteArrayInputStream.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/utils/openoffice/XByteArrayInputStream.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -54,6 +54,8 @@
* Moves internal pointer to p1 position.
*
* @param p1 new internal pointer position.
+ * @throws IllegalArgumentException when p1 is too small or too big
+ * @throws com.sun.star.io.IOException when IOException occurs
*/
public void seek(long p1) throws IllegalArgumentException,
com.sun.star.io.IOException {
@@ -64,6 +66,7 @@
* Returns internal pointer position.
*
* @return internal pointer position
+ * @throws com.sun.star.io.IOException when IOException occurs
*/
public long getPosition() throws com.sun.star.io.IOException {
return pos;
@@ -73,6 +76,7 @@
* Returns length of data array.
*
* @returns length of data array
+ * @throws com.sun.star.io.IOException when IOException occurs
*/
public long getLength() throws com.sun.star.io.IOException {
return count;
@@ -84,6 +88,9 @@
* @param p1 output data array
* @param p2 max length of data read
* @return count of bytes actually read
+ * @throws NotConnectedException when application is not connected to OOo server
+ * @throws BufferSizeExceededException when buffer size was exceeded in output stream
+ * @throws com.sun.star.io.IOException when IOException occurs
*/
public int readBytes(byte[][] p1, int p2) throws NotConnectedException,
BufferSizeExceededException, com.sun.star.io.IOException {
@@ -113,6 +120,9 @@
* @param p1 output data array
* @param p2 max length of data read
* @return count of bytes actually read
+ * @throws NotConnectedException when application is not connected to OOo server
+ * @throws BufferSizeExceededException when buffer size was exceeded in output stream
+ * @throws com.sun.star.io.IOException when IOException occurs
*/
public int readSomeBytes(byte[][] p1, int p2) throws NotConnectedException,
BufferSizeExceededException, com.sun.star.io.IOException {
@@ -121,16 +131,32 @@
/**
* Skips some bytes from data array.
+ *
+ * @param p1 number of bytes to skip
+ * @throws NotConnectedException when application is not connected to OOo server
+ * @throws BufferSizeExceededException when buffer size was exceeded in output stream
+ * @throws com.sun.star.io.IOException when IOException occurs
*/
public void skipBytes(int p1) throws NotConnectedException,
BufferSizeExceededException, com.sun.star.io.IOException {
skip(p1);
}
+ /**
+ * Returns how many available bytes are ready to read in stream.
+ *
+ * @return how many available bytes are ready to read in stream
+ */
public int available() {
return super.available();
}
+ /**
+ * Closes input stream.
+ *
+ * @throws NotConnectedException when application is not connected to OOo server
+ * @throws com.sun.star.io.IOException when IOException occurs
+ */
public void closeInput() throws NotConnectedException,
com.sun.star.io.IOException {
try {
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -160,7 +160,7 @@
}
/**
- * Sends simpel message to receiver. Saves send status into database.
+ * Sends simple message to receiver. Saves send status into database.
*
* @param sentContent sentContent to send
* @param receiver destination address
@@ -247,6 +247,8 @@
/**
* Adds new listener of receiving messages.
+ *
+ * @param receiveListener new receive listener
*/
public void addReceiveListener(ReceiveListener receiveListener) {
synchronized (receiveListeners) {
@@ -256,6 +258,8 @@
/**
* Removes listener of receiving messages.
+ *
+ * @param receiveListener receive listener to remove
*/
public void removeReceiveListener(ReceiveListener receiveListener) {
synchronized (receiveListeners) {
@@ -265,6 +269,8 @@
/**
* Adds new listener of chaning outbound message state.
+ *
+ * @param sendStateChangeListener new sent state change listener
*/
public void addSendStateChangeListener(SendStateChangeListener sendStateChangeListener) {
synchronized (sendStateChangeListeners) {
@@ -274,6 +280,8 @@
/**
* Removes listener ofchaning outbound message state.
+ *
+ * @param sent state change listener to remove
*/
public void removeSendStateChangeListener(SendStateChangeListener sendStateChangeListener) {
synchronized (sendStateChangeListeners) {
@@ -283,6 +291,8 @@
/**
* Sets state of device.
+ *
+ * @param state new state of device
*/
protected void setState(State state) {
this.state = state;
@@ -290,6 +300,8 @@
/**
* Returns state of device.
+ *
+ * @return state of device
*/
public State getState() {
return state;
@@ -297,6 +309,8 @@
/**
* Stub. Return unique name of device. It will be something like "Fax0001" "Fax0002".
+ *
+ * @return unique name of device
*/
public String getName() {
return name;
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/OutboundMessage.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/OutboundMessage.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/OutboundMessage.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -60,8 +60,7 @@
/**
* Creates new outbound message.
*
- * @param device
- * device which will send this message.
+ * @param device device which will send this message.
*/
public OutboundMessage(Device device) {
this.device = device;
@@ -126,8 +125,7 @@
/**
* Sets message mime type.
*
- * @param contentMimeType
- * mime type to set
+ * @param contentMimeType mime type to set
* @return true if given mime type is supported
*/
public boolean setContentMimeType(String contentMimeType) {
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxInboundMessage.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxInboundMessage.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxInboundMessage.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -49,6 +49,13 @@
/**
* FaxDevice creates it after notification of new received Fax.
*
+ * @param device device receiving this message
+ * @param hylaFaxClient HylaFAX Client receiving this message
+ * @param messageId unique HylaFAX message id
+ * @param sourceAddress address of sender
+ * @param destinationAddress address of receiver
+ * @param contentMimeType mime type of message content
+ * @param fileName HylaFAX's FTP filename
* @throws FaxInboundMessageCreateException when inbound message is invalid, fax server's response is invalid, or fax server's response cannot be convered to pdf
*/
public FaxInboundMessage(FaxDevice device, HylaFAXClient hylaFaxClient, String messageId, String sourceAddress, String destinationAddress, String contentMimeType,
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/fax/polling/ReceivePollingJob.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/fax/polling/ReceivePollingJob.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/fax/polling/ReceivePollingJob.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -75,6 +75,7 @@
*
* @see FaxDevice#notifyReceive(org.comsuite.devices.InboundMessage)
* @param context job context, contains FaxDevice
+ * @throws JobExecutionException when any instruction of function fails
*/
public void execute(JobExecutionContext context) throws JobExecutionException {
final FaxDevice faxDevice = (FaxDevice) context.getJobDetail().getJobDataMap().get("FaxDevice");
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/sms/ReceivePollingJob.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/sms/ReceivePollingJob.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/sms/ReceivePollingJob.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -28,6 +28,7 @@
* @see FaxDevice.notifyReceive
* @param context
* job context, contains SmsDevice
+ * @throws JobExecutionException when any instruction of function fails
*/
public void execute(JobExecutionContext context) throws JobExecutionException {
// logger.info("execute");
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsDevice.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsDevice.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsDevice.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -290,6 +290,7 @@
/**
* Sends message throught GSM modem. Message can only have plain/text data.
*
+ * @param message message to send
* @throws DeviceInvalidOutboundMessageException
* message was created on another device
* @throws OutboundMessageInvalidContentMimeTypeException
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsOutboundMessage.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsOutboundMessage.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsOutboundMessage.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -20,7 +20,6 @@
*/
package org.commsuite.devices.sms;
-import java.util.ArrayList;
import java.util.List;
import javolution.util.FastTable;
Modified: trunk/code/CSMiddleware/src/org/commsuite/messaging/AbstractMessageConsumer.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/messaging/AbstractMessageConsumer.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/messaging/AbstractMessageConsumer.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -27,6 +27,8 @@
import org.commsuite.util.SpringMiddlewareContext;
/**
+ * Abstract message consumer is a class that can consume object of Message class from ActiveMQ queues.
+ *
* @since 1.0
* @author Marcin Zduniak
*/
@@ -34,6 +36,9 @@
private final static Logger logger = Logger.getLogger(AbstractMessageConsumer.class);
+ /**
+ * Creates new AbstractMessageConsumer.
+ */
public AbstractMessageConsumer() {
super(Message.class);
}
@@ -42,6 +47,11 @@
public abstract Status getMessageSentStatus();
+ /**
+ * Calls consumeMessage function. Before and after that it updates message status in database.
+ *
+ * @param obj Message object
+ */
public final boolean consumeQueueMessage(Object obj) {
// AbstractQueueMessageConsumer:47 - checking for object type
Message csMessage = (Message)obj;
@@ -72,6 +82,11 @@
return errorWhileConsumption;
}
+ /**
+ * Consumes Message object.
+ *
+ * @param msg Message object
+ */
public abstract void consumeMessage(Message msg);
}
Modified: trunk/code/CSMiddleware/src/org/commsuite/notification/AbstractNotificationConsumer.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/notification/AbstractNotificationConsumer.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/notification/AbstractNotificationConsumer.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -81,6 +81,11 @@
return errorWhileConsumption;
}
+ /**
+ * Consumes notifications.
+ *
+ * @param notification Notification object
+ */
public abstract void consumeNotification(Notification notification);
}
Modified: trunk/code/CSMiddleware/src/org/commsuite/queue/IQueueManager.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/queue/IQueueManager.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/queue/IQueueManager.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -40,6 +40,7 @@
/**
* Atomicaly creates new queue with given name and associates it with consumer consumer.
+ *
* @param queueName name of queue
* @param consumer queue consumer
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mal...@us...> - 2006-11-11 16:06:54
|
Revision: 217
http://svn.sourceforge.net/comsuite/?rev=217&view=rev
Author: malinowskirafal
Date: 2006-11-11 08:06:44 -0800 (Sat, 11 Nov 2006)
Log Message:
-----------
Added Paths:
-----------
trunk/docs/testing/jmx.txt
Added: trunk/docs/testing/jmx.txt
===================================================================
--- trunk/docs/testing/jmx.txt (rev 0)
+++ trunk/docs/testing/jmx.txt 2006-11-11 16:06:44 UTC (rev 217)
@@ -0,0 +1,7 @@
+To enable remote JMX connections change property serviceUrl of rmiServerConnector in jmxContext.xml file to:
+ service:jmx:rmi://localhost/jndi/rmi://[ip-of-server]:1099/CSConnector
+
+If IP is 10.0.0.21:
+ service:jmx:rmi://localhost/jndi/rmi://10.0.0.21:1099/CSConnector
+
+Use this string as JMX URL in jconsole.
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mal...@us...> - 2006-11-01 15:39:47
|
Revision: 216
http://svn.sourceforge.net/comsuite/?rev=216&view=rev
Author: malinowskirafal
Date: 2006-11-01 07:39:32 -0800 (Wed, 01 Nov 2006)
Log Message:
-----------
better installation docs
Modified Paths:
--------------
trunk/docs/linux-distiribution/INSTALL.html
Added Paths:
-----------
trunk/docs/linux-distiribution/img/install_new_1.png.png
trunk/docs/linux-distiribution/img/install_new_2.png.png
trunk/docs/linux-distiribution/img/install_new_3.png.png
trunk/docs/linux-distiribution/img/install_new_4.png.png
Modified: trunk/docs/linux-distiribution/INSTALL.html
===================================================================
--- trunk/docs/linux-distiribution/INSTALL.html 2006-10-18 16:27:11 UTC (rev 215)
+++ trunk/docs/linux-distiribution/INSTALL.html 2006-11-01 15:39:32 UTC (rev 216)
@@ -40,9 +40,29 @@
<p>
System instalacyjny - polecenie cfdisk uruchamia program do partycjonowania dysku, polecenie setup uruchamia instalacj\xEA.
</p>
+ <img src="img/install_new_1.png" />
+ <p>
+ Okno programu cfdisk - lista istniej\xB1cych partycji. W celu instalacji systemu CommunicationsSuiteLinux nale\xBFy usun\xB1\xE6
+ wszystkie istniej\xB1ce partycje. W tym celu nale\xBFy wybra\xE6 partycj\xEA za pomoc\xB1 klawiszy strza\xB3ek g\xF3ra-d\xF3\xB3, wybra\xE6 przycik
+ Delete za pomoc\xB1 klawiszy stra\xB3ek prawo-lewo i nacisn\xB1\xE6 Enter. Po usuni\xEAciu wszystkich partycji na ekranie znajdowa\xE6
+ si\xEA b\xEAdzie jedna pozycja o nazwie FreeSpace.
+ </p>
+ <img src="img/install_new_2.png" />
+ <p>
+ Po wybraniu przycisku New na ekranie pojawia si\xEA powy\xBFsze okno. Nale\xBFy wybra\xE6 opcj\xEA Primary i naci\xB6n\xB1\xE6 Enter.
+ W kolejnym oknie wprowadzamy wielko\xB6\xE6 nowej partycji (tworzona partycja jest partycj\xB1 wymiany). Wpisujemy warto\xB6\xE6
+ 4096 i naciskamy Enter. Wybieramy opcj\xEA Beginning i naciskamy Enter. Wybieramy opcj\xEA Type i naciskamy Enter.
+ </p>
+ <img src="img/install_new_3.png" />
+ <p>
+ Okno wyboru typu partycji. Nale\xBFy nacisn\xB1\xE6 klawisz Enter, wprowadzi\xE6 warto\xB6\xE6 82 i ponownie nacisn\xB1\xE6 klawisz Enter.
+ Nast\xEApnie nale\xBFy wybra\xE6 pozycj\xEA FreeSpace oraz opcj\xEA New i nacisn\xB1\xE6 3 razy klawisz Enter. Nast\xEApnie nale\xBFy
+ wybra\xE6 opcj\xEA Write, wpisa\xE6 yes, nacisn\xB1\xE6 Enter i wybra\xE6 opcj\xEA Quit.
+ </p>
<img src="img/install_4.png" />
<p>
- Program instalacyjny. W celu rozpocz\xEAcia instalacji nale\xBFy wybra\xE6 opcj\xEA ADDSWAP i nacisn\xB1\xE6 przycisk Enter.
+ Po wpisaniu polecenia setup pojawia si\xEA program instalacyjny. W celu rozpocz\xEAcia instalacji nale\xBFy wybra\xE6 opcj\xEA
+ ADDSWAP i nacisn\xB1\xE6 przycisk Enter.
</p>
<img src="img/install_5.png" />
<p>
@@ -105,6 +125,13 @@
<p>
Mo\xBFliwos\xE6 stworzenia dyskietki bootuj\xB1cej.
</p>
+ <p>
+ Wybra\xE6 opcj\xEA 'No modem'.
+ </p>
+ <img src="img/install_new_3.png" />
+ <p>
+ Opcja 'Yes' - konfiguracja sieci jest wymagana do poprawnego dzia\xB3ania systemu.
+ </p>
<img src="img/install_20.png" />
<p>
Okna pozwalaj\xB1ce na wprowadzenie nazwy hosta i nazwy domeny oraz wyb\xF3r adresu IP (lub DHCP).
@@ -117,17 +144,21 @@
<p>
Wyb\xF3r strefy czasowej i sposobu przechowywania daty. Dat\xEA i czas zmienia si\xEA w BIOS'ie lub poleceniem date.
</p>
+ <p>
+ Nast\xEApnie nale\xBFy poda\xE6 has\xB3o administratora (kilkukrotnie, w zale\xBFno\xB6ci od tego, ile razy program b\xEAdzie o nie pyta\xB3).
+ </p>
<img src="img/install_23.png" />
<p>
Zako\xF1czenie instalacji.
</p>
<img src="img/install_24.png" />
<p>
- Wyj\xB6cie z instalatora i reset systemu.
+ Wyj\xB6cie z instalatora i reset systemu (Ctrl+Alt+Del).
</p>
<img src="img/install_25.png" />
<p>
- Po pierwszym odpaleniu systemu pojawi si\xEA konfigurator. Mo\xBFna go tak\xBFe uruchomi\xE6 poleceniem cslinux_configuration.py.
+ Po pierwszym odpaleniu systemu nale\xBFy si\xEA zalogowa\xE6 (u\xBFytkownik: root, has\xB3o: podane zosta\xB3o wcze\xB6niej)
+ oraz uruchomi\xE6 konfigurator: cslinux_configuration.py.
</p>
<img src="img/install_42.png" />
<p>
@@ -172,15 +203,19 @@
</p>
<img src="img/install_36.png" />
<p>
- Konfiguraja lokalnego serwera FAX.
+ Konfiguraja lokalnego serwera FAX. Country code - kod kradu, Area code - kod strefy. Received facsimile mode - 0777.
+ Pozosta\xB3e opcje - domy\xB6lnie.
</p>
<img src="img/install_38.png" />
<p>
- Dodawanie nowego modemu pod\xB3\xB1czonego przez port USB.
+ Dodawanie nowego modemu pod\xB3\xB1czonego przez port USB. Przyk\xB3adowe warto\xB6ci:
+ ttyS[0-9], ttyUSB[0-9], tss/USB[0-9]
</p>
<img src="img/install_39.png" />
<p>
- Po dodaniu nowego modemu nale\xBFy zmodyfikowa\xE6 plik /etc/inittab.
+ Po dodaniu nowego modemu nale\xBFy zmodyfikowa\xE6 plik /etc/inittab - dopisa\xE6 lini\xEA
+ mX:234:respawn:/usr/local/sbin/faxgetty /dev/DEVICE dla ka\xBFdego modemu, gdzie X to unikalna liczba
+ a DEVICE to parametr podany w poprzednim punkcie.
</p>
<img src="img/install_41.png" />
<p>
@@ -190,5 +225,8 @@
<p>
Restart serwera.
</p>
+ <p>
+ Po ka\xBFdej rekonfiguracji zalecany jest restart serwera.
+ </p>
</body>
</html>
\ No newline at end of file
Added: trunk/docs/linux-distiribution/img/install_new_1.png.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/linux-distiribution/img/install_new_1.png.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/linux-distiribution/img/install_new_2.png.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/linux-distiribution/img/install_new_2.png.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/linux-distiribution/img/install_new_3.png.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/linux-distiribution/img/install_new_3.png.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/linux-distiribution/img/install_new_4.png.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/linux-distiribution/img/install_new_4.png.png
___________________________________________________________________
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.
|
|
From: <zd...@us...> - 2006-10-18 16:27:21
|
Revision: 215
http://svn.sourceforge.net/comsuite/?rev=215&view=rev
Author: zduniak
Date: 2006-10-18 09:27:11 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
Tag for CS version 1.0
Added Paths:
-----------
tags/1.0/
Copied: tags/1.0 (from rev 212, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-17 17:38:48
|
Revision: 214
http://svn.sourceforge.net/comsuite/?rev=214&view=rev
Author: zduniak
Date: 2006-10-17 09:34:37 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
FaxOutboundMessage.java - refactoring
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java 2006-10-17 16:30:37 UTC (rev 213)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java 2006-10-17 16:34:37 UTC (rev 214)
@@ -112,14 +112,11 @@
}
final FaxDevice faxDevice = (FaxDevice) getDevice();
- final HylaFAXClient hylaFAXClient;
+ HylaFAXClient hylaFAXClient = null;
+
try {
hylaFAXClient = faxDevice.getConnection();
- } catch (DeviceInitializationFailedException e) {
- throw new OutboundMessageSendException("", e);
- }
- try {
final Job hylafaxJob = hylaFAXClient.createJob();
setMessageId(Long.toString(hylafaxJob.getId()));
@@ -157,9 +154,14 @@
} catch (ConversionFailedException e) {
logger.error("cannot convert", e);
throw new OutboundMessageSendException(e);
+ } catch (DeviceInitializationFailedException e) {
+ logger.error("cannot connect", e);
+ throw new OutboundMessageSendException(e);
} finally {
try {
- faxDevice.closeConnection(hylaFAXClient);
+ if (null != hylaFAXClient) {
+ faxDevice.closeConnection(hylaFAXClient);
+ }
} catch (IOException e) {
logger.error("cannot close", e);
throw new OutboundMessageSendException(e);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-17 16:30:45
|
Revision: 213
http://svn.sourceforge.net/comsuite/?rev=213&view=rev
Author: zduniak
Date: 2006-10-17 09:30:37 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
- constants extracted
- closing connection with HFAX server moved to 'finally' block
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java 2006-10-13 19:40:28 UTC (rev 212)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxOutboundMessage.java 2006-10-17 16:30:37 UTC (rev 213)
@@ -42,16 +42,23 @@
/**
* Outbound message for FaxDevice.
- *
+ *
* @see FaxDevice
* @since 1.0
* @author Rafał Malinowski
+ * @author Marcin Zduniak
*/
public class FaxOutboundMessage extends OutboundMessage {
- private static final Logger logger = Logger.getLogger(FaxOutboundMessage.class);
-
+
+ private static final String HYLAFAX_JOB_KILL_TIME = "000159";
+
+ private static final int HYLAFAX_JOB_MAXIMUM_TRIES = 1;
+
+ private static final Logger logger = Logger
+ .getLogger(FaxOutboundMessage.class);
+
protected static List<String> acceptedMimeTypes;
-
+
static {
acceptedMimeTypes = new FastTable<String>();
acceptedMimeTypes.add("application/pdf");
@@ -60,93 +67,108 @@
acceptedMimeTypes.add("image/tiff-fx");
acceptedMimeTypes.add("text/plain");
}
-
+
/**
- * Creates new fax outbound message for device faxDevice.
- * It creates new HylaFAX job on server and assigns it unique id.
+ * Creates new fax outbound message for device faxDevice. It creates new
+ * HylaFAX job on server and assigns it unique id.
*
- * @param faxDevice device that own this message
+ * @param faxDevice
+ * device that own this message
*/
- public FaxOutboundMessage(FaxDevice device)
- {
+ public FaxOutboundMessage(FaxDevice device) {
super(device);
}
/**
* Sends message using faxDevice set in constructor.
*
- * @throws OutboundMessageInvalidContentMimeTypeException when message's content type cannot be used with fax device
- * @throws OutboundMessageInvalidContentException when message content is null
- * @throws OutboundMessageInvalidDestinationAddressException when destination address is null
- * @throws OutboundMessageConversionFailedException when message's content's conversion failed
+ * @throws OutboundMessageInvalidContentMimeTypeException
+ * when message's content type cannot be used with fax device
+ * @throws OutboundMessageInvalidContentException
+ * when message content is null
+ * @throws OutboundMessageInvalidDestinationAddressException
+ * when destination address is null
+ * @throws OutboundMessageConversionFailedException
+ * when message's content's conversion failed
*/
- public void send() throws
- OutboundMessageInvalidContentMimeTypeException, OutboundMessageInvalidContentException,
- OutboundMessageInvalidDestinationAddressException, OutboundMessageSendException,
- OutboundMessageConversionFailedException {
+ public void send() throws OutboundMessageInvalidContentMimeTypeException,
+ OutboundMessageInvalidContentException,
+ OutboundMessageInvalidDestinationAddressException,
+ OutboundMessageSendException,
+ OutboundMessageConversionFailedException {
logger.info("sending: " + getMessageId());
-
+
if (!isContentMimeTypeSupported()) {
- throw new OutboundMessageInvalidContentMimeTypeException(getContentMimeType());
+ throw new OutboundMessageInvalidContentMimeTypeException(
+ getContentMimeType());
}
-
+
if (getContent() == null) {
throw new OutboundMessageInvalidContentException();
}
-
+
if (getDestinationAddress() == null) {
throw new OutboundMessageInvalidDestinationAddressException();
}
-
- FaxDevice faxDevice = (FaxDevice)getDevice();
- HylaFAXClient hylaFAXClient;
+
+ final FaxDevice faxDevice = (FaxDevice) getDevice();
+ final HylaFAXClient hylaFAXClient;
try {
hylaFAXClient = faxDevice.getConnection();
} catch (DeviceInitializationFailedException e) {
throw new OutboundMessageSendException("", e);
}
-
+
try {
- Job hylafaxJob = hylaFAXClient.createJob();
+ final Job hylafaxJob = hylaFAXClient.createJob();
setMessageId(Long.toString(hylafaxJob.getId()));
-
- byte[] converted = getConverter().convert(getContent());
-
- String temporaryFileName = hylaFAXClient.putTemporary(new ByteArrayInputStream(converted));
-
- Throwable t = getConverter().getThrowable();
+
+ final byte[] converted = getConverter().convert(getContent());
+
+ final String temporaryFileName = hylaFAXClient
+ .putTemporary(new ByteArrayInputStream(converted));
+
+ final Throwable t = getConverter().getThrowable();
if (t != null) {
faxDevice.closeConnection(hylaFAXClient);
throw new OutboundMessageConversionFailedException(t);
}
-
+
// TODO: consider using this parameters:
// http://lists.innovationsw.com/pipermail/gnu-hylafax/2003-July/000251.html
// http://lists.innovationsw.com/pipermail/gnu-hylafax/2003-March/000227.html
hylafaxJob.addDocument(temporaryFileName);
hylafaxJob.setDialstring(getDestinationAddress());
-
+
// do not allow hylafax to requeue job
// CS will do it
- hylafaxJob.setMaximumTries(1);
- hylafaxJob.setKilltime("000159");
-
+ hylafaxJob
+ .setMaximumTries(FaxOutboundMessage.HYLAFAX_JOB_MAXIMUM_TRIES);
+ hylafaxJob.setKilltime(FaxOutboundMessage.HYLAFAX_JOB_KILL_TIME);
+
hylaFAXClient.submit(hylafaxJob);
- faxDevice.closeConnection(hylaFAXClient);
- }
- catch (IOException e) {
+ } catch (IOException e) {
logger.error("cannot send, IOException", e);
throw new OutboundMessageSendException(e);
- }
- catch (ServerResponseException e) {
+ } catch (ServerResponseException e) {
logger.error("cannot send, ServerResponseException", e);
throw new OutboundMessageSendException(e);
} catch (ConversionFailedException e) {
logger.error("cannot convert", e);
throw new OutboundMessageSendException(e);
+ } finally {
+ try {
+ faxDevice.closeConnection(hylaFAXClient);
+ } catch (IOException e) {
+ logger.error("cannot close", e);
+ throw new OutboundMessageSendException(e);
+ } catch (ServerResponseException e) {
+ logger.error("cannot close", e);
+ throw new OutboundMessageSendException(e);
+ }
}
-
+
logger.info("message sent: " + getMessageId());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-13 19:40:35
|
Revision: 212
http://svn.sourceforge.net/comsuite/?rev=212&view=rev
Author: zduniak
Date: 2006-10-13 12:40:28 -0700 (Fri, 13 Oct 2006)
Log Message:
-----------
instalation -> installation
Added Paths:
-----------
trunk/docs/installation/
Removed Paths:
-------------
trunk/docs/instalation/
Copied: trunk/docs/installation (from rev 211, trunk/docs/instalation)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-13 19:35:40
|
Revision: 211
http://svn.sourceforge.net/comsuite/?rev=211&view=rev
Author: zduniak
Date: 2006-10-13 12:34:47 -0700 (Fri, 13 Oct 2006)
Log Message:
-----------
installation instructions
Modified Paths:
--------------
trunk/docs/instalation/tools.txt
Added Paths:
-----------
trunk/docs/instalation/instal_devel_en.doc
trunk/docs/instalation/linux-installation/
trunk/docs/instalation/linux-installation/installation-eng.html
trunk/docs/instalation/linux-installation/installation.html
trunk/docs/instalation/screenshots/
trunk/docs/instalation/screenshots/eclipse-jdk50.PNG
trunk/docs/instalation/screenshots/java-home-settings.PNG
trunk/docs/instalation/screenshots/postgresql-dbs.PNG
Added: trunk/docs/instalation/instal_devel_en.doc
===================================================================
(Binary files differ)
Property changes on: trunk/docs/instalation/instal_devel_en.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/instalation/linux-installation/installation-eng.html
===================================================================
--- trunk/docs/instalation/linux-installation/installation-eng.html (rev 0)
+++ trunk/docs/instalation/linux-installation/installation-eng.html 2006-10-13 19:34:47 UTC (rev 211)
@@ -0,0 +1,504 @@
+<html>
+ <head>
+ <meta http-equiv="Content-type" value="text/html; charset=iso-8859-2" />
+ <style type="text/css">
+ body {
+ font: 10pt Verdana;
+ margin: 50pt;
+ }
+ h2 {
+ text-indent: 15pt;
+ font: bold 12pt Verdana;
+ }
+ li, p {
+ text-align: justify;
+ text-indent: 15pt;
+ }
+ pre {
+ text-indent: 0pt;
+ font: 10pt "Courier";
+ margin: 10pt;
+ padding: 5pt;
+ background-color: #dddddd;
+ border: 1px dashed black;
+ }
+ </style>
+ </head>
+ <body>
+ <h1>Running CommunicationsSuite</h1>
+ <ol>
+ <li>Install Slackware 10.2 Linux (or newer) - full installation</li>
+ <li>Install Bluez (www.linuxpackages.net contains all required packages)
+ <ul>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/X11/DBUS/dbus-0.60-i486-2sdd.tgz</li>
+ <li>installpkg dbus-0.60-i486-2sdd.tgz</li>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/Library/bluez-libs/bluez-libs-2.21-i486-1bmr.tgz</li>
+ <li>installpkg bluez-libs-2.21-i486-1bmr.tgz</li>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/Console/bluez-utils/bluez-utils-2.21-i486-1bmr.tgz</li>
+ <li>installpkg bluez-utils-2.21-i486-1bmr.tgz</li>
+ </ul>
+ </li>
+ <li>Bluez configuration
+ <ul>
+ <li>/etc/bluetooth/hcid.conf
+<pre>options {
+ autoinit yes;
+ security auto;
+ pairing multi;
+ pin_helper /etc/bluetooth/pin;
+}
+
+device {
+ name "BlueZ (%d)";
+ class 0x3e0100;
+ iscan enable; pscan enable;
+ lm accept;
+ lp rswitch,hold,sniff,park;
+ auth disable;
+}
+</pre>
+ </li>
+ <li>/etc/bluetooth/pin
+<pre>#!/bin/bash
+
+# replace 1111 with any number
+echo "PIN:1111"
+</pre>
+ </li>
+ <li>/etc/bluetooth/rfcomm.conf
+<pre>
+</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Install fonts
+ <ul>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/ken/cabextract-1.2-i486-1kjz.tgz</li>
+ <li>installpkg cabextract-1.2-i486-1kjz.tgz</li>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/ananda/core_web_fonts-20050922-noarch-1rsa.tgz</li>
+ <li>installpkg core_web_fonts-20050922-noarch-1rsa.tgz</li>
+ </ul>
+ </li>
+ <li>Startup scripts
+ <ul>
+ <li>/etc/rc.d/rc.local
+<pre>#!/bin/bash
+
+. /etc/profile # need it for JAVA_HOME
+
+/usr/sbin/hcid
+
+if [ ! -r /.configured ]; then
+ /usr/sbin/cslinux_configuration.py
+ touch /.configured
+fi
+
+for i in `seq 0 9`; do
+ /usr/bin/rfcomm bind $i
+done;
+
+/usr/X11/bin/Xvfb :0 2>/dev/null &
+/etc/init.d/hylafax start
+/etc/rc.d/rc.postgresql start
+/usr/share/tomcat/bin/catalina.sh start
+</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Install tomcat
+ <ul>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/Daemon/tomcat/tomcat-5.5.16-noarch-1stb.tgz</li>
+ <li>installpkg tomcat-5.5.16-noarch-1stb.tgz</li>
+ <li>edit /usr/share/tomcat/bin/setclasspath.sh like:
+<pre>...
+...
+...
+
+# First clear out the user classpath
+CLASSPATH=/opt/openoffice.org2.0/program/
+
+...
+...
+...
+</pre>
+ </li>
+ <li>edit /usr/share/tomcat/bin/catalina.sh like:
+<pre>...
+...
+...
+
+CATALINA_OPTS=-Dorg.apache.activeio.journal.active.DisableLocking=true
+
+if [ "$1" = "jpda" ] ; then
+ if [ -z "$JPDA_TRANSPORT" ]; then
+
+...
+...
+...
+</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Prepare database
+ <ul>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/ken/postgresql-8.1.4-i486-1kjz.tgz</li>
+ <li>installpkg postgresql-8.1.4-i486-1kjz.tgz</li>
+ <li>create file /root/import.sql:
+<pre>create table CS_ACTIONS (
+ id int8 not null, description varchar(255),
+ name varchar(255) not null unique, primary key (id)
+);
+create table CS_CONTENTS (
+ id int8 not null,
+ CONTENTS_BIN bytea not null,
+ MIME_TYPE varchar(255) not null,
+ DESCRIPTION varchar(255), primary key (id)
+);
+create table CS_GROUPS (
+ id int8 not null, name varchar(255) not null unique,
+ description varchar(255), primary key (id)
+);
+create table CS_GROUPS_REF (
+ SUPGROUP_ID int8 not null,
+ SUBGROUP_ID int8 not null,
+ primary key (SUBGROUP_ID, SUPGROUP_ID)
+);
+create table CS_GROUPS_USERS (
+ USER_ID int8 not null,
+ GROUP_ID int8 not null,
+ primary key (USER_ID, GROUP_ID)
+);
+create table CS_MESSAGES (
+ id int8 not null,
+ CREATION_DATE timestamp not null,
+ DESCRIPTION varchar(255),
+ DIRECTION int2 not null,
+ END_DATE timestamp,
+ EXPIRATION_DATE timestamp,
+ FORMAT_TYPE int2 not null,
+ LAST_PROCESS_DATE timestamp not null,
+ LAST_PROCESS_MESSAGE varchar(255),
+ PRIORITY int2 not null,
+ RECEIVER varchar(255) not null,
+ SAP_ID varchar(255),
+ SEND_DATE timestamp not null,
+ SENDER varchar(255) not null,
+ START_DATE timestamp,
+ STATUS int2 not null,
+ SAP_SERVER_ID int8,
+ USER_ID int8, primary key (id)
+);
+create table CS_ROLES (
+ id int8 not null, description varchar(255),
+ name varchar(255) not null unique,
+ primary key (id)
+);
+create table CS_ROLES_ACTIONS (
+ ACTION_ID int8 not null,
+ ROLE_ID int8 not null,
+ primary key (ROLE_ID, ACTION_ID)
+);
+create table CS_ROLES_GROUPS (
+ GROUP_ID int8 not null,
+ ROLE_ID int8 not null,
+ primary key (GROUP_ID, ROLE_ID)
+);
+create table CS_ROLES_USERS (
+ USER_ID int8 not null,
+ ROLE_ID int8 not null,
+ primary key (USER_ID, ROLE_ID)
+);
+create table CS_SAP_SERVERS (
+ id int8 not null,
+ ACTIVE_INSTANCE bool not null,
+ ADM_EMAIL varchar(250) not null,
+ CLIENT varchar(30) not null,
+ GROUP_NAME varchar(30),
+ GW_HOST varchar(1000),
+ GW_SERV varchar(30),
+ HOST varchar(1000) not null,
+ LOAD_BALANCING bool not null,
+ NAME varchar(30) not null unique,
+ USER_PASSWORD varchar(30) not null,
+ PROG_ID varchar(30) not null,
+ R3_NAME varchar(30),
+ SYSTEM_NUMBER varchar(30) not null,
+ UNICODE bool not null,
+ USER_NAME varchar(30) not null,
+ DEFAULT_INSTANCE bool not null,
+ MAX_CONNECTIONS_IN_POOL int4 not null,
+ primary key (id)
+);
+create table CS_SENT_CONTENTS (
+ id int8 not null,
+ CONTENT_ID int8 not null,
+ INTERNAL_ID varchar(255) not null,
+ MESSAGE_ID int8 not null,
+ STATE int2 not null,
+ TRY_NUMBER int4 not null,
+ LIST_ORDER int4,
+ primary key (id)
+);
+create table CS_USERS (
+ id int8 not null,
+ LOGIN varchar(30) not null unique,
+ USER_PASSWORD varchar(30) not null,
+ city varchar(255),
+ country int2,
+ department varchar(255),
+ email varchar(255),
+ enabled bool not null,
+ fax varchar(255),
+ firstName varchar(255),
+ language int2,
+ lastName varchar(255),
+ mobile varchar(255),
+ position varchar(255),
+ postalCode varchar(255),
+ state varchar(255),
+ street varchar(255),
+ telephone varchar(255),
+ timeZone int2,
+ validFrom timestamp,
+ validTo timestamp,
+ primary key (id)
+);
+alter table CS_GROUPS_REF
+ add constraint FK963BD6B784A38B77 foreign key (SUPGROUP_ID) references CS_GROUPS;
+alter table CS_GROUPS_REF
+ add constraint FK963BD6B768E57969 foreign key (SUBGROUP_ID) references CS_GROUPS;
+alter table CS_GROUPS_USERS
+ add constraint FKF6D1AF2CD63AD62B foreign key (USER_ID) references CS_USERS;
+alter table CS_GROUPS_USERS
+ add constraint FKF6D1AF2C1E65FB29 foreign key (GROUP_ID) references CS_GROUPS;
+alter table CS_MESSAGES
+ add constraint FK442A983BD63AD62B foreign key (USER_ID) references CS_USERS;
+alter table CS_MESSAGES
+ add constraint FK442A983B6359E879 foreign key (SAP_SERVER_ID) references CS_SAP_SERVERS;
+alter table CS_ROLES_ACTIONS
+ add constraint FK52647BAC3110124B foreign key (ROLE_ID) references CS_ROLES;
+alter table CS_ROLES_ACTIONS
+ add constraint FK52647BAC77C6A0B foreign key (ACTION_ID) references CS_ACTIONS;
+alter table CS_ROLES_GROUPS
+ add constraint FKF4F091253110124B foreign key (ROLE_ID) references CS_ROLES;
+alter table CS_ROLES_GROUPS
+ add constraint FKF4F091251E65FB29 foreign key (GROUP_ID) references CS_GROUPS;
+alter table CS_ROLES_USERS
+ add constraint FK31F6A477D63AD62B foreign key (USER_ID) references CS_USERS;
+alter table CS_ROLES_USERS
+ add constraint FK31F6A4773110124B foreign key (ROLE_ID) references CS_ROLES;
+alter table CS_SENT_CONTENTS
+ add constraint FKFBFD1652930EF669 foreign key (MESSAGE_ID) references CS_MESSAGES;
+alter table CS_SENT_CONTENTS
+ add constraint FKFBFD1652C54858C foreign key (CONTENT_ID) references CS_CONTENTS;
+create sequence CS_ACTIONS_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_CONTENTS_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_GROUPS_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_MESSAGES_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_ROLES_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_SAP_SERVERS_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_SENT_CONTENT_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_USER_SEQ INCREMENT BY 1 START WITH 100;
+
+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');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (3, 'CSSAPServers', 'Listing all servers & testing server');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (4, 'CSServerAdd', 'Adding server');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (8, 'CSMessages', 'Listing all messages');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (11, 'CSUsersSearchResult', 'Showing any profile');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (12, 'CSUser', 'Editing & deleting any profile');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (13, '/common/CSUsers', 'Editing users priveleges');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (14, 'CSActionSearch', 'Listing actions');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (15, 'CSRoleSearch', 'Listing roles');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (16, 'CSGroupSearch', 'Listing groups');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (17, 'CSAction', 'Editing actions');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (18, 'CSRole', 'Editing roles');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (19, 'CSGroup', 'Editing groups');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (20, 'CSMainPanel', 'Editing groups');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (21, 'CSServerSearch', 'Searching servers');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (22, 'CSServerEdit', 'Editing servers');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (23, 'CSMessagesSearch', 'Searching messages');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (24, 'CSMessagesDetails', 'Listing message details');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (25, 'CSContentsServlet', 'Viewing contents of messages');
+
+INSERT INTO cs_roles (id, name, description)
+ VALUES (1, 'Role_JMX_User', 'JMX user');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (2, 'Role_RemoteClient_User', 'RemoteClient user');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (3, 'Role_AdminPanel_User', 'AdminPanel user');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (4, 'Role_AdminPanel_Observer', 'AdminPanel observer');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (5, 'Role_AdminPanel_ServersAdmin', 'AdminPanel servers supervisor');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (6, 'Role_AdminPanel_MessagesAdmin', 'AdminPanel messages supervisor');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (7, 'Role_AdminPanel_UsersAdmin', 'AdminPanel users supervisor');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (8, 'Role_AdminPanel_PrivelegesAdmin', 'AdminPanel privelges supervisor');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (9, 'Role_Anonymous', 'View non secured context');
+
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (1, 1);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (2, 2);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (3, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (3, 5);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (4, 5);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (8, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (8, 6);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (11, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (11, 7);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (11, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (12, 7);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (12, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (13, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (14, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (14, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (15, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (15, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (16, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (16, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (17, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (18, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (19, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (20, 9);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (21, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (21, 5);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (22, 5);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (23, 6);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (24, 6);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (25, 9);
+
+INSERT INTO cs_groups (id, name, description)
+ VALUES (1, 'Group_CS_Users', 'Whole application users');
+INSERT INTO cs_groups (id, name, description)
+ VALUES (2, 'Group_CS_Admins', 'Whole application supervisors');
+
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (1, 1);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (1, 2);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (1, 3);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 1);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 2);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 3);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 4);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 5);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 6);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 7);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 8);
+
+INSERT INTO cs_users (id, login, user_password, city, country, department, email, enabled, fax,
+ firstname, language, lastname, mobile, position, postalcode, state, street, telephone,
+ timezone, validfrom, validto) VALUES (1, 'jmxUser', 'jmxUser', 'Poznan', 0, NULL, '',
+ TRUE, NULL, '', NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, 27, NULL, NULL);
+INSERT INTO cs_users (id, login, user_password, city, country, department, email, enabled, fax,
+ firstname, language, lastname, mobile, position, postalcode, state, street, telephone,
+ timezone, validfrom, validto) VALUES (2, 'rcUser', 'rcUser', 'Poznan', 0, NULL, '',
+ TRUE, NULL, '', NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, 27, NULL, NULL);
+INSERT INTO cs_users (id, login, user_password, city, country, department, email, enabled, fax,
+ firstname, language, lastname, mobile, position, postalcode, state, street, telephone,
+ timezone, validfrom, validto) VALUES (3, 'observer', 'observer', 'Poznan', 0, NULL, '',
+ TRUE, NULL, '', NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, 27, NULL, NULL);
+INSERT INTO cs_users (id, login, user_password, city, country, department, email, enabled, fax,
+ firstname, language, lastname, mobile, position, postalcode, state, street, telephone,
+ timezone, validfrom, validto) VALUES (4, 'supervisor', 'supervisor', 'Poznan', 0, NULL, '',
+ TRUE, NULL, '', NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, 27, NULL, NULL);
+
+INSERT INTO cs_roles_users (role_id, user_id) VALUES (1, 1);
+INSERT INTO cs_roles_users (role_id, user_id) VALUES (2, 2);
+INSERT INTO cs_roles_users (role_id, user_id) VALUES (4, 3);
+INSERT INTO cs_roles_users (role_id, user_id) VALUES (9, 3);
+INSERT INTO cs_roles_users (role_id, user_id) VALUES (9, 4);
+INSERT INTO cs_groups_users (group_id, user_id) VALUES (2, 4);
+</pre>
+ </li>
+ <li>su postgres</li>
+ <li>createuser -r -S -D cs</li>
+ <li>createdb -O cs cs</li>
+ <li>createdb -O cs csjms</li>
+ <li>psql cs -U cs < /root/import.sql</li>
+ <li>chmod +x /etc/rc.d/rc.postgresql</li>
+ </ul>
+ </li>
+ <li>Install OpenOffice.org:
+ <ul>
+ <li>wget http://ftp.scarlet.be/pub/linuxpackages/Slackware-10.2/ken/openoffice.org-2.0.3-i586-1kjz.tgz</li>
+ <li>installpkg openoffice.org-2.0.3-i586-1kjz.tgz</li>
+ <li>xinit</li>
+ <li>run /opt/openOffice.org2.0/program/soffice, choose 'I do not want to register', press Alt+Backspa</li>
+ </ul>
+ </li>
+ <li>Install JCO
+ <ul>
+ <li>Put librfccm.so and libsapjcorfc.so files into /usr/lib/jre1.5.0_04/lib/i386/client</li>
+ </ul>
+ </li>
+ <li>Install HylaFAX
+ <ul>
+ <li>wget ftp://ftp.hylafax.org/source/hylafax-4.3.0.tar.gz</li>
+ <li>tar xzf hylafax-4.3.0.tar.gz</li>
+ <li>cd hylafax-4.3.0</li>
+ <li>./configure (press Enter after every question)</li>
+ <li>make</li>
+ <li>make install</li>
+ </ul>
+ </li>
+ <li>Configure HylaFAX
+ <ul>
+ <li>faxsetup - important questions: numbers, prefixes, server name, answer 0777 when asked for RecvMode</li>
+ <li>faxaddmodem - add new modem, important questions: numbers, prefixes, server name, answer 0777 when asked for RecvMode</li>
+ <li>for every modem edit /etc/inittab (add line):
+<pre>
+m[unique_number]:234:respawn:/usr/local/sbin/faxgetty MODEM_DEVICE
+</pre>
+</li>
+ <li>init q</li>
+ </ul>
+ </li>
+ <li>Install java-jai
+ <ul>
+ <li>get java-jai from http://java.sun.com/products/java-media/jai/downloads/download-1_1_2.html (Linux JRE Install) intou /usr/lib/java</li>
+ <li>cd /usr/lib/java</li>
+ <li>chmod +x jai-1_1_2-lib-linux-i586-jre.bin</li>
+ <li>./jai-1_1_2-lib-linux-i586-jre.bin</li>
+ </ul>
+ </li>
+ <li>Install java-jai-imageio
+ <ul>
+ <li>cd /usr/lib/java</li>
+ <li>wget http://download.java.net/media/jai-imageio/builds/release/1_0_01/jai_imageio-1_0_01-lib-linux-i586-jre.bin</li>
+ <li>chmod +x jai_imageio-1_0_01-lib-linux-i586-jre.bin</li>
+ <li>./jai_imageio-1_0_01-lib-linux-i586-jre.bin</li>
+ </ul>
+ </li>
+ <li>put CommunicationsSuite.war and CommunicationsSuiteAdmin.war into /usr/share/tomcat/webapps</li>
+ <li>Run application
+ <ul>
+ <li>/etc/rc.d/rc.postgresql start</li>
+ <li>/etc/init.d/hylafax start</li>
+ <li>/usr/share/tomcat/bin/catalina.sh run</li>
+ </ul>
+ </li>
+ </ol>
+ </body>
+</html>
Property changes on: trunk/docs/instalation/linux-installation/installation-eng.html
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: trunk/docs/instalation/linux-installation/installation.html
===================================================================
--- trunk/docs/instalation/linux-installation/installation.html (rev 0)
+++ trunk/docs/instalation/linux-installation/installation.html 2006-10-13 19:34:47 UTC (rev 211)
@@ -0,0 +1,504 @@
+<html>
+ <head>
+ <meta http-equiv="Content-type" value="text/html; charset=iso-8859-2" />
+ <style type="text/css">
+ body {
+ font: 10pt Verdana;
+ margin: 50pt;
+ }
+ h2 {
+ text-indent: 15pt;
+ font: bold 12pt Verdana;
+ }
+ li, p {
+ text-align: justify;
+ text-indent: 15pt;
+ }
+ pre {
+ text-indent: 0pt;
+ font: 10pt "Courier";
+ margin: 10pt;
+ padding: 5pt;
+ background-color: #dddddd;
+ border: 1px dashed black;
+ }
+ </style>
+ </head>
+ <body>
+ <h1>Uruchomienie CommunicationsSuite</h1>
+ <ol>
+ <li>Instalacja systemu Slackware 10.2 (lub nowszego) - wszystkie pakiety</li>
+ <li>Instalacja Bluez (pakiety do wyszukania na: www.linuxpackages.net)
+ <ul>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/X11/DBUS/dbus-0.60-i486-2sdd.tgz</li>
+ <li>installpkg dbus-0.60-i486-2sdd.tgz</li>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/Library/bluez-libs/bluez-libs-2.21-i486-1bmr.tgz</li>
+ <li>installpkg bluez-libs-2.21-i486-1bmr.tgz</li>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/Console/bluez-utils/bluez-utils-2.21-i486-1bmr.tgz</li>
+ <li>installpkg bluez-utils-2.21-i486-1bmr.tgz</li>
+ </ul>
+ </li>
+ <li>Konfiguracja Bluez
+ <ul>
+ <li>/etc/bluetooth/hcid.conf
+<pre>options {
+ autoinit yes;
+ security auto;
+ pairing multi;
+ pin_helper /etc/bluetooth/pin;
+}
+
+device {
+ name "BlueZ (%d)";
+ class 0x3e0100;
+ iscan enable; pscan enable;
+ lm accept;
+ lp rswitch,hold,sniff,park;
+ auth disable;
+}
+</pre>
+ </li>
+ <li>/etc/bluetooth/pin
+<pre>#!/bin/bash
+
+# replace 1111 with any number
+echo "PIN:1111"
+</pre>
+ </li>
+ <li>/etc/bluetooth/rfcomm.conf
+<pre>
+</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Instalacja czcionek
+ <ul>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/ken/cabextract-1.2-i486-1kjz.tgz</li>
+ <li>installpkg cabextract-1.2-i486-1kjz.tgz</li>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/ananda/core_web_fonts-20050922-noarch-1rsa.tgz</li>
+ <li>installpkg core_web_fonts-20050922-noarch-1rsa.tgz</li>
+ </ul>
+ </li>
+ <li>Skrypty startowe
+ <ul>
+ <li>/etc/rc.d/rc.local
+<pre>#!/bin/bash
+
+. /etc/profile # need it for JAVA_HOME
+
+/usr/sbin/hcid
+
+if [ ! -r /.configured ]; then
+ /usr/sbin/cslinux_configuration.py
+ touch /.configured
+fi
+
+for i in `seq 0 9`; do
+ /usr/bin/rfcomm bind $i
+done;
+
+/usr/X11/bin/Xvfb :0 2>/dev/null &
+/etc/init.d/hylafax start
+/etc/rc.d/rc.postgresql start
+/usr/share/tomcat/bin/catalina.sh start
+</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Instalacja tomcata
+ <ul>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/Daemon/tomcat/tomcat-5.5.16-noarch-1stb.tgz</li>
+ <li>installpkg tomcat-5.5.16-noarch-1stb.tgz</li>
+ <li>zmieni\xE6 /usr/share/tomcat/bin/setclasspath.sh w nast\xEApuj\xB1cy spos\xF3b:
+<pre>...
+...
+...
+
+# First clear out the user classpath
+CLASSPATH=/opt/openoffice.org2.0/program/
+
+...
+...
+...
+</pre>
+ </li>
+ <li>zmieni\xE6 /usr/share/tomcat/bin/catalina.sh w nast\xEApuj\xB1cy spos\xF3b:
+<pre>...
+...
+...
+
+CATALINA_OPTS=-Dorg.apache.activeio.journal.active.DisableLocking=true
+
+if [ "$1" = "jpda" ] ; then
+ if [ -z "$JPDA_TRANSPORT" ]; then
+
+...
+...
+...
+</pre>
+ </li>
+ </ul>
+ </li>
+ <li>Przygotowanye bazy danych
+ <ul>
+ <li>wget http://www.nymphomatic.org/mirror/linuxpackages/Slackware-10.2/ken/postgresql-8.1.4-i486-1kjz.tgz</li>
+ <li>installpkg postgresql-8.1.4-i486-1kjz.tgz</li>
+ <li>Stworzenie pliku /root/import.sql:
+<pre>create table CS_ACTIONS (
+ id int8 not null, description varchar(255),
+ name varchar(255) not null unique, primary key (id)
+);
+create table CS_CONTENTS (
+ id int8 not null,
+ CONTENTS_BIN bytea not null,
+ MIME_TYPE varchar(255) not null,
+ DESCRIPTION varchar(255), primary key (id)
+);
+create table CS_GROUPS (
+ id int8 not null, name varchar(255) not null unique,
+ description varchar(255), primary key (id)
+);
+create table CS_GROUPS_REF (
+ SUPGROUP_ID int8 not null,
+ SUBGROUP_ID int8 not null,
+ primary key (SUBGROUP_ID, SUPGROUP_ID)
+);
+create table CS_GROUPS_USERS (
+ USER_ID int8 not null,
+ GROUP_ID int8 not null,
+ primary key (USER_ID, GROUP_ID)
+);
+create table CS_MESSAGES (
+ id int8 not null,
+ CREATION_DATE timestamp not null,
+ DESCRIPTION varchar(255),
+ DIRECTION int2 not null,
+ END_DATE timestamp,
+ EXPIRATION_DATE timestamp,
+ FORMAT_TYPE int2 not null,
+ LAST_PROCESS_DATE timestamp not null,
+ LAST_PROCESS_MESSAGE varchar(255),
+ PRIORITY int2 not null,
+ RECEIVER varchar(255) not null,
+ SAP_ID varchar(255),
+ SEND_DATE timestamp not null,
+ SENDER varchar(255) not null,
+ START_DATE timestamp,
+ STATUS int2 not null,
+ SAP_SERVER_ID int8,
+ USER_ID int8, primary key (id)
+);
+create table CS_ROLES (
+ id int8 not null, description varchar(255),
+ name varchar(255) not null unique,
+ primary key (id)
+);
+create table CS_ROLES_ACTIONS (
+ ACTION_ID int8 not null,
+ ROLE_ID int8 not null,
+ primary key (ROLE_ID, ACTION_ID)
+);
+create table CS_ROLES_GROUPS (
+ GROUP_ID int8 not null,
+ ROLE_ID int8 not null,
+ primary key (GROUP_ID, ROLE_ID)
+);
+create table CS_ROLES_USERS (
+ USER_ID int8 not null,
+ ROLE_ID int8 not null,
+ primary key (USER_ID, ROLE_ID)
+);
+create table CS_SAP_SERVERS (
+ id int8 not null,
+ ACTIVE_INSTANCE bool not null,
+ ADM_EMAIL varchar(250) not null,
+ CLIENT varchar(30) not null,
+ GROUP_NAME varchar(30),
+ GW_HOST varchar(1000),
+ GW_SERV varchar(30),
+ HOST varchar(1000) not null,
+ LOAD_BALANCING bool not null,
+ NAME varchar(30) not null unique,
+ USER_PASSWORD varchar(30) not null,
+ PROG_ID varchar(30) not null,
+ R3_NAME varchar(30),
+ SYSTEM_NUMBER varchar(30) not null,
+ UNICODE bool not null,
+ USER_NAME varchar(30) not null,
+ DEFAULT_INSTANCE bool not null,
+ MAX_CONNECTIONS_IN_POOL int4 not null,
+ primary key (id)
+);
+create table CS_SENT_CONTENTS (
+ id int8 not null,
+ CONTENT_ID int8 not null,
+ INTERNAL_ID varchar(255) not null,
+ MESSAGE_ID int8 not null,
+ STATE int2 not null,
+ TRY_NUMBER int4 not null,
+ LIST_ORDER int4,
+ primary key (id)
+);
+create table CS_USERS (
+ id int8 not null,
+ LOGIN varchar(30) not null unique,
+ USER_PASSWORD varchar(30) not null,
+ city varchar(255),
+ country int2,
+ department varchar(255),
+ email varchar(255),
+ enabled bool not null,
+ fax varchar(255),
+ firstName varchar(255),
+ language int2,
+ lastName varchar(255),
+ mobile varchar(255),
+ position varchar(255),
+ postalCode varchar(255),
+ state varchar(255),
+ street varchar(255),
+ telephone varchar(255),
+ timeZone int2,
+ validFrom timestamp,
+ validTo timestamp,
+ primary key (id)
+);
+alter table CS_GROUPS_REF
+ add constraint FK963BD6B784A38B77 foreign key (SUPGROUP_ID) references CS_GROUPS;
+alter table CS_GROUPS_REF
+ add constraint FK963BD6B768E57969 foreign key (SUBGROUP_ID) references CS_GROUPS;
+alter table CS_GROUPS_USERS
+ add constraint FKF6D1AF2CD63AD62B foreign key (USER_ID) references CS_USERS;
+alter table CS_GROUPS_USERS
+ add constraint FKF6D1AF2C1E65FB29 foreign key (GROUP_ID) references CS_GROUPS;
+alter table CS_MESSAGES
+ add constraint FK442A983BD63AD62B foreign key (USER_ID) references CS_USERS;
+alter table CS_MESSAGES
+ add constraint FK442A983B6359E879 foreign key (SAP_SERVER_ID) references CS_SAP_SERVERS;
+alter table CS_ROLES_ACTIONS
+ add constraint FK52647BAC3110124B foreign key (ROLE_ID) references CS_ROLES;
+alter table CS_ROLES_ACTIONS
+ add constraint FK52647BAC77C6A0B foreign key (ACTION_ID) references CS_ACTIONS;
+alter table CS_ROLES_GROUPS
+ add constraint FKF4F091253110124B foreign key (ROLE_ID) references CS_ROLES;
+alter table CS_ROLES_GROUPS
+ add constraint FKF4F091251E65FB29 foreign key (GROUP_ID) references CS_GROUPS;
+alter table CS_ROLES_USERS
+ add constraint FK31F6A477D63AD62B foreign key (USER_ID) references CS_USERS;
+alter table CS_ROLES_USERS
+ add constraint FK31F6A4773110124B foreign key (ROLE_ID) references CS_ROLES;
+alter table CS_SENT_CONTENTS
+ add constraint FKFBFD1652930EF669 foreign key (MESSAGE_ID) references CS_MESSAGES;
+alter table CS_SENT_CONTENTS
+ add constraint FKFBFD1652C54858C foreign key (CONTENT_ID) references CS_CONTENTS;
+create sequence CS_ACTIONS_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_CONTENTS_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_GROUPS_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_MESSAGES_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_ROLES_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_SAP_SERVERS_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_SENT_CONTENT_SEQ INCREMENT BY 1 START WITH 100;
+create sequence CS_USER_SEQ INCREMENT BY 1 START WITH 100;
+
+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');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (3, 'CSSAPServers', 'Listing all servers & testing server');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (4, 'CSServerAdd', 'Adding server');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (8, 'CSMessages', 'Listing all messages');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (11, 'CSUsersSearchResult', 'Showing any profile');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (12, 'CSUser', 'Editing & deleting any profile');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (13, '/common/CSUsers', 'Editing users priveleges');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (14, 'CSActionSearch', 'Listing actions');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (15, 'CSRoleSearch', 'Listing roles');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (16, 'CSGroupSearch', 'Listing groups');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (17, 'CSAction', 'Editing actions');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (18, 'CSRole', 'Editing roles');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (19, 'CSGroup', 'Editing groups');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (20, 'CSMainPanel', 'Editing groups');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (21, 'CSServerSearch', 'Searching servers');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (22, 'CSServerEdit', 'Editing servers');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (23, 'CSMessagesSearch', 'Searching messages');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (24, 'CSMessagesDetails', 'Listing message details');
+INSERT INTO cs_actions (id, name, description)
+ VALUES (25, 'CSContentsServlet', 'Viewing contents of messages');
+
+INSERT INTO cs_roles (id, name, description)
+ VALUES (1, 'Role_JMX_User', 'JMX user');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (2, 'Role_RemoteClient_User', 'RemoteClient user');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (3, 'Role_AdminPanel_User', 'AdminPanel user');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (4, 'Role_AdminPanel_Observer', 'AdminPanel observer');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (5, 'Role_AdminPanel_ServersAdmin', 'AdminPanel servers supervisor');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (6, 'Role_AdminPanel_MessagesAdmin', 'AdminPanel messages supervisor');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (7, 'Role_AdminPanel_UsersAdmin', 'AdminPanel users supervisor');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (8, 'Role_AdminPanel_PrivelegesAdmin', 'AdminPanel privelges supervisor');
+INSERT INTO cs_roles (id, name, description)
+ VALUES (9, 'Role_Anonymous', 'View non secured context');
+
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (1, 1);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (2, 2);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (3, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (3, 5);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (4, 5);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (8, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (8, 6);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (11, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (11, 7);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (11, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (12, 7);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (12, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (13, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (14, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (14, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (15, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (15, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (16, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (16, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (17, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (18, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (19, 8);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (20, 9);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (21, 4);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (21, 5);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (22, 5);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (23, 6);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (24, 6);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (25, 9);
+
+INSERT INTO cs_groups (id, name, description)
+ VALUES (1, 'Group_CS_Users', 'Whole application users');
+INSERT INTO cs_groups (id, name, description)
+ VALUES (2, 'Group_CS_Admins', 'Whole application supervisors');
+
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (1, 1);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (1, 2);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (1, 3);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 1);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 2);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 3);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 4);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 5);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 6);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 7);
+INSERT INTO cs_roles_groups (group_id, role_id) VALUES (2, 8);
+
+INSERT INTO cs_users (id, login, user_password, city, country, department, email, enabled, fax,
+ firstname, language, lastname, mobile, position, postalcode, state, street, telephone,
+ timezone, validfrom, validto) VALUES (1, 'jmxUser', 'jmxUser', 'Poznan', 0, NULL, '',
+ TRUE, NULL, '', NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, 27, NULL, NULL);
+INSERT INTO cs_users (id, login, user_password, city, country, department, email, enabled, fax,
+ firstname, language, lastname, mobile, position, postalcode, state, street, telephone,
+ timezone, validfrom, validto) VALUES (2, 'rcUser', 'rcUser', 'Poznan', 0, NULL, '',
+ TRUE, NULL, '', NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, 27, NULL, NULL);
+INSERT INTO cs_users (id, login, user_password, city, country, department, email, enabled, fax,
+ firstname, language, lastname, mobile, position, postalcode, state, street, telephone,
+ timezone, validfrom, validto) VALUES (3, 'observer', 'observer', 'Poznan', 0, NULL, '',
+ TRUE, NULL, '', NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, 27, NULL, NULL);
+INSERT INTO cs_users (id, login, user_password, city, country, department, email, enabled, fax,
+ firstname, language, lastname, mobile, position, postalcode, state, street, telephone,
+ timezone, validfrom, validto) VALUES (4, 'supervisor', 'supervisor', 'Poznan', 0, NULL, '',
+ TRUE, NULL, '', NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, 27, NULL, NULL);
+
+INSERT INTO cs_roles_users (role_id, user_id) VALUES (1, 1);
+INSERT INTO cs_roles_users (role_id, user_id) VALUES (2, 2);
+INSERT INTO cs_roles_users (role_id, user_id) VALUES (4, 3);
+INSERT INTO cs_roles_users (role_id, user_id) VALUES (9, 3);
+INSERT INTO cs_roles_users (role_id, user_id) VALUES (9, 4);
+INSERT INTO cs_groups_users (group_id, user_id) VALUES (2, 4);
+</pre>
+ </li>
+ <li>su postgres</li>
+ <li>createuser -r -S -D cs</li>
+ <li>createdb -O cs cs</li>
+ <li>createdb -O cs csjms</li>
+ <li>psql cs -U cs < /root/import.sql</li>
+ <li>chmod +x /etc/rc.d/rc.postgresql</li>
+ </ul>
+ </li>
+ <li>Instalacja OpenOffice.org:
+ <ul>
+ <li>wget http://ftp.scarlet.be/pub/linuxpackages/Slackware-10.2/ken/openoffice.org-2.0.3-i586-1kjz.tgz</li>
+ <li>installpkg openoffice.org-2.0.3-i586-1kjz.tgz</li>
+ <li>xinit</li>
+ <li>odpali\xE6 /opt/openOffice.org2.0/program/soffice i wybra\xE6 'I do not want to register', nast\xEApnie nacisn\xB1\xE6 Alt+Backspa</li>
+ </ul>
+ </li>
+ <li>Instalacja JCO
+ <ul>
+ <li>Wrzuci\xE6 pliki librfccm.so i libsapjcorfc.so w /usr/lib/jre1.5.0_04/lib/i386/client</li>
+ </ul>
+ </li>
+ <li>Instalacja HylaFAX
+ <ul>
+ <li>wget ftp://ftp.hylafax.org/source/hylafax-4.3.0.tar.gz</li>
+ <li>tar xzf hylafax-4.3.0.tar.gz</li>
+ <li>cd hylafax-4.3.0</li>
+ <li>./configure (na ka\xBFde pytanie odpowiedzie\xF1 naci\xB6ni\xEAciem klawisza Enter)</li>
+ <li>make</li>
+ <li>make install</li>
+ </ul>
+ </li>
+ <li>Konfiguracja HylaFAX
+ <ul>
+ <li>faxsetup - wa\xBFne pytania: numery i prefiksy oraz nazwa serwera, na pytanie o RecvMode odpowiedzie\xF1 0777</li>
+ <li>faxaddmodem - dodanie nowego modemu, wa\xBFne pytania: numery i prefiksy oraz nazwa serwera, na pytanie o RecvMode odpowiedzie\xF1 0777</li>
+ <li>dla ka\xBFdego modemu wyedytowa\xE6 /etc/inittab (doda\xE6 lini\xEA):
+<pre>
+m[unique_number]:234:respawn:/usr/local/sbin/faxgetty MODEM_DEVICE
+</pre>
+</li>
+ <li>init q</li>
+ </ul>
+ </li>
+ <li>Instalacja java-jai
+ <ul>
+ <li>pobra\xE6 java-jai ze strony http://java.sun.com/products/java-media/jai/downloads/download-1_1_2.html (werjsa: Linux JRE Install) do katalogu /usr/lib/java</li>
+ <li>cd /usr/lib/java</li>
+ <li>chmod +x jai-1_1_2-lib-linux-i586-jre.bin</li>
+ <li>./jai-1_1_2-lib-linux-i586-jre.bin</li>
+ </ul>
+ </li>
+ <li>Instalacja java-jai-imageio
+ <ul>
+ <li>cd /usr/lib/java</li>
+ <li>wget http://download.java.net/media/jai-imageio/builds/release/1_0_01/jai_imageio-1_0_01-lib-linux-i586-jre.bin</li>
+ <li>chmod +x jai_imageio-1_0_01-lib-linux-i586-jre.bin</li>
+ <li>./jai_imageio-1_0_01-lib-linux-i586-jre.bin</li>
+ </ul>
+ </li>
+ <li>CommunicationsSuite.war i CommunicationsSuiteAdmin.war id\xB1 do /usr/share/tomcat/webapps</li>
+ <li>Uruchomienie aplikacji
+ <ul>
+ <li>/etc/rc.d/rc.postgresql start</li>
+ <li>/etc/init.d/hylafax start</li>
+ <li>/usr/share/tomcat/bin/catalina.sh run</li>
+ </ul>
+ </li>
+ </ol>
+ </body>
+</html>
Property changes on: trunk/docs/instalation/linux-installation/installation.html
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: trunk/docs/instalation/screenshots/eclipse-jdk50.PNG
===================================================================
(Binary files differ)
Property changes on: trunk/docs/instalation/screenshots/eclipse-jdk50.PNG
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/instalation/screenshots/java-home-settings.PNG
===================================================================
(Binary files differ)
Property changes on: trunk/docs/instalation/screenshots/java-home-settings.PNG
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/instalation/screenshots/postgresql-dbs.PNG
===================================================================
(Binary files differ)
Property changes on: trunk/docs/instalation/screenshots/postgresql-dbs.PNG
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/docs/instalation/tools.txt
===================================================================
--- trunk/docs/instalation/tools.txt 2006-10-13 17:21:13 UTC (rev 210)
+++ trunk/docs/instalation/tools.txt 2006-10-13 19:34:47 UTC (rev 211)
@@ -14,7 +14,7 @@
- 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,
+- OpenOffice 2.0.3 - 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)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-13 17:21:22
|
Revision: 210
http://svn.sourceforge.net/comsuite/?rev=210&view=rev
Author: zduniak
Date: 2006-10-13 10:21:13 -0700 (Fri, 13 Oct 2006)
Log Message:
-----------
E-mail address corrected
Modified Paths:
--------------
trunk/code/CSTests/import.sql
Modified: trunk/code/CSTests/import.sql
===================================================================
--- trunk/code/CSTests/import.sql 2006-10-13 17:19:52 UTC (rev 209)
+++ trunk/code/CSTests/import.sql 2006-10-13 17:21:13 UTC (rev 210)
@@ -1 +1 @@
--- insert into 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) 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 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) values(123456,'ma...@zd...','100','bcz.bcc.com.pl','sapgw44','bcz.bcc.com.pl',FALSE,'BCC_BCZ_100_DB','changeme','ZTESTJCO','44',FALSE,'cstest',TRUE,5);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-13 17:20:02
|
Revision: 209
http://svn.sourceforge.net/comsuite/?rev=209&view=rev
Author: zduniak
Date: 2006-10-13 10:19:52 -0700 (Fri, 13 Oct 2006)
Log Message:
-----------
Fake SAP-servers installations configurations disabled
Modified Paths:
--------------
trunk/code/CSMiddleware/import.sql
trunk/code/CSTests/import.sql
Modified: trunk/code/CSMiddleware/import.sql
===================================================================
--- trunk/code/CSMiddleware/import.sql 2006-10-06 18:03:51 UTC (rev 208)
+++ trunk/code/CSMiddleware/import.sql 2006-10-13 17:19:52 UTC (rev 209)
@@ -1,6 +1,7 @@
---DO NOT ADD ROWS WITH ID GREATER THEN 99
-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', 'zc...@bc...','100', 'bcz.bcc.com.pl','sapgw44','bcz.bcc.com.pl',FALSE, 'BCC_BCZ_100_DB','nowehaslo','ZTESTJCO', '44', FALSE, 'zcomm', TRUE,5,'','');
+-- DO NOT ADD ROWS WITH ID GREATER THEN 99
+-- 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', 'zc...@bc...','100', 'bcz.bcc.com.pl','sapgw44','bcz.bcc.com.pl',FALSE, 'BCC_BCZ_100_DB','nowehaslo','ZTESTJCO', '44', FALSE, 'zcomm', 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');
INSERT INTO cs_actions (id, name, description) VALUES (3, 'CSSAPServers', 'Listing all servers & testing server');
Modified: trunk/code/CSTests/import.sql
===================================================================
--- trunk/code/CSTests/import.sql 2006-10-06 18:03:51 UTC (rev 208)
+++ trunk/code/CSTests/import.sql 2006-10-13 17:19:52 UTC (rev 209)
@@ -1 +1 @@
-insert into 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) 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 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) 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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-06 18:04:02
|
Revision: 208
http://svn.sourceforge.net/comsuite/?rev=208&view=rev
Author: skuzniak
Date: 2006-10-06 11:03:51 -0700 (Fri, 06 Oct 2006)
Log Message:
-----------
white page in messages content bug fixed
Modified Paths:
--------------
trunk/code/CSAdminPanel/WebContent/WEB-INF/faces-config.xml
Modified: trunk/code/CSAdminPanel/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/code/CSAdminPanel/WebContent/WEB-INF/faces-config.xml 2006-10-06 07:44:45 UTC (rev 207)
+++ trunk/code/CSAdminPanel/WebContent/WEB-INF/faces-config.xml 2006-10-06 18:03:51 UTC (rev 208)
@@ -608,7 +608,6 @@
<navigation-case>
<from-outcome>servlet</from-outcome>
<to-view-id>/pages/CSContentsServlet.jsp</to-view-id>
- <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>usersToGroup</from-outcome>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-06 07:44:58
|
Revision: 207
http://svn.sourceforge.net/comsuite/?rev=207&view=rev
Author: skuzniak
Date: 2006-10-06 00:44:45 -0700 (Fri, 06 Oct 2006)
Log Message:
-----------
added privileges to view contents
Modified Paths:
--------------
trunk/code/CSMiddleware/import.sql
Modified: trunk/code/CSMiddleware/import.sql
===================================================================
--- trunk/code/CSMiddleware/import.sql 2006-10-06 06:59:04 UTC (rev 206)
+++ trunk/code/CSMiddleware/import.sql 2006-10-06 07:44:45 UTC (rev 207)
@@ -20,6 +20,7 @@
INSERT INTO cs_actions (id, name, description) VALUES (22, 'CSServerEdit', 'Editing servers');
INSERT INTO cs_actions (id, name, description) VALUES (23, 'CSMessagesSearch', 'Searching messages');
INSERT INTO cs_actions (id, name, description) VALUES (24, 'CSMessagesDetails', 'Listing message details');
+INSERT INTO cs_actions (id, name, description) VALUES (25, 'CSContentsServlet', 'Viewing contents of messages');
INSERT INTO cs_roles (id, name, description) VALUES (1, 'Role_JMX_User', 'JMX user');
INSERT INTO cs_roles (id, name, description) VALUES (2, 'Role_RemoteClient_User', 'RemoteClient user');
@@ -59,6 +60,7 @@
INSERT INTO cs_roles_actions (action_id, role_id) VALUES (22, 5);
INSERT INTO cs_roles_actions (action_id, role_id) VALUES (23, 6);
INSERT INTO cs_roles_actions (action_id, role_id) VALUES (24, 6);
+INSERT INTO cs_roles_actions (action_id, role_id) VALUES (25, 9);
INSERT INTO cs_groups (id, name, description) VALUES (1, 'Group_CS_Users', 'Whole application users');
INSERT INTO cs_groups (id, name, description) VALUES (2, 'Group_CS_Admins', 'Whole application supervisors');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-06 06:59:11
|
Revision: 206
http://svn.sourceforge.net/comsuite/?rev=206&view=rev
Author: zduniak
Date: 2006-10-05 23:59:04 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
Login panel in English (every time)
Modified Paths:
--------------
trunk/code/CSAdminPanel/WebContent/CSLoginForm.jsp
Modified: trunk/code/CSAdminPanel/WebContent/CSLoginForm.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/CSLoginForm.jsp 2006-10-05 16:13:43 UTC (rev 205)
+++ trunk/code/CSAdminPanel/WebContent/CSLoginForm.jsp 2006-10-06 06:59:04 UTC (rev 206)
@@ -29,11 +29,11 @@
<td>
<table>
<tr>
- <td><h:outputText value="#{Locale.WELCOME_LOGIN}" /></td>
+ <td>Login:</td>
<td><input type="text" name="j_username" /></td>
</tr>
<tr>
- <td><h:outputText value="#{Locale.WELCOME_PASSWORD}" /></td>
+ <td>Password:</td>
<td><input type="password" name="j_password" /></td>
</tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-10-05 16:13:54
|
Revision: 205
http://svn.sourceforge.net/comsuite/?rev=205&view=rev
Author: marasm
Date: 2006-10-05 09:13:43 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
holding references to consumers
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/queue/JMSQueueManager.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/queue/JMSQueueManager.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/queue/JMSQueueManager.java 2006-10-05 13:48:41 UTC (rev 204)
+++ trunk/code/CSMiddleware/src/org/commsuite/queue/JMSQueueManager.java 2006-10-05 16:13:43 UTC (rev 205)
@@ -20,6 +20,7 @@
*/
package org.commsuite.queue;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -45,10 +46,14 @@
* @author Marcin Zduniak
* @author Rafał Malinowski
*/
-public abstract class JMSQueueManager implements IQueueManager, ExceptionListener {
+public abstract class JMSQueueManager implements IQueueManager,
+ ExceptionListener {
- private final static Logger logger = Logger.getLogger(JMSQueueManager.class);
+ private List<MessageConsumer> consumersList = new ArrayList<MessageConsumer>();
+ private final static Logger logger = Logger
+ .getLogger(JMSQueueManager.class);
+
protected final static String QUEUE_PROPERTIES;
static {
// see: http://activemq.org/Destination+Options for all options
@@ -56,7 +61,8 @@
sb.append("?");
sb.append("consumer.dispatchAsync=true&"); // more:
// http://incubator.apache.org/activemq/consumer-dispatch-async.html
- sb.append("consumer.exclusive=true&"); // more: http://activemq.org/Exclusive+Consumer
+ sb.append("consumer.exclusive=true&"); // more:
+ // http://activemq.org/Exclusive+Consumer
sb.append("consumer.prefetch=10&"); // more:
// http://incubator.apache.org/activemq/what-is-the-prefetch-limit-for.html
QUEUE_PROPERTIES = sb.toString();
@@ -106,7 +112,8 @@
final List<AbstractQueueMessageConsumer> abstrConsumers = new FastTable<AbstractQueueMessageConsumer>();
try {
for (MessageConsumer msgCons : consumers.values()) {
- abstrConsumers.add((AbstractQueueMessageConsumer) msgCons.getMessageListener());
+ abstrConsumers.add((AbstractQueueMessageConsumer) msgCons
+ .getMessageListener());
}
} catch (JMSException je) {
logger.fatal("", je);
@@ -117,7 +124,8 @@
/**
* @param queueName -
* name of queue that we are looking for
- * @return Queue with specified name or null if there is no message with given name
+ * @return Queue with specified name or null if there is no message with
+ * given name
*/
public Queue getQueueByName(String queueName) {
for (Queue queue : queues) {
@@ -126,8 +134,9 @@
return queue;
}
} catch (JMSException je) {
- logger.fatal("Unexpected exception while searching connection with name \""
- + queueName + "\"", je);
+ logger.fatal(
+ "Unexpected exception while searching connection with name \""
+ + queueName + "\"", je);
}
}
logger.fatal("No connection with name \"" + queueName + "\" found !");
@@ -137,7 +146,8 @@
/**
* @param name -
* name of consumer that we are looking for
- * @return Consumer with specified name or null if there is no message with given name
+ * @return Consumer with specified name or null if there is no message with
+ * given name
*/
public AbstractQueueMessageConsumer getConsumerByName(String name) {
for (AbstractQueueMessageConsumer mc : getConsumersList()) {
@@ -187,14 +197,17 @@
//
// also if you know you are not going to reuse the Message object after
// sending then disable copyMessageOnSend
- // I was able to speed things up significantly by setting the asyncDispatch and
- // useAsyncSend properties. Using the vm: transport also sped it up quite a
+ // I was able to speed things up significantly by setting the
+ // asyncDispatch and
+ // useAsyncSend properties. Using the vm: transport also sped it up
+ // quite a
// bit.
}
private final Session getSession() throws JMSException {
// try {
- return connection.createSession(TRANSACTION_ENABLED, Session.AUTO_ACKNOWLEDGE);
+ return connection.createSession(TRANSACTION_ENABLED,
+ Session.AUTO_ACKNOWLEDGE);
// } catch (JMSException je) {
// logger.fatal("Fatal error while creating session", je);
// throw new RuntimeException(je);
@@ -203,7 +216,8 @@
protected Queue createQueue(String queueName) {
final String queueNameWithProperties = queueName + QUEUE_PROPERTIES;
- final Queue queue = new org.apache.activemq.command.ActiveMQQueue(queueNameWithProperties);
+ final Queue queue = new org.apache.activemq.command.ActiveMQQueue(
+ queueNameWithProperties);
return queue;
}
@@ -218,7 +232,8 @@
* @throws RuntimeException
* if there is a problem with creating a connection
*/
- public void associateNewConsumer(String queueName, AbstractQueueMessageConsumer consumer) {
+ public void associateNewConsumer(String queueName,
+ AbstractQueueMessageConsumer consumer) {
Session session = null;
try {
ensureConnection();
@@ -228,12 +243,14 @@
logger.debug("Session: " + session);
final Queue queue = createQueue(queueName);
- final MessageConsumer messageConsumer = session.createConsumer(queue);
+ final MessageConsumer messageConsumer = session
+ .createConsumer(queue);
consumer.setName(queueName);
messageConsumer.setMessageListener(consumer);
queues.add(queue);
consumers.put(queueName, messageConsumer);
sessions.put(queueName, session);
+ consumersList.add(messageConsumer);
} catch (Throwable t) {
logger.fatal("Fatal error while associating consumer \"" + consumer
+ "\" with connection \"" + connection + "\"", t);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mal...@us...> - 2006-10-05 13:48:50
|
Revision: 204
http://svn.sourceforge.net/comsuite/?rev=204&view=rev
Author: malinowskirafal
Date: 2006-10-05 06:48:41 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
re-enabled tests
Modified Paths:
--------------
trunk/code/CSTests/src/org/commsuite/converter/ConverterBuilderTest.java
Modified: trunk/code/CSTests/src/org/commsuite/converter/ConverterBuilderTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/converter/ConverterBuilderTest.java 2006-10-05 13:44:06 UTC (rev 203)
+++ trunk/code/CSTests/src/org/commsuite/converter/ConverterBuilderTest.java 2006-10-05 13:48:41 UTC (rev 204)
@@ -105,41 +105,41 @@
}
-// public void testConversionsXlsToPdf() throws Exception {
-// convertFile("example.xls", "application/x-msexcel", "xls_to_pdf.pdf", "application/pdf");
-// }
-//
-// public void testConversionsDocToPdf() throws Exception {
-// convertFile("example.doc", "application/msword", "doc_to_pdf.pdf", "application/pdf");
-// }
-//
-// public void testConversionsOdtToPdf() throws Exception {
-// convertFile("example.odt", "application/vnd.oasis.opendocument.text", "odt_to_pdf.pdf",
-// "application/pdf");
-// }
-//
-// public void testConversionsPptToPdf() throws Exception {
-// convertFile("example.ppt", "application/vnd.ms-powerpoint", "ppt_to_pdf.pdf",
-// "application/pdf");
-// }
-//
-// public void testConversionsPngToTiff() throws Exception {
-// convertFile("example.png", "image/x-png", "png_to_tiff.tiff", "image/tiff");
-// }
-//
-// public void testConversionsPngToPdf() throws Exception {
-// convertFile("example.png", "image/x-png", "png_to_pdf.pdf", "application/pdf");
-// }
+ public void testConversionsXlsToPdf() throws Throwable {
+ convertFile("example.xls", "application/x-msexcel", "xls_to_pdf.pdf", "application/pdf");
+ }
+ public void testConversionsDocToPdf() throws Throwable {
+ convertFile("example.doc", "application/msword", "doc_to_pdf.pdf", "application/pdf");
+ }
+
+ public void testConversionsOdtToPdf() throws Throwable {
+ convertFile("example.odt", "application/vnd.oasis.opendocument.text", "odt_to_pdf.pdf",
+ "application/pdf");
+ }
+
+ public void testConversionsPptToPdf() throws Throwable {
+ convertFile("example.ppt", "application/vnd.ms-powerpoint", "ppt_to_pdf.pdf",
+ "application/pdf");
+ }
+
+ public void testConversionsPngToTiff() throws Throwable {
+ convertFile("example.png", "image/x-png", "png_to_tiff.tiff", "image/tiff");
+ }
+
+ public void testConversionsPngToPdf() throws Throwable {
+ convertFile("example.png", "image/x-png", "png_to_pdf.pdf", "application/pdf");
+ }
+
public void testConversionstiffToPdf() throws Throwable {
convertFile("example.tiff", "image/tiff", "tiff_to_pdf.pdf", "application/pdf");
}
-//
-// public void testConversionsBmpToPdf() throws Exception {
-// convertFile("example.bmp", "image/bmp", "bmp_to_pdf.pdf", "application/pdf");
-// }
-//
-// public void testConversionsJpegToPdf() throws Exception {
-// convertFile("example.jpg", "image/jpeg", "jpeg_to_pdf.pdf", "application/pdf");
-// }
+
+ public void testConversionsBmpToPdf() throws Throwable {
+ convertFile("example.bmp", "image/bmp", "bmp_to_pdf.pdf", "application/pdf");
+ }
+
+ public void testConversionsJpegToPdf() throws Throwable {
+ convertFile("example.jpg", "image/jpeg", "jpeg_to_pdf.pdf", "application/pdf");
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-10-05 13:44:16
|
Revision: 203
http://svn.sourceforge.net/comsuite/?rev=203&view=rev
Author: marasm
Date: 2006-10-05 06:44:06 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
test fixed
Modified Paths:
--------------
trunk/code/CSTests/src/org/commsuite/sap/SAPCommTest.java
Modified: trunk/code/CSTests/src/org/commsuite/sap/SAPCommTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/sap/SAPCommTest.java 2006-10-05 13:34:14 UTC (rev 202)
+++ trunk/code/CSTests/src/org/commsuite/sap/SAPCommTest.java 2006-10-05 13:44:06 UTC (rev 203)
@@ -26,6 +26,7 @@
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
+import java.util.Enumeration;
import java.util.Properties;
import org.commsuite.model.SAPInstanceDef;
@@ -54,11 +55,6 @@
this.properties.put(JCO_CLIENT_PREFIX + "user", this.exampleValidInstance.getUser());
this.properties.put(JCO_CLIENT_PREFIX + "passwd", this.exampleValidInstance.getPassword());
-// if (null != this.exampleValidInstance.getLanguage()) {
-// this.properties
-// .put(JCO_CLIENT_PREFIX + "lang", this.exampleValidInstance.getLanguage());
-// }
-
if (this.exampleValidInstance.isLoadBalancing()) {
this.properties
.put(JCO_CLIENT_PREFIX + "r3name", this.exampleValidInstance.getR3name());
@@ -80,6 +76,8 @@
this.properties.put(JCO_SERVER_PREFIX + "progid", this.exampleValidInstance.getProgid());
this.properties.put(JCO_SERVER_PREFIX + "unicode",
this.exampleValidInstance.isUnicode() ? "1" : "0");
+ this.properties.put(JCO_CLIENT_PREFIX + "unicode",
+ this.exampleValidInstance.isUnicode() ? "1" : "0");
}
public void onSetUpBeforeTransaction() {
@@ -89,7 +87,6 @@
this.exampleValidInstance.setUser("sim");
this.exampleValidInstance.setPassword("secret");
this.exampleValidInstance.setClient("mandant");
-// this.exampleValidInstance.setLanguage("Polish");
this.exampleValidInstance.setHost("localhost");
this.exampleValidInstance.setMaxConnectionsInPool(10);
this.exampleValidInstance.setDefaultInstance(false);
@@ -134,19 +131,34 @@
this.setExampleProperties();
Properties props = testComm.getLogonProperties();
- assertEquals("Suppose to be equals objects", props, this.properties);
+
+ Enumeration<Object> keys = props.keys();
+ while (keys.hasMoreElements()) {
+ String key = (String)keys.nextElement();
+ assertEquals(props.getProperty(key), this.properties.getProperty(key));
+ }
this.exampleValidInstance.setLoadBalancing(true);
this.setExampleProperties();
props = testComm.getLogonProperties();
- assertEquals("Suppose to be equals objects", props, this.properties);
+
+ keys = props.keys();
+ while (keys.hasMoreElements()) {
+ String key = (String)keys.nextElement();
+ assertEquals(props.getProperty(key), this.properties.getProperty(key));
+ }
this.exampleValidInstance.setUnicode(false);
this.setExampleProperties();
props = testComm.getLogonProperties();
- assertEquals("Suppose to be equals objects", props, this.properties);
+
+ keys = props.keys();
+ while (keys.hasMoreElements()) {
+ String key = (String)keys.nextElement();
+ assertEquals(props.getProperty(key), this.properties.getProperty(key));
+ }
}
public void testStopServer() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-05 13:34:53
|
Revision: 202
http://svn.sourceforge.net/comsuite/?rev=202&view=rev
Author: skuzniak
Date: 2006-10-05 06:34:14 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
confirmation of deleting items provided.removing assigned roles from groups bug fixed.
Modified Paths:
--------------
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/GroupBean.java
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/SearchGroupBean.java
trunk/code/CSAdminPanel/WebContent/pages/actions/CSActionSearch.jsp
trunk/code/CSAdminPanel/WebContent/pages/groups/CSGroupSearch.jsp
trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp
trunk/code/CSAdminPanel/WebContent/pages/roles/CSRoleSearch.jsp
trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp
trunk/code/CSAdminPanel/WebContent/pages/users/CSUsersSearchResult.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/GroupsService.java
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/GroupBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/GroupBean.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/GroupBean.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -169,7 +169,7 @@
ids[i] = item.getValue().toString();
i++;
}
- ws.updateRolesForGroup(group, ids);
+ ws.updateRolesForGroup(group, ids, new String[0]);
LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_GROUP_SUCCESSFULL,
BeansUtils.ADD_GROUP_NAVIGATION);
} catch (WebServiceException wse) {
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/SearchGroupBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/SearchGroupBean.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/SearchGroupBean.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -64,6 +64,8 @@
private List<RoleExtended> temporaryRolesForGroup;
+ private List<RoleExtended> temporaryRolesForDelete;
+
private List<UserExtended> temporaryUsersForGroup;
private List<UserExtended> temporaryUsersForDelete;
@@ -532,14 +534,24 @@
i++;
}
final WSGroup group2 = ws.updateUsersForGroup(group, idsToAdd, idsToDelete);
-
+ logger.debug("adding");
int i2 = 0;
- final String[] ids2 = new String[this.temporaryRolesForGroup.size()];
+ final String[] idsToAdd2 = new String[this.temporaryRolesForGroup.size()];
for (final RoleExtended role : this.temporaryRolesForGroup) {
- ids2[i2] = String.valueOf(role.getRole().getId());
+ logger.debug("add "+ i2);
+ idsToAdd2[i2] = String.valueOf(role.getRole().getId());
i2++;
}
- ws.updateRolesForGroup(group2, ids2);
+ logger.debug("deleting");
+ i2 = 0;
+ final String[] idsToDelete2 = new String[this.temporaryRolesForDelete.size()];
+ for (final RoleExtended role : this.temporaryRolesForDelete) {
+ logger.debug("delete "+ i2);
+ idsToDelete2[i2] = String.valueOf(role.getRole().getId());
+ i2++;
+ }
+ logger.debug("updating");
+ ws.updateRolesForGroup(group2, idsToAdd2, idsToDelete2);
LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_GROUP_SUCCESSFULL_UPDATE,
BeansUtils.SEARCH_GROUP_NAVIGATION);
} catch (WebServiceException wse) {
@@ -628,9 +640,14 @@
}
public String deleteSelectedRoles() {
+ if (null == this.temporaryRolesForDelete) {
+ this.temporaryRolesForDelete = new FastTable<RoleExtended>();
+ }
+
List<RoleExtended> roles = new FastTable<RoleExtended>();
for (RoleExtended r : this.temporaryRolesForGroup) {
if (r.isSelected()) {
+ this.temporaryRolesForDelete.add(r);
roles.add(r);
}
}
@@ -664,6 +681,7 @@
super();
// this.temporaryRolesForGroup = new FastTable<RoleExtended>();
this.temporaryUsersForDelete = new FastTable<UserExtended>();
+ this.temporaryRolesForDelete = new FastTable<RoleExtended>();
// this.temporaryUsersForGroup = new FastTable<UserExtended>();
}
Modified: trunk/code/CSAdminPanel/WebContent/pages/actions/CSActionSearch.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/actions/CSActionSearch.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/actions/CSActionSearch.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -50,7 +50,8 @@
<h:outputText value="#{Locale.LABEL_ADD}" styleClass="header-command" />
</h:panelGrid>
</h:commandLink>
- <h:commandLink action="#{searchActionBean.deleteAction}" >
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ action="#{searchActionBean.deleteAction}" >
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon" />
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="header-command" />
Modified: trunk/code/CSAdminPanel/WebContent/pages/groups/CSGroupSearch.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/groups/CSGroupSearch.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/groups/CSGroupSearch.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -52,7 +52,8 @@
<h:outputText value="#{Locale.LABEL_ADD}" styleClass="header-command" />
</h:panelGrid>
</h:commandLink>
- <h:commandLink action="#{searchGroupBean.deleteGroup}" >
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ action="#{searchGroupBean.deleteGroup}" >
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon" />
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="header-command" />
Modified: trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -66,7 +66,8 @@
<h:outputText value="#{Locale.LABEL_DETAILS}" styleClass="listView-header-value"/>
</h:panelGrid>
</h:commandLink>
- <h:commandLink actionListener="#{searchMessageBean.selectMessage}" action="#{searchMessageBean.deleteMesage}">
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ 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-remove.gif" styleClass="header-icon"/>
Modified: trunk/code/CSAdminPanel/WebContent/pages/roles/CSRoleSearch.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/roles/CSRoleSearch.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/roles/CSRoleSearch.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -50,7 +50,8 @@
<h:outputText value="#{Locale.LABEL_ADD}" styleClass="header-command"/>
</h:panelGrid>
</h:commandLink>
- <h:commandLink action="#{searchRoleBean.deleteRole}" >
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ action="#{searchRoleBean.deleteRole}" >
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon" />
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="header-command"/>
Modified: trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -58,7 +58,8 @@
<h:outputText value="#{Locale.LABEL_EDIT}" styleClass="header-command"/>
</h:panelGrid>
</h:commandLink>
- <h:commandLink actionListener="#{searchServerBean.selectServer}" action="#{searchServerBean.deleteServer}" >
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ actionListener="#{searchServerBean.selectServer}" action="#{searchServerBean.deleteServer}" >
<f:param name="serverId" value="#{inst.instance.id}" />
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon"/>
Modified: trunk/code/CSAdminPanel/WebContent/pages/users/CSUsersSearchResult.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/users/CSUsersSearchResult.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/users/CSUsersSearchResult.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -47,7 +47,8 @@
</h:panelGrid>
<f:param value="#{usr.id}" name="userId"/>
</h:commandLink>
- <h:commandLink actionListener="#{deleteUserBean.selectUser}" action="#{deleteUserBean.deleteUser}">
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ actionListener="#{deleteUserBean.selectUser}" action="#{deleteUserBean.deleteUser}">
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/user-trash.gif" styleClass="header-icon"/>
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="header-command" />
Modified: trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -532,11 +532,12 @@
* updates roles assigned to <code>group</code>.
*
* @param wsGroup group to be updated
- * @param ids array of role ids
+ * @param idsToAdd array of role ids to add
+ * @param idsToDelete array of role ids to delete
* @return updated grouop object
* @throws WebServiceException on any error
*/
- public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] ids) throws WebServiceException;
+ public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] idsToAdd, String[] idsToDelete) throws WebServiceException;
/**
* updates users assigned to <code>group</code>.
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -710,10 +710,10 @@
*
* @see org.commsuite.ws.IcommunicateWS#updateRolesForGroup();
*/
- public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] ids) throws WebServiceException {
+ public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] idsToAdd, String[] idsToDelete) throws WebServiceException {
try {
GroupsService service = GroupsService.getInstance();
- return service.updateRolesForGroup(wsGroup, ids);
+ return service.updateRolesForGroup(wsGroup, idsToAdd, idsToDelete);
} catch (DataIntegrityViolationException dive) {
logger.fatal("Duplicate name error");
throw new WebServiceException(CommunicateUtils.DUPLICATED_GROUP_MESSAGE);
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/GroupsService.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/services/GroupsService.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/GroupsService.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -105,7 +105,7 @@
}
}
- public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] ids) throws WebServiceException {
+ public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] idsToAdd, String[] idsToDelete) throws WebServiceException {
Group group;
try {
GroupManager groupManager = (GroupManager) SpringMiddlewareContext.getGroupManager();
@@ -114,8 +114,8 @@
} else {
group = groupManager.getGroup(wsGroup.getId().toString());
}
- logger.debug("IDS: " + ids);
- group.getRoles().addAll(this.getRolesToGroup(ids));
+ logger.debug("IDS: " + idsToAdd);
+ this.saveGroupToRoles(group, idsToAdd, idsToDelete);
if (validateGroup(group)) {
return groupManager.saveGroup(group);
@@ -126,7 +126,7 @@
logger.fatal("Duplicate name error");
throw new DataIntegrityViolationException(CommunicateUtils.DUPLICATED_GROUP_MESSAGE);
} catch (Throwable t) {
- logger.fatal("Fatal exception[updateActionsForRole]", t);
+ logger.fatal("Fatal exception[updateRolesForGroup]", t);
throw new WebServiceException(t);
}
}
@@ -154,7 +154,7 @@
// TODO: [SK] w implementacji tej metody nie widze operacji na grupach wiec skad taka nazwa ?
// [SK]poniewaz ta metoda sluzy do pobrania rol, aby je do grupy przypisac
- private Set<Role> getRolesToGroup(String[] ids) {
+ /*private Set<Role> getRolesToGroup(String[] ids) {
RoleManager roleManager = (RoleManager) SpringMiddlewareContext.getRoleManager();
Set<Role> roles = new FastSet<Role>();
for (String id : ids) {
@@ -163,17 +163,19 @@
roles.add(role);
}
return roles;
- }
+ }*/
private void saveGroupToUsers(Group group, String[] idsToAdd, String[] idsToDelete) {
UserManager userManager = (UserManager) SpringMiddlewareContext.getUserManager();
for (String id : idsToAdd) {
+ logger.debug("Id to add: "+ id);
User user = userManager.getUser(id);
user.getGroups().add(group);
group.getUsers().add(user);
userManager.saveUser(user);
}
for (String id : idsToDelete) {
+ logger.debug("Id to delete: "+ id);
User user = userManager.getUser(id);
user.getGroups().remove(group);
group.getUsers().remove(user);
@@ -181,6 +183,24 @@
}
}
+ private void saveGroupToRoles(Group group, String[] idsToAdd, String[] idsToDelete) {
+ RoleManager roleManager = (RoleManager) SpringMiddlewareContext.getRoleManager();
+ for (String id : idsToAdd) {
+ logger.debug("Id to add: "+ id);
+ Role role = roleManager.getRole(id);
+ role.getGroups().add(group);
+ group.getRoles().add(role);
+ roleManager.saveRole(role);
+ }
+ for (String id : idsToDelete) {
+ logger.debug("Id to delete: "+ id);
+ Role role = roleManager.getRole(id);
+ role.getGroups().remove(group);
+ group.getRoles().remove(role);
+ roleManager.saveRole(role);
+ }
+ }
+
public void deleteGroupFromDatabase(String id) throws WebServiceException {
try {
GroupManager groupManager = (GroupManager) SpringMiddlewareContext.getGroupManager();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-10-05 12:34:05
|
Revision: 201
http://svn.sourceforge.net/comsuite/?rev=201&view=rev
Author: marasm
Date: 2006-10-05 05:33:48 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
SAPInstanceDef -> sapInstanceDef
Modified Paths:
--------------
trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/SAPInstanceDefDaoImpl.java
trunk/code/CSTests/src/org/commsuite/managers/impl/MessageManagerTest.java
trunk/code/CSTests/src/org/commsuite/util/FakeObject.java
Modified: trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/SAPInstanceDefDaoImpl.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/SAPInstanceDefDaoImpl.java 2006-10-05 10:08:25 UTC (rev 200)
+++ trunk/code/CSMiddleware/src/org/commsuite/dao/hibernate/SAPInstanceDefDaoImpl.java 2006-10-05 12:33:48 UTC (rev 201)
@@ -122,7 +122,7 @@
public SAPInstanceDef getSAPInstanceDefByMessageId(Long messageId) {
final List sapList = getHibernateTemplate()
.find(
- "select s from Message m join m.SAPInstanceDefOwner s where m.id = ?",
+ "select s from Message m join m.sapInstanceDefOwner s where m.id = ?",
messageId);
if (sapList.size() == 0)
Modified: trunk/code/CSTests/src/org/commsuite/managers/impl/MessageManagerTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/managers/impl/MessageManagerTest.java 2006-10-05 10:08:25 UTC (rev 200)
+++ trunk/code/CSTests/src/org/commsuite/managers/impl/MessageManagerTest.java 2006-10-05 12:33:48 UTC (rev 201)
@@ -136,7 +136,7 @@
message.addContents(contents);
- message.setSAPInstanceDefOwner(sap);
+ message.setSapInstanceDefOwner(sap);
message.setDescription("message");
message.setSapID("sapid");
message = mgr.saveMessage(message);
Modified: trunk/code/CSTests/src/org/commsuite/util/FakeObject.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/util/FakeObject.java 2006-10-05 10:08:25 UTC (rev 200)
+++ trunk/code/CSTests/src/org/commsuite/util/FakeObject.java 2006-10-05 12:33:48 UTC (rev 201)
@@ -54,7 +54,7 @@
SAPInstanceDef sapInstanceDef = sapInstanceDefManager.getSAPInstanceDef("123456");
message.setSapID("sap01-01");
- message.setSAPInstanceDefOwner(sapInstanceDef);
+ message.setSapInstanceDefOwner(sapInstanceDef);
message.setCreationDate(new Date());
message.setDirection(Direction.OUTBOUND);
message.setEndDate(new Date());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-05 10:08:32
|
Revision: 200
http://svn.sourceforge.net/comsuite/?rev=200&view=rev
Author: skuzniak
Date: 2006-10-05 03:08:25 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
styles corrected
Modified Paths:
--------------
trunk/code/CSAdminPanel/WebContent/pages/CSHeader.jsp
trunk/code/CSAdminPanel/WebContent/pages/css/mainStyle.css
Modified: trunk/code/CSAdminPanel/WebContent/pages/CSHeader.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/CSHeader.jsp 2006-10-05 09:08:34 UTC (rev 199)
+++ trunk/code/CSAdminPanel/WebContent/pages/CSHeader.jsp 2006-10-05 10:08:25 UTC (rev 200)
@@ -5,9 +5,8 @@
<f:loadBundle basename="org.commsuite.web.locale.Locale" var="Locale" />
<h:form id="lang">
<h:panelGrid columns="1" styleClass="header">
- <h:panelGrid id="headerName" columns="1"
- styleClass="header-menu-banner">
- <h:panelGrid columns="10" styleClass="header-menu-icons">
+ <h:panelGrid id="headerName" columns="2" styleClass="header-menu-banner">
+ <h:panelGrid columns="8" styleClass="header-menu-icons">
<h:commandLink action="home" styleClass="header-link">
<h:panelGrid columns="1">
<h:graphicImage
@@ -87,8 +86,9 @@
<h:outputText value=" "
styleClass="header-icon" />
</h:panelGrid>
-
- <h:panelGroup id="headerLangCombo" styleClass="header-lang">
+ </h:panelGrid>
+ <h:panelGrid columns="2" styleClass="header-lang">
+ <h:panelGroup id="headerLangCombo">
<h:graphicImage
value="#{pageContext.request.contextPath}/pages/files/gif/preferences-desktop-locale.gif" />
<h:selectOneMenu value="#{languageSelectionBean.locale}">
Modified: trunk/code/CSAdminPanel/WebContent/pages/css/mainStyle.css
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/css/mainStyle.css 2006-10-05 09:08:34 UTC (rev 199)
+++ trunk/code/CSAdminPanel/WebContent/pages/css/mainStyle.css 2006-10-05 10:08:25 UTC (rev 200)
@@ -38,9 +38,9 @@
}
.header-menu-icons{
- width:70%;
+ width:590px;
display:block;
- margin-left:30%;
+ margin-left:160px;
margin-right:auto;
}
@@ -61,6 +61,10 @@
}
.header-lang{
+ width:250px;
+ display:block;
+ margin-left:auto;
+ margin-right:auto;
text-align:right;
font-size:12px;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-05 09:08:51
|
Revision: 199
http://svn.sourceforge.net/comsuite/?rev=199&view=rev
Author: skuzniak
Date: 2006-10-05 02:08:34 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
set redirection in pages
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/WebContent/WEB-INF/faces-config.xml
trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java 2006-10-05 08:04:29 UTC (rev 198)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java 2006-10-05 09:08:34 UTC (rev 199)
@@ -187,11 +187,6 @@
final String message = LanguageSelectionBean.getDisplayString(
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-05 08:04:29 UTC (rev 198)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java 2006-10-05 09:08:34 UTC (rev 199)
@@ -20,13 +20,9 @@
*/
package org.commsuite.web.beans.messages;
-import java.io.IOException;
import java.util.List;
-import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javolution.util.FastTable;
Modified: trunk/code/CSAdminPanel/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/code/CSAdminPanel/WebContent/WEB-INF/faces-config.xml 2006-10-05 08:04:29 UTC (rev 198)
+++ trunk/code/CSAdminPanel/WebContent/WEB-INF/faces-config.xml 2006-10-05 09:08:34 UTC (rev 199)
@@ -528,86 +528,107 @@
<navigation-case>
<from-outcome>addAction</from-outcome>
<to-view-id>/pages/actions/CSActionAdd.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>searchAction</from-outcome>
<to-view-id>/pages/actions/CSActionSearch.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>editAction</from-outcome>
<to-view-id>/pages/actions/CSActionsEdit.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>addGroup</from-outcome>
<to-view-id>/pages/groups/CSGroupAdd.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>searchGroup</from-outcome>
<to-view-id>/pages/groups/CSGroupSearch.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>editGroup</from-outcome>
<to-view-id>/pages/groups/CSGroupEdit.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>addRole</from-outcome>
<to-view-id>/pages/roles/CSRoleCreate.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>searchRole</from-outcome>
<to-view-id>/pages/roles/CSRoleSearch.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>editRole</from-outcome>
<to-view-id>/pages/roles/CSRoleEdit.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>addServer</from-outcome>
<to-view-id>/pages/servers/CSServerAdd.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>showServers</from-outcome>
<to-view-id>/pages/servers/CSSAPServers.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>addUser</from-outcome>
<to-view-id>/pages/users/CSUserAdd.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>searchUser</from-outcome>
<to-view-id>/pages/users/CSUserSearch.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>showUsers</from-outcome>
<to-view-id>/pages/users/CSUsersSearchResult.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>showMessages</from-outcome>
<to-view-id>/pages/messages/CSMessages.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>home</from-outcome>
<to-view-id>/pages/CSMainPanel.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>servlet</from-outcome>
<to-view-id>/pages/CSContentsServlet.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>usersToGroup</from-outcome>
<to-view-id>/pages/common/CSUsersToGroup.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>usersToRole</from-outcome>
<to-view-id>/pages/common/CSUsersToRole.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>actionsToRoles</from-outcome>
<to-view-id>/pages/common/CSActionsToRole.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>rolesToGroup</from-outcome>
<to-view-id>/pages/common/CSRolesToGroup.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>loggedOut</from-outcome>
@@ -617,22 +638,27 @@
<navigation-case>
<from-outcome>searchMessages</from-outcome>
<to-view-id>/pages/messages/CSMessagesSearch.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>editUser</from-outcome>
<to-view-id>/pages/users/CSUserEdit.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>searchServers</from-outcome>
<to-view-id>/pages/servers/CSServerSearch.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>editServer</from-outcome>
<to-view-id>/pages/servers/CSServerEdit.jsp</to-view-id>
+ <redirect/>
</navigation-case>
<navigation-case>
<from-outcome>messageDetails</from-outcome>
<to-view-id>/pages/messages/CSMessagesDetails.jsp</to-view-id>
+ <redirect/>
</navigation-case>
</navigation-rule>
<navigation-rule>
@@ -640,6 +666,7 @@
<navigation-case>
<from-outcome>loginPage</from-outcome>
<to-view-id>/index.jsp</to-view-id>
+ <redirect/>
</navigation-case>
</navigation-rule>
<validator>
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-05 08:04:29 UTC (rev 198)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-05 09:08:34 UTC (rev 199)
@@ -59,16 +59,17 @@
private static final Logger logger = Logger.getLogger(CommunicateWS.class);
- // private static final String ROLE_OPTION = "roles";
-
- // private static final String USERS_OPTION = "users";
-
/**
* Default constructor.
*/
public CommunicateWS() {
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getMessagesSubset();
+ */
public Collection<WSMessage> getMessagesSubset(int begin, int end) throws WebServiceException {
try {
final MessagesService service = MessagesService.getMessagesService();
@@ -79,6 +80,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getMessagesByServer();
+ */
public Collection<WSMessage> getMessagesByServer(String serverId) throws WebServiceException {
try {
final MessagesService service = MessagesService.getMessagesService();
@@ -88,7 +94,12 @@
throw new WebServiceException(t);
}
}
-
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#deleteMessage();
+ */
public void deleteMessage(String id) throws WebServiceException {
try {
final MessagesService service = MessagesService.getMessagesService();
@@ -97,7 +108,12 @@
throw new WebServiceException("Exception during deleting message with id: "+ id);
}
}
-
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getMessagesSize();
+ */
public int getMessagesSize(SearchMessageModel wsMessage) throws WebServiceException {
try {
MessagesService service = MessagesService.getMessagesService();
@@ -108,6 +124,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getAllMessages();
+ */
public Collection<WSMessage> getAllMessages() throws WebServiceException {
try {
MessagesService service = MessagesService.getMessagesService();
@@ -118,6 +139,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getSelectedMessages();
+ */
public Collection<WSMessage> getSelectedMessages(SearchMessageModel wsMessage)
throws WebServiceException {
try {
@@ -129,6 +155,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getSelectedMessagesSubset();
+ */
public Collection<WSMessage> getSelectedMessagesSubset(SearchMessageModel wsMessage, int begin, int end)
throws WebServiceException {
try {
@@ -140,6 +171,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getContentsById();
+ */
public WSContents getContentsById(String id) throws WebServiceException {
try {
MessagesService service = MessagesService.getMessagesService();
@@ -150,6 +186,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getSentContentsByMessage();
+ */
public Collection<WSSentContent> getSentContentsByMessage(String id) throws WebServiceException {
try {
MessagesService service = MessagesService.getMessagesService();
@@ -160,6 +201,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getContentsBySentContent();
+ */
public Collection<WSContents> getContentsBySentContent(String id) throws WebServiceException {
try {
MessagesService service = MessagesService.getMessagesService();
@@ -170,6 +216,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getMessageById();
+ */
public WSMessage getMessageById(String id) throws WebServiceException {
try {
MessagesService service = MessagesService.getMessagesService();
@@ -179,7 +230,12 @@
throw new WebServiceException(t);
}
}
-
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getInstancesSize();
+ */
public int getInstancesSize(WSSAPInstanceDef def, boolean defaultSearch, boolean loadSearch, boolean unicodeSearch, boolean activeSearch)
throws WebServiceException {
try {
@@ -191,6 +247,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getInstancesSubset();
+ */
public Collection<WSSAPInstanceDef> getInstancesSubset(int begin, int end) throws WebServiceException {
try {
ServersService service = ServersService.getInstance();
@@ -202,6 +263,11 @@
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getAllInstances();
+ */
public Collection<WSSAPInstanceDef> getAllInstances() throws WebServiceException {
try {
ServersService service = ServersService.getInstance();
@@ -213,6 +279,11 @@
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getInstanceById();
+ */
public WSSAPInstanceDef getInstanceById(String id) throws WebServiceException {
try {
ServersService service = ServersService.getInstance();
@@ -224,6 +295,11 @@
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getSelectedInstancesSubset();
+ */
public Collection<WSSAPInstanceDef> getSelectedInstancesSubset(WSSAPInstanceDef def,
boolean defaultSearch, boolean loadSearch, boolean unicodeSearch, boolean activeSearch, int begin, int end)
throws WebServiceException {
@@ -236,6 +312,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getSelectedInstances();
+ */
public Collection<WSSAPInstanceDef> getSelectedInstances(WSSAPInstanceDef def,
boolean defaultSearch, boolean loadSearch, boolean unicodeSearch, boolean activeSearch)
throws WebServiceException {
@@ -248,6 +329,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#saveNewInstance();
+ */
public WSSAPInstanceDef saveNewInstance(WSSAPInstanceDef instance) throws WebServiceException {
try {
@@ -259,6 +345,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#deleteServer();
+ */
public void deleteServer(String id) throws WebServiceException {
try {
ServersService service = ServersService.getInstance();
@@ -268,7 +359,12 @@
throw new WebServiceException("error in deleteServer method", t);
}
}
-
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getUsersSize();
+ */
public int getUsersSize(WSUser user, boolean enabledSearch) throws WebServiceException {
try {
UsersService service = UsersService.getInstance();
@@ -279,6 +375,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getAllUsers();
+ */
public Collection<WSUser> getAllUsers() throws WebServiceException {
try {
UsersService service = UsersService.getInstance();
@@ -289,6 +390,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getUsersSubset();
+ */
public Collection<WSUser> getUsersSubset(int begin, int end) throws WebServiceException {
try {
UsersService service = UsersService.getInstance();
@@ -299,6 +405,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getSelectedUsersSubset();
+ */
public Collection<WSUser> getSelectedUsersSubset(WSUser user, boolean enabledSearch, int begin, int end) throws WebServiceException {
try {
UsersService service = UsersService.getInstance();
@@ -312,6 +423,11 @@
// TODO: [SK] czy ta metoda sluzy tylko do dodawania nowych userow? czy takze
// do zapisywania zmian przy edycji juz istniejacych userow ? nazwa tej metody jest odpowiednia
// ?
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#addUserToDatabase();
+ */
public WSUser addUserToDatabase(WSUser user) throws WebServiceException {
try {
UsersService service = UsersService.getInstance();
@@ -322,6 +438,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#deleteUserFromDatabase();
+ */
public void deleteUserFromDatabase(String id) throws WebServiceException {
try {
UsersService service = UsersService.getInstance();
@@ -335,6 +456,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getActionsAvailable();
+ */
public Collection<WSAction> getActionsAvailable() throws WebServiceException {
try {
ActionsService service = ActionsService.getInstance();
@@ -345,6 +471,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getActionsByRole();
+ */
public Collection<WSAction> getActionsByRole(String id) throws WebServiceException {
try {
ActionsService service = ActionsService.getInstance();
@@ -357,6 +488,11 @@
// TODO: [SK] czy ta metoda sluzy tylko do dodawania nowych akcji? czy takze
// do zapisywania zmian przy edycji juz istniejacych akcji ? nazwa tej metody jest odpowiednia ?
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#addActionToDatabase();
+ */
public WSAction addActionToDatabase(WSAction action) throws WebServiceException {
try {
ActionsService service = ActionsService.getInstance();
@@ -370,7 +506,11 @@
}
}
- // TODO: [SK] czy ta metoda nie powinna zwracac obiektu typu WSAction ?
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getActionById();
+ */
public Action getActionById(String id) throws WebServiceException {
try {
ActionsService service = ActionsService.getInstance();
@@ -381,6 +521,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getWSActionById();
+ */
public WSAction getWSActionById(String id) throws WebServiceException {
try {
ActionsService service = ActionsService.getInstance();
@@ -391,6 +536,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#deleteActionFromDatabase();
+ */
public void deleteActionFromDatabase(String id) throws WebServiceException {
try {
ActionsService service = ActionsService.getInstance();
@@ -404,6 +554,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getActionsByName();
+ */
public Collection<WSAction> getActionsByName(String name) throws WebServiceException {
try {
ActionsService service = ActionsService.getInstance();
@@ -414,6 +569,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#updateRole();
+ */
public WSRole updateRole(WSRole wsRole) throws WebServiceException {
try {
RolesService service = RolesService.getInstnce();
@@ -427,6 +587,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#updateActionsForRole();
+ */
public WSRole updateActionsForRole(WSRole wsRole, String[] ids) throws WebServiceException {
try {
RolesService service = RolesService.getInstnce();
@@ -440,6 +605,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#updateUsersForRole();
+ */
public WSRole updateUsersForRole(WSRole wsRole, String[] idsToAdd, String[] idsToDelete)
throws WebServiceException {
try {
@@ -454,6 +624,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#deleteRoleFromDatabase();
+ */
public void deleteRoleFromDatabase(String id) throws WebServiceException {
try {
RolesService service = RolesService.getInstnce();
@@ -467,6 +642,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getAllRoles();
+ */
public Collection<WSRole> getAllRoles() throws WebServiceException {
try {
RolesService service = RolesService.getInstnce();
@@ -477,6 +657,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#serverTest();
+ */
public String serverTest(String serverName) throws WebServiceException {
try {
ServersService service = ServersService.getInstance();
@@ -487,6 +672,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getAllGroups();
+ */
public Collection<WSGroup> getAllGroups() throws WebServiceException {
try {
GroupsService service = GroupsService.getInstance();
@@ -497,6 +687,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#updateGroup();
+ */
public WSGroup updateGroup(WSGroup wsGroup) throws WebServiceException {
try {
GroupsService service = GroupsService.getInstance();
@@ -510,6 +705,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#updateRolesForGroup();
+ */
public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] ids) throws WebServiceException {
try {
GroupsService service = GroupsService.getInstance();
@@ -523,6 +723,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#updateUsersForGroup();
+ */
public WSGroup updateUsersForGroup(WSGroup wsGroup, String[] idsToAdd, String[] idsToDelete)
throws WebServiceException {
try {
@@ -537,6 +742,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#deleteGroupFromDatabase();
+ */
public void deleteGroupFromDatabase(String id) throws WebServiceException {
try {
GroupsService service = GroupsService.getInstance();
@@ -550,6 +760,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getUserById();
+ */
public WSUser getUserById(String id) throws WebServiceException {
try {
UsersService service = UsersService.getInstance();
@@ -560,6 +775,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getUserByName();
+ */
public WSUser getUserByName(String name) throws WebServiceException {
try {
UsersService service = UsersService.getInstance();
@@ -570,6 +790,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getRoleById();
+ */
public WSRole getRoleById(String id) throws WebServiceException {
try {
RolesService service = RolesService.getInstnce();
@@ -580,6 +805,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getGroupById();
+ */
public WSGroup getGroupById(String id) throws WebServiceException {
try {
GroupsService service = GroupsService.getInstance();
@@ -590,6 +820,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getRolesByName();
+ */
public Collection<WSRole> getRolesByName(String name) throws WebServiceException {
try {
RolesService service = RolesService.getInstnce();
@@ -600,6 +835,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getGroupsByName();
+ */
public Collection<WSGroup> getGroupsByName(String name) throws WebServiceException {
try {
GroupsService service = GroupsService.getInstance();
@@ -610,6 +850,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getUsersByFields();
+ */
public Collection<WSUser> getUsersByFields(WSUser user, boolean enabledSearch) throws WebServiceException {
try {
UsersService service = UsersService.getInstance();
@@ -620,6 +865,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getUsersForGroup();
+ */
public Collection<WSUser> getUsersForGroup(String id) throws WebServiceException {
try {
UsersService service = UsersService.getInstance();
@@ -630,6 +880,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getRolesForGroup();
+ */
public Collection<WSRole> getRolesForGroup(String id) throws WebServiceException {
try {
RolesService service = RolesService.getInstnce();
@@ -640,6 +895,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getUsersByRole();
+ */
public Collection<WSUser> getUsersByRole(String id) throws WebServiceException {
try {
UsersService service = UsersService.getInstance();
@@ -650,6 +910,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getRolesByUser();
+ */
public Collection<WSRole> getRolesByUser(String id) throws WebServiceException {
try {
RolesService service = RolesService.getInstnce();
@@ -660,6 +925,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getGroupsByUser();
+ */
public Collection<WSGroup> getGroupsByUser(String id) throws WebServiceException {
try {
GroupsService service = GroupsService.getInstance();
@@ -670,6 +940,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#getRoleByActionId();
+ */
public Collection<WSRole> getRoleByActionId(String id) throws WebServiceException {
try {
RolesService service = RolesService.getInstnce();
@@ -680,6 +955,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#resubmitMessageWithId();
+ */
public void resubmitMessageWithId(String messageId) throws WebServiceException {
try {
MessagesService service = MessagesService.getMessagesService();
@@ -690,6 +970,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#isSapServerWorking();
+ */
public boolean isSapServerWorking(String serverName) throws WebServiceException {
try {
ServersService service = ServersService.getInstance();
@@ -700,6 +985,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#startSapServer();
+ */
public void startSapServer(String serverName) throws WebServiceException {
try {
ServersService service = ServersService.getInstance();
@@ -710,6 +1000,11 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#stopSapServer();
+ */
public void stopSapServer(String serverName) throws WebServiceException {
try {
ServersService service = ServersService.getInstance();
@@ -719,7 +1014,12 @@
throw new WebServiceException(t);
}
}
-
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.commsuite.ws.IcommunicateWS#deactivateServer();
+ */
public void deactivateServer(String id, boolean mode) throws WebServiceException {
try {
ServersService service = ServersService.getInstance();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-10-05 08:04:41
|
Revision: 198
http://svn.sourceforge.net/comsuite/?rev=198&view=rev
Author: marasm
Date: 2006-10-05 01:04:29 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
message state set to failed/sent after sending to sap
Modified Paths:
--------------
trunk/code/CSCommon/src/org/commsuite/aop/SystemArchitecture.java
trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java
Modified: trunk/code/CSCommon/src/org/commsuite/aop/SystemArchitecture.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/aop/SystemArchitecture.java 2006-10-05 07:54:26 UTC (rev 197)
+++ trunk/code/CSCommon/src/org/commsuite/aop/SystemArchitecture.java 2006-10-05 08:04:29 UTC (rev 198)
@@ -65,7 +65,9 @@
final StringBuilder parameters = new StringBuilder();
- if (null != pjp.getArgs()) {
+ if (null != pjp.getArgs()
+ && !pjp.getSignature().toString().toUpperCase().contains(
+ "JCOFUNCTION")) {
// TODO: consider using only one method invocation:
// Arrays.toString(pjp.getArgs())
// instead of below loop:
@@ -93,8 +95,12 @@
throw e;
}
- logger.debug(pjp.getSignature() + " " + result);
+ if (!pjp.getSignature().toString().toUpperCase()
+ .contains("JCOFUNCTION")) {
+ logger.debug(pjp.getSignature() + " " + result);
+ } else {
+ logger.debug(pjp.getSignature());
+ }
return result;
}
-
}
Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-10-05 07:54:26 UTC (rev 197)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPCommManager.java 2006-10-05 08:04:29 UTC (rev 198)
@@ -32,13 +32,11 @@
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;
@@ -65,7 +63,7 @@
private boolean enabled;
private INotificationsManager notificationsManager;
-
+
/**
* @param enabled
* The enabled to set.
@@ -82,12 +80,13 @@
}
/**
- * TODO: JavaDoc
- */
+ * TODO: JavaDoc
+ */
public SAPCommManager() {
super();
sapComms = new FastMap<String, ISAPComm>();
- enabled = "true".equals(SpringContext.getProperty("commsuite.SAPCommManager.enabled"));
+ enabled = "true".equals(SpringContext
+ .getProperty("commsuite.SAPCommManager.enabled"));
}
/**
@@ -102,8 +101,8 @@
}
/**
- * TODO: JavaDoc
- */
+ * TODO: JavaDoc
+ */
public void sendMessageToDefault(Message message) {
logger.debug("Sending message to default SAP servers");
@@ -115,12 +114,17 @@
for (final ISAPComm sapComm : sapComms.values()) {
if (sapComm.isDefault()) {
logger.debug("Sending message to: " + sapComm.getName());
+
+ State state = (sapComm.sendMessage(message)) ? State.SENT
+ : State.FAILED;
- // TODO: message must be cloned and stored in DB as set of distinct messages.
- // Enumeration Message.SentContents.State must be set accordingly to what
- // state was received from SAP server for each of messages.
+ for (SentContent sentContent : message.getSentContents()) {
+ sentContent.setState(state);
+ }
- sapComm.sendMessage(message);
+ SpringMiddlewareContext.getMessageManager()
+ .saveMessage(message);
+
logger.debug("Message sent to: " + sapComm.getName());
// SentContentManager sentContentManager = SpringMiddlewareContext.getSentContentManager();
@@ -138,41 +142,47 @@
}
/**
- * TODO: JavaDoc
- */
+ * TODO: JavaDoc
+ */
public void init() {
- logger.debug("Running init() method in SAPCommManager (size: " + sapComms.size() + ")");
+ logger.debug("Running init() method in SAPCommManager (size: "
+ + sapComms.size() + ")");
initJCOTracePath();
- final Collection<ISAPComm> clonnedSapComms = new FastTable<ISAPComm>(sapComms.values());
+ final Collection<ISAPComm> clonnedSapComms = new FastTable<ISAPComm>(
+ sapComms.values());
for (final ISAPComm sapComm : clonnedSapComms) {
- if (sapComm.isActiveInstance()) {
- logger.info("Initiating: " + sapComm);
- try {
- sapComm.startServer();
- } catch (Throwable t) {
- logger.fatal("Error during starting SAPComm: " + sapComm, t);
- // stop partially started SAPComm:
- try {
- sapComm.destroy();
- } catch (Throwable ignore) {
- // Ignore
- }
- // remove error prone SAPComm from oryginal collection:
- // REVIEW: maybe it is not good idea to remove sap instance from collection ?
- // sapComms.remove(sapComm.getName());
- }
- }
+ if (sapComm.isActiveInstance()) {
+ logger.info("Initiating: " + sapComm);
+ try {
+ sapComm.startServer();
+ } catch (Throwable t) {
+ logger
+ .fatal("Error during starting SAPComm: " + sapComm,
+ t);
+ // stop partially started SAPComm:
+ try {
+ sapComm.destroy();
+ } catch (Throwable ignore) {
+ // Ignore
+ }
+ // remove error prone SAPComm from oryginal collection:
+ // REVIEW: maybe it is not good idea to remove sap instance
+ // from collection ?
+ // sapComms.remove(sapComm.getName());
+ }
+ }
}
}
/**
- * TODO: JavaDoc
- */
+ * TODO: JavaDoc
+ */
private void initJCOTracePath() {
- final String jcoTracePath = getClass().getResource("/").getPath() + ".." + File.separator
- + ".." + File.separator + ".." + File.separator + ".." + File.separator + "logs"
+ final String jcoTracePath = getClass().getResource("/").getPath()
+ + ".." + File.separator + ".." + File.separator + ".."
+ + File.separator + ".." + File.separator + "logs"
+ File.separator;
JCO.setTracePath(jcoTracePath);
JCO.setTraceLevel(TRACE_LEVEL);
@@ -182,8 +192,8 @@
}
/**
- * TODO: JavaDoc
- */
+ * TODO: JavaDoc
+ */
public void destroy() {
logger.info("Destroying SAPCommManager");
for (final ISAPComm sapComm : sapComms.values()) {
@@ -193,14 +203,15 @@
}
/**
- * TODO: JavaDoc
- */
+ * 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
- logger.info("Running setSapInstances() method in SAPCommManager (size: "
- + sapInstances.size() + ")");
+ logger
+ .info("Running setSapInstances() method in SAPCommManager (size: "
+ + sapInstances.size() + ")");
if (!isEnabled()) {
return;
@@ -211,75 +222,80 @@
sapComm.init(inst);
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.
+ // Refactor it in order to neglect below condition in production
+ // code.
if (null != notificationsManager) {
- notificationsManager.associateNewConsumer(sapComm.getName(), sapNotificationConsumer);
+ notificationsManager.associateNewConsumer(sapComm.getName(),
+ sapNotificationConsumer);
}
- sapComms.put(sapComm.getName(), sapComm);
+ sapComms.put(sapComm.getName(), sapComm);
}
}
/**
- * TODO: JavaDoc
- */
+ * TODO: JavaDoc
+ */
// TODO: should this method be sensitive on active field??
public void setSapInstance(SAPInstanceDef instance) {
- if (!isEnabled()) {
- return;
- }
- final ISAPComm sapComm = new SAPComm();
- sapComm.init(instance);
- final SAPNotificationConsumer sapNotificationConsumer = new SAPNotificationConsumer(
+ if (!isEnabled()) {
+ return;
+ }
+ final ISAPComm sapComm = new SAPComm();
+ sapComm.init(instance);
+ final SAPNotificationConsumer sapNotificationConsumer = new SAPNotificationConsumer(
sapComm);
- notificationsManager.associateNewConsumer(sapComm.getName(), sapNotificationConsumer);
+ notificationsManager.associateNewConsumer(sapComm.getName(),
+ sapNotificationConsumer);
sapComms.put(sapComm.getName(), sapComm);
}
/**
- * TODO: JavaDoc
- */
- public void setNotificationsManager(INotificationsManager notificationsManager) {
+ * TODO: JavaDoc
+ */
+ public void setNotificationsManager(
+ INotificationsManager notificationsManager) {
this.notificationsManager = notificationsManager;
}
/**
- * TODO: JavaDoc
- */
+ * TODO: JavaDoc
+ */
public boolean isEnabled() {
return enabled;
}
/**
- * TODO: JavaDoc
- */
+ * TODO: JavaDoc
+ */
/* package scope */void checkExistenceOfSAPInstance(String instanceName) {
if (!sapComms.containsKey(instanceName)) {
- throw new SAPInstanceException("Instance: " + instanceName + " does not exist.");
+ throw new SAPInstanceException("Instance: " + instanceName
+ + " does not exist.");
}
}
/**
- * TODO: JavaDoc
- */
+ * TODO: JavaDoc
+ */
public void startInstance(String instanceName) {
logger.info("Starting instance: " + instanceName);
checkExistenceOfSAPInstance(instanceName);
final ISAPComm instance = sapComms.get(instanceName);
if (instance.isActiveInstance()) {
- instance.startServer();
- logger.info("Instance started: " + instanceName);
+ instance.startServer();
+ logger.info("Instance started: " + instanceName);
} else {
- logger.warn("Instance is not active");
- throw new RuntimeException("Unable to start inactive instance");
+ logger.warn("Instance is not active");
+ throw new RuntimeException("Unable to start inactive instance");
}
}
/**
- * TODO: JavaDoc
- */
+ * TODO: JavaDoc
+ */
public void stopInstance(String instanceName) {
logger.info("Stopping instance: " + instanceName);
checkExistenceOfSAPInstance(instanceName);
@@ -289,30 +305,30 @@
}
/**
- * TODO: JavaDoc
- */
+ * TODO: JavaDoc
+ */
public void destroyInstance(String instanceName) {
logger.info("Destroying instance: " + instanceName);
checkExistenceOfSAPInstance(instanceName);
final ISAPComm instance = sapComms.get(instanceName);
- logger.debug("INSTANCE: "+ instance);
+ logger.debug("INSTANCE: " + instance);
sapComms.remove(instance.getName());
instance.destroy();
logger.info("Instance destroyed: " + instanceName);
}
/**
- * TODO: JavaDoc
- */
+ * 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());
- }
+ * 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: <sku...@us...> - 2006-10-05 07:54:31
|
Revision: 197
http://svn.sourceforge.net/comsuite/?rev=197&view=rev
Author: skuzniak
Date: 2006-10-05 00:54:26 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
image name in messages view corrected
Modified Paths:
--------------
trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp
Modified: trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp 2006-10-05 07:52:07 UTC (rev 196)
+++ trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp 2006-10-05 07:54:26 UTC (rev 197)
@@ -69,7 +69,7 @@
<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:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon"/>
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="listView-header-value"/>
</h:panelGrid>
</h:commandLink>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sku...@us...> - 2006-10-05 07:52:24
|
Revision: 196
http://svn.sourceforge.net/comsuite/?rev=196&view=rev
Author: skuzniak
Date: 2006-10-05 00:52:07 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
'get' error corrected, exception after session expires corrected
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/WebContent/CSLoginForm.jsp
trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java 2006-10-05 07:44:27 UTC (rev 195)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java 2006-10-05 07:52:07 UTC (rev 196)
@@ -72,7 +72,7 @@
*/
public LanguageSelectionBean() {
super();
-
+ logger.debug("Initializing LanguageSelectionBean");
// REFACTOR: [SK] Below hardcoded set of items must be placed in some configuration file (at
// least) or stored in a database.
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-05 07:44:27 UTC (rev 195)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java 2006-10-05 07:52:07 UTC (rev 196)
@@ -20,9 +20,13 @@
*/
package org.commsuite.web.beans.messages;
+import java.io.IOException;
import java.util.List;
+import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javolution.util.FastTable;
@@ -94,6 +98,22 @@
* TODO: JavaDoc
*/
public MessageExtended getMessageExtended() {
+ logger.debug("messageID: "+ this.messageId);
+ if (null == this.messageId) {
+ /*String redirectPage = "";
+ try {
+ FacesContext context = FacesContext.getCurrentInstance();
+ HttpServletResponse response = (HttpServletResponse)context.getExternalContext().getResponse();
+ HttpServletRequest request = (HttpServletRequest)context.getExternalContext().getRequest();
+ redirectPage = request.getContextPath()+ "/pages/messages/CSMessages.jsp";
+ response.sendRedirect(redirectPage);
+ return new MessageExtended();
+ } catch(IOException ioe) {
+ logger.fatal("404 - page not found");
+ return new MessageExtended();
+ }*/
+ return new MessageExtended();
+ }
final ICommunicateWS ws = SpringAdminPanelContext.getCommunicateWS();
try {
final WSMessage message = ws.getMessageById(this.messageId);
Modified: trunk/code/CSAdminPanel/WebContent/CSLoginForm.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/CSLoginForm.jsp 2006-10-05 07:44:27 UTC (rev 195)
+++ trunk/code/CSAdminPanel/WebContent/CSLoginForm.jsp 2006-10-05 07:52:07 UTC (rev 196)
@@ -10,7 +10,7 @@
</title>
</head>
<body>
- <form id="loginForm" action="loginuser">
+ <form id="loginForm" action="loginuser" method="post">
<h:messages />
<table>
<tr>
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-05 07:44:27 UTC (rev 195)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-05 07:52:07 UTC (rev 196)
@@ -175,7 +175,7 @@
MessagesService service = MessagesService.getMessagesService();
return service.getMessageById(id);
} catch (Throwable t) {
- logger.fatal("error in getSentContentsByMessage method", t);
+ logger.fatal("error in getMessageById method", t);
throw new WebServiceException(t);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
