activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r995399 - in /activemq/activemq-apollo/trunk: ./ apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/ apollo-dto/ apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/ apollo-web/src/main/scala/org/apache/activemq...
Date Thu, 09 Sep 2010 12:27:21 GMT
Author: dejanb
Date: Thu Sep  9 12:27:20 2010
New Revision: 995399

URL: http://svn.apache.org/viewvc?rev=995399&view=rev
Log:
fix some build issues

Modified:
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStore.scala
    activemq/activemq-apollo/trunk/apollo-dto/pom.xml
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
    activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/RootResource.scala
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStore.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStore.scala?rev=995399&r1=995398&r2=995399&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStore.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStore.scala
Thu Sep  9 12:27:20 2010
@@ -119,7 +119,7 @@ class BDBStore extends DelayingStoreSupp
     new Thread() {
       override def run = {
         executor_pool.shutdown
-        executor_pool.awaitTermination(1, TimeUnit.DAYS)
+        executor_pool.awaitTermination(86400, TimeUnit.SECONDS)
         executor_pool = null
         client.stop
         onCompleted.run

Modified: activemq/activemq-apollo/trunk/apollo-dto/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/pom.xml?rev=995399&r1=995398&r2=995399&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/pom.xml Thu Sep  9 12:27:20 2010
@@ -186,10 +186,12 @@
         <dependency>
           <groupId>javax.xml.bind</groupId>
           <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-api-version}</version>
         </dependency>
         <dependency>
           <groupId>com.sun.xml.bind</groupId>
           <artifactId>jaxb-impl</artifactId>
+          <version>${jaxb-version}</version>
         </dependency>
       </dependencies>
     </profile>

Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala?rev=995399&r1=995398&r2=995399&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
Thu Sep  9 12:27:20 2010
@@ -120,7 +120,7 @@ class HawtDBStore extends DelayingStoreS
     new Thread() {
       override def run = {
         executor_pool.shutdown
-        executor_pool.awaitTermination(1, TimeUnit.DAYS)
+        executor_pool.awaitTermination(86400, TimeUnit.SECONDS)
         executor_pool = null
         client.stop
         onCompleted.run

Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/RootResource.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/RootResource.scala?rev=995399&r1=995398&r2=995399&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/RootResource.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/RootResource.scala
Thu Sep  9 12:27:20 2010
@@ -69,9 +69,9 @@ object ViewHelper {
   val TB: Long = GB * 1024
 
   val SECONDS: Long = TimeUnit.SECONDS.toMillis(1)
-  val MINUTES: Long = TimeUnit.MINUTES.toMillis(1)
-  val HOURS: Long = TimeUnit.HOURS.toMillis(1)
-  val DAYS: Long = TimeUnit.DAYS.toMillis(1)
+  val MINUTES: Long = TimeUnit.SECONDS.toMillis(60)
+  val HOURS: Long = TimeUnit.SECONDS.toMillis(3600)
+  val DAYS: Long = TimeUnit.SECONDS.toMillis(216000)
   val YEARS: Long = DAYS * 365
 
 

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=995399&r1=995398&r2=995399&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Thu Sep  9 12:27:20 2010
@@ -119,7 +119,7 @@
   </properties>
 
   <prerequisites>
-    <maven>2.0.10</maven>
+    <maven>2.2.1</maven>
   </prerequisites>
 
   <url>http://activemq.apache.org/</url>



Mime
View raw message