Mail Archive Home | gotm-commits List | December 2005 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Thursday, December 22, 2005 @ 17:48:17
Author: rouvoy
Path: /cvsroot/gotm/gotm/src
Modified: fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal
fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal
fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal
fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal
fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal
fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal
java/org/objectweb/gotm/lib/factory/TransactionFactoryObservable.java
java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java
java/org/objectweb/gotm/lib/message/SubscriberPool.java
* Updating the ACOM example.
-----------------------------------------------------------------------+
fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal | 2
fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal | 2
fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal | 2
fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal | 2
fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal | 2
fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal | 2
java/org/objectweb/gotm/lib/factory/TransactionFactoryObservable.java | 6
-
java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java | 12
+--
java/org/objectweb/gotm/lib/message/SubscriberPool.java | 39
+++++-----
9 files changed, 35 insertions(+), 34 deletions(-)
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal:1.2
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal:1.3
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal:1.2
Tue Nov 22 11:50:49 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal
Thu Dec 22 17:48:16 2005
@@ -6,7 +6,7 @@
<definition name="org.objectweb.gotm.lib.protocol.coordinator.Fc2PC"
extends="org.objectweb.gotm.lib.protocol.coordinator.Fc2PCAbstract">
<component name="LogManager"
-
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(log-2PC,output)"/>
+
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(output,log-coord-2PC)"/>
<binding client="this.decision-commit" server="this.publish-sync"/>
<binding client="this.decision-abort" server="this.publish-sync"/>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal:1.2
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal:1.3
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal:1.2
Tue Nov 22 11:50:49 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal
Thu Dec 22 17:48:16 2005
@@ -6,7 +6,7 @@
<definition name="org.objectweb.gotm.lib.protocol.coordinator.Fc2PCPA"
extends="org.objectweb.gotm.lib.protocol.coordinator.Fc2PCAbstract">
<component name="LogManager"
-
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(log-2PCPA,output)"/>
+
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(output,log-coord-2PCPA)"/>
<binding client="this.decision-commit" server="this.publish-sync"/>
<binding client="this.decision-abort" server="this.publish-async"/>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal:1.2
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal:1.3
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal:1.2
Tue Nov 22 11:50:49 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal
Thu Dec 22 17:48:16 2005
@@ -6,7 +6,7 @@
<definition name="org.objectweb.gotm.lib.protocol.coordinator.Fc2PCPC"
extends="org.objectweb.gotm.lib.protocol.coordinator.Fc2PCAbstract">
<component name="LogManager"
-
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(log-2PCPC,output)"/>
+
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(output,log-coord-2PCPC)"/>
<binding client="this.decision-commit" server="this.publish-async"/>
<binding client="this.decision-abort" server="this.publish-sync"/>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal:1.2
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal:1.3
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal:1.2
Tue Nov 22 11:50:49 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal
Thu Dec 22 17:48:16 2005
@@ -6,7 +6,7 @@
<definition name="org.objectweb.gotm.lib.protocol.participant.Fc2PC"
extends="org.objectweb.gotm.lib.protocol.participant.Fc2PCAbstract">
<component name="LogManager"
-
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(log-2PC,output)"/>
+
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(output,log-part-2PC)"/>
<binding client="this.log-vote" server="LogManager.write-force"/>
<binding client="this.log-commit-ack" server="LogManager.write-force"/>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal:1.2
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal:1.3
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal:1.2
Tue Nov 22 11:50:49 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal
Thu Dec 22 17:48:16 2005
@@ -6,7 +6,7 @@
<definition name="org.objectweb.gotm.lib.protocol.participant.Fc2PCPA"
extends="org.objectweb.gotm.lib.protocol.participant.Fc2PCAbstract">
<component name="LogManager"
-
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(log-2PCPA,output)"/>
+
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(output,log-part-2PCPA)"/>
<binding client="this.log-vote" server="LogManager.write-force"/>
<binding client="this.log-commit-ack" server="LogManager.write-force"/>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal:1.2
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal:1.3
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal:1.2
Tue Nov 22 11:50:49 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal
Thu Dec 22 17:48:16 2005
@@ -6,7 +6,7 @@
<definition name="org.objectweb.gotm.lib.protocol.participant.Fc2PCPC"
extends="org.objectweb.gotm.lib.protocol.participant.Fc2PCAbstract">
<component name="LogManager"
-
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(log-2PCPC,output)"/>
+
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(output,log-part-2PCPC)"/>
<binding client="this.log-vote" server="LogManager.write-force"/>
<binding client="this.log-commit-ack" server="LogManager.write-no-force"/>
Index:
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryObservable.java
diff -u
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryObservable.java:1.7
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryObservable.java:1.8
---
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryObservable.java:1.7
Tue Dec 20 16:43:34 2005
+++
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryObservable.java
Thu Dec 22 17:48:16 2005
@@ -17,7 +17,7 @@
Initial developer(s): Romain Rouvoy (romain.rouvoy@xxxxxxx)
Contributor(s): .
--------------------------------------------------------------------------------
-$Id: TransactionFactoryObservable.java,v 1.7 2005/12/20 15:43:34 rouvoy Exp $
+$Id: TransactionFactoryObservable.java,v 1.8 2005/12/22 16:48:16 rouvoy Exp $
==============================================================================*/
package org.objectweb.gotm.lib.factory;
@@ -31,12 +31,12 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class TransactionFactoryObservable
extends TransactionFactoryCache {
/**
- * @fractal.bc cardinality="collection"
+ * @fractal.bc cardinality="collection" contingency="optional"
*
signature="org.objectweb.transaction.api.message.PublishFeature"
*/
protected final HashMap publish = new HashMap();
Index: gotm/src/java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java
diff -u
gotm/src/java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java:1.8
gotm/src/java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java:1.9
--- gotm/src/java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java:1.8
Tue Dec 20 16:43:34 2005
+++ gotm/src/java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java Thu
Dec 22 17:48:16 2005
@@ -17,7 +17,7 @@
Initial developer(s): Romain Rouvoy (romain.rouvoy@xxxxxxx)
Contributor(s): .
--------------------------------------------------------------------------------
-$Id: HOWLoggerProvider.java,v 1.8 2005/12/20 15:43:34 rouvoy Exp $
+$Id: HOWLoggerProvider.java,v 1.9 2005/12/22 16:48:16 rouvoy Exp $
==============================================================================*/
package org.objectweb.gotm.lib.logging;
@@ -35,7 +35,7 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class HOWLoggerProvider
extends ComponentImpl
@@ -44,14 +44,14 @@
protected static final HashMap cache = new HashMap();
/**
- * @fractal.ac argument="file"
+ * @fractal.ac argument="dir"
*/
- protected String filename = "gotm.log";
+ protected String dirpath = "tmp/";
/**
- * @fractal.ac argument="dir"
+ * @fractal.ac argument="file"
*/
- protected String dirpath = "tmp/";
+ protected String filename = "gotm.log";
protected Logger howlogger;
Index: gotm/src/java/org/objectweb/gotm/lib/message/SubscriberPool.java
diff -u gotm/src/java/org/objectweb/gotm/lib/message/SubscriberPool.java:1.4
gotm/src/java/org/objectweb/gotm/lib/message/SubscriberPool.java:1.5
--- gotm/src/java/org/objectweb/gotm/lib/message/SubscriberPool.java:1.4
Tue Dec 20 11:49:28 2005
+++ gotm/src/java/org/objectweb/gotm/lib/message/SubscriberPool.java Thu
Dec 22 17:48:16 2005
@@ -17,7 +17,7 @@
Initial developer(s): Romain Rouvoy (romain.rouvoy@xxxxxxx)
Contributor(s): .
--------------------------------------------------------------------------------
-$Id: SubscriberPool.java,v 1.4 2005/12/20 10:49:28 rouvoy Exp $
+$Id: SubscriberPool.java,v 1.5 2005/12/22 16:48:16 rouvoy Exp $
==============================================================================*/
package org.objectweb.gotm.lib.message;
@@ -32,7 +32,7 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class SubscriberPool
extends ComponentImpl
@@ -46,12 +46,13 @@
* @param topic the topic.
* @return the list of listeners of topic.
*/
- protected final ArrayList listeners(final String topic) {
- ArrayList set = (ArrayList) this.topics.get(topic);
- if (set != null) return set;
- set = new ArrayList();
- this.topics.put(topic, set);
- return set;
+ protected final ArrayList subscribers(final String topic) {
+ ArrayList subscribers = (ArrayList) this.topics.get(topic);
+ if (subscribers != null)
+ return subscribers;
+ subscribers = new ArrayList();
+ this.topics.put(topic, subscribers);
+ return subscribers;
}
/*
@@ -59,8 +60,8 @@
* @see
org.objectweb.gotm.lib.message.SubscriberProvider#getTopic(java.lang.String)
*/
public PublishFeature[] getTopic(final String topic) {
- ArrayList listeners = listeners(topic);
- return (PublishFeature[]) listeners.toArray(new
PublishFeature[listeners.size()]);
+ ArrayList subscribers = subscribers(topic);
+ return (PublishFeature[]) subscribers.toArray(new
PublishFeature[subscribers.size()]);
}
/*
@@ -77,11 +78,11 @@
* @see
org.objectweb.transaction.api.message.SubscribeFeature#subscribe(org.objectweb.transaction.api.message.Event,
* org.objectweb.transaction.api.message.PublishFeature)
*/
- public void subscribe(final String topic, PublishFeature subscriber) {
+ public void subscribe(String topic, PublishFeature subscriber) {
// if (this.logger.isLoggable(DEBUG))
// this.logger.log(DEBUG, subscriber.getClass().getName()+"
subcribes to
// "+topic);
- listeners(topic).add(subscriber);
+ subscribers(topic).add(subscriber);
}
/*
@@ -89,11 +90,11 @@
* @see
org.objectweb.transaction.api.message.SubscribeFeature#unsubscribe(org.objectweb.transaction.api.message.Event,
* org.objectweb.transaction.api.message.PublishFeature)
*/
- public void unsubscribe(final String topic, PublishFeature subscriber) {
+ public void unsubscribe(String topic, PublishFeature subscriber) {
// if (this.logger.isLoggable(DEBUG))
// this.logger.log(DEBUG, subscriber.getClass().getName()+"
unsubcribes
// from "+topic);
- listeners(topic).remove(subscriber);
+ subscribers(topic).remove(subscriber);
}
/*
@@ -101,7 +102,7 @@
* @see
org.objectweb.transaction.api.message.SubscribeFeature#subscribe(org.objectweb.transaction.api.message.Event[],
* org.objectweb.transaction.api.message.PublishFeature)
*/
- public void subscribe(final String[] topic, PublishFeature subscriber) {
+ public void subscribe(String[] topic, PublishFeature subscriber) {
for (int i = 0; i < topic.length; i++) {
subscribe(topic[i], subscriber);
}
@@ -112,7 +113,7 @@
* @see
org.objectweb.transaction.api.message.SubscribeFeature#unsubscribe(org.objectweb.transaction.api.message.Event[],
* org.objectweb.transaction.api.message.PublishFeature)
*/
- public void unsubscribe(final String[] topic, PublishFeature suscriber) {
+ public void unsubscribe(String[] topic, PublishFeature suscriber) {
// System.err.println("[POOL] Subscribe to "+Arrays.asList(topic));
for (int i = 0; i < topic.length; i++) {
unsubscribe(topic[i], suscriber);
@@ -151,8 +152,8 @@
* @see org.objectweb.fractal.api.control.LifeCycleController#stopFc()
*/
public void stopFc() {
- if (this.logger.isLoggable(DEBUG))
- this.logger.log(DEBUG, "Clearing the Subscribers enlisted");
- this.topics.clear() ;
+// if (this.logger.isLoggable(DEBUG))
+// this.logger.log(DEBUG, "Clearing the Subscribers enlisted");
+// this.topics.clear() ;
}
}
\ No newline at end of file
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.