Author: rkanter
Date: Fri Feb 8 22:55:02 2013
New Revision: 1444269
URL: http://svn.apache.org/r1444269
Log:
OOZIE-1170 Update minitest module (MiniOozie) to use main pom as its parent
(jaoki via rkanter)
Added:
oozie/branches/branch-3.3/minitest/src/test/resources/hsqldb-oozie-site.xml
Modified:
oozie/branches/branch-3.3/minitest/ (props changed)
oozie/branches/branch-3.3/minitest/pom.xml
oozie/branches/branch-3.3/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java
oozie/branches/branch-3.3/pom.xml
oozie/branches/branch-3.3/release-log.txt
Propchange: oozie/branches/branch-3.3/minitest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 8 22:55:02 2013
@@ -0,0 +1 @@
+target
Modified: oozie/branches/branch-3.3/minitest/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/minitest/pom.xml?rev=1444269&r1=1444268&r2=1444269&view=diff
==============================================================================
--- oozie/branches/branch-3.3/minitest/pom.xml (original)
+++ oozie/branches/branch-3.3/minitest/pom.xml Fri Feb 8 22:55:02 2013
@@ -17,148 +17,86 @@
limitations under the License.
-->
<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.oozie.test</groupId>
- <artifactId>oozie-mini</artifactId>
- <version>3.3.2</version>
- <repositories>
- <repository>
- <id>central</id>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>Codehaus repository</id>
- <url>http://repository.codehaus.org/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>m2apache.snapshots</id>
-
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
- <properties>
- <test.exclude>_</test.exclude>
- <test.exclude.pattern>_</test.exclude.pattern>
- <oozie.data.dir>${project.build.directory}/test-data</oozie.data.dir>
- </properties>
+ <parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-main</artifactId>
+ <version>3.3.2</version>
+ </parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.oozie</groupId>
- <artifactId>oozie-core</artifactId>
- <version>3.3.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.oozie</groupId>
- <artifactId>oozie-core</artifactId>
- <version>3.3.2</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.5.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.5.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>0.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <groupId>org.apache.oozie.test</groupId>
+ <artifactId>oozie-mini</artifactId>
+ <version>3.3.2</version>
+ <description>Apache Oozie MiniOozie</description>
+ <name>Apache Oozie MiniOozie</name>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- </plugins>
- </pluginManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>0.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <plugins>
+ <build>
+ <plugins>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <!-- excluding all as the root POM does the full
check-->
- <exclude>**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>always</forkMode>
- <argLine>-Xmx1024m</argLine>
- <systemPropertiesVariables>
-
<hadoop.log.dir>/tmp</hadoop.log.dir>
-
<oozie.data.dir>${oozie.data.dir}</oozie.data.dir>
- </systemPropertiesVariables>
- <excludes>
-
<exclude>**/${test.exclude}.java</exclude>
-
<exclude>${test.exclude.pattern}</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <!-- minitest does not necessary have .java files
under src/main
+ and this causes [WARNING] JAR will be empty upon
mvn package -->
+ <phase>never</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified:
oozie/branches/branch-3.3/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java?rev=1444269&r1=1444268&r2=1444269&view=diff
==============================================================================
---
oozie/branches/branch-3.3/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java
(original)
+++
oozie/branches/branch-3.3/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java
Fri Feb 8 22:55:02 2013
@@ -68,7 +68,6 @@ public class WorkflowTest extends MiniOo
Properties conf = wc.createConfiguration();
conf.setProperty(OozieClient.APP_PATH, appPath.toString() +
File.separator + "workflow.xml");
conf.setProperty(OozieClient.USER_NAME, getTestUser());
- conf.setProperty(OozieClient.GROUP_NAME, getTestGroup());
final String jobId = wc.submit(conf);
@@ -112,7 +111,6 @@ public class WorkflowTest extends MiniOo
Properties conf = wc.createConfiguration();
conf.setProperty(OozieClient.APP_PATH, appPath.toString() +
File.separator + "workflow.xml");
conf.setProperty(OozieClient.USER_NAME, getTestUser());
- conf.setProperty(OozieClient.GROUP_NAME, getTestGroup());
conf.setProperty("nnbase", path.toString());
conf.setProperty("base", path.toUri().getPath());
Added:
oozie/branches/branch-3.3/minitest/src/test/resources/hsqldb-oozie-site.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/minitest/src/test/resources/hsqldb-oozie-site.xml?rev=1444269&view=auto
==============================================================================
--- oozie/branches/branch-3.3/minitest/src/test/resources/hsqldb-oozie-site.xml
(added)
+++ oozie/branches/branch-3.3/minitest/src/test/resources/hsqldb-oozie-site.xml
Fri Feb 8 22:55:02 2013
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+ 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.
+-->
+<configuration>
+ <property>
+ <name>oozie.service.JPAService.jdbc.driver</name>
+ <value>org.hsqldb.jdbcDriver</value>
+ </property>
+ <property>
+ <name>oozie.service.JPAService.jdbc.url</name>
+ <value>jdbc:hsqldb:mem:oozie-db;create=true</value>
+ </property>
+</configuration>
Modified: oozie/branches/branch-3.3/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/pom.xml?rev=1444269&r1=1444268&r2=1444269&view=diff
==============================================================================
--- oozie/branches/branch-3.3/pom.xml (original)
+++ oozie/branches/branch-3.3/pom.xml Fri Feb 8 22:55:02 2013
@@ -101,6 +101,7 @@
<module>docs</module>
<module>sharelib</module>
<module>tools</module>
+ <module>minitest</module>
<module>distro</module>
</modules>
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1444269&r1=1444268&r2=1444269&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Fri Feb 8 22:55:02 2013
@@ -1,5 +1,6 @@
-- Oozie 3.3.2 (unreleased)
+OOZIE-1170 Update minitest module (MiniOozie) to use main pom as its parent
(jaoki via rkanter)
OOZIE-1188 Typo in documentation for using login server example (rkanter)
OOZIE-1113 The cookies used in the AltKerberosAuthenticationHandler examples
aren't read properly if quoted (rkanter)
OOZIE-1103 Create example using AltKerberosAuthenticationHandler (rkanter)
