You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/05/05 07:58:27 UTC
svn commit: r535453 - in /incubator/tuscany/java/sca/modules:
core-spi/src/main/java/org/apache/tuscany/spi/annotation/
core-spi/src/main/java/org/apache/tuscany/spi/services/store/
core/src/main/java/org/apache/tuscany/core/monitor/ core/src/test/java...
Author: rfeng
Date: Fri May 4 22:58:26 2007
New Revision: 535453
URL: http://svn.apache.org/viewvc?view=rev&rev=535453
Log:
Remove the Monitor and LogLevel annotations
Removed:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/monitor/
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/monitor/
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/integration/MemoryStore.java
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java?view=diff&rev=535453&r1=535452&r2=535453
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java Fri May 4 22:58:26 2007
@@ -18,57 +18,54 @@
*/
package org.apache.tuscany.spi.services.store;
-import org.apache.tuscany.spi.annotation.LogLevel;
/**
* A generic monintor interface for services to log events
- *
+ *
* @version $Rev$ $Date$
*/
public interface StoreMonitor {
/**
* Signals the service has started
- *
+ *
* @param msg
*/
- @LogLevel("DEBUG")
void start(String msg);
/**
* Signals the service has been shutdown
- *
+ *
* @param msg
*/
- @LogLevel("DEBUG")
void stop(String msg);
/**
* Fired when recovery is started
*/
- @LogLevel("DEBUG")
+
void beginRecover();
/**
* Fired when recovery is completed
*/
- @LogLevel("DEBUG")
+
void endRecover();
/**
* Fired when a record is processed during recovery
- *
+ *
* @param recordId the id of the record being recovered
*/
- @LogLevel("DEBUG")
+
void recover(Object recordId);
/**
* Signals an error event
- *
+ *
* @param e the error
*/
- @LogLevel("ERROR")
+
void error(Throwable e);
}
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java?view=diff&rev=535453&r1=535452&r2=535453
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java Fri May 4 22:58:26 2007
@@ -25,7 +25,6 @@
import java.util.concurrent.TimeUnit;
import org.apache.tuscany.core.RuntimeComponent;
-import org.apache.tuscany.spi.annotation.Monitor;
import org.apache.tuscany.spi.event.AbstractEventPublisher;
import org.apache.tuscany.spi.services.store.DuplicateRecordException;
import org.apache.tuscany.spi.services.store.RecoveryListener;
@@ -54,7 +53,7 @@
private StoreMonitor monitor;
private long defaultExpirationOffset = 600000; // 10 minutes
- public MemoryStore(@Monitor StoreMonitor monitor) {
+ public MemoryStore(StoreMonitor monitor) {
this.monitor = monitor;
this.store = new ConcurrentHashMap<RuntimeComponent, Map<String, Record>>();
this.scheduler = Executors.newSingleThreadScheduledExecutor();
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/integration/MemoryStore.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/integration/MemoryStore.java?view=diff&rev=535453&r1=535452&r2=535453
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/integration/MemoryStore.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/integration/MemoryStore.java Fri May 4 22:58:26 2007
@@ -25,7 +25,6 @@
import java.util.concurrent.TimeUnit;
import org.apache.tuscany.core.RuntimeComponent;
-import org.apache.tuscany.spi.annotation.Monitor;
import org.apache.tuscany.spi.event.AbstractEventPublisher;
import org.apache.tuscany.spi.services.store.DuplicateRecordException;
import org.apache.tuscany.spi.services.store.RecoveryListener;
@@ -40,8 +39,9 @@
import org.osoa.sca.annotations.Service;
/**
- * Implements a non-durable, non-transactional store using a simple in-memory map
- *
+ * Implements a non-durable, non-transactional store using a simple in-memory
+ * map
+ *
* @version $Rev$ $Date$
*/
@Service(Store.class)
@@ -54,7 +54,7 @@
private StoreMonitor monitor;
private long defaultExpirationOffset = 600000; // 10 minutes
- public MemoryStore(@Monitor StoreMonitor monitor) {
+ public MemoryStore(StoreMonitor monitor) {
this.monitor = monitor;
this.store = new ConcurrentHashMap<RuntimeComponent, Map<String, Record>>();
this.scheduler = Executors.newSingleThreadScheduledExecutor();
@@ -62,7 +62,7 @@
/**
* Returns the maximum default expiration offset for records in the store
- *
+ *
* @return the maximum default expiration offset for records in the store
*/
public long getDefaultExpirationOffset() {
@@ -101,7 +101,8 @@
monitor.stop("In-memory store stopped");
}
- public void insertRecord(RuntimeComponent owner, String id, Object object, long expiration) throws StoreWriteException {
+ public void insertRecord(RuntimeComponent owner, String id, Object object, long expiration)
+ throws StoreWriteException {
Map<String, Record> map = store.get(owner);
if (map == null) {
map = new ConcurrentHashMap<String, Record>();
@@ -113,7 +114,8 @@
map.put(id, new Record(object, expiration));
}
- public void updateRecord(RuntimeComponent owner, String id, Object object, long expiration) throws StoreWriteException {
+ public void updateRecord(RuntimeComponent owner, String id, Object object, long expiration)
+ throws StoreWriteException {
Map<String, Record> map = store.get(owner);
if (map == null) {
throw new StoreWriteException("Record not found", owner.getURI(), id);
@@ -183,7 +185,7 @@
if (expiration != NEVER && now >= expiration) {
RuntimeComponent owner = entries.getKey();
Object instance = entry.getValue().getData();
- // notify listeners of the expiration
+ // notify listeners of the expiration
StoreExpirationEvent event = new StoreExpirationEvent(this, owner, instance);
publish(event);
entries.getValue().remove(entry.getKey());
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org