nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcgil...@apache.org
Subject [41/42] incubator-nifi git commit: Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250
Date Tue, 20 Jan 2015 14:02:17 GMT
Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

Conflicts:
	nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
	nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/1392f328
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1392f328
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1392f328

Branch: refs/heads/NIFI-250
Commit: 1392f328c905a7919d2555767cb53395409e3e1e
Parents: 39a77e4 b29b61a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Authored: Tue Jan 20 08:34:05 2015 -0500
Committer: Matt Gilman <matt.c.gilman@gmail.com>
Committed: Tue Jan 20 08:34:05 2015 -0500

----------------------------------------------------------------------
 .../org/apache/nifi/web/api/dto/DtoFactory.java |  30 -----
 .../nifi/web/controller/ControllerFacade.java   | 120 ++++++++++++++++++-
 2 files changed, 118 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1392f328/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
----------------------------------------------------------------------
diff --cc nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
index 7a7ca43,917e23a..f2ffc68
--- a/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
+++ b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
@@@ -115,10 -115,6 +115,126 @@@ import org.apache.nifi.admin.service.Us
  import org.apache.nifi.authorization.DownloadAuthorization;
  import org.apache.nifi.processor.DataUnit;
  import org.apache.nifi.reporting.ReportingTask;
- <<<<<<< HEAD:nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
++/*
++ * 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.controller;
++
++import java.io.IOException;
++import java.io.InputStream;
++import java.text.Collator;
++import java.util.ArrayList;
++import java.util.Collection;
++import java.util.Collections;
++import java.util.Comparator;
++import java.util.Date;
++import java.util.HashMap;
++import java.util.HashSet;
++import java.util.List;
++import java.util.Locale;
++import java.util.Map;
++import java.util.Set;
++import java.util.SortedSet;
++import java.util.TimeZone;
++import java.util.TreeSet;
++import java.util.concurrent.TimeUnit;
++
++import javax.ws.rs.WebApplicationException;
++
++import org.apache.nifi.cluster.protocol.NodeIdentifier;
++import org.apache.nifi.components.PropertyDescriptor;
++import org.apache.nifi.connectable.Connectable;
++import org.apache.nifi.connectable.Connection;
++import org.apache.nifi.connectable.Funnel;
++import org.apache.nifi.connectable.Port;
++import org.apache.nifi.controller.ContentAvailability;
++import org.apache.nifi.controller.ControllerService;
++import org.apache.nifi.controller.Counter;
++import org.apache.nifi.controller.FlowController;
++import org.apache.nifi.controller.FlowFileQueue;
++import org.apache.nifi.controller.ProcessorNode;
++import org.apache.nifi.controller.ScheduledState;
++import org.apache.nifi.controller.repository.ContentNotFoundException;
++import org.apache.nifi.controller.repository.claim.ContentDirection;
++import org.apache.nifi.controller.service.ControllerServiceNode;
++import org.apache.nifi.controller.service.ControllerServiceProvider;
++import org.apache.nifi.controller.status.ProcessGroupStatus;
++import org.apache.nifi.diagnostics.SystemDiagnostics;
++import org.apache.nifi.flowfile.FlowFilePrioritizer;
++import org.apache.nifi.flowfile.attributes.CoreAttributes;
++import org.apache.nifi.groups.ProcessGroup;
++import org.apache.nifi.groups.ProcessGroupCounts;
++import org.apache.nifi.groups.RemoteProcessGroup;
++import org.apache.nifi.nar.ExtensionManager;
++import org.apache.nifi.nar.NarCloseable;
++import org.apache.nifi.processor.Processor;
++import org.apache.nifi.processor.QueueSize;
++import org.apache.nifi.processor.Relationship;
++import org.apache.nifi.provenance.ProvenanceEventRecord;
++import org.apache.nifi.provenance.ProvenanceEventRepository;
++import org.apache.nifi.provenance.SearchableFields;
++import org.apache.nifi.provenance.lineage.ComputeLineageSubmission;
++import org.apache.nifi.provenance.search.Query;
++import org.apache.nifi.provenance.search.QueryResult;
++import org.apache.nifi.provenance.search.QuerySubmission;
++import org.apache.nifi.provenance.search.SearchTerm;
++import org.apache.nifi.provenance.search.SearchTerms;
++import org.apache.nifi.provenance.search.SearchableField;
++import org.apache.nifi.remote.RootGroupPort;
++import org.apache.nifi.reporting.Bulletin;
++import org.apache.nifi.reporting.BulletinRepository;
++import org.apache.nifi.scheduling.SchedulingStrategy;
++import org.apache.nifi.search.SearchContext;
++import org.apache.nifi.search.SearchResult;
++import org.apache.nifi.search.Searchable;
++import org.apache.nifi.web.security.user.NiFiUserUtils;
++import org.apache.nifi.services.FlowService;
++import org.apache.nifi.user.NiFiUser;
++import org.apache.nifi.util.FormatUtils;
++import org.apache.nifi.util.NiFiProperties;
++import org.apache.nifi.web.NiFiCoreException;
++import org.apache.nifi.web.ResourceNotFoundException;
++import org.apache.nifi.web.api.dto.BulletinDTO;
++import org.apache.nifi.web.api.dto.DocumentedTypeDTO;
++import org.apache.nifi.web.api.dto.DtoFactory;
++import org.apache.nifi.web.api.dto.provenance.AttributeDTO;
++import org.apache.nifi.web.api.dto.provenance.ProvenanceDTO;
++import org.apache.nifi.web.api.dto.provenance.ProvenanceEventDTO;
++import org.apache.nifi.web.api.dto.provenance.ProvenanceOptionsDTO;
++import org.apache.nifi.web.api.dto.provenance.ProvenanceRequestDTO;
++import org.apache.nifi.web.api.dto.provenance.ProvenanceResultsDTO;
++import org.apache.nifi.web.api.dto.provenance.ProvenanceSearchableFieldDTO;
++import org.apache.nifi.web.api.dto.provenance.lineage.LineageDTO;
++import org.apache.nifi.web.api.dto.provenance.lineage.LineageRequestDTO;
++import org.apache.nifi.web.api.dto.provenance.lineage.LineageRequestDTO.LineageRequestType;
++import org.apache.nifi.web.api.dto.search.ComponentSearchResultDTO;
++import org.apache.nifi.web.api.dto.search.SearchResultsDTO;
++import org.apache.nifi.web.api.dto.status.ControllerStatusDTO;
++import org.apache.nifi.web.api.dto.status.ProcessGroupStatusDTO;
++import org.apache.nifi.web.api.dto.status.StatusHistoryDTO;
++import org.apache.nifi.web.util.DownloadableContent;
++import org.apache.commons.collections4.CollectionUtils;
++import org.apache.commons.lang3.StringUtils;
++import org.apache.nifi.admin.service.UserService;
++import org.apache.nifi.authorization.DownloadAuthorization;
++import org.apache.nifi.processor.DataUnit;
++import org.apache.nifi.reporting.ReportingTask;
++
 +=======
 +import org.apache.nifi.web.api.dto.DocumentedChildTypeDTO;
- >>>>>>> da18ce0... NIFI-250::nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  import org.springframework.security.access.AccessDeniedException;


Mime
View raw message