You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2015/01/31 04:44:05 UTC

[28/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
deleted file mode 100644
index 9e15fc1..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
+++ /dev/null
@@ -1,262 +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.nifi.web.api.dto;
-
-import java.util.Set;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Configuration details for a NiFi controller. Primary use of this DTO is for
- * consumption by a remote NiFi instance to initiate site to site
- * communications.
- */
-@XmlType(name = "controller")
-public class ControllerDTO {
-
-    private String id;
-    private String name;
-    private String comments;
-
-    private Integer runningCount;
-    private Integer stoppedCount;
-    private Integer invalidCount;
-    private Integer disabledCount;
-    private Integer activeRemotePortCount;
-    private Integer inactiveRemotePortCount;
-
-    private Integer inputPortCount;
-    private Integer outputPortCount;
-
-    private Integer remoteSiteListeningPort;
-    private Boolean siteToSiteSecure;
-    private String instanceId;
-    private Set<PortDTO> inputPorts;
-    private Set<PortDTO> outputPorts;
-
-    /**
-     * The id of this NiFi controller.
-     *
-     * @return
-     */
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * The name of this NiFi controller.
-     *
-     * @return The name of this controller
-     */
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * The comments of this NiFi controller.
-     *
-     * @return
-     */
-    public String getComments() {
-        return comments;
-    }
-
-    public void setComments(String comments) {
-        this.comments = comments;
-    }
-
-    /**
-     * The input ports available to send data to this NiFi controller.
-     *
-     * @return
-     */
-    public Set<PortDTO> getInputPorts() {
-        return inputPorts;
-    }
-
-    public void setInputPorts(Set<PortDTO> inputPorts) {
-        this.inputPorts = inputPorts;
-    }
-
-    /**
-     * The output ports available to received data from this NiFi controller.
-     *
-     * @return
-     */
-    public Set<PortDTO> getOutputPorts() {
-        return outputPorts;
-    }
-
-    public void setOutputPorts(Set<PortDTO> outputPorts) {
-        this.outputPorts = outputPorts;
-    }
-
-    /**
-     * The Instance ID of the cluster, if this node is connected to a Cluster
-     * Manager, or of this individual instance of in standalone mode
-     *
-     * @return
-     */
-    public String getInstanceId() {
-        return instanceId;
-    }
-
-    public void setInstanceId(String instanceId) {
-        this.instanceId = instanceId;
-    }
-
-    /**
-     * The Socket Port on which this instance is listening for Remote Transfers
-     * of Flow Files. If this instance is not configured to receive Flow Files
-     * from remote instances, this will be null.
-     *
-     * @return a integer between 1 and 65535, or null, if not configured for
-     * remote transfer
-     */
-    public Integer getRemoteSiteListeningPort() {
-        return remoteSiteListeningPort;
-    }
-
-    public void setRemoteSiteListeningPort(final Integer port) {
-        this.remoteSiteListeningPort = port;
-    }
-
-    /**
-     * Indicates whether or not Site-to-Site communications with this instance
-     * is secure (2-way authentication)
-     *
-     * @return
-     */
-    public Boolean isSiteToSiteSecure() {
-        return siteToSiteSecure;
-    }
-
-    public void setSiteToSiteSecure(Boolean siteToSiteSecure) {
-        this.siteToSiteSecure = siteToSiteSecure;
-    }
-
-    /**
-     * The number of running components in this process group.
-     *
-     * @return
-     */
-    public Integer getRunningCount() {
-        return runningCount;
-    }
-
-    public void setRunningCount(Integer runningCount) {
-        this.runningCount = runningCount;
-    }
-
-    /**
-     * The number of stopped components in this process group.
-     *
-     * @return
-     */
-    public Integer getStoppedCount() {
-        return stoppedCount;
-    }
-
-    public void setStoppedCount(Integer stoppedCount) {
-        this.stoppedCount = stoppedCount;
-    }
-
-    /**
-     * The number of active remote ports contained in this process group.
-     *
-     * @return
-     */
-    public Integer getActiveRemotePortCount() {
-        return activeRemotePortCount;
-    }
-
-    public void setActiveRemotePortCount(Integer activeRemotePortCount) {
-        this.activeRemotePortCount = activeRemotePortCount;
-    }
-
-    /**
-     * The number of inactive remote ports contained in this process group.
-     *
-     * @return
-     */
-    public Integer getInactiveRemotePortCount() {
-        return inactiveRemotePortCount;
-    }
-
-    public void setInactiveRemotePortCount(Integer inactiveRemotePortCount) {
-        this.inactiveRemotePortCount = inactiveRemotePortCount;
-    }
-
-    /**
-     * The number of input ports contained in this process group.
-     *
-     * @return
-     */
-    public Integer getInputPortCount() {
-        return inputPortCount;
-    }
-
-    public void setInputPortCount(Integer inputPortCount) {
-        this.inputPortCount = inputPortCount;
-    }
-
-    /**
-     * The number of invalid components in this process group.
-     *
-     * @return
-     */
-    public Integer getInvalidCount() {
-        return invalidCount;
-    }
-
-    public void setInvalidCount(Integer invalidCount) {
-        this.invalidCount = invalidCount;
-    }
-
-    /**
-     * The number of disabled components in this process group.
-     *
-     * @return
-     */
-    public Integer getDisabledCount() {
-        return disabledCount;
-    }
-
-    public void setDisabledCount(Integer disabledCount) {
-        this.disabledCount = disabledCount;
-    }
-
-    /**
-     * The number of output ports in this process group.
-     *
-     * @return
-     */
-    public Integer getOutputPortCount() {
-        return outputPortCount;
-    }
-
-    public void setOutputPortCount(Integer outputPortCount) {
-        this.outputPortCount = outputPortCount;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java
deleted file mode 100644
index 10ea41d..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.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.nifi.web.api.dto;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Counter value for a specific component in a specific context. A counter is a
- * value that a component can adjust during processing.
- */
-@XmlType(name = "counter")
-public class CounterDTO {
-
-    private String id;
-    private String context;
-    private String name;
-    private Long valueCount;
-    private String value;
-
-    /**
-     * The context of the counter.
-     *
-     * @return
-     */
-    public String getContext() {
-        return context;
-    }
-
-    public void setContext(String context) {
-        this.context = context;
-    }
-
-    /**
-     * The id of the counter.
-     *
-     * @return
-     */
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * The name of the counter
-     *
-     * @return
-     */
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * The value for the counter
-     *
-     * @return
-     */
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public Long getValueCount() {
-        return valueCount;
-    }
-
-    public void setValueCount(Long valueCount) {
-        this.valueCount = valueCount;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java
deleted file mode 100644
index ac1aa38..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java
+++ /dev/null
@@ -1,61 +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.nifi.web.api.dto;
-
-import java.util.Collection;
-import java.util.Date;
-
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.TimeAdapter;
-
-/**
- * All the counters in this NiFi instance at a given time.
- */
-@XmlType(name = "counters")
-public class CountersDTO {
-
-    private Date generated;
-    private Collection<CounterDTO> counters;
-
-    /**
-     * Gets the collection of counters.
-     *
-     * @return
-     */
-    public Collection<CounterDTO> getCounters() {
-        return counters;
-    }
-
-    public void setCounters(Collection<CounterDTO> counters) {
-        this.counters = counters;
-    }
-
-    /**
-     * Gets the date/time that this report was generated.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(TimeAdapter.class)
-    public Date getGenerated() {
-        return generated;
-    }
-
-    public void setGenerated(Date generated) {
-        this.generated = generated;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
deleted file mode 100644
index 5a2d789..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.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.nifi.web.api.dto;
-
-import java.util.Set;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Class used for providing documentation of a specified type that may be
- * instantiated.
- */
-@XmlType(name = "documentedType")
-public class DocumentedTypeDTO {
-
-    private String type;
-    private String description;
-    private Set<String> tags;
-
-    /**
-     * An optional description of the corresponding type.
-     *
-     * @return
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    /**
-     * The type is the fully-qualified name of a Java class.
-     *
-     * @return
-     */
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    /**
-     * The tags associated with this type
-     *
-     * @return
-     */
-    public Set<String> getTags() {
-        return tags;
-    }
-
-    public void setTags(final Set<String> tags) {
-        this.tags = tags;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java
deleted file mode 100644
index 61c3c33..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java
+++ /dev/null
@@ -1,141 +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.nifi.web.api.dto;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The contents of a flow snippet.
- */
-@XmlType(name = "flowSnippet")
-public class FlowSnippetDTO {
-
-    private Set<ProcessGroupDTO> processGroups = new LinkedHashSet<>();
-    private Set<RemoteProcessGroupDTO> remoteProcessGroups = new LinkedHashSet<>();
-    private Set<ProcessorDTO> processors = new LinkedHashSet<>();
-    private Set<PortDTO> inputPorts = new LinkedHashSet<>();
-    private Set<PortDTO> outputPorts = new LinkedHashSet<>();
-    private Set<ConnectionDTO> connections = new LinkedHashSet<>();
-    private Set<LabelDTO> labels = new LinkedHashSet<>();
-    private Set<FunnelDTO> funnels = new LinkedHashSet<>();
-
-    /**
-     * The connections in this flow snippet.
-     *
-     * @return
-     */
-    public Set<ConnectionDTO> getConnections() {
-        return connections;
-    }
-
-    public void setConnections(Set<ConnectionDTO> connections) {
-        this.connections = connections;
-    }
-
-    /**
-     * The input ports in this flow snippet.
-     *
-     * @return
-     */
-    public Set<PortDTO> getInputPorts() {
-        return inputPorts;
-    }
-
-    public void setInputPorts(Set<PortDTO> inputPorts) {
-        this.inputPorts = inputPorts;
-    }
-
-    /**
-     * The labels in this flow snippet.
-     *
-     * @return
-     */
-    public Set<LabelDTO> getLabels() {
-        return labels;
-    }
-
-    public void setLabels(Set<LabelDTO> labels) {
-        this.labels = labels;
-    }
-
-    /**
-     * The funnels in this flow snippet.
-     *
-     * @return
-     */
-    public Set<FunnelDTO> getFunnels() {
-        return funnels;
-    }
-
-    public void setFunnels(Set<FunnelDTO> funnels) {
-        this.funnels = funnels;
-    }
-
-    /**
-     * The output ports in this flow snippet.
-     *
-     * @return
-     */
-    public Set<PortDTO> getOutputPorts() {
-        return outputPorts;
-    }
-
-    public void setOutputPorts(Set<PortDTO> outputPorts) {
-        this.outputPorts = outputPorts;
-    }
-
-    /**
-     * The process groups in this flow snippet.
-     *
-     * @return
-     */
-    public Set<ProcessGroupDTO> getProcessGroups() {
-        return processGroups;
-    }
-
-    public void setProcessGroups(Set<ProcessGroupDTO> processGroups) {
-        this.processGroups = processGroups;
-    }
-
-    /**
-     * The processors in this flow group.
-     *
-     * @return
-     */
-    public Set<ProcessorDTO> getProcessors() {
-        return processors;
-    }
-
-    public void setProcessors(Set<ProcessorDTO> processors) {
-        this.processors = processors;
-    }
-
-    /**
-     * The remote process groups in this flow snippet.
-     *
-     * @return
-     */
-    public Set<RemoteProcessGroupDTO> getRemoteProcessGroups() {
-        return remoteProcessGroups;
-    }
-
-    public void setRemoteProcessGroups(Set<RemoteProcessGroupDTO> remoteProcessGroups) {
-        this.remoteProcessGroups = remoteProcessGroups;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FunnelDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FunnelDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FunnelDTO.java
deleted file mode 100644
index 1240501..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FunnelDTO.java
+++ /dev/null
@@ -1,29 +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.nifi.web.api.dto;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Details of a funnel.
- */
-@XmlType(name = "funnel")
-public class FunnelDTO extends NiFiComponentDTO {
-
-    public FunnelDTO() {
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java
deleted file mode 100644
index f50c792..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.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.nifi.web.api.dto;
-
-import java.util.Collections;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Details of a label.
- */
-@XmlType(name = "label")
-public class LabelDTO extends NiFiComponentDTO {
-
-    private String label;
-
-    private Double width;
-    private Double height;
-
-    // font-size = 12px
-    // color = #eee
-    private Map<String, String> style = Collections.emptyMap();
-
-    public LabelDTO() {
-    }
-
-    /**
-     * The text that appears in the label.
-     *
-     * @return The label text
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(final String label) {
-        this.label = label;
-    }
-
-    /**
-     * The style for this label.
-     *
-     * @return
-     */
-    public Map<String, String> getStyle() {
-        return style;
-    }
-
-    public void setStyle(Map<String, String> style) {
-        this.style = style;
-    }
-
-    /**
-     * The height of the label in pixels when at a 1:1 scale.
-     *
-     * @return
-     */
-    public Double getHeight() {
-        return height;
-    }
-
-    public void setHeight(Double height) {
-        this.height = height;
-    }
-
-    /**
-     * The width of the label in pixels when at a 1:1 scale.
-     *
-     * @return
-     */
-    public Double getWidth() {
-        return width;
-    }
-
-    public void setWidth(Double width) {
-        this.width = width;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java
deleted file mode 100644
index e3c8445..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java
+++ /dev/null
@@ -1,95 +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.nifi.web.api.dto;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Base class for all nifi components.
- */
-@XmlType(name = "nifiComponent")
-public class NiFiComponentDTO {
-
-    private String id;
-    private String uri;
-    private PositionDTO position;
-    private String parentGroupId;
-
-    public NiFiComponentDTO() {
-    }
-
-    public NiFiComponentDTO(final String id) {
-        this.id = id;
-    }
-
-    public NiFiComponentDTO(final String id, final double x, final double y) {
-        this.id = id;
-        this.position = new PositionDTO(x, y);
-    }
-
-    /**
-     * The id for this component.
-     *
-     * @return The id
-     */
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(final String id) {
-        this.id = id;
-    }
-
-    /**
-     * The id for the parent group of this component.
-     *
-     * @return
-     */
-    public String getParentGroupId() {
-        return parentGroupId;
-    }
-
-    public void setParentGroupId(String parentGroupId) {
-        this.parentGroupId = parentGroupId;
-    }
-
-    /**
-     * The uri for linking to this component in this NiFi.
-     *
-     * @return The uri
-     */
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    public void setPosition(final PositionDTO position) {
-        this.position = position;
-    }
-
-    /**
-     * The position of this component in the UI.
-     *
-     * @return The position
-     */
-    public PositionDTO getPosition() {
-        return position;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java
deleted file mode 100644
index 9499c2e..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java
+++ /dev/null
@@ -1,188 +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.nifi.web.api.dto;
-
-import java.util.Date;
-import java.util.List;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
-
-/**
- * Details of a node within this NiFi.
- */
-@XmlType(name = "node")
-public class NodeDTO {
-
-    private String nodeId;
-    private String address;
-    private Integer apiPort;
-    private String status;
-    private Date heartbeat;
-    private Date connectionRequested;
-    private Boolean primary;
-    private Integer activeThreadCount;
-    private String queued;
-    private List<NodeEventDTO> events;
-    private Date nodeStartTime;
-
-    /**
-     * The node's last heartbeat timestamp.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getHeartbeat() {
-        return heartbeat;
-    }
-
-    public void setHeartbeat(Date heartbeat) {
-        this.heartbeat = heartbeat;
-    }
-
-    /**
-     * The time of the node's last connection request.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getConnectionRequested() {
-        return connectionRequested;
-    }
-
-    public void setConnectionRequested(Date connectionRequested) {
-        this.connectionRequested = connectionRequested;
-    }
-
-    /**
-     * The active thread count.
-     *
-     * @return The active thread count
-     */
-    public Integer getActiveThreadCount() {
-        return activeThreadCount;
-    }
-
-    public void setActiveThreadCount(Integer activeThreadCount) {
-        this.activeThreadCount = activeThreadCount;
-    }
-
-    /**
-     * The queue for the controller.
-     *
-     * @return
-     */
-    public String getQueued() {
-        return queued;
-    }
-
-    public void setQueued(String queued) {
-        this.queued = queued;
-    }
-
-    /**
-     * The node's host/IP address.
-     *
-     * @return
-     */
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    /**
-     * The node ID.
-     *
-     * @return
-     */
-    public String getNodeId() {
-        return nodeId;
-    }
-
-    public void setNodeId(String nodeId) {
-        this.nodeId = nodeId;
-    }
-
-    /**
-     * The port the node is listening for API requests.
-     *
-     * @return
-     */
-    public Integer getApiPort() {
-        return apiPort;
-    }
-
-    public void setApiPort(Integer port) {
-        this.apiPort = port;
-    }
-
-    /**
-     * The node's status.
-     *
-     * @return
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    /**
-     * The node's events.
-     *
-     * @return
-     */
-    public List<NodeEventDTO> getEvents() {
-        return events;
-    }
-
-    public void setEvents(List<NodeEventDTO> events) {
-        this.events = events;
-    }
-
-    /**
-     * Whether this node is the primary node within the cluster.
-     *
-     * @return
-     */
-    public Boolean isPrimary() {
-        return primary;
-    }
-
-    public void setPrimary(Boolean primary) {
-        this.primary = primary;
-    }
-
-    /**
-     * The time at which this Node was last restarted
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getNodeStartTime() {
-        return nodeStartTime;
-    }
-
-    public void setNodeStartTime(Date nodeStartTime) {
-        this.nodeStartTime = nodeStartTime;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java
deleted file mode 100644
index 3cad8d8..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java
+++ /dev/null
@@ -1,74 +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.nifi.web.api.dto;
-
-import java.util.Date;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
-
-/**
- * A event for a node within this NiFi cluster.
- */
-@XmlType(name = "nodeEvent")
-public class NodeEventDTO {
-
-    private Date timestamp;
-    private String category;
-    private String message;
-
-    /**
-     * The category of the node event.
-     *
-     * @return
-     */
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    /**
-     * The message of the node event.
-     *
-     * @return
-     */
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    /**
-     * The timestamp of the node event.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Date timestamp) {
-        this.timestamp = timestamp;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java
deleted file mode 100644
index 8c83331..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java
+++ /dev/null
@@ -1,56 +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.nifi.web.api.dto;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The system diagnostics for a node with this NiFi cluster.
- */
-@XmlType(name = "nodeSystemDiagnostics")
-public class NodeSystemDiagnosticsDTO {
-
-    private NodeDTO node;
-    private SystemDiagnosticsDTO systemDiagnostics;
-
-    /**
-     * The node.
-     *
-     * @return
-     */
-    public NodeDTO getNode() {
-        return node;
-    }
-
-    public void setNode(NodeDTO node) {
-        this.node = node;
-    }
-
-    /**
-     * The system diagnostics.
-     *
-     * @return
-     */
-    public SystemDiagnosticsDTO getSystemDiagnostics() {
-        return systemDiagnostics;
-    }
-
-    public void setControllerStatus(SystemDiagnosticsDTO systemDiagnostics) {
-        this.systemDiagnostics = systemDiagnostics;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java
deleted file mode 100644
index 2a372f4..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java
+++ /dev/null
@@ -1,161 +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.nifi.web.api.dto;
-
-import java.util.Collection;
-import java.util.Set;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The details for a port within this NiFi flow.
- */
-@XmlType(name = "port")
-public class PortDTO extends NiFiComponentDTO {
-
-    private String name;
-    private String comments;
-    private String state;
-    private String type;
-    private Boolean transmitting;
-    private Integer concurrentlySchedulableTaskCount;
-    private Set<String> userAccessControl;
-    private Set<String> groupAccessControl;
-
-    private Collection<String> validationErrors;
-
-    /**
-     * The name of this port.
-     *
-     * @return
-     */
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    /**
-     * The state of this port. Possible states are 'RUNNING', 'STOPPED', and
-     * 'DISABLED'.
-     *
-     * @return
-     */
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    /**
-     * The type of port. Possible values are 'INPUT_PORT' or 'OUTPUT_PORT'.
-     *
-     * @return
-     */
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    /**
-     * The number of tasks that should be concurrently scheduled for this port.
-     *
-     * @return
-     */
-    public Integer getConcurrentlySchedulableTaskCount() {
-        return concurrentlySchedulableTaskCount;
-    }
-
-    public void setConcurrentlySchedulableTaskCount(Integer concurrentlySchedulableTaskCount) {
-        this.concurrentlySchedulableTaskCount = concurrentlySchedulableTaskCount;
-    }
-
-    /**
-     * The comments for this port.
-     *
-     * @return
-     */
-    public String getComments() {
-        return comments;
-    }
-
-    public void setComments(String comments) {
-        this.comments = comments;
-    }
-
-    /**
-     * Whether this port has incoming or outgoing connections to a remote NiFi.
-     * This is only applicable when the port is running on the root group.
-     *
-     * @return
-     */
-    public Boolean isTransmitting() {
-        return transmitting;
-    }
-
-    public void setTransmitting(Boolean transmitting) {
-        this.transmitting = transmitting;
-    }
-
-    /**
-     * Groups that are allowed to access this port.
-     *
-     * @return
-     */
-    public Set<String> getGroupAccessControl() {
-        return groupAccessControl;
-    }
-
-    public void setGroupAccessControl(Set<String> groupAccessControl) {
-        this.groupAccessControl = groupAccessControl;
-    }
-
-    /**
-     * Users that are allowed to access this port.
-     *
-     * @return
-     */
-    public Set<String> getUserAccessControl() {
-        return userAccessControl;
-    }
-
-    public void setUserAccessControl(Set<String> userAccessControl) {
-        this.userAccessControl = userAccessControl;
-    }
-
-    /**
-     * Gets the validation errors from this port. These validation errors
-     * represent the problems with the port that must be resolved before it can
-     * be started.
-     *
-     * @return The validation errors
-     */
-    public Collection<String> getValidationErrors() {
-        return validationErrors;
-    }
-
-    public void setValidationErrors(Collection<String> validationErrors) {
-        this.validationErrors = validationErrors;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
deleted file mode 100644
index ab077f3..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
+++ /dev/null
@@ -1,65 +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.nifi.web.api.dto;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * A position on the canvas.
- */
-@XmlType(name = "position")
-public class PositionDTO {
-
-    private Double x;
-    private Double y;
-
-    public PositionDTO() {
-    }
-
-    public PositionDTO(Double x, Double y) {
-        this.x = x;
-        this.y = y;
-    }
-
-    /* getters / setters */
-    /**
-     * The x coordinate.
-     *
-     * @return
-     */
-    public Double getX() {
-        return x;
-    }
-
-    public void setX(Double x) {
-        this.x = x;
-    }
-
-    /**
-     * The y coordinate.
-     *
-     * @return
-     */
-    public Double getY() {
-        return y;
-    }
-
-    public void setY(Double y) {
-        this.y = y;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
deleted file mode 100644
index fb33c67..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
+++ /dev/null
@@ -1,73 +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.nifi.web.api.dto;
-
-import java.util.Date;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
-
-/**
- * The previous value for a processor property.
- */
-@XmlType(name = "previousValue")
-public class PreviousValueDTO {
-
-    private String previousValue;
-    private Date timestamp;
-    private String userName;
-
-    /**
-     * The previous value.
-     *
-     * @return
-     */
-    public String getPreviousValue() {
-        return previousValue;
-    }
-
-    public void setPreviousValue(String previousValue) {
-        this.previousValue = previousValue;
-    }
-
-    /**
-     * When it was modified.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Date timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    /**
-     * The user who changed the previous value.
-     *
-     * @return
-     */
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
deleted file mode 100644
index 4140046..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
+++ /dev/null
@@ -1,219 +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.nifi.web.api.dto;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The details for a process group within this NiFi flow.
- */
-@XmlType(name = "processGroup")
-public class ProcessGroupDTO extends NiFiComponentDTO {
-
-    private String name;
-    private String comments;
-    private Boolean running;
-
-    private ProcessGroupDTO parent;
-
-    private Integer runningCount;
-    private Integer stoppedCount;
-    private Integer invalidCount;
-    private Integer disabledCount;
-    private Integer activeRemotePortCount;
-    private Integer inactiveRemotePortCount;
-
-    private Integer inputPortCount;
-    private Integer outputPortCount;
-
-    private FlowSnippetDTO contents;
-
-    public ProcessGroupDTO() {
-        super();
-    }
-
-    /**
-     * The name of this Process Group.
-     *
-     * @return The name of this Process Group
-     */
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * This Process Group's parent
-     *
-     * @return This Process Group's parent
-     */
-    public ProcessGroupDTO getParent() {
-        return parent;
-    }
-
-    public void setParent(ProcessGroupDTO parent) {
-        this.parent = parent;
-    }
-
-    /**
-     * The comments for this process group.
-     *
-     * @return
-     */
-    public String getComments() {
-        return comments;
-    }
-
-    public void setComments(String comments) {
-        this.comments = comments;
-    }
-
-    /**
-     * The contents of this process group. This field will be populated if the
-     * request is marked verbose.
-     *
-     * @return
-     */
-    public FlowSnippetDTO getContents() {
-        return contents;
-    }
-
-    public void setContents(FlowSnippetDTO contents) {
-        this.contents = contents;
-    }
-
-    /**
-     * The number of input ports contained in this process group.
-     *
-     * @return
-     */
-    public Integer getInputPortCount() {
-        return inputPortCount;
-    }
-
-    public void setInputPortCount(Integer inputPortCount) {
-        this.inputPortCount = inputPortCount;
-    }
-
-    /**
-     * The number of invalid components in this process group.
-     *
-     * @return
-     */
-    public Integer getInvalidCount() {
-        return invalidCount;
-    }
-
-    public void setInvalidCount(Integer invalidCount) {
-        this.invalidCount = invalidCount;
-    }
-
-    /**
-     * The number of output ports in this process group.
-     *
-     * @return
-     */
-    public Integer getOutputPortCount() {
-        return outputPortCount;
-    }
-
-    public void setOutputPortCount(Integer outputPortCount) {
-        this.outputPortCount = outputPortCount;
-    }
-
-    /**
-     * Used in requests, indicates whether this process group should be running.
-     *
-     * @return
-     */
-    public Boolean isRunning() {
-        return running;
-    }
-
-    public void setRunning(Boolean running) {
-        this.running = running;
-    }
-
-    /**
-     * The number of running component in this process group.
-     *
-     * @return
-     */
-    public Integer getRunningCount() {
-        return runningCount;
-    }
-
-    public void setRunningCount(Integer runningCount) {
-        this.runningCount = runningCount;
-    }
-
-    /**
-     * The number of stopped components in this process group.
-     *
-     * @return
-     */
-    public Integer getStoppedCount() {
-        return stoppedCount;
-    }
-
-    public void setStoppedCount(Integer stoppedCount) {
-        this.stoppedCount = stoppedCount;
-    }
-
-    /**
-     * The number of disabled components in this process group.
-     *
-     * @return
-     */
-    public Integer getDisabledCount() {
-        return disabledCount;
-    }
-
-    public void setDisabledCount(Integer disabledCount) {
-        this.disabledCount = disabledCount;
-    }
-
-    /**
-     * The number of active remote ports in this process group.
-     *
-     * @return
-     */
-    public Integer getActiveRemotePortCount() {
-        return activeRemotePortCount;
-    }
-
-    public void setActiveRemotePortCount(Integer activeRemotePortCount) {
-        this.activeRemotePortCount = activeRemotePortCount;
-    }
-
-    /**
-     * The number of inactive remote ports in this process group.
-     *
-     * @return
-     */
-    public Integer getInactiveRemotePortCount() {
-        return inactiveRemotePortCount;
-    }
-
-    public void setInactiveRemotePortCount(Integer inactiveRemotePortCount) {
-        this.inactiveRemotePortCount = inactiveRemotePortCount;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
deleted file mode 100644
index 1481b0f..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
+++ /dev/null
@@ -1,486 +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.nifi.web.api.dto;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Configuration details for a processor in this NiFi.
- */
-@XmlType(name = "processorConfig")
-public class ProcessorConfigDTO {
-
-    private Map<String, String> properties;
-    private Map<String, PropertyDescriptorDTO> descriptors;
-
-    // settings
-    private String schedulingPeriod;
-    private String schedulingStrategy;
-    private String penaltyDuration;
-    private String yieldDuration;
-    private String bulletinLevel;
-    private Long runDurationMillis;
-    private Integer concurrentlySchedulableTaskCount;
-    private Set<String> autoTerminatedRelationships;
-    private String comments;
-    private String customUiUrl;
-    private Boolean lossTolerant;
-
-    // annotation data
-    private String annotationData;
-
-    private Map<String, String> defaultConcurrentTasks;
-    private Map<String, String> defaultSchedulingPeriod;
-
-    public ProcessorConfigDTO() {
-
-    }
-
-    /**
-     * The amount of time that should elapse between task executions. This will
-     * not affect currently scheduled tasks.
-     *
-     * @return The scheduling period in seconds
-     */
-    public String getSchedulingPeriod() {
-        return schedulingPeriod;
-    }
-
-    public void setSchedulingPeriod(String setSchedulingPeriod) {
-        this.schedulingPeriod = setSchedulingPeriod;
-    }
-
-    /**
-     * Indicates whether the processor should be scheduled to run in
-     * event-driven mode or timer-driven mode
-     *
-     * @return
-     */
-    public String getSchedulingStrategy() {
-        return schedulingStrategy;
-    }
-
-    public void setSchedulingStrategy(String schedulingStrategy) {
-        this.schedulingStrategy = schedulingStrategy;
-    }
-
-    /**
-     * The amount of time that is used when this processor penalizes a flow
-     * file.
-     *
-     * @return
-     */
-    public String getPenaltyDuration() {
-        return penaltyDuration;
-    }
-
-    public void setPenaltyDuration(String penaltyDuration) {
-        this.penaltyDuration = penaltyDuration;
-    }
-
-    /**
-     * When yielding, this amount of time must elaspe before this processor is
-     * scheduled again.
-     *
-     * @return
-     */
-    public String getYieldDuration() {
-        return yieldDuration;
-    }
-
-    public void setYieldDuration(String yieldDuration) {
-        this.yieldDuration = yieldDuration;
-    }
-
-    /**
-     * The level at this this processor will report bulletins.
-     *
-     * @return
-     */
-    public String getBulletinLevel() {
-        return bulletinLevel;
-    }
-
-    public void setBulletinLevel(String bulletinLevel) {
-        this.bulletinLevel = bulletinLevel;
-    }
-
-    /**
-     * The number of tasks that should be concurrently scheduled for this
-     * processor. If this processor doesn't allow parallel processing then any
-     * positive input will be ignored.
-     *
-     * @return The concurrently schedulable task count
-     */
-    public Integer getConcurrentlySchedulableTaskCount() {
-        return concurrentlySchedulableTaskCount;
-    }
-
-    public void setConcurrentlySchedulableTaskCount(Integer concurrentlySchedulableTaskCount) {
-        this.concurrentlySchedulableTaskCount = concurrentlySchedulableTaskCount;
-    }
-
-    /**
-     * Whether or not this Processor is Loss Tolerant
-     *
-     * @return
-     */
-    public Boolean isLossTolerant() {
-        return lossTolerant;
-    }
-
-    public void setLossTolerant(final Boolean lossTolerant) {
-        this.lossTolerant = lossTolerant;
-    }
-
-    /**
-     * The comments for this processor.
-     *
-     * @return The comments
-     */
-    public String getComments() {
-        return comments;
-    }
-
-    public void setComments(String comments) {
-        this.comments = comments;
-    }
-
-    /**
-     * The properties for this processor. Properties whose value is not set will
-     * only contain the property name. These properties are (un)marshalled
-     * differently since we need/want to control the ordering of the properties.
-     * The descriptors and metadata are used as a lookup when processing these
-     * properties.
-     *
-     * @return The optional properties
-     */
-    public Map<String, String> getProperties() {
-        return properties;
-    }
-
-    public void setProperties(Map<String, String> properties) {
-        this.properties = properties;
-    }
-
-    /**
-     * The descriptors for this processor's properties.
-     *
-     * @return
-     */
-    public Map<String, PropertyDescriptorDTO> getDescriptors() {
-        return descriptors;
-    }
-
-    public void setDescriptors(Map<String, PropertyDescriptorDTO> descriptors) {
-        this.descriptors = descriptors;
-    }
-
-    /**
-     * Annotation data for this processor.
-     *
-     * @return The annotation data
-     */
-    public String getAnnotationData() {
-        return annotationData;
-    }
-
-    public void setAnnotationData(String annotationData) {
-        this.annotationData = annotationData;
-    }
-
-    /**
-     * Whether of not this processor has a custom UI.
-     *
-     * @return
-     */
-    public String getCustomUiUrl() {
-        return customUiUrl;
-    }
-
-    public void setCustomUiUrl(String customUiUrl) {
-        this.customUiUrl = customUiUrl;
-    }
-
-    /**
-     * The names of all processor relationships that cause a flow file to be
-     * terminated if the relationship is not connected to anything
-     *
-     * @return
-     */
-    public Set<String> getAutoTerminatedRelationships() {
-        return autoTerminatedRelationships;
-    }
-
-    public void setAutoTerminatedRelationships(final Set<String> autoTerminatedRelationships) {
-        this.autoTerminatedRelationships = autoTerminatedRelationships;
-    }
-
-    /**
-     * Maps default values for concurrent tasks for each applicable scheduling
-     * strategy.
-     *
-     * @return
-     */
-    public Map<String, String> getDefaultConcurrentTasks() {
-        return defaultConcurrentTasks;
-    }
-
-    public void setDefaultConcurrentTasks(Map<String, String> defaultConcurrentTasks) {
-        this.defaultConcurrentTasks = defaultConcurrentTasks;
-    }
-
-    /**
-     * The run duration in milliseconds.
-     *
-     * @return
-     */
-    public Long getRunDurationMillis() {
-        return runDurationMillis;
-    }
-
-    public void setRunDurationMillis(Long runDurationMillis) {
-        this.runDurationMillis = runDurationMillis;
-    }
-
-    /**
-     * Maps default values for scheduling period for each applicable scheduling
-     * strategy.
-     *
-     * @return
-     */
-    public Map<String, String> getDefaultSchedulingPeriod() {
-        return defaultSchedulingPeriod;
-    }
-
-    public void setDefaultSchedulingPeriod(Map<String, String> defaultSchedulingPeriod) {
-        this.defaultSchedulingPeriod = defaultSchedulingPeriod;
-    }
-
-    /**
-     * The allowable values for a property with a constrained set of options.
-     */
-    @XmlType(name = "allowableValue")
-    public static class AllowableValueDTO {
-
-        private String displayName;
-        private String value;
-        private String description;
-
-        /**
-         * Returns the human-readable value that is allowed for this
-         * PropertyDescriptor
-         *
-         * @return
-         */
-        public String getDisplayName() {
-            return displayName;
-        }
-
-        public void setDisplayName(String displayName) {
-            this.displayName = displayName;
-        }
-
-        /**
-         * Returns the value for this allowable value.
-         *
-         * @return
-         */
-        public String getValue() {
-            return value;
-        }
-
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Returns a description of this Allowable Value, or <code>null</code>
-         * if no description is given
-         *
-         * @return
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        public void setDescription(String description) {
-            this.description = description;
-        }
-
-        @Override
-        public boolean equals(final Object obj) {
-            if (obj == this) {
-                return true;
-            }
-
-            if (!(obj instanceof AllowableValueDTO)) {
-                return false;
-            }
-
-            final AllowableValueDTO other = (AllowableValueDTO) obj;
-            return (this.value.equals(other.getValue()));
-        }
-
-        @Override
-        public int hashCode() {
-            return 23984731 + 17 * value.hashCode();
-        }
-    }
-
-    /**
-     * A description of a processor property.
-     */
-    @XmlType(name = "propertyDescriptor")
-    public static class PropertyDescriptorDTO {
-
-        private String name;
-        private String displayName;
-        private String description;
-        private String defaultValue;
-        private Set<AllowableValueDTO> allowableValues;
-        private boolean required;
-        private boolean sensitive;
-        private boolean dynamic;
-        private boolean supportsEl;
-
-        /**
-         * The set of allowable values for this property. If empty then the
-         * allowable values are not constrained.
-         *
-         * @return
-         */
-        public Set<AllowableValueDTO> getAllowableValues() {
-            return allowableValues;
-        }
-
-        public void setAllowableValues(Set<AllowableValueDTO> allowableValues) {
-            this.allowableValues = allowableValues;
-        }
-
-        /**
-         * The default value for this property.
-         *
-         * @return
-         */
-        public String getDefaultValue() {
-            return defaultValue;
-        }
-
-        public void setDefaultValue(String defaultValue) {
-            this.defaultValue = defaultValue;
-        }
-
-        /**
-         * And explanation of the meaning of the given property. This
-         * description is meant to be displayed to a user or simply provide a
-         * mechanism of documenting intent.
-         *
-         * @return
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        public void setDescription(String description) {
-            this.description = description;
-        }
-
-        /**
-         * The property name.
-         *
-         * @return
-         */
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        /**
-         * The human-readable name to display to users.
-         *
-         * @return
-         */
-        public String getDisplayName() {
-            return displayName;
-        }
-
-        public void setDisplayName(String displayName) {
-            this.displayName = displayName;
-        }
-
-        /**
-         * Determines whether the property is required for this processor.
-         *
-         * @return
-         */
-        public boolean isRequired() {
-            return required;
-        }
-
-        public void setRequired(boolean required) {
-            this.required = required;
-        }
-
-        /**
-         * Indicates that the value for this property should be considered
-         * sensitive and protected whenever stored or represented.
-         *
-         * @return
-         */
-        public boolean isSensitive() {
-            return sensitive;
-        }
-
-        public void setSensitive(boolean sensitive) {
-            this.sensitive = sensitive;
-        }
-
-        /**
-         * Indicates whether this property is dynamic.
-         *
-         * @return
-         */
-        public boolean isDynamic() {
-            return dynamic;
-        }
-
-        public void setDynamic(boolean dynamic) {
-            this.dynamic = dynamic;
-        }
-
-        /**
-         * Specifies whether or not this property support expression language.
-         *
-         * @return
-         */
-        public boolean getSupportsEl() {
-            return supportsEl;
-        }
-
-        public void setSupportsEl(boolean supportsEl) {
-            this.supportsEl = supportsEl;
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
deleted file mode 100644
index 71ba4ed..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
+++ /dev/null
@@ -1,181 +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.nifi.web.api.dto;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Details for a processor within this NiFi.
- */
-@XmlType(name = "processor")
-public class ProcessorDTO extends NiFiComponentDTO {
-
-    private String name;
-    private String type;
-    private String state;
-    private Map<String, String> style;
-    private List<RelationshipDTO> relationships;
-    private String description;
-    private Boolean supportsParallelProcessing;
-    private Boolean supportsEventDriven;
-
-    private ProcessorConfigDTO config;
-
-    private Collection<String> validationErrors;
-
-    public ProcessorDTO() {
-        super();
-    }
-
-    /**
-     * The name of this processor.
-     *
-     * @return This processors name
-     */
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * The type of this processor.
-     *
-     * @return This processors type
-     */
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    /**
-     * The state of this processor. Possible states are 'RUNNING', 'STOPPED',
-     * and 'DISABLED'.
-     *
-     * @return
-     */
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    /**
-     * The styles for this processor. (Currently only supports color).
-     *
-     * @return
-     */
-    public Map<String, String> getStyle() {
-        return style;
-    }
-
-    public void setStyle(Map<String, String> style) {
-        this.style = style;
-    }
-
-    /**
-     * Whether this processor supports parallel processing.
-     *
-     * @return
-     */
-    public Boolean getSupportsParallelProcessing() {
-        return supportsParallelProcessing;
-    }
-
-    public void setSupportsParallelProcessing(Boolean supportsParallelProcessing) {
-        this.supportsParallelProcessing = supportsParallelProcessing;
-    }
-
-    /**
-     * Whether this processor supports event driven scheduling.
-     *
-     * @return
-     */
-    public Boolean getSupportsEventDriven() {
-        return supportsEventDriven;
-    }
-
-    public void setSupportsEventDriven(Boolean supportsEventDriven) {
-        this.supportsEventDriven = supportsEventDriven;
-    }
-
-    /**
-     * Gets the available relationships that this processor currently supports.
-     *
-     * @return The available relationships
-     */
-    public List<RelationshipDTO> getRelationships() {
-        return relationships;
-    }
-
-    public void setRelationships(List<RelationshipDTO> relationships) {
-        this.relationships = relationships;
-    }
-
-    /**
-     * The configuration details for this processor. These details will be
-     * included in a response if the verbose flag is set to true.
-     *
-     * @return The processor configuration details
-     */
-    public ProcessorConfigDTO getConfig() {
-        return config;
-    }
-
-    public void setConfig(ProcessorConfigDTO config) {
-        this.config = config;
-    }
-
-    /**
-     * Gets the validation errors from this processor. These validation errors
-     * represent the problems with the processor that must be resolved before it
-     * can be started.
-     *
-     * @return The validation errors
-     */
-    public Collection<String> getValidationErrors() {
-        return validationErrors;
-    }
-
-    public void setValidationErrors(Collection<String> validationErrors) {
-        this.validationErrors = validationErrors;
-    }
-
-    /**
-     * Gets the description for this processor.
-     *
-     * @return
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(final String description) {
-        this.description = description;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorHistoryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorHistoryDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorHistoryDTO.java
deleted file mode 100644
index 2741116..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorHistoryDTO.java
+++ /dev/null
@@ -1,56 +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.nifi.web.api.dto;
-
-import java.util.Map;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * History of a processor's properties.
- */
-@XmlType(name = "processorHistory")
-public class ProcessorHistoryDTO {
-
-    private String processorId;
-    private Map<String, PropertyHistoryDTO> propertyHistory;
-
-    /**
-     * The processor id.
-     *
-     * @return
-     */
-    public String getProcessorId() {
-        return processorId;
-    }
-
-    public void setProcessorId(String processorId) {
-        this.processorId = processorId;
-    }
-
-    /**
-     * The history for this processors properties.
-     *
-     * @return
-     */
-    public Map<String, PropertyHistoryDTO> getPropertyHistory() {
-        return propertyHistory;
-    }
-
-    public void setPropertyHistory(Map<String, PropertyHistoryDTO> propertyHistory) {
-        this.propertyHistory = propertyHistory;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java
deleted file mode 100644
index 064ad21..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java
+++ /dev/null
@@ -1,43 +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.nifi.web.api.dto;
-
-import java.util.List;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * History of a processor property.
- */
-@XmlType(name = "propertyHistory")
-public class PropertyHistoryDTO {
-
-    private List<PreviousValueDTO> previousValues;
-
-    /**
-     * The previous values.
-     *
-     * @return
-     */
-    public List<PreviousValueDTO> getPreviousValues() {
-        return previousValues;
-    }
-
-    public void setPreviousValues(List<PreviousValueDTO> previousValues) {
-        this.previousValues = previousValues;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java
deleted file mode 100644
index 7042aaa..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java
+++ /dev/null
@@ -1,69 +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.nifi.web.api.dto;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Details of a relationship.
- */
-@XmlType(name = "relationship")
-public class RelationshipDTO {
-
-    private String name;
-    private String description;
-    private Boolean autoTerminate;
-
-    /**
-     * The relationship name.
-     *
-     * @return
-     */
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * The relationship description.
-     *
-     * @return
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    /**
-     * Whether or not this relationship is auto terminated.
-     *
-     * @return
-     */
-    public Boolean isAutoTerminate() {
-        return autoTerminate;
-    }
-
-    public void setAutoTerminate(Boolean autoTerminate) {
-        this.autoTerminate = autoTerminate;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java
deleted file mode 100644
index 1e5356d..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java
+++ /dev/null
@@ -1,56 +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.nifi.web.api.dto;
-
-import java.util.Set;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Contents of a remote process group.
- */
-@XmlType(name = "remoteProcessGroupContents")
-public class RemoteProcessGroupContentsDTO {
-
-    private Set<RemoteProcessGroupPortDTO> inputPorts;
-    private Set<RemoteProcessGroupPortDTO> outputPorts;
-
-    /**
-     * The Controller Input Ports to which data can be sent
-     *
-     * @return
-     */
-    public Set<RemoteProcessGroupPortDTO> getInputPorts() {
-        return inputPorts;
-    }
-
-    public void setInputPorts(Set<RemoteProcessGroupPortDTO> inputPorts) {
-        this.inputPorts = inputPorts;
-    }
-
-    /**
-     * The Controller Output Ports from which data can be retrieved
-     *
-     * @return
-     */
-    public Set<RemoteProcessGroupPortDTO> getOutputPorts() {
-        return outputPorts;
-    }
-
-    public void setOutputPorts(Set<RemoteProcessGroupPortDTO> outputPorts) {
-        this.outputPorts = outputPorts;
-    }
-}