Author: gk
Date: Wed Oct 24 14:14:43 2018
New Revision: 1844777
URL: http://svn.apache.org/viewvc?rev=1844777&view=rev
Log:
- updating more parents to Turbine Parent 5
- crypto: update test algo to SHA-256
- crypto: remove not used file CryptoAuthenticator.xml
- quartz: using resources in test, moved quartz.xml
Added:
turbine/fulcrum/trunk/quartz/src/resources/
turbine/fulcrum/trunk/quartz/src/resources/test/
turbine/fulcrum/trunk/quartz/src/resources/test/quartz.xml (with props)
Removed:
turbine/fulcrum/trunk/quartz/src/test/quartz.xml
turbine/fulcrum/trunk/security/api/src/test/CryptoAuthenticator.xml
Modified:
turbine/fulcrum/trunk/cache/pom.xml
turbine/fulcrum/trunk/commonsemail/pom.xml
turbine/fulcrum/trunk/configuration/impl/pom.xml
turbine/fulcrum/trunk/groovy/pom.xml
turbine/fulcrum/trunk/hsqldb/pom.xml
turbine/fulcrum/trunk/hsqldb/src/test/test.script
turbine/fulcrum/trunk/jetty/pom.xml
turbine/fulcrum/trunk/json/pom.xml
turbine/fulcrum/trunk/parent/pom.xml
turbine/fulcrum/trunk/pbe/pom.xml
turbine/fulcrum/trunk/pool/pom.xml
turbine/fulcrum/trunk/quartz/pom.xml
turbine/fulcrum/trunk/quartz/src/test/TestComponentConfig.xml
turbine/fulcrum/trunk/resourcemanager/pom.xml
turbine/fulcrum/trunk/script/pom.xml
turbine/fulcrum/trunk/security/api/src/test/CryptoComponentConfig.xml
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java
turbine/fulcrum/trunk/site/pom.xml
turbine/fulcrum/trunk/spring/pom.xml
turbine/fulcrum/trunk/xmlrpc/pom.xml
turbine/fulcrum/trunk/xslt/pom.xml
Modified: turbine/fulcrum/trunk/cache/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/pom.xml (original)
+++ turbine/fulcrum/trunk/cache/pom.xml Wed Oct 24 14:14:43 2018
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/commonsemail/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/commonsemail/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/commonsemail/pom.xml (original)
+++ turbine/fulcrum/trunk/commonsemail/pom.xml Wed Oct 24 14:14:43 2018
@@ -29,7 +29,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/configuration/impl/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/configuration/impl/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/configuration/impl/pom.xml (original)
+++ turbine/fulcrum/trunk/configuration/impl/pom.xml Wed Oct 24 14:14:43 2018
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/groovy/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/groovy/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/groovy/pom.xml (original)
+++ turbine/fulcrum/trunk/groovy/pom.xml Wed Oct 24 14:14:43 2018
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
Modified: turbine/fulcrum/trunk/hsqldb/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/pom.xml (original)
+++ turbine/fulcrum/trunk/hsqldb/pom.xml Wed Oct 24 14:14:43 2018
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/hsqldb/src/test/test.script
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/test/test.script?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
Binary files - no diff available.
Modified: turbine/fulcrum/trunk/jetty/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/jetty/pom.xml (original)
+++ turbine/fulcrum/trunk/jetty/pom.xml Wed Oct 24 14:14:43 2018
@@ -3,7 +3,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/json/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Wed Oct 24 14:14:43 2018
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>4</version>
+ <version>5</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parent/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parent/pom.xml (original)
+++ turbine/fulcrum/trunk/parent/pom.xml Wed Oct 24 14:14:43 2018
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parent</artifactId>
Modified: turbine/fulcrum/trunk/pbe/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pbe/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pbe/pom.xml (original)
+++ turbine/fulcrum/trunk/pbe/pom.xml Wed Oct 24 14:14:43 2018
@@ -2,7 +2,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/pool/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pool/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pool/pom.xml (original)
+++ turbine/fulcrum/trunk/pool/pom.xml Wed Oct 24 14:14:43 2018
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>3</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/quartz/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/pom.xml (original)
+++ turbine/fulcrum/trunk/quartz/pom.xml Wed Oct 24 14:14:43 2018
@@ -17,7 +17,7 @@
-->
<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";>
<parent>
- <artifactId>turbine-parent</artifactId>
+ <artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
<version>5</version>
</parent>
@@ -112,6 +112,14 @@
<build>
<sourceDirectory>${basedir}/src/java</sourceDirectory>
<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/resources/test</directory>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </testResource>
+ </testResources>
</build>
<properties>
Added: turbine/fulcrum/trunk/quartz/src/resources/test/quartz.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/resources/test/quartz.xml?rev=1844777&view=auto
==============================================================================
--- turbine/fulcrum/trunk/quartz/src/resources/test/quartz.xml (added)
+++ turbine/fulcrum/trunk/quartz/src/resources/test/quartz.xml Wed Oct 24
14:14:43 2018
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<job-scheduling-data
xmlns="http://www.quartz-scheduler.org/xml/JobSchedulingData";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://www.quartz-scheduler.org/xml/JobSchedulingData
http://www.quartz-scheduler.org/xml/job_scheduling_data_2_0.xsd";
+ version="2.0">
+ <pre-processing-commands>
+ <delete-jobs-in-group>*</delete-jobs-in-group>
+ <!-- clear all jobs in scheduler -->
+ <delete-triggers-in-group>*</delete-triggers-in-group>
+ <!-- clear all triggers in scheduler -->
+ </pre-processing-commands>
+ <processing-directives>
+ <!-- if there are any jobs/trigger in scheduler of same name (as in
this file), overwrite them -->
+ <overwrite-existing-data>true</overwrite-existing-data>
+ <!-- if there are any jobs/trigger in scheduler of same name (as in
this file), and over-write is false, ignore them rather then generating an
error -->
+ <ignore-duplicates>false</ignore-duplicates>
+ </processing-directives>
+ <schedule>
+ <job>
+ <name>simpleJob</name>
+ <group>TURBINE</group>
+ <description>A simple job</description>
+ <job-class>org.apache.fulcrum.quartz.test.SimpleJob</job-class>
+ <job-data-map>
+ <entry>
+ <key>dressing-list</key>
+ <value>ketchup,mayo</value>
+ </entry>
+ <entry>
+ <key>burger-type</key>
+ <value>hotdog</value>
+ </entry>
+ </job-data-map>
+ </job>
+ <job>
+ <name>notSoSimpleJob</name>
+ <group>TURBINE</group>
+ <description>A not so simple job using a service
manager</description>
+
<job-class>org.apache.fulcrum.quartz.test.NotSoSimpleJob</job-class>
+ </job>
+ <trigger>
+ <cron>
+ <!-- define a Cron trigger firing every second from now on -->
+ <name>cronTrigger</name>
+ <group>TURBINE</group>
+ <job-name>notSoSimpleJob</job-name>
+ <job-group>TURBINE</job-group>
+ <cron-expression>* * * * * ?</cron-expression>
+ </cron>
+ </trigger>
+ <trigger>
+ <simple>
+ <!-- define a simple trigger firing every second -->
+ <name>simpleTrigger</name>
+ <group>TURBINE</group>
+ <job-name>simpleJob</job-name>
+ <job-group>TURBINE</job-group>
+ <start-time>2010-08-01T00:00:00</start-time>
+
<misfire-instruction>MISFIRE_INSTRUCTION_RESCHEDULE_NOW_WITH_EXISTING_REPEAT_COUNT</misfire-instruction>
+ <repeat-count>-1</repeat-count>
+ <repeat-interval>1000</repeat-interval>
+ </simple>
+ </trigger>
+ </schedule>
+</job-scheduling-data>
Propchange: turbine/fulcrum/trunk/quartz/src/resources/test/quartz.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/fulcrum/trunk/quartz/src/test/TestComponentConfig.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/test/TestComponentConfig.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/src/test/TestComponentConfig.xml (original)
+++ turbine/fulcrum/trunk/quartz/src/test/TestComponentConfig.xml Wed Oct 24
14:14:43 2018
@@ -42,7 +42,7 @@
<parameter name="org.quartz.jobStore.misfireThreshold"
value="60000"/>
<parameter name="org.quartz.jobStore.class"
value="org.quartz.simpl.RAMJobStore"/>
<parameter name="org.quartz.plugin.jobInitializer.class"
value="org.quartz.plugins.xml.XMLSchedulingDataProcessorPlugin"/>
- <parameter name="org.quartz.plugin.jobInitializer.fileNames"
value="./src/test/quartz.xml"/>
+ <parameter name="org.quartz.plugin.jobInitializer.fileNames"
value="./quartz.xml"/>
<parameter
name="org.quartz.plugin.jobInitializer.failOnFileNotFound" value="true"/>
<parameter
name="org.quartz.plugin.jobInitializer.scanInterval" value="120"/>
<parameter
name="org.quartz.plugin.jobInitializer.wrapInUserTransaction" value="false"/>
Modified: turbine/fulcrum/trunk/resourcemanager/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/resourcemanager/pom.xml (original)
+++ turbine/fulcrum/trunk/resourcemanager/pom.xml Wed Oct 24 14:14:43 2018
@@ -3,7 +3,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/script/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/script/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/script/pom.xml (original)
+++ turbine/fulcrum/trunk/script/pom.xml Wed Oct 24 14:14:43 2018
@@ -17,11 +17,10 @@
-->
<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";>
<parent>
- <artifactId>turbine-parent</artifactId>
- <groupId>org.apache.turbine</groupId>
- <version>4</version>
+ <artifactId>turbine-parent</artifactId>
+ <groupId>org.apache.turbine</groupId>
+ <version>5</version>
</parent>
-
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-script</artifactId>
Modified: turbine/fulcrum/trunk/security/api/src/test/CryptoComponentConfig.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/CryptoComponentConfig.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/CryptoComponentConfig.xml
(original)
+++ turbine/fulcrum/trunk/security/api/src/test/CryptoComponentConfig.xml Wed
Oct 24 14:14:43 2018
@@ -22,7 +22,7 @@
<authenticator>
<algorithm>java</algorithm>
- <cipher>SHA1</cipher>
+ <cipher>SHA-256</cipher>
</authenticator>
<crypto>
Modified:
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java
Wed Oct 24 14:14:43 2018
@@ -36,7 +36,7 @@ public class CryptoAuthenticatorTest ext
{
private static final String preDefinedInput = "Oeltanks";
- private static final String preDefinedResult =
"uVDiJHaavRYX8oWt5ctkaa7j1cw=";
+ private static final String preDefinedResult =
"XBSqev4ilv7P7852G2rL5WgX3FLy8VzfOY+tVq+xjek=";
@Before
@@ -63,4 +63,5 @@ public class CryptoAuthenticatorTest ext
assertTrue(authenticator.authenticate(user, preDefinedInput));
assertFalse(authenticator.authenticate(user, "mypassword"));
}
+
}
Modified: turbine/fulcrum/trunk/site/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/site/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/site/pom.xml (original)
+++ turbine/fulcrum/trunk/site/pom.xml Wed Oct 24 14:14:43 2018
@@ -23,7 +23,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.apache.fulcrum</groupId>
Modified: turbine/fulcrum/trunk/spring/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/spring/pom.xml (original)
+++ turbine/fulcrum/trunk/spring/pom.xml Wed Oct 24 14:14:43 2018
@@ -2,7 +2,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/xmlrpc/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xmlrpc/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/xmlrpc/pom.xml (original)
+++ turbine/fulcrum/trunk/xmlrpc/pom.xml Wed Oct 24 14:14:43 2018
@@ -22,7 +22,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/xslt/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xslt/pom.xml?rev=1844777&r1=1844776&r2=1844777&view=diff
==============================================================================
--- turbine/fulcrum/trunk/xslt/pom.xml (original)
+++ turbine/fulcrum/trunk/xslt/pom.xml Wed Oct 24 14:14:43 2018
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
