cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r370783 - in /cocoon/trunk: ./ cocoon-core/src/main/java/org/apache/cocoon/acting/ cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ cocoon-cron/cocoon-cron-impl/ cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/coc...
Date Fri, 20 Jan 2006 10:57:03 GMT
Author: cziegeler
Date: Fri Jan 20 02:56:47 2006
New Revision: 370783

URL: http://svn.apache.org/viewcvs?rev=370783&view=rev
Log:
Update quartz to 1.5.1 and add cron block to build

Added:
    cocoon/trunk/legal/quartz-1.5.1.jar.license.txt
      - copied unchanged from r370770, cocoon/trunk/legal/quartz-1.5.0.jar.license.txt
Removed:
    cocoon/trunk/legal/quartz-1.5.0.jar.license.txt
    cocoon/trunk/lib/optional/quartz-1.5.0.jar
Modified:
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
    cocoon/trunk/cocoon-cron/cocoon-cron-impl/pom.xml
    cocoon/trunk/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java
    cocoon/trunk/pom.xml

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java?rev=370783&r1=370782&r2=370783&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
Fri Jan 20 02:56:47 2006
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.acting;
 
-import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.parameters.Parameters;

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java?rev=370783&r1=370782&r2=370783&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
Fri Jan 20 02:56:47 2006
@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.cocoon.components.modules.input;
 
-import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.thread.ThreadSafe;

Modified: cocoon/trunk/cocoon-cron/cocoon-cron-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-cron/cocoon-cron-impl/pom.xml?rev=370783&r1=370782&r2=370783&view=diff
==============================================================================
--- cocoon/trunk/cocoon-cron/cocoon-cron-impl/pom.xml (original)
+++ cocoon/trunk/cocoon-cron/cocoon-cron-impl/pom.xml Fri Jan 20 02:56:47 2006
@@ -34,17 +34,23 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.2-SNAPSHOT</version>
+      <version>2.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>quartz</groupId>
       <artifactId>quartz</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>excalibur-datasource</groupId>
       <artifactId>excalibur-datasource</artifactId>
       <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>d-haven-managed-pool</artifactId>
+          <groupId>d-haven-managed-pool</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java?rev=370783&r1=370782&r2=370783&view=diff
==============================================================================
--- cocoon/trunk/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java
(original)
+++ cocoon/trunk/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java
Fri Jan 20 02:56:47 2006
@@ -524,4 +524,8 @@
             throws SQLException, ClassNotFoundException, IOException {
         return delegate.selectTriggerJobDataMap(conn, triggerName, groupName);
     }
+
+    public int updateSchedulerState(Connection arg0, String arg1, long arg2) throws SQLException
{
+        return delegate.updateSchedulerState(arg0, arg1, arg2);
+    }
 }

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/pom.xml?rev=370783&r1=370782&r2=370783&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Fri Jan 20 02:56:47 2006
@@ -44,6 +44,7 @@
     <module>cocoon-ajax</module>
     <module>cocoon-authentication-fw</module>
     <module>cocoon-captcha</module>
+    <module>cocoon-cron</module>
     <module>cocoon-forms</module>
     <!--module>cocoon-jcr</module> -->
     <module>cocoon-portal</module>



Mime
View raw message