svn commit: r1442213 - in /oozie/branches/branch-3.3: ./ builds/ core/src/test/java/org/apache/oozie/command/coord/ core/src/test/java/org/apache/oozie/service/ core/src/test/java/org/apache/oozie/test/ core/src/test/resources/ docs/src/site/twiki/ exa...

[rkanter]

Author: rkanter
Date: Mon Feb  4 17:57:19 2013
New Revision: 1442213

URL: http://svn.apache.org/viewvc?rev=1442213&view=rev
Log:
OOZIE-1000 Remove Yahoo branding from docs, tests, etc (rkanter via virag)

Modified:
    oozie/branches/branch-3.3/builds/runHudsonCIBuild.sh
    
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionMaterializeCommand.java
    
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java
    
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
    
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/service/TestProxyUserService.java
    
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/service/TestSchemaService.java
    
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
    
oozie/branches/branch-3.3/core/src/test/resources/coord-action-start-escape-strings.xml
    oozie/branches/branch-3.3/core/src/test/resources/coord-matd-job.xml
    oozie/branches/branch-3.3/core/src/test/resources/derby-oozie-site.xml
    oozie/branches/branch-3.3/core/src/test/resources/hsqldb-oozie-site.xml
    oozie/branches/branch-3.3/core/src/test/resources/oracle-oozie-site.xml
    oozie/branches/branch-3.3/core/src/test/resources/postgres-oozie-site.xml
    
oozie/branches/branch-3.3/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki
    oozie/branches/branch-3.3/docs/src/site/twiki/ENG_Building.twiki
    oozie/branches/branch-3.3/docs/src/site/twiki/index.twiki
    oozie/branches/branch-3.3/examples/src/test/resources/derby-oozie-site.xml
    oozie/branches/branch-3.3/examples/src/test/resources/hsqldb-oozie-site.xml
    oozie/branches/branch-3.3/examples/src/test/resources/oracle-oozie-site.xml
    oozie/branches/branch-3.3/minitest/pom.xml
    oozie/branches/branch-3.3/minitest/src/test/resources/oozie-log4j.properties
    oozie/branches/branch-3.3/release-log.txt

Modified: oozie/branches/branch-3.3/builds/runHudsonCIBuild.sh
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/builds/runHudsonCIBuild.sh?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/builds/runHudsonCIBuild.sh (original)
+++ oozie/branches/branch-3.3/builds/runHudsonCIBuild.sh Mon Feb  4 17:57:19 
2013
@@ -21,7 +21,7 @@
 # invoking this script.
 # export WORKSPACE=PATH_TO_WORKSPACE
 # export TOOLS_HOME=PATH_TO_COMMON_LIBRAARY_HOME
-# export OOZIE_GIT_REPO=git://github.com/yahoo/oozie.git
+# export OOZIE_GIT_REPO=git://github.com/apache/oozie.git
 
 # You can also explicitly change JAVA_HOME or M3_HOME below.
 

Modified: 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionMaterializeCommand.java
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionMaterializeCommand.java?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionMaterializeCommand.java
 (original)
+++ 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionMaterializeCommand.java
 Mon Feb  4 17:57:19 2013
@@ -155,9 +155,9 @@ public class TestCoordActionMaterializeC
                 + " <sla:should-start>5</sla:should-start>"
                 + " <sla:should-end>120</sla:should-end>"
                 + " <sla:notification-msg>Notifying User for 
${coord:nominalTime()} nominal time </sla:notification-msg>"
-                + " <sla:alert-contact>a...@yahoo.com</sla:alert-contact>"
-                + " <sla:dev-contact>a...@yahoo.com</sla:dev-contact>"
-                + " <sla:qa-contact>a...@yahoo.com</sla:qa-contact>" + " 
<sla:se-contact>a...@yahoo.com</sla:se-contact>"
+                + " <sla:alert-contact>a...@example.com</sla:alert-contact>"
+                + " <sla:dev-contact>a...@example.com</sla:dev-contact>"
+                + " <sla:qa-contact>a...@example.com</sla:qa-contact>" + " 
<sla:se-contact>a...@example.com</sla:se-contact>"
                 + "</sla:info>";
         appXml += "</action>";
         appXml += "</coordinator-app>";
@@ -254,9 +254,9 @@ public class TestCoordActionMaterializeC
                 + " <sla:should-start>5</sla:should-start>"
                 + " <sla:should-end>120</sla:should-end>"
                 + " <sla:notification-msg>Notifying User for 
${coord:nominalTime()} nominal time </sla:notification-msg>"
-                + " <sla:alert-contact>a...@yahoo.com</sla:alert-contact>"
-                + " <sla:dev-contact>a...@yahoo.com</sla:dev-contact>"
-                + " <sla:qa-contact>a...@yahoo.com</sla:qa-contact>" + " 
<sla:se-contact>a...@yahoo.com</sla:se-contact>"
+                + " <sla:alert-contact>a...@example.com</sla:alert-contact>"
+                + " <sla:dev-contact>a...@example.com</sla:dev-contact>"
+                + " <sla:qa-contact>a...@example.com</sla:qa-contact>" + " 
<sla:se-contact>a...@example.com</sla:se-contact>"
                 + "</sla:info>";
         appXml += "</action>";
         appXml += "</coordinator-app>";

Modified: 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java
 (original)
+++ 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java
 Mon Feb  4 17:57:19 2013
@@ -225,9 +225,9 @@ public class TestCoordActionStartXComman
                 + " <sla:nominal-time>2009-03-06T10:00Z</sla:nominal-time>" + 
" <sla:should-start>5</sla:should-start>"
                 + " <sla:should-end>120</sla:should-end>"
                 + " <sla:notification-msg>Notifying User for nominal time : 
2009-03-06T10:00Z </sla:notification-msg>"
-                + " <sla:alert-contact>a...@yahoo.com</sla:alert-contact>"
-                + " <sla:dev-contact>a...@yahoo.com</sla:dev-contact>"
-                + " <sla:qa-contact>a...@yahoo.com</sla:qa-contact>" + " 
<sla:se-contact>a...@yahoo.com</sla:se-contact>"
+                + " <sla:alert-contact>a...@example.com</sla:alert-contact>"
+                + " <sla:dev-contact>a...@example.com</sla:dev-contact>"
+                + " <sla:qa-contact>a...@example.com</sla:qa-contact>" + " 
<sla:se-contact>a...@example.com</sla:se-contact>"
                 + "</sla:info>";
         actionXml += slaXml;
         actionXml += "</action>";
@@ -255,9 +255,9 @@ public class TestCoordActionStartXComman
                 + " <sla:app-name>test-app</sla:app-name>" + " 
<sla:nominal-time>2009-03-06T10:00Z</sla:nominal-time>"
                 + " <sla:should-start>5</sla:should-start>" + " 
<sla:should-end>${2 * HOURS}</sla:should-end>"
                 + " <sla:notification-msg>Notifying User for nominal time : 
2009-03-06T10:00Z </sla:notification-msg>"
-                + " <sla:alert-contact>a...@yahoo.com</sla:alert-contact>"
-                + " <sla:dev-contact>a...@yahoo.com</sla:dev-contact>"
-                + " <sla:qa-contact>a...@yahoo.com</sla:qa-contact>" + " 
<sla:se-contact>a...@yahoo.com</sla:se-contact>"
+                + " <sla:alert-contact>a...@example.com</sla:alert-contact>"
+                + " <sla:dev-contact>a...@example.com</sla:dev-contact>"
+                + " <sla:qa-contact>a...@example.com</sla:qa-contact>" + " 
<sla:se-contact>a...@example.com</sla:se-contact>"
                 + "</sla:info>";
         content += "<end name='end' />" + slaXml2 + "</workflow-app>";
         writeToFile(content, appPath);

Modified: 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
 (original)
+++ 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
 Mon Feb  4 17:57:19 2013
@@ -479,10 +479,10 @@ public class TestCoordSubmitXCommand ext
                 + " <sla:should-start>${5 * MINUTES}</sla:should-start>"
                 + " <sla:should-end>${2 * HOURS}</sla:should-end>"
                 + " <sla:notification-msg>Notifying User for 
${coord:nominalTime()} nominal time </sla:notification-msg>"
-                + " <sla:alert-contact>a...@yahoo.com</sla:alert-contact>"
-                + " <sla:dev-contact>a...@yahoo.com</sla:dev-contact>"
-                + " <sla:qa-contact>a...@yahoo.com</sla:qa-contact>"
-                + " <sla:se-contact>a...@yahoo.com</sla:se-contact>"
+                + " <sla:alert-contact>a...@example.com</sla:alert-contact>"
+                + " <sla:dev-contact>a...@example.com</sla:dev-contact>"
+                + " <sla:qa-contact>a...@example.com</sla:qa-contact>"
+                + " <sla:se-contact>a...@example.com</sla:se-contact>"
                 + " <sla:alert-frequency>LAST_HOUR</sla:alert-frequency>"
                 + " <sla:alert-percentage>10</sla:alert-percentage>" + 
"</sla:info>" + "</action> </coordinator-app>";
         writeToFile(appXml, appPath);

Modified: 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/service/TestProxyUserService.java
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/service/TestProxyUserService.java?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/service/TestProxyUserService.java
 (original)
+++ 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/service/TestProxyUserService.java
 Mon Feb  4 17:57:19 2013
@@ -222,7 +222,7 @@ public class TestProxyUserService extend
         try {
             ProxyUserService proxyUser = services.get(ProxyUserService.class);
             Assert.assertNotNull(proxyUser);
-            proxyUser.validate("foo", "www.yahoo.com", "bar");
+            proxyUser.validate("foo", "www.example.com", "bar");
             fail();
         }
         catch (AccessControlException ex) {

Modified: 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/service/TestSchemaService.java
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/service/TestSchemaService.java?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/service/TestSchemaService.java
 (original)
+++ 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/service/TestSchemaService.java
 Mon Feb  4 17:57:19 2013
@@ -54,8 +54,8 @@ public class TestSchemaService extends X
             + "<end name='end'/>"
             + "<sla:info> <sla:app-name>5</sla:app-name> 
<sla:nominal-time>2009-03-06T010:00Z</sla:nominal-time> "
             + "<sla:should-start>5</sla:should-start> 
<sla:should-end>50</sla:should-end> "
-            + "<sla:alert-contact>a...@yahoo.com</sla:alert-contact> 
<sla:dev-contact>a...@yahoo.com</sla:dev-contact>"
-            + " <sla:qa-contact>a...@yahoo.com</sla:qa-contact> 
<sla:se-contact>a...@yahoo.com</sla:se-contact>"
+            + "<sla:alert-contact>a...@example.com</sla:alert-contact> 
<sla:dev-contact>a...@example.com</sla:dev-contact>"
+            + " <sla:qa-contact>a...@example.com</sla:qa-contact> 
<sla:se-contact>a...@example.com</sla:se-contact>"
             + "</sla:info>" + "</workflow-app>";
 
     private static final String WF_SLA_APP_NW = "<workflow-app 
xmlns='uri:oozie:workflow:0.1' name='app'  xmlns:sla='uri:oozie:sla:0.1'>"
@@ -63,8 +63,8 @@ public class TestSchemaService extends X
             + "<end name='end'/>"
             + "<sla:info> <sla:app-name>5</sla:app-name> 
<sla:nominal-time>2009-03-06T010:00Z</sla:nominal-time> "
             + "<sla:should-start>5</sla:should-start> 
<sla:should-end>50</sla:should-end> "
-            + "<sla:alert-contact>a...@yahoo.com</sla:alert-contact> 
<sla:dev-contact>a...@yahoo.com</sla:dev-contact>"
-            + " <sla:qa-contact>a...@yahoo.com</sla:qa-contact> 
<sla:se-contact>a...@yahoo.com</sla:se-contact>"
+            + "<sla:alert-contact>a...@example.com</sla:alert-contact> 
<sla:dev-contact>a...@example.com</sla:dev-contact>"
+            + " <sla:qa-contact>a...@example.com</sla:qa-contact> 
<sla:se-contact>a...@example.com</sla:se-contact>"
             + "</sla:info>" + "</workflow-app>";
 
     private static final String COORD_APP1 = "<coordinator-app name=\"NAME\" 
frequency=\"${coord:days(1)}\" start=\"${start}\" end=\"${end}\" 
timezone=\"${timezone}\" xmlns=\"uri:oozie:coordinator:0.2\">"
@@ -235,8 +235,8 @@ public class TestSchemaService extends X
                 + "<controls> <timeout>10</timeout> 
<concurrency>2</concurrency> <execution>LIFO</execution> </controls> <datasets> 
<dataset name='a' frequency='${coord:days(7)}' 
initial-instance='2009-02-01T01:00Z' timezone='UTC'> 
<uri-template>file:///tmp/coord/workflows/${YEAR}/${DAY}</uri-template> 
</dataset> <dataset name='local_a' frequency='${coord:days(7)}' 
initial-instance='2009-02-01T01:00Z' timezone='UTC'> 
<uri-template>file:///tmp/coord/workflows/${YEAR}/${DAY}</uri-template> 
</dataset> </datasets> <input-events> <data-in name='A' dataset='a'> 
<instance>${coord:latest(0)}</instance> </data-in>  </input-events> 
<output-events> <data-out name='LOCAL_A' dataset='local_a'> 
<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> 
<workflow> <app-path>hdfs:///tmp/workflows/</app-path> <configuration> 
<property> <name>inputA</name> <value>${coord:dataIn('A')}</value> </property> 
<property> <name>inputB</name> <value>${coord:dataOut('LOCAL_A')}</va
 lue> </property></configuration> </workflow>  "
                 + "<sla:info> <sla:app-name>5</sla:app-name> 
<sla:nominal-time>2009-03-06T010:00Z</sla:nominal-time> "
                 + "<sla:should-start>5</sla:should-start> 
<sla:should-end>50</sla:should-end> "
-                + "<sla:alert-contact>a...@yahoo.com</sla:alert-contact> 
<sla:dev-contact>a...@yahoo.com</sla:dev-contact>"
-                + " <sla:qa-contact>a...@yahoo.com</sla:qa-contact> 
<sla:se-contact>a...@yahoo.com</sla:se-contact>"
+                + "<sla:alert-contact>a...@example.com</sla:alert-contact> 
<sla:dev-contact>a...@example.com</sla:dev-contact>"
+                + " <sla:qa-contact>a...@example.com</sla:qa-contact> 
<sla:se-contact>a...@example.com</sla:se-contact>"
                 + "</sla:info>" + "</action> </coordinator-app>";
 
         Element e = XmlUtils.parseXml(COORD_APP1);

Modified: 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/test/XDataTestCase.java?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
 (original)
+++ 
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
 Mon Feb  4 17:57:19 2013
@@ -86,9 +86,9 @@ public abstract class XDataTestCase exte
             + " <sla:nominal-time>2009-03-06T10:00Z</sla:nominal-time>" + " 
<sla:should-start>5</sla:should-start>"
             + " <sla:should-end>120</sla:should-end>"
             + " <sla:notification-msg>Notifying User for nominal time : 
2009-03-06T10:00Z </sla:notification-msg>"
-            + " <sla:alert-contact>a...@yahoo.com</sla:alert-contact>"
-            + " <sla:dev-contact>a...@yahoo.com</sla:dev-contact>"
-            + " <sla:qa-contact>a...@yahoo.com</sla:qa-contact>" + " 
<sla:se-contact>a...@yahoo.com</sla:se-contact>"
+            + " <sla:alert-contact>a...@example.com</sla:alert-contact>"
+            + " <sla:dev-contact>a...@example.com</sla:dev-contact>"
+            + " <sla:qa-contact>a...@example.com</sla:qa-contact>" + " 
<sla:se-contact>a...@example.com</sla:se-contact>"
             + "</sla:info>";
 
     protected String bundleName;

Modified: 
oozie/branches/branch-3.3/core/src/test/resources/coord-action-start-escape-strings.xml
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/resources/coord-action-start-escape-strings.xml?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- 
oozie/branches/branch-3.3/core/src/test/resources/coord-action-start-escape-strings.xml
 (original)
+++ 
oozie/branches/branch-3.3/core/src/test/resources/coord-action-start-escape-strings.xml
 Mon Feb  4 17:57:19 2013
@@ -59,7 +59,7 @@
         </property>
         <property>
                  <name>urlTemplate</name>
-                 
<value>http://yahoo.com/test?custid1=yahoo&amp;custid2=us&amp;offset=0&amp;hits=10</value>
+                 
<value>http://example.com/test?custid1=somecompany&amp;custid2=us&amp;offset=0&amp;hits=10</value>
                </property>
       </configuration>
     </workflow>

Modified: oozie/branches/branch-3.3/core/src/test/resources/coord-matd-job.xml
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/resources/coord-matd-job.xml?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/src/test/resources/coord-matd-job.xml 
(original)
+++ oozie/branches/branch-3.3/core/src/test/resources/coord-matd-job.xml Mon 
Feb  4 17:57:19 2013
@@ -36,10 +36,10 @@
                        <sla:should-end>120</sla:should-end>
                        <sla:notification-msg>Notifying User for 
${coord:nominalTime()}
                                nominal time </sla:notification-msg>
-                       <sla:alert-contact>a...@yahoo.com</sla:alert-contact>
-                       <sla:dev-contact>a...@yahoo.com</sla:dev-contact>
-                       <sla:qa-contact>a...@yahoo.com</sla:qa-contact>
-                       <sla:se-contact>a...@yahoo.com</sla:se-contact>
+                       <sla:alert-contact>a...@example.com</sla:alert-contact>
+                       <sla:dev-contact>a...@example.com</sla:dev-contact>
+                       <sla:qa-contact>a...@example.com</sla:qa-contact>
+                       <sla:se-contact>a...@example.com</sla:se-contact>
                </sla:info>
        </action>
 </coordinator-app>

Modified: oozie/branches/branch-3.3/core/src/test/resources/derby-oozie-site.xml
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/resources/derby-oozie-site.xml?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/src/test/resources/derby-oozie-site.xml 
(original)
+++ oozie/branches/branch-3.3/core/src/test/resources/derby-oozie-site.xml Mon 
Feb  4 17:57:19 2013
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
-  Copyright (c) 2010 Yahoo! Inc. All rights reserved.
-  Licensed 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
+  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
+       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. See accompanying LICENSE file.
+  limitations under the License.
 -->
 <configuration>
     <property>

Modified: 
oozie/branches/branch-3.3/core/src/test/resources/hsqldb-oozie-site.xml
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/resources/hsqldb-oozie-site.xml?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/src/test/resources/hsqldb-oozie-site.xml 
(original)
+++ oozie/branches/branch-3.3/core/src/test/resources/hsqldb-oozie-site.xml Mon 
Feb  4 17:57:19 2013
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
-  Copyright (c) 2010 Yahoo! Inc. All rights reserved.
-  Licensed 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
+  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
+       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. See accompanying LICENSE file.
+  limitations under the License.
 -->
 <configuration>
     <property>

Modified: 
oozie/branches/branch-3.3/core/src/test/resources/oracle-oozie-site.xml
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/resources/oracle-oozie-site.xml?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/src/test/resources/oracle-oozie-site.xml 
(original)
+++ oozie/branches/branch-3.3/core/src/test/resources/oracle-oozie-site.xml Mon 
Feb  4 17:57:19 2013
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
-  Copyright (c) 2010 Yahoo! Inc. All rights reserved.
-  Licensed 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
+  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
+       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. See accompanying LICENSE file.
+  limitations under the License.
 -->
 <configuration>
     <property>

Modified: 
oozie/branches/branch-3.3/core/src/test/resources/postgres-oozie-site.xml
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/resources/postgres-oozie-site.xml?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/src/test/resources/postgres-oozie-site.xml 
(original)
+++ oozie/branches/branch-3.3/core/src/test/resources/postgres-oozie-site.xml 
Mon Feb  4 17:57:19 2013
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
-  Copyright (c) 2010 Yahoo! Inc. All rights reserved.
-  Licensed 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
+  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
+       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. See accompanying LICENSE file.
+  limitations under the License.
 -->
 <configuration>
     <property>

Modified: 
oozie/branches/branch-3.3/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- 
oozie/branches/branch-3.3/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki 
(original)
+++ 
oozie/branches/branch-3.3/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki 
Mon Feb  4 17:57:19 2013
@@ -2460,10 +2460,10 @@ If you add *sla* tags to the Coordinator
             <sla:should-start>${5 * MINUTES}</sla:should-start>
             <sla:should-end>${55 * MINUTES}</sla:should-end>
             <sla:message>log processor run for: 
${coord:nominalTime()}</sla:message>
-            <sla:alert-contact>j...@yahoo-inc.com</sla:alert-contact>
-            <sla:dev-contact>a...@yahoo-inc.com</sla:dev-contact>
-            <sla:qa-contact>a...@yahoo-inc.com</sla:qa-contact>
-            <sla:se-contact>a...@yahoo-inc.com</sla:se-contact>
+            <sla:alert-contact>j...@example.com</sla:alert-contact>
+            <sla:dev-contact>a...@example.com</sla:dev-contact>
+            <sla:qa-contact>a...@example.com</sla:qa-contact>
+            <sla:se-contact>a...@example.com</sla:se-contact>
             <sla:upstream-apps>application-a,application-b</sla:upstream-apps>
             <sla:alert-percentage>99</sla:alert-percentage>
             <sla:alert-frequency>${24 * LAST_HOUR}</sla:alert-frequency>
@@ -2505,10 +2505,10 @@ If you add *sla* tags to the Coordinator
         <sla:should-start>${10 * MINUTES}</sla:should-start>
         <sla:should-end>${30 * MINUTES}</sla:should-end>
         <sla:message>abc.grouper for input ${input}</sla:message>
-        <sla:alert-contact>j...@yahoo-inc.com</sla:alert-contact>
-        <sla:dev-contact>a...@yahoo-inc.com</sla:dev-contact>
-        <sla:qa-contact>a...@yahoo-inc.com</sla:qa-contact>
-        <sla:se-contact>a...@yahoo-inc.com</sla:se-contact>
+        <sla:alert-contact>j...@example.com</sla:alert-contact>
+        <sla:dev-contact>a...@example.com</sla:dev-contact>
+        <sla:qa-contact>a...@example.com</sla:qa-contact>
+        <sla:se-contact>a...@example.com</sla:se-contact>
         <sla:upstream-apps>applicaion-a,application-b</sla:upstream-apps>
         <sla:alert-percentage>99</sla:alert-percentage>
         <sla:alert-frequency>${24 * LAST_HOUR}</sla:alert-frequency>

Modified: oozie/branches/branch-3.3/docs/src/site/twiki/ENG_Building.twiki
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/docs/src/site/twiki/ENG_Building.twiki?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/docs/src/site/twiki/ENG_Building.twiki (original)
+++ oozie/branches/branch-3.3/docs/src/site/twiki/ENG_Building.twiki Mon Feb  4 
17:57:19 2013
@@ -22,9 +22,6 @@ The Maven command (mvn) must be in the c
 
 To generate the documentation, Oozie uses a patched Doxia plugin for Maven 
with improved twiki support.
 
-This plugin is available from 
[[http://yahoo.github.com/maven/repository][Yahoo GitHub Maven repository]] and
-it is automatically downloaded by Maven when building Oozie.
-
 The source of the modified plugin is available in the Oozie GitHub repository, 
in the =ydoxia= branch.
 
 To build and install it locally run the following command in the =ydoxia= 
branch:

Modified: oozie/branches/branch-3.3/docs/src/site/twiki/index.twiki
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/docs/src/site/twiki/index.twiki?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/docs/src/site/twiki/index.twiki (original)
+++ oozie/branches/branch-3.3/docs/src/site/twiki/index.twiki Mon Feb  4 
17:57:19 2013
@@ -1,6 +1,6 @@
 <noautolink>
 
----+!! Oozie, Yahoo! Workflow Engine for Hadoop
+---+!! Oozie, Workflow Engine for Apache Hadoop
 
 Oozie v3 is a server based _Bundle Engine_ that provides a higher-level oozie 
abstraction that will batch a set of coordinator applications. The user will be 
able to start/stop/suspend/resume/rerun a set coordinator jobs in the bundle 
level resulting a better and easy operational control.
 

Modified: 
oozie/branches/branch-3.3/examples/src/test/resources/derby-oozie-site.xml
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/examples/src/test/resources/derby-oozie-site.xml?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/examples/src/test/resources/derby-oozie-site.xml 
(original)
+++ oozie/branches/branch-3.3/examples/src/test/resources/derby-oozie-site.xml 
Mon Feb  4 17:57:19 2013
@@ -1,18 +1,22 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
-  Copyright (c) 2010 Yahoo! Inc. All rights reserved.
-  Licensed 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
+  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
+       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. See accompanying LICENSE file.
+  limitations under the License.
+-->tations under the License. See accompanying LICENSE file.
 -->
 <configuration>
     <property>

Modified: 
oozie/branches/branch-3.3/examples/src/test/resources/hsqldb-oozie-site.xml
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/examples/src/test/resources/hsqldb-oozie-site.xml?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/examples/src/test/resources/hsqldb-oozie-site.xml 
(original)
+++ oozie/branches/branch-3.3/examples/src/test/resources/hsqldb-oozie-site.xml 
Mon Feb  4 17:57:19 2013
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
-  Copyright (c) 2010 Yahoo! Inc. All rights reserved.
-  Licensed 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
+  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
+       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. See accompanying LICENSE file.
+  limitations under the License.
 -->
 <configuration>
     <property>

Modified: 
oozie/branches/branch-3.3/examples/src/test/resources/oracle-oozie-site.xml
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/examples/src/test/resources/oracle-oozie-site.xml?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/examples/src/test/resources/oracle-oozie-site.xml 
(original)
+++ oozie/branches/branch-3.3/examples/src/test/resources/oracle-oozie-site.xml 
Mon Feb  4 17:57:19 2013
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
-  Copyright (c) 2010 Yahoo! Inc. All rights reserved.
-  Licensed 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
+  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
+       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. See accompanying LICENSE file.
+  limitations under the License.
 -->
 <configuration>
     <property>

Modified: oozie/branches/branch-3.3/minitest/pom.xml
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/minitest/pom.xml?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/minitest/pom.xml (original)
+++ oozie/branches/branch-3.3/minitest/pom.xml Mon Feb  4 17:57:19 2013
@@ -38,13 +38,6 @@
                        </snapshots>
                </repository>
                <repository>
-                       <id>yahoo.github</id>
-                       <url>http://yahoo.github.com/maven/repository</url>
-                       <snapshots>
-                               <enabled>true</enabled>
-                       </snapshots>
-               </repository>
-               <repository>
                        <id>m2apache.snapshots</id>
                        
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
                        <releases>

Modified: 
oozie/branches/branch-3.3/minitest/src/test/resources/oozie-log4j.properties
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/minitest/src/test/resources/oozie-log4j.properties?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- 
oozie/branches/branch-3.3/minitest/src/test/resources/oozie-log4j.properties 
(original)
+++ 
oozie/branches/branch-3.3/minitest/src/test/resources/oozie-log4j.properties 
Mon Feb  4 17:57:19 2013
@@ -32,6 +32,5 @@ log4j.logger.oozieaudit=OFF, none
 log4j.logger.openjpa=INFO, test
 log4j.logger.org.apache.openjpa=INFO, test
 log4j.logger.org.apache.hadoop=INFO, test
-log4j.logger.com.yahoo.hadoop=INFO, test
 log4j.logger.org.mortbay=INFO, test
 log4j.logger.org.hsqldb=INFO, test

Modified: oozie/branches/branch-3.3/release-log.txt
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1442213&r1=1442212&r2=1442213&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Mon Feb  4 17:57:19 2013
@@ -1,5 +1,6 @@
 -- Oozie 3.3.2 (unreleased)
 
+OOZIE-1000 Remove Yahoo branding from docs, tests, etc (rkanter via virag)
 OOZIE-999 XLogStreamer requires log4j.appender.oozie.layout.ConversionPattern 
to contain a "-" (dash) or streaming logs to web UI and CLI don't work (rkanter 
via virag)
 OOZIE-998 test-patch doesn't allow lines that are exactly 132 characters 
(rkanter via tucu)
 OOZIE-739 a coord action fails because the uri points to a namenode that is 
not in whitelist. the E0901 error shows in the oozie.log, but not written to 
the database (mona,mbattisha via virag)