Modified: oozie/branches/hcat-intre/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki?rev=1446792&r1=1446791&r2=1446792&view=diff ============================================================================== --- oozie/branches/hcat-intre/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki (original) +++ oozie/branches/hcat-intre/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki Fri Feb 15 22:26:25 2013 @@ -2462,7 +2462,7 @@ C = foreach B generate foo, bar; store C into 'myOutputDatabase.myOutputTable' using org.apache.hcatalog.pig.HCatStorer('datestamp=20090102,region=EUR'); </blockquote> ----++++ 6.8.4 coord:dataInPartitionMin(String name, String partition) EL function +---++++ 6.8.5 coord:dataInPartitionMin(String name, String partition) EL function The =${coord:dataInPartitionMin(String name, String partition)}= EL function resolves to the *minimum* value of the specified partition for all the dataset instances specified in an input event dataset section. It can be used to do @@ -2472,7 +2472,7 @@ with [[CoordinatorFunctionalSpec#DataInP Refer to the [[CoordinatorFunctionalSpec#HCatPigExampleTwo][Example]] below for usage. #DataInPartitionMax ----++++ 6.8.5 coord:dataInPartitionMax(String name, String partition) EL function +---++++ 6.8.6 coord:dataInPartitionMax(String name, String partition) EL function The =${coord:dataInPartitionMax(String name, String partition)}= EL function resolves to the *maximum* value of the specified partition for all the dataset instances specified in an input event dataset section. It is a better practice @@ -2504,13 +2504,13 @@ partition max/min values, output partiti <dataset name="Click-data" frequency="${coord:hours(1)}" initial-instance="2009-01-01T01:00Z" timezone="UTC"> <uri-template> - hcat://foo:11002/myInputDatabase/myInputTable/datestamp=${YEAR}${MONTH}${DAY}${HOUR};region=${region} + hcat://foo:11002/myInputDatabase/myInputTable/datestamp=${YEAR}${MONTH}${DAY}${HOUR};region=USA </uri-template> </dataset> <dataset name="Stats" frequency="${coord:days(1)}" initial-instance="2009-01-01T01:00Z" timezone="UTC"> <uri-template> - hcat://foo:11002/myOutputDatabase/myOutputTable/datestamp=${YEAR}${MONTH}${DAY};region=${region} + hcat://foo:11002/myOutputDatabase/myOutputTable/datestamp=${YEAR}${MONTH}${DAY};region=USA </uri-template> </dataset> </datasets>
Modified: oozie/branches/hcat-intre/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java?rev=1446792&r1=1446791&r2=1446792&view=diff ============================================================================== --- oozie/branches/hcat-intre/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java (original) +++ oozie/branches/hcat-intre/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java Fri Feb 15 22:26:25 2013 @@ -41,6 +41,7 @@ public class WorkflowTest extends MiniOo @Override protected void setUp() throws Exception { + System.setProperty("oozie.test.metastore.server", "false"); System.setProperty(XLogService.LOG4J_FILE, "oozie-log4j.properties"); super.setUp(); } Modified: oozie/branches/hcat-intre/pom.xml URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/pom.xml?rev=1446792&r1=1446791&r2=1446792&view=diff ============================================================================== --- oozie/branches/hcat-intre/pom.xml (original) +++ oozie/branches/hcat-intre/pom.xml Fri Feb 15 22:26:25 2013 @@ -270,7 +270,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.5.8</version> + <version>1.6.6</version> </dependency> <!-- core --> @@ -460,12 +460,12 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.5.8</version> + <version>1.6.6</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> + <version>1.6.6</version> </dependency> <dependency> @@ -476,8 +476,20 @@ <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>activemq-all</artifactId> - <version>5.7.0</version> + <artifactId>activemq-client</artifactId> + <version>5.8.0</version> + </dependency> + + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> + <version>5.8.0</version> + </dependency> + + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-kahadb-store</artifactId> + <version>5.8.0</version> </dependency> <dependency> @@ -655,12 +667,6 @@ <version>1.8.5</version> </dependency> - <dependency> - <groupId>com.googlecode.concurrentlinkedhashmap</groupId> - <artifactId>concurrentlinkedhashmap-lru</artifactId> - <version>1.3.1</version> - </dependency> - <!-- examples --> <dependency> <groupId>commons-httpclient</groupId> Modified: oozie/branches/hcat-intre/release-log.txt URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/release-log.txt?rev=1446792&r1=1446791&r2=1446792&view=diff ============================================================================== --- oozie/branches/hcat-intre/release-log.txt (original) +++ oozie/branches/hcat-intre/release-log.txt Fri Feb 15 22:26:25 2013 @@ -1,5 +1,6 @@ -- Oozie 3.4.0 release (trunk - unreleased) +OOZIE-1217 Address review comments in OOZIE-1210 (rohini via virag) OOZIE-1189 add filter option to specify JobID and AppName in SLA CLI command (egashira via mona) OOZIE-1197 Create a hcat sharelib which can be included in pig, hive and java actions (mona,rohini via virag) OOZIE-1211 oozie does not support duplicated dataset (jaoki via virag)
