falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samar...@apache.org
Subject [4/6] git commit: FALCON 564 contributed by Raghav Gautam
Date Thu, 07 Aug 2014 05:29:20 GMT
FALCON 564 contributed by Raghav Gautam


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/9094742b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/9094742b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/9094742b

Branch: refs/heads/master
Commit: 9094742b374370b41b440bb7d22de4dcaee19d5b
Parents: 74e858b
Author: Samarth Gupta <samarth.gupta@inmobi.com>
Authored: Thu Aug 7 10:53:04 2014 +0530
Committer: Samarth Gupta <samarth.gupta@inmobi.com>
Committed: Thu Aug 7 10:53:04 2014 +0530

----------------------------------------------------------------------
 falcon-regression/merlin-core/pom.xml           |  10 +-
 .../apache/falcon/entity/v0/DateValidator.java  |  77 ---
 .../org/apache/falcon/entity/v0/Entity.java     |  94 ----
 .../org/apache/falcon/entity/v0/EntityType.java |  98 ----
 .../org/apache/falcon/entity/v0/Frequency.java  | 113 -----
 .../apache/falcon/entity/v0/SchemaHelper.java   |  71 ---
 .../falcon/entity/v0/cluster/Cluster.java       | 246 ---------
 .../falcon/entity/v0/cluster/Interface.java     | 129 -----
 .../falcon/entity/v0/cluster/Interfaces.java    |  80 ---
 .../falcon/entity/v0/cluster/Interfacetype.java |  70 ---
 .../falcon/entity/v0/cluster/Location.java      | 103 ----
 .../falcon/entity/v0/cluster/Locations.java     |  79 ---
 .../falcon/entity/v0/cluster/ObjectFactory.java |  95 ----
 .../falcon/entity/v0/cluster/Properties.java    |  80 ---
 .../falcon/entity/v0/cluster/Property.java      | 100 ----
 .../falcon/entity/v0/cluster/package-info.java  |   9 -
 .../org/apache/falcon/entity/v0/feed/ACL.java   | 123 -----
 .../falcon/entity/v0/feed/ActionType.java       |  64 ---
 .../apache/falcon/entity/v0/feed/Adapter1.java  |  27 -
 .../apache/falcon/entity/v0/feed/Adapter2.java  |  27 -
 .../apache/falcon/entity/v0/feed/Adapter3.java  |  27 -
 .../falcon/entity/v0/feed/CatalogTable.java     |  71 ---
 .../apache/falcon/entity/v0/feed/Cluster.java   | 285 -----------
 .../falcon/entity/v0/feed/ClusterType.java      |  58 ---
 .../apache/falcon/entity/v0/feed/Clusters.java  |  80 ---
 .../org/apache/falcon/entity/v0/feed/Feed.java  | 493 -------------------
 .../falcon/entity/v0/feed/LateArrival.java      |  80 ---
 .../apache/falcon/entity/v0/feed/Location.java  | 101 ----
 .../falcon/entity/v0/feed/LocationType.java     |  64 ---
 .../apache/falcon/entity/v0/feed/Locations.java |  80 ---
 .../falcon/entity/v0/feed/ObjectFactory.java    | 159 ------
 .../apache/falcon/entity/v0/feed/Partition.java |  65 ---
 .../falcon/entity/v0/feed/Partitions.java       |  81 ---
 .../falcon/entity/v0/feed/Properties.java       |  80 ---
 .../apache/falcon/entity/v0/feed/Property.java  |  97 ----
 .../apache/falcon/entity/v0/feed/Retention.java | 126 -----
 .../falcon/entity/v0/feed/RetentionType.java    |  55 ---
 .../apache/falcon/entity/v0/feed/Schema.java    |  96 ----
 .../apache/falcon/entity/v0/feed/Validity.java  | 106 ----
 .../falcon/entity/v0/feed/package-info.java     |   9 -
 .../falcon/entity/v0/process/Adapter1.java      |  27 -
 .../falcon/entity/v0/process/Adapter2.java      |  27 -
 .../falcon/entity/v0/process/Adapter3.java      |  27 -
 .../falcon/entity/v0/process/Cluster.java       | 102 ----
 .../falcon/entity/v0/process/Clusters.java      |  80 ---
 .../falcon/entity/v0/process/EngineType.java    |  61 ---
 .../falcon/entity/v0/process/ExecutionType.java |  47 --
 .../apache/falcon/entity/v0/process/Input.java  | 204 --------
 .../apache/falcon/entity/v0/process/Inputs.java |  76 ---
 .../falcon/entity/v0/process/LateInput.java     |  92 ----
 .../falcon/entity/v0/process/LateProcess.java   | 134 -----
 .../falcon/entity/v0/process/ObjectFactory.java | 151 ------
 .../apache/falcon/entity/v0/process/Output.java | 119 -----
 .../falcon/entity/v0/process/Outputs.java       |  76 ---
 .../falcon/entity/v0/process/PolicyType.java    |  61 ---
 .../falcon/entity/v0/process/Process.java       | 442 -----------------
 .../falcon/entity/v0/process/Properties.java    |  76 ---
 .../falcon/entity/v0/process/Property.java      |  92 ----
 .../apache/falcon/entity/v0/process/Retry.java  | 120 -----
 .../falcon/entity/v0/process/Validity.java      | 100 ----
 .../falcon/entity/v0/process/Workflow.java      | 181 -------
 .../falcon/entity/v0/process/package-info.java  |   9 -
 .../regression/Entities/ClusterMerlin.java      |   3 +-
 .../falcon/regression/Entities/FeedMerlin.java  |   2 +-
 .../regression/Entities/ProcessMerlin.java      |   2 +-
 .../regression/Entities/TestEntityUtil.java     |  38 ++
 .../falcon/regression/core/bundle/Bundle.java   | 118 ++---
 .../regression/core/util/InstanceUtil.java      |  24 +-
 .../falcon/regression/core/util/Util.java       |  36 +-
 falcon-regression/merlin/pom.xml                |   2 +-
 .../falcon/regression/FeedReplicationTest.java  |   3 +-
 falcon-regression/pom.xml                       | 259 +---------
 72 files changed, 148 insertions(+), 6551 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/pom.xml b/falcon-regression/merlin-core/pom.xml
index 9cac189..5caaab9 100644
--- a/falcon-regression/merlin-core/pom.xml
+++ b/falcon-regression/merlin-core/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.falcon.regression</groupId>
         <artifactId>falcon-regression</artifactId>
-        <version>0.5.1-incubating-SNAPSHOT</version>
+        <version>0.6-incubating-SNAPSHOT</version>
     </parent>
     <artifactId>falcon-merlin-core</artifactId>
     <description>merlin-core - utilities for Apache Falcon regression suite</description>
@@ -180,9 +180,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <groupId>javax.jms</groupId>
+            <artifactId>jms</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.falcon</groupId>
+            <artifactId>falcon-client</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/DateValidator.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/DateValidator.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/DateValidator.java
deleted file mode 100644
index e9cdd87..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/DateValidator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * 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.
- */
-package org.apache.falcon.entity.v0;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Date utility class.
- */
-public final class DateValidator {
-
-    private static final String DATE_PATTERN =
-            "(2\\d\\d\\d|19\\d\\d)-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])T([0-1][0-9]|2[0-3]):([0-5][0-9])Z";
-    private static final Pattern PATTERN = Pattern.compile(DATE_PATTERN);
-
-    private DateValidator() {
-    }
-
-    /**
-     * Validate date format with regular expression.
-     *
-     * @param date date address for validation
-     * @return true valid date fromat, false invalid date format
-     */
-    public static boolean validate(final String date) {
-
-        Matcher matcher = PATTERN.matcher(date);
-
-        if (matcher.matches()) {
-
-            matcher.reset();
-
-            if (matcher.find()) {
-
-                int year = Integer.parseInt(matcher.group(1));
-                String month = matcher.group(2);
-                String day = matcher.group(3);
-
-                if (day.equals("31")
-                        && (month.equals("4") || month.equals("6")
-                        || month.equals("9") || month.equals("11")
-                        || month.equals("04") || month.equals("06") || month.equals("09"))) {
-                    return false; // only 1,3,5,7,8,10,12 has 31 days
-                } else if (month.equals("2") || month.equals("02")) {
-                    // leap year
-                    if (year % 4 == 0) {
-                        return !(day.equals("30") || day.equals("31"));
-                    } else {
-                        return !(day.equals("29") || day.equals("30") || day.equals("31"));
-                    }
-                } else {
-                    return true;
-                }
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/Entity.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/Entity.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/Entity.java
deleted file mode 100644
index 252e860..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/Entity.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.falcon.entity.v0;
-
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-/**
- * Base class that all entity jaxb object will extend.
- */
-public abstract class Entity {
-    public abstract String getName();
-
-    public EntityType getEntityType() {
-        for (EntityType type : EntityType.values()) {
-            if (type.getEntityClass().equals(getClass())) {
-                return type;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || !o.getClass().equals(this.getClass())) {
-            return false;
-        }
-
-        Entity entity = (Entity) o;
-
-        String name = getName();
-        return !(name != null ? !name.equals(entity.getName()) : entity.getName() != null);
-    }
-
-    @Override
-    public int hashCode() {
-        String clazz = this.getClass().getName();
-
-        String name = getName();
-        int result = name != null ? name.hashCode() : 0;
-        result = 31 * result + clazz.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        try {
-            StringWriter stringWriter = new StringWriter();
-            Marshaller marshaller = getEntityType().getMarshaller();
-            marshaller.marshal(this, stringWriter);
-            return stringWriter.toString();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static Entity fromString(EntityType type, String str) {
-        try {
-            Unmarshaller unmarshaler = type.getUnmarshaller();
-            return (Entity) unmarshaler.unmarshal(new StringReader(str));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public String toShortString() {
-        return "(" + getEntityType().name().toLowerCase() + ") " + getName();
-    }
-
-    public Entity copy() {
-        return fromString(getEntityType(), toString());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/EntityType.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/EntityType.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/EntityType.java
deleted file mode 100644
index e93fb49..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/EntityType.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.falcon.entity.v0;
-
-import org.apache.falcon.entity.v0.cluster.Cluster;
-import org.apache.falcon.entity.v0.feed.Feed;
-import org.apache.falcon.entity.v0.process.Process;
-
-import javax.xml.bind.*;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-
-/**
- * Enum for types of entities in Falcon Process, Feed and Cluster.
- */
-public enum EntityType {
-    FEED(Feed.class, "/feed-0.1.xsd", "name"),
-    PROCESS(Process.class, "/process-0.1.xsd", "name"),
-    CLUSTER(Cluster.class, "/cluster-0.1.xsd", "name");
-
-    //Fail unmarshalling of whole xml if unmarshalling of any element fails
-    private static class EventHandler implements ValidationEventHandler {
-        @Override
-        public boolean handleEvent(ValidationEvent event) {
-            return false;
-        }
-    }
-
-    private static final String NS = "http://www.w3.org/2001/XMLSchema";
-
-    private final Class<? extends Entity> clazz;
-    private JAXBContext jaxbContext;
-    private Schema schema;
-    private String[] immutableProperties;
-
-    private String schemaFile;
-
-    private EntityType(Class<? extends Entity> typeClass, String schemaFile, String... immutableProperties) {
-        clazz = typeClass;
-        this.immutableProperties = immutableProperties;
-        this.schemaFile = schemaFile;
-        try {
-            jaxbContext = JAXBContext.newInstance(typeClass);
-            synchronized (this) {
-                SchemaFactory schemaFactory = SchemaFactory.newInstance(NS);
-                schema = schemaFactory.newSchema(getClass().getResource(schemaFile));
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public Class<? extends Entity> getEntityClass() {
-        return clazz;
-    }
-
-    public String getSchemaFile() {
-        return schemaFile;
-    }
-
-    public Marshaller getMarshaller() throws JAXBException {
-        Marshaller marshaller = jaxbContext.createMarshaller();
-        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-        return marshaller;
-    }
-
-    public Unmarshaller getUnmarshaller() throws JAXBException {
-        Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-        //unmarshaller.setSchema(schema);
-        unmarshaller.setEventHandler(new EventHandler());
-        return unmarshaller;
-    }
-
-    public boolean isSchedulable() {
-        return this != EntityType.CLUSTER;
-    }
-
-    @edu.umd.cs.findbugs.annotations.SuppressWarnings({"EI_EXPOSE_REP"})
-    public String[] getImmutableProperties() {
-        return immutableProperties;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/Frequency.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/Frequency.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/Frequency.java
deleted file mode 100644
index a9e4b90..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/Frequency.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.falcon.entity.v0;
-
-import java.util.Calendar;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Frequency as supported in the xsd definitions.
- */
-public class Frequency {
-    private static final Pattern PATTERN = Pattern.compile("(minutes|hours|days|months)\\((\\d+)\\)");
-
-    /**
-     * TimeUnit corresponding to the frequency.
-     */
-    public static enum TimeUnit {
-        minutes(Calendar.MINUTE), hours(Calendar.HOUR), days(Calendar.DATE), months(Calendar.MONTH);
-
-        private int calendarUnit;
-
-        private TimeUnit(int calendarUnit) {
-            this.calendarUnit = calendarUnit;
-        }
-
-        public int getCalendarUnit() {
-            return calendarUnit;
-        }
-    }
-
-    private TimeUnit timeUnit;
-    private String frequency;
-
-    public Frequency(String freq, TimeUnit timeUnit) {
-        this.frequency = freq;
-        this.timeUnit = timeUnit;
-    }
-
-    public Frequency(String strValue) {
-        Matcher matcher = PATTERN.matcher(strValue);
-        if (!matcher.matches()) {
-            throw new IllegalArgumentException("Invalid frequency: " + strValue);
-        }
-
-        timeUnit = TimeUnit.valueOf(matcher.group(1));
-        frequency = matcher.group(2);
-    }
-
-    public static Frequency fromString(String strValue) {
-        return new Frequency(strValue);
-    }
-
-    public static String toString(Frequency freq) {
-        return freq==null? null:freq.toString();
-    }
-
-    @Override
-    public String toString() {
-        return timeUnit.name() + "(" + frequency + ")";
-    }
-
-    public TimeUnit getTimeUnit() {
-        return timeUnit;
-    }
-
-    public String getFrequency() {
-        return frequency;
-    }
-
-    public int getFrequencyAsInt() {
-        return Integer.valueOf(frequency);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-
-        if (!(obj instanceof Frequency)) {
-            return false;
-        }
-
-        Frequency freq = (Frequency) obj;
-        return this == freq || this.getFrequency().equals(freq.getFrequency())
-                && this.getTimeUnit() == freq.getTimeUnit();
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = timeUnit.hashCode();
-        result = 31 * result + frequency.hashCode();
-        return result;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/SchemaHelper.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/SchemaHelper.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/SchemaHelper.java
deleted file mode 100644
index 62b810c..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/SchemaHelper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.falcon.entity.v0;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-
-/**
- * Support function to parse and format date in xsd string.
- */
-public final class SchemaHelper {
-
-    public static final String ISO8601_FORMAT = "yyyy-MM-dd'T'HH:mm'Z'";
-
-    private SchemaHelper() {}
-
-    public static String getTimeZoneId(TimeZone tz) {
-        return tz.getID();
-    }
-
-    public static DateFormat getDateFormat() {
-        DateFormat dateFormat = new SimpleDateFormat(ISO8601_FORMAT);
-        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-        return dateFormat;
-    }
-
-    public static String formatDateUTC(Date date) {
-        return (date != null) ? getDateFormat().format(date) : null;
-    }
-
-    public static Date parseDateUTC(String dateStr) {
-        if (!DateValidator.validate(dateStr)) {
-            throw new IllegalArgumentException(dateStr + " is not a valid UTC string");
-        }
-        try {
-            return getDateFormat().parse(dateStr);
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static String formatDateUTCToISO8601(final String dateString, final String dateStringFormat) {
-
-        try {
-            DateFormat dateFormat = new SimpleDateFormat(dateStringFormat.substring(0, dateString.length()));
-            dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-            return SchemaHelper.formatDateUTC(dateFormat.parse(dateString));
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Cluster.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Cluster.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Cluster.java
deleted file mode 100644
index 0a097dc..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Cluster.java
+++ /dev/null
@@ -1,246 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.cluster;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.apache.falcon.entity.v0.Entity;
-
-
-/**
- * The cluster contains the definition of different
- *                 interfaces which are used by Falcon like readonly, write, workflow and messaging.
- *                 A cluster is referenced by feeds and processes which are on-boarded
- *                 to Falcon by its name.
- *                 name: the name of cluster, which must be unique.
- *                 colo: the name of the colo to which this cluster belongs to.
- *             
- * 
- * <p>Java class for cluster complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="cluster">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="tags" type="{uri:falcon:cluster:0.1}KEY_VALUE_PAIR" minOccurs="0"/>
- *         &lt;element name="interfaces" type="{uri:falcon:cluster:0.1}interfaces"/>
- *         &lt;element name="locations" type="{uri:falcon:cluster:0.1}locations"/>
- *         &lt;element name="properties" type="{uri:falcon:cluster:0.1}properties" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="name" use="required" type="{uri:falcon:cluster:0.1}IDENTIFIER" />
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="colo" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cluster", propOrder = {
-    "tags",
-    "interfaces",
-    "locations",
-    "properties"
-})
-@XmlRootElement(name = "cluster")
-public class Cluster
-    extends Entity
-{
-
-    protected String tags;
-    @XmlElement(required = true)
-    protected Interfaces interfaces;
-    @XmlElement(required = true)
-    protected Locations locations;
-    protected Properties properties;
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-    @XmlAttribute(name = "description")
-    protected String description;
-    @XmlAttribute(name = "colo", required = true)
-    protected String colo;
-
-    /**
-     * Gets the value of the tags property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTags() {
-        return tags;
-    }
-
-    /**
-     * Sets the value of the tags property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTags(String value) {
-        this.tags = value;
-    }
-
-    /**
-     * Gets the value of the interfaces property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Interfaces }
-     *     
-     */
-    public Interfaces getInterfaces() {
-        return interfaces;
-    }
-
-    /**
-     * Sets the value of the interfaces property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Interfaces }
-     *     
-     */
-    public void setInterfaces(Interfaces value) {
-        this.interfaces = value;
-    }
-
-    /**
-     * Gets the value of the locations property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Locations }
-     *     
-     */
-    public Locations getLocations() {
-        return locations;
-    }
-
-    /**
-     * Sets the value of the locations property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Locations }
-     *     
-     */
-    public void setLocations(Locations value) {
-        this.locations = value;
-    }
-
-    /**
-     * Gets the value of the properties property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Properties }
-     *     
-     */
-    public Properties getProperties() {
-        return properties;
-    }
-
-    /**
-     * Sets the value of the properties property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Properties }
-     *     
-     */
-    public void setProperties(Properties value) {
-        this.properties = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the colo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getColo() {
-        return colo;
-    }
-
-    /**
-     * Sets the value of the colo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setColo(String value) {
-        this.colo = value;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Interface.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Interface.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Interface.java
deleted file mode 100644
index 1b6be3e..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Interface.java
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.cluster;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
- *                 An interface specifies the interface type, Falcon uses it to schedule
- *                 entities in workflow engine, to save and read data from hadoop and to
- *                 publish messages to messaging engine.
- *                 endpoint: is the url for each interface; examples: for write it is the
- *                 url of hdfs (fs.default.name) and
- *                 for workflow it is url of workflow engine like oozie.
- *                 version: The current runtime version of each interface.
- *             
- * 
- * <p>Java class for interface complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="interface">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="type" use="required" type="{uri:falcon:cluster:0.1}interfacetype" />
- *       &lt;attribute name="endpoint" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "interface")
-public class Interface {
-
-    @XmlAttribute(name = "type", required = true)
-    protected Interfacetype type;
-    @XmlAttribute(name = "endpoint", required = true)
-    protected String endpoint;
-    @XmlAttribute(name = "version", required = true)
-    protected String version;
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Interfacetype }
-     *     
-     */
-    public Interfacetype getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Interfacetype }
-     *     
-     */
-    public void setType(Interfacetype value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the endpoint property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEndpoint() {
-        return endpoint;
-    }
-
-    /**
-     * Sets the value of the endpoint property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEndpoint(String value) {
-        this.endpoint = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Interfaces.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Interfaces.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Interfaces.java
deleted file mode 100644
index 2cf0ea6..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Interfaces.java
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.cluster;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
- *                 A list of interfaces.
- *             
- * 
- * <p>Java class for interfaces complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="interfaces">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="interface" type="{uri:falcon:cluster:0.1}interface" maxOccurs="unbounded" minOccurs="3"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "interfaces", propOrder = {
-    "interfaces"
-})
-public class Interfaces {
-
-    @XmlElement(name = "interface", required = true)
-    protected List<Interface> interfaces;
-
-    /**
-     * Gets the value of the interfaces property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the interfaces property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getInterfaces().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Interface }
-     * 
-     * 
-     */
-    public List<Interface> getInterfaces() {
-        if (interfaces == null) {
-            interfaces = new ArrayList<Interface>();
-        }
-        return this.interfaces;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Interfacetype.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Interfacetype.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Interfacetype.java
deleted file mode 100644
index f05ed07..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Interfacetype.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.cluster;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for interfacetype.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="interfacetype">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="readonly"/>
- *     &lt;enumeration value="write"/>
- *     &lt;enumeration value="execute"/>
- *     &lt;enumeration value="workflow"/>
- *     &lt;enumeration value="messaging"/>
- *     &lt;enumeration value="registry"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "interfacetype")
-@XmlEnum
-public enum Interfacetype {
-
-    @XmlEnumValue("readonly")
-    READONLY("readonly"),
-    @XmlEnumValue("write")
-    WRITE("write"),
-    @XmlEnumValue("execute")
-    EXECUTE("execute"),
-    @XmlEnumValue("workflow")
-    WORKFLOW("workflow"),
-    @XmlEnumValue("messaging")
-    MESSAGING("messaging"),
-    @XmlEnumValue("registry")
-    REGISTRY("registry");
-    private final String value;
-
-    Interfacetype(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static Interfacetype fromValue(String v) {
-        for (Interfacetype c: Interfacetype.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Location.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Location.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Location.java
deleted file mode 100644
index bc07315..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Location.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.cluster;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
- *                 Location has the name and the path.
- *                 name: is the type of locations like
- *                 staging, temp and working.
- *                 path: the hdfs path for each location.
- *                 Falcon would use the location to do intermediate
- *                 processing of entities in hdfs and hence Falcon
- *                 should have read/write/execute permission on these
- *                 locations.
- *             
- * 
- * <p>Java class for location complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="location">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="name" use="required" type="{uri:falcon:cluster:0.1}IDENTIFIER" />
- *       &lt;attribute name="path" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "location")
-public class Location {
-
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-    @XmlAttribute(name = "path", required = true)
-    protected String path;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the path property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPath() {
-        return path;
-    }
-
-    /**
-     * Sets the value of the path property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPath(String value) {
-        this.path = value;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Locations.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Locations.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Locations.java
deleted file mode 100644
index 0988dc3..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Locations.java
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.cluster;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * A list of locations on cluster.
- *             
- * 
- * <p>Java class for locations complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="locations">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="location" type="{uri:falcon:cluster:0.1}location" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "locations", propOrder = {
-    "locations"
-})
-public class Locations {
-
-    @XmlElement(name = "location", required = true)
-    protected List<Location> locations;
-
-    /**
-     * Gets the value of the locations property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the locations property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getLocations().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Location }
-     * 
-     * 
-     */
-    public List<Location> getLocations() {
-        if (locations == null) {
-            locations = new ArrayList<Location>();
-        }
-        return this.locations;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/ObjectFactory.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/ObjectFactory.java
deleted file mode 100644
index 8222988..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/ObjectFactory.java
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.cluster;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the org.apache.falcon.entity.v0.cluster package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.falcon.entity.v0.cluster
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link Cluster }
-     * 
-     */
-    public Cluster createCluster() {
-        return new Cluster();
-    }
-
-    /**
-     * Create an instance of {@link Interfaces }
-     * 
-     */
-    public Interfaces createInterfaces() {
-        return new Interfaces();
-    }
-
-    /**
-     * Create an instance of {@link Locations }
-     * 
-     */
-    public Locations createLocations() {
-        return new Locations();
-    }
-
-    /**
-     * Create an instance of {@link Properties }
-     * 
-     */
-    public Properties createProperties() {
-        return new Properties();
-    }
-
-    /**
-     * Create an instance of {@link Location }
-     * 
-     */
-    public Location createLocation() {
-        return new Location();
-    }
-
-    /**
-     * Create an instance of {@link Property }
-     * 
-     */
-    public Property createProperty() {
-        return new Property();
-    }
-
-    /**
-     * Create an instance of {@link Interface }
-     * 
-     */
-    public Interface createInterface() {
-        return new Interface();
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Properties.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Properties.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Properties.java
deleted file mode 100644
index 66cc5cf..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Properties.java
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.cluster;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
- *                 A list of property elements.
- *             
- * 
- * <p>Java class for properties complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="properties">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="property" type="{uri:falcon:cluster:0.1}property" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "properties", propOrder = {
-    "properties"
-})
-public class Properties {
-
-    @XmlElement(name = "property")
-    protected List<Property> properties;
-
-    /**
-     * Gets the value of the properties property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the properties property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getProperties().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Property }
-     * 
-     * 
-     */
-    public List<Property> getProperties() {
-        if (properties == null) {
-            properties = new ArrayList<Property>();
-        }
-        return this.properties;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Property.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Property.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Property.java
deleted file mode 100644
index fd35145..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/Property.java
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.cluster;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
- *                 A key-value pair, which are propagated to the
- *                 workflow engine.
- *                 Ideally the Mapred's job queue name (queueName) and
- *                 JMS impl class nameof messaging engine (brokerImplClass)
- *                 should be defined here.
- *             
- * 
- * <p>Java class for property complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="property">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "property")
-public class Property {
-
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-    @XmlAttribute(name = "value", required = true)
-    protected String value;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/package-info.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/package-info.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/package-info.java
deleted file mode 100644
index dc21e24..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/cluster/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "uri:falcon:cluster:0.1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.falcon.entity.v0.cluster;

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/ACL.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/ACL.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/ACL.java
deleted file mode 100644
index ebaf70a..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/ACL.java
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.feed;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
- *                 Access control list for this feed.
- *             
- * 
- * <p>Java class for ACL complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ACL">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="owner" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="group" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="permission" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ACL")
-public class ACL {
-
-    @XmlAttribute(name = "owner")
-    protected String owner;
-    @XmlAttribute(name = "group")
-    protected String group;
-    @XmlAttribute(name = "permission")
-    protected String permission;
-
-    /**
-     * Gets the value of the owner property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOwner() {
-        return owner;
-    }
-
-    /**
-     * Sets the value of the owner property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOwner(String value) {
-        this.owner = value;
-    }
-
-    /**
-     * Gets the value of the group property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGroup() {
-        return group;
-    }
-
-    /**
-     * Sets the value of the group property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGroup(String value) {
-        this.group = value;
-    }
-
-    /**
-     * Gets the value of the permission property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPermission() {
-        return permission;
-    }
-
-    /**
-     * Sets the value of the permission property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPermission(String value) {
-        this.permission = value;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/ActionType.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/ActionType.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/ActionType.java
deleted file mode 100644
index 57380e7..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/ActionType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.feed;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for action-type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="action-type">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="archive"/>
- *     &lt;enumeration value="delete"/>
- *     &lt;enumeration value="chown"/>
- *     &lt;enumeration value="chmod"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "action-type")
-@XmlEnum
-public enum ActionType {
-
-    @XmlEnumValue("archive")
-    ARCHIVE("archive"),
-    @XmlEnumValue("delete")
-    DELETE("delete"),
-    @XmlEnumValue("chown")
-    CHOWN("chown"),
-    @XmlEnumValue("chmod")
-    CHMOD("chmod");
-    private final String value;
-
-    ActionType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static ActionType fromValue(String v) {
-        for (ActionType c: ActionType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Adapter1.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Adapter1.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Adapter1.java
deleted file mode 100644
index c11541b..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Adapter1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.feed;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import org.apache.falcon.entity.v0.Frequency;
-
-public class Adapter1
-    extends XmlAdapter<String, Frequency>
-{
-
-
-    public Frequency unmarshal(String value) {
-        return (org.apache.falcon.entity.v0.Frequency.fromString(value));
-    }
-
-    public String marshal(Frequency value) {
-        return (org.apache.falcon.entity.v0.Frequency.toString(value));
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Adapter2.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Adapter2.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Adapter2.java
deleted file mode 100644
index 98fe47d..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Adapter2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.feed;
-
-import java.util.TimeZone;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-public class Adapter2
-    extends XmlAdapter<String, TimeZone>
-{
-
-
-    public TimeZone unmarshal(String value) {
-        return (java.util.TimeZone.getTimeZone(value));
-    }
-
-    public String marshal(TimeZone value) {
-        return (org.apache.falcon.entity.v0.SchemaHelper.getTimeZoneId(value));
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Adapter3.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Adapter3.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Adapter3.java
deleted file mode 100644
index 81c3c1e..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Adapter3.java
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.feed;
-
-import java.util.Date;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-public class Adapter3
-    extends XmlAdapter<String, Date>
-{
-
-
-    public Date unmarshal(String value) {
-        return (org.apache.falcon.entity.v0.SchemaHelper.parseDateUTC(value));
-    }
-
-    public String marshal(Date value) {
-        return (org.apache.falcon.entity.v0.SchemaHelper.formatDateUTC(value));
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/CatalogTable.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/CatalogTable.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/CatalogTable.java
deleted file mode 100644
index c942f8a..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/CatalogTable.java
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.feed;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
- *                 catalog specifies the uri of a Hive table along with the partition spec.
- *                 uri="catalog:$database:$table#(partition-key=partition-value);+"
- *                 Example: catalog:logs-db:clicks#ds=${YEAR}-${MONTH}-${DAY}
- *             
- * 
- * <p>Java class for catalog-table complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="catalog-table">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="uri" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "catalog-table")
-public class CatalogTable {
-
-    @XmlAttribute(name = "uri", required = true)
-    protected String uri;
-
-    /**
-     * Gets the value of the uri property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUri() {
-        return uri;
-    }
-
-    /**
-     * Sets the value of the uri property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUri(String value) {
-        this.uri = value;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Cluster.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Cluster.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Cluster.java
deleted file mode 100644
index 0c295cb..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Cluster.java
+++ /dev/null
@@ -1,285 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.feed;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.falcon.entity.v0.Frequency;
-
-
-/**
- * 
- *                 Feed references a cluster by it's name, before submitting a feed all the
- *                 referenced cluster should be submitted to Falcon.
- *                 type: specifies whether the
- *                 referenced cluster should be treated as a
- *                 source or target for a feed.
- *                 Validity of a feed on cluster specifies duration for which this feed is
- *                 valid on this cluster.
- *                 Retention specifies how long the feed is retained on this cluster and the
- *                 action to be taken on the feed after the expiry of retention period.
- *                 The retention limit is
- *                 specified by expression frequency(times), ex: if
- *                 feed should be retained for at least 6 hours then retention's limit="hours(6)".
- *                 The field partitionExp contains
- *                 partition tags. Number of partition tags has to be equal to number of partitions specified in feed
- *                 schema.
- *                 A partition tag can be a wildcard(*), a static string or
- *                 an expression. Atleast one of the strings has to be an expression.
- *             
- * 
- * <p>Java class for cluster complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="cluster">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="validity" type="{uri:falcon:feed:0.1}validity"/>
- *         &lt;element name="retention" type="{uri:falcon:feed:0.1}retention"/>
- *         &lt;choice minOccurs="0">
- *           &lt;element name="locations" type="{uri:falcon:feed:0.1}locations" minOccurs="0"/>
- *           &lt;element name="table" type="{uri:falcon:feed:0.1}catalog-table"/>
- *         &lt;/choice>
- *       &lt;/sequence>
- *       &lt;attribute name="name" use="required" type="{uri:falcon:feed:0.1}IDENTIFIER" />
- *       &lt;attribute name="type" type="{uri:falcon:feed:0.1}cluster-type" />
- *       &lt;attribute name="partition" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="delay" type="{uri:falcon:feed:0.1}frequency-type" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cluster", propOrder = {
-    "validity",
-    "retention",
-    "table",
-    "locations"
-})
-public class Cluster {
-
-    @XmlElement(required = true)
-    protected Validity validity;
-    @XmlElement(required = true)
-    protected Retention retention;
-    protected CatalogTable table;
-    protected Locations locations;
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-    @XmlAttribute(name = "type")
-    protected ClusterType type;
-    @XmlAttribute(name = "partition")
-    protected String partition;
-    @XmlAttribute(name = "delay")
-    @XmlJavaTypeAdapter(Adapter1 .class)
-    protected Frequency delay;
-
-    /**
-     * Gets the value of the validity property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Validity }
-     *     
-     */
-    public Validity getValidity() {
-        return validity;
-    }
-
-    /**
-     * Sets the value of the validity property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Validity }
-     *     
-     */
-    public void setValidity(Validity value) {
-        this.validity = value;
-    }
-
-    /**
-     * Gets the value of the retention property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Retention }
-     *     
-     */
-    public Retention getRetention() {
-        return retention;
-    }
-
-    /**
-     * Sets the value of the retention property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Retention }
-     *     
-     */
-    public void setRetention(Retention value) {
-        this.retention = value;
-    }
-
-    /**
-     * Gets the value of the table property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CatalogTable }
-     *     
-     */
-    public CatalogTable getTable() {
-        return table;
-    }
-
-    /**
-     * Sets the value of the table property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CatalogTable }
-     *     
-     */
-    public void setTable(CatalogTable value) {
-        this.table = value;
-    }
-
-    /**
-     * Gets the value of the locations property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Locations }
-     *     
-     */
-    public Locations getLocations() {
-        return locations;
-    }
-
-    /**
-     * Sets the value of the locations property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Locations }
-     *     
-     */
-    public void setLocations(Locations value) {
-        this.locations = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ClusterType }
-     *     
-     */
-    public ClusterType getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ClusterType }
-     *     
-     */
-    public void setType(ClusterType value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the partition property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartition() {
-        return partition;
-    }
-
-    /**
-     * Sets the value of the partition property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartition(String value) {
-        this.partition = value;
-    }
-
-    /**
-     * Gets the value of the delay property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public Frequency getDelay() {
-        return delay;
-    }
-
-    /**
-     * Sets the value of the delay property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDelay(Frequency value) {
-        this.delay = value;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/ClusterType.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/ClusterType.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/ClusterType.java
deleted file mode 100644
index a996c19..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/ClusterType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.feed;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for cluster-type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="cluster-type">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="source"/>
- *     &lt;enumeration value="target"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "cluster-type")
-@XmlEnum
-public enum ClusterType {
-
-    @XmlEnumValue("source")
-    SOURCE("source"),
-    @XmlEnumValue("target")
-    TARGET("target");
-    private final String value;
-
-    ClusterType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static ClusterType fromValue(String v) {
-        for (ClusterType c: ClusterType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9094742b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Clusters.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Clusters.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Clusters.java
deleted file mode 100644
index c2750eb..0000000
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/entity/v0/feed/Clusters.java
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.28 at 10:55:57 AM PDT 
-//
-
-
-package org.apache.falcon.entity.v0.feed;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
- *                 A list of clusters.
- *             
- * 
- * <p>Java class for clusters complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="clusters">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="cluster" type="{uri:falcon:feed:0.1}cluster" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "clusters", propOrder = {
-    "clusters"
-})
-public class Clusters {
-
-    @XmlElement(name = "cluster", required = true)
-    protected List<Cluster> clusters;
-
-    /**
-     * Gets the value of the clusters property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the clusters property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getClusters().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Cluster }
-     * 
-     * 
-     */
-    public List<Cluster> getClusters() {
-        if (clusters == null) {
-            clusters = new ArrayList<Cluster>();
-        }
-        return this.clusters;
-    }
-
-}


Mime
View raw message