svn commit: r709913 - in /incubator/droids/trunk: pom.xml src/java/org/apache/droids/impl/MultiThreadedTaskMaster.java

[olegk]

Author: olegk
Date: Sun Nov  2 11:36:53 2008
New Revision: 709913

URL: http://svn.apache.org/viewvc?rev=709913&view=rev
Log:
Updated Droids POM

Modified:
    incubator/droids/trunk/pom.xml
    
incubator/droids/trunk/src/java/org/apache/droids/impl/MultiThreadedTaskMaster.java

Modified: incubator/droids/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/droids/trunk/pom.xml?rev=709913&r1=709912&r2=709913&view=diff
==============================================================================
--- incubator/droids/trunk/pom.xml (original)
+++ incubator/droids/trunk/pom.xml Sun Nov  2 11:36:53 2008
@@ -27,9 +27,9 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.labs</groupId>
+  <groupId>org.apache.droids</groupId>
   <artifactId>droids</artifactId>
-  <version>0.1-SNAPSHOT</version>
+  <version>0.1-incubating-SNAPSHOT</version>
   <name>Droids</name>
   <inceptionYear>2007</inceptionYear>
   <description>
@@ -58,12 +58,13 @@
     <maven.compile.optimize>true</maven.compile.optimize>
     <maven.compile.deprecation>true</maven.compile.deprecation>
     <commons-logging.version>1.1.1</commons-logging.version>
-    
<cocoon-spring-configurator.version>2.0.0</cocoon-spring-configurator.version>
+    <commons-io.version>1.3.1</commons-io.version>
     <stax-api.version>1.0.1</stax-api.version>
     <wstx-asl.version>3.2.4</wstx-asl.version>
     <httpclient.version>4.0-beta1</httpclient.version>
     <nekohtml.version>1.9.6.2</nekohtml.version>
     <junit.version>4.5</junit.version>
+    <log4j.version>1.2.14</log4j.version>
   </properties>
 
   <dependencies>
@@ -73,9 +74,9 @@
       <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-spring-configurator</artifactId>
-      <version>${cocoon-spring-configurator.version}</version>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>${commons-io.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -87,12 +88,12 @@
       <artifactId>wstx-asl</artifactId>
       <version>${wstx-asl.version}</version>
       <scope>runtime</scope>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>stax</groupId>
-                                       <artifactId>stax-api</artifactId>
-                               </exclusion>
-                       </exclusions>
+      <exclusions>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+       </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -103,12 +104,18 @@
       <groupId>nekohtml</groupId>
       <artifactId>nekohtml</artifactId>
       <version>${nekohtml.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>xml-apis</groupId>
-                                       <artifactId>xml-apis</artifactId>
-                               </exclusion>
-                       </exclusions>
+      <exclusions>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -118,10 +125,10 @@
     </dependency>
   </dependencies>
   <build>
-    <sourceDirectory>src/core/java</sourceDirectory>
+    <sourceDirectory>src/java</sourceDirectory>
     <resources>
       <resource>
-        <directory>src/core/java</directory>
+        <directory>src/java</directory>
         <filtering>false</filtering>
         <includes>
             <include>**/*.xml</include>

Modified: 
incubator/droids/trunk/src/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
URL: 
http://svn.apache.org/viewvc/incubator/droids/trunk/src/java/org/apache/droids/impl/MultiThreadedTaskMaster.java?rev=709913&r1=709912&r2=709913&view=diff
==============================================================================
--- 
incubator/droids/trunk/src/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
 (original)
+++ 
incubator/droids/trunk/src/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
 Sun Nov  2 11:36:53 2008
@@ -204,23 +204,18 @@
     }
   }
 
-  @Override
   public int getCompletedTasks() {
     return completedTask;
   }
 
-
-  @Override
   public Date getFinishedWorking() {
     return finishedWorking;
   }
 
-  @Override
   public Task getLastCompletedTask() {
     return lastCompletedTask;
   }
 
-  @Override
   public Date getStartTime() {
     return startedWorking;
   }