xlawrence 2005/01/20 16:36:30 CET
Modified files:
calClient/src/java/org/jahia/suite/calendar/calServer
Calendarclient.java
UwCalConnectorServlet.java
src/java/org/jahia/suite/calendar/framework SyncManager.java
Log:
Added a close method to the framework interface
Revision Changes Path
1.7 +9 -0
uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/Calendarclient.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/Calendarclient.java.diff?r1=1.6&r2=1.7&f=h
1.3 +10 -2
uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnectorServlet.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnectorServlet.java.diff?r1=1.2&r2=1.3&f=h
1.2 +6 -0
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/SyncManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/SyncManager.java.diff?r1=1.1&r2=1.2&f=h
Index: Calendarclient.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/Calendarclient.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Calendarclient.java 17 Jan 2005 14:50:01 -0000 1.6
+++ Calendarclient.java 20 Jan 2005 15:36:29 -0000 1.7
@@ -92,6 +92,15 @@
}
/**
+ * Frees all used ressources
+ */
+ public void stop() {
+ syncManager.close();
+ agent.setMessageListener(null);
+ agent.stop();
+ }
+
+ /**
* Implementation of the MessageListener interface.
* Simply performs the required action based on the Request type or
throws
* a SyncException if the request type is unknown.
Index: UwCalConnectorServlet.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnectorServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UwCalConnectorServlet.java 14 Jan 2005 11:00:42 -0000 1.2
+++ UwCalConnectorServlet.java 20 Jan 2005 15:36:29 -0000 1.3
@@ -58,13 +58,15 @@
private String errorMsg;
+ private Calendarclient app;
+
/**
* Initializes the JMS client for Synchronization
*/
public void init() throws ServletException {
try {
log.info("Starting UwCal Calendar Client...");
- Calendarclient app = new Calendarclient();
+ app = new Calendarclient();
app.start();
log.info("Calendar Client successfully started");
@@ -100,7 +102,13 @@
out.println("</body></html>");
out.flush();
- out.close();
+ out.close();
+ }
+
+ public void destroy() {
+ if (app != null) {
+ app.stop();
+ }
}
}
Index: SyncManager.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/SyncManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SyncManager.java 17 Jan 2005 14:49:03 -0000 1.1
+++ SyncManager.java 20 Jan 2005 15:36:29 -0000 1.2
@@ -117,4 +117,10 @@
* @throws SyncException If something goes wrong
*/
public void endSynch(String calendarID, boolean commit) throws
SyncException;
+
+ /**
+ * This method should be called to free all used ressources used
+ * by the SyncManager before it is garbage collected.
+ */
+ public void close() throws SyncException;
}
