servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r406652 - in /incubator/servicemix/trunk: servicemix-eip/ servicemix-eip/src/main/java/org/apache/servicemix/eip/ servicemix-eip/src/main/java/org/apache/servicemix/eip/support/ servicemix-services/src/main/java/org/apache/servicemix/timers...
Date Mon, 15 May 2006 15:27:59 GMT
Author: gnodet
Date: Mon May 15 08:27:53 2006
New Revision: 406652

URL: http://svn.apache.org/viewcvs?rev=406652&view=rev
Log:
Remove commonj dependency from servicemix-eip

Modified:
    incubator/servicemix/trunk/servicemix-eip/pom.xml
    incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPEndpoint.java
    incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java
    incubator/servicemix/trunk/servicemix-services/src/main/java/org/apache/servicemix/timers/impl/TimerManagerImpl.java

Modified: incubator/servicemix/trunk/servicemix-eip/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-eip/pom.xml?rev=406652&r1=406651&r2=406652&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-eip/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-eip/pom.xml Mon May 15 08:27:53 2006
@@ -49,15 +49,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-commonj_1.1_spec</artifactId>
-    </dependency>
-    <dependency>        
-      <groupId>org.apache.geronimo.modules</groupId>
-      <artifactId>geronimo-commonj</artifactId>
-      <version>1.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>test</scope>

Modified: incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPEndpoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPEndpoint.java?rev=406652&r1=406651&r2=406652&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPEndpoint.java
(original)
+++ incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPEndpoint.java
Mon May 15 08:27:53 2006
@@ -25,7 +25,6 @@
 import javax.jbi.messaging.MessageExchange.Role;
 import javax.jbi.servicedesc.ServiceEndpoint;
 
-import org.apache.geronimo.commonj.timers.TimerManagerImpl;
 import org.apache.servicemix.common.BaseLifeCycle;
 import org.apache.servicemix.common.Endpoint;
 import org.apache.servicemix.common.ExchangeProcessor;
@@ -34,8 +33,8 @@
 import org.apache.servicemix.store.Store;
 import org.apache.servicemix.store.StoreFactory;
 import org.apache.servicemix.store.memory.MemoryStoreFactory;
-
-import commonj.timers.TimerManager;
+import org.apache.servicemix.timers.TimerManager;
+import org.apache.servicemix.timers.impl.TimerManagerImpl;
 
 /**
  * @author gnodet

Modified: incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java?rev=406652&r1=406651&r2=406652&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java
(original)
+++ incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java
Mon May 15 08:27:53 2006
@@ -26,9 +26,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.eip.EIPEndpoint;
-
-import commonj.timers.Timer;
-import commonj.timers.TimerListener;
+import org.apache.servicemix.timers.Timer;
+import org.apache.servicemix.timers.TimerListener;
 
 import edu.emory.mathcs.backport.java.util.concurrent.locks.Lock;
 

Modified: incubator/servicemix/trunk/servicemix-services/src/main/java/org/apache/servicemix/timers/impl/TimerManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-services/src/main/java/org/apache/servicemix/timers/impl/TimerManagerImpl.java?rev=406652&r1=406651&r2=406652&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-services/src/main/java/org/apache/servicemix/timers/impl/TimerManagerImpl.java
(original)
+++ incubator/servicemix/trunk/servicemix-services/src/main/java/org/apache/servicemix/timers/impl/TimerManagerImpl.java
Mon May 15 08:27:53 2006
@@ -27,7 +27,7 @@
 public class TimerManagerImpl implements TimerManager {
 
     private static final Log log = LogFactory.getLog(TimerManagerImpl.class);
-    private static java.util.Timer timer;
+    private static java.util.Timer timer = new java.util.Timer();
     
     public Timer schedule(TimerListener listener, long delay) {
         if (log.isDebugEnabled()) {



Mime
View raw message