Projects >> core >>9f019e2a9ad4591df34a4d5ab2334cd8ff356c5c

Chunk
Conflicting content 
    @Path ("/wirenode/{params:.*}")
    @Produces ("application/json")
    public Response wireNode ( @Context HttpServletRequest request, @PathParam ("params") String params ) throws DotStateException, DotDataException, DotSecurityException, JSONException {
<<<<<<< HEAD
        InitDataObject initData = init( params, true, request, true ); 
=======
        InitDataObject initData = init( params, true, request, false, "NetworkPortlet" ); // TODO rejectWhenNoUser has to be true
>>>>>>> bab43410d8f314950a594e8f40d70148294ae393
        JSONObject jsonNode = new JSONObject();

        if(request.getContentType().startsWith(MediaType.APPLICATION_JSON)) {
Solution content 
    @Path ("/wirenode/{params:.*}")
    @Produces ("application/json")
    public Response wireNode ( @Context HttpServletRequest request, @PathParam ("params") String params ) throws DotStateException, DotDataException, DotSecurityException, JSONException {
        InitDataObject initData = init( params, true, request, true, "NetworkPortlet" ); 

        JSONObject jsonNode = new JSONObject();

        if(request.getContentType().startsWith(MediaType.APPLICATION_JSON)) {
File
ClusterResource.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
import com.dotmarketing.startup.runalways.Task00006CreateSystemLayout;
import com.dotmarketing.startup.runalways.Task00007RemoveSitesearchQuartzJob;
import com.dotmarketing.startup.runalways.Task00008CreateDefaultWorkflowScheme;
<<<<<<< HEAD
import com.dotmarketing.startup.runonce.Task00760AddContentletStructureInodeIndex;
import com.dotmarketing.startup.runonce.Task00765AddUserForeignKeys;
import com.dotmarketing.startup.runonce.Task00766AddFieldVariableTable;
import com.dotmarketing.startup.runonce.Task00767FieldVariableValueTypeChange;
import com.dotmarketing.startup.runonce.Task00768CreateTagStorageFieldOnHostStructure;
import com.dotmarketing.startup.runonce.Task00769UpdateTagDataModel;
import com.dotmarketing.startup.runonce.Task00775DropUnusedTables;
import com.dotmarketing.startup.runonce.Task00780UUIDTypeChange;
import com.dotmarketing.startup.runonce.Task00782CleanDataInconsistencies;
import com.dotmarketing.startup.runonce.Task00785DataModelChanges;
import com.dotmarketing.startup.runonce.Task00790DataModelChangesForWebAssets;
import com.dotmarketing.startup.runonce.Task00795LiveWorkingToIdentifier;
import com.dotmarketing.startup.runonce.Task00800CreateTemplateContainers;
import com.dotmarketing.startup.runonce.Task00805AddRenameFolderProcedure;
import com.dotmarketing.startup.runonce.Task00810FilesAsContentChanges;
import com.dotmarketing.startup.runonce.Task00815WorkFlowTablesChanges;
import com.dotmarketing.startup.runonce.Task00820CreateNewWorkFlowTables;
import com.dotmarketing.startup.runonce.Task00825UpdateLoadRecordsToIndex;
import com.dotmarketing.startup.runonce.Task00835CreateIndiciesTables;
import com.dotmarketing.startup.runonce.Task00840FixContentletVersionInfo;
import com.dotmarketing.startup.runonce.Task00845ChangeLockedOnToTimeStamp;
import com.dotmarketing.startup.runonce.Task00850DropOldFilesConstraintInWorkflow;
import com.dotmarketing.startup.runonce.Task00855FixRenameFolder;
import com.dotmarketing.startup.runonce.Task00860ExtendServerIdsMSSQL;
import com.dotmarketing.startup.runonce.Task00865AddTimestampToVersionTables;
import com.dotmarketing.startup.runonce.Task00900CreateLogConsoleTable;
import com.dotmarketing.startup.runonce.Task00905FixAddFolderAfterDelete;
import com.dotmarketing.startup.runonce.Task00910AddEscalationFields;
import com.dotmarketing.startup.runonce.Task00920AddContentletVersionSystemHost;
import com.dotmarketing.startup.runonce.Task00922FixdotfolderpathMSSQL;
import com.dotmarketing.startup.runonce.Task00925UserIdTypeChange;
import com.dotmarketing.startup.runonce.Task00930AddIdentifierIndex;
import com.dotmarketing.startup.runonce.Task00935LogConsoleTableData;
import com.dotmarketing.startup.runonce.Task00940AlterTemplateTable;
import com.dotmarketing.startup.runonce.Task00945AddTableContentPublishing;
import com.dotmarketing.startup.runonce.Task00950AddTablePublishingEndpoint;
import com.dotmarketing.startup.runonce.Task01000LinkChequerTable;
import com.dotmarketing.startup.runonce.Task01005TemplateThemeField;
import com.dotmarketing.startup.runonce.Task01015AddPublishExpireDateToIdentifier;
import com.dotmarketing.startup.runonce.Task01016AddStructureExpireFields;
import com.dotmarketing.startup.runonce.Task01020CreateDefaultWorkflow;
import com.dotmarketing.startup.runonce.Task01030AddSiteSearchAuditTable;
import com.dotmarketing.startup.runonce.Task01035FixTriggerVarLength;
import com.dotmarketing.startup.runonce.Task01060CreatePushPublishPushedAssets;
import com.dotmarketing.startup.runonce.Task01065IndexOnPublishingQueueAuditStatus;
import com.dotmarketing.startup.runonce.Task01070BundleNameDropUnique;
import com.dotmarketing.startup.runonce.Task01085CreateBundleTablesIfNotExists;
import com.dotmarketing.startup.runonce.Task01090AddWorkflowSchemeUniqueNameContraint;
import com.dotmarketing.startup.runonce.Task03000CreateContainertStructures;
import com.dotmarketing.startup.runonce.Task01045FixUpgradeTriggerVarLength;
import com.dotmarketing.startup.runonce.Task01050AddPushPublishLogger;
import com.dotmarketing.startup.runonce.Task01055CreatePushPublishEnvironmentTable;
import com.dotmarketing.startup.runonce.Task01080CreateModDateForMissingObjects;
import com.dotmarketing.startup.runonce.Task03005CreateModDateForFieldIfNeeded;
import com.dotmarketing.startup.runonce.Task03010AddContentletIdentifierIndex;
import com.dotmarketing.startup.runonce.Task03015CreateClusterConfigModel;
import com.dotmarketing.startup.runonce.Task03020PostgresqlIndiciesFK;
import com.dotmarketing.startup.runonce.Task03025CreateFoundationForNotificationSystem;
import com.dotmarketing.startup.runonce.Task03030CreateIndicesForVersionTables;
import com.dotmarketing.startup.runonce.Task03035FixContainerCheckTrigger;
import com.dotmarketing.startup.runonce.Task03040AddIndexesToStructureFields;
import com.dotmarketing.startup.runonce.Task03045AddLicenseRepoModel;
=======
import com.dotmarketing.startup.runonce.*;
>>>>>>> bab43410d8f314950a594e8f40d70148294ae393

public class TaskLocatorUtil {
Solution content 
import com.dotmarketing.startup.runalways.Task00006CreateSystemLayout;
import com.dotmarketing.startup.runalways.Task00007RemoveSitesearchQuartzJob;
import com.dotmarketing.startup.runalways.Task00008CreateDefaultWorkflowScheme;
import com.dotmarketing.startup.runonce.Task00760AddContentletStructureInodeIndex;
import com.dotmarketing.startup.runonce.Task00765AddUserForeignKeys;
import com.dotmarketing.startup.runonce.Task00766AddFieldVariableTable;
import com.dotmarketing.startup.runonce.Task00767FieldVariableValueTypeChange;
import com.dotmarketing.startup.runonce.Task00768CreateTagStorageFieldOnHostStructure;
import com.dotmarketing.startup.runonce.Task00769UpdateTagDataModel;
import com.dotmarketing.startup.runonce.Task00775DropUnusedTables;
import com.dotmarketing.startup.runonce.Task00780UUIDTypeChange;
import com.dotmarketing.startup.runonce.Task00782CleanDataInconsistencies;
import com.dotmarketing.startup.runonce.Task00785DataModelChanges;
import com.dotmarketing.startup.runonce.Task00790DataModelChangesForWebAssets;
import com.dotmarketing.startup.runonce.Task00795LiveWorkingToIdentifier;
import com.dotmarketing.startup.runonce.Task00800CreateTemplateContainers;
import com.dotmarketing.startup.runonce.Task00805AddRenameFolderProcedure;
import com.dotmarketing.startup.runonce.Task00810FilesAsContentChanges;
import com.dotmarketing.startup.runonce.Task00815WorkFlowTablesChanges;
import com.dotmarketing.startup.runonce.Task00820CreateNewWorkFlowTables;
import com.dotmarketing.startup.runonce.Task00825UpdateLoadRecordsToIndex;
import com.dotmarketing.startup.runonce.Task00835CreateIndiciesTables;
import com.dotmarketing.startup.runonce.Task00840FixContentletVersionInfo;
import com.dotmarketing.startup.runonce.Task00845ChangeLockedOnToTimeStamp;
import com.dotmarketing.startup.runonce.Task00850DropOldFilesConstraintInWorkflow;
import com.dotmarketing.startup.runonce.Task00855FixRenameFolder;
import com.dotmarketing.startup.runonce.Task00860ExtendServerIdsMSSQL;
import com.dotmarketing.startup.runonce.Task00865AddTimestampToVersionTables;
import com.dotmarketing.startup.runonce.Task00900CreateLogConsoleTable;
import com.dotmarketing.startup.runonce.Task00905FixAddFolderAfterDelete;
import com.dotmarketing.startup.runonce.Task00910AddEscalationFields;
import com.dotmarketing.startup.runonce.Task00920AddContentletVersionSystemHost;
import com.dotmarketing.startup.runonce.Task00922FixdotfolderpathMSSQL;
import com.dotmarketing.startup.runonce.Task00925UserIdTypeChange;
import com.dotmarketing.startup.runonce.Task00930AddIdentifierIndex;
import com.dotmarketing.startup.runonce.Task00935LogConsoleTableData;
import com.dotmarketing.startup.runonce.Task00940AlterTemplateTable;
import com.dotmarketing.startup.runonce.Task00945AddTableContentPublishing;
import com.dotmarketing.startup.runonce.Task00950AddTablePublishingEndpoint;
import com.dotmarketing.startup.runonce.Task01000LinkChequerTable;
import com.dotmarketing.startup.runonce.Task01005TemplateThemeField;
import com.dotmarketing.startup.runonce.Task01015AddPublishExpireDateToIdentifier;
import com.dotmarketing.startup.runonce.Task01016AddStructureExpireFields;
import com.dotmarketing.startup.runonce.Task01020CreateDefaultWorkflow;
import com.dotmarketing.startup.runonce.Task01030AddSiteSearchAuditTable;
import com.dotmarketing.startup.runonce.Task01035FixTriggerVarLength;
import com.dotmarketing.startup.runonce.Task01060CreatePushPublishPushedAssets;
import com.dotmarketing.startup.runonce.Task01065IndexOnPublishingQueueAuditStatus;
import com.dotmarketing.startup.runonce.Task01070BundleNameDropUnique;
import com.dotmarketing.startup.runonce.Task01085CreateBundleTablesIfNotExists;
import com.dotmarketing.startup.runonce.Task01090AddWorkflowSchemeUniqueNameContraint;
import com.dotmarketing.startup.runonce.Task01095CreateIntegrityCheckerResultTables;
import com.dotmarketing.startup.runonce.Task03000CreateContainertStructures;
import com.dotmarketing.startup.runonce.Task01045FixUpgradeTriggerVarLength;
import com.dotmarketing.startup.runonce.Task01050AddPushPublishLogger;
import com.dotmarketing.startup.runonce.Task01055CreatePushPublishEnvironmentTable;
import com.dotmarketing.startup.runonce.Task01080CreateModDateForMissingObjects;
import com.dotmarketing.startup.runonce.Task03005CreateModDateForFieldIfNeeded;
import com.dotmarketing.startup.runonce.Task03010AddContentletIdentifierIndex;
import com.dotmarketing.startup.runonce.Task03015CreateClusterConfigModel;
import com.dotmarketing.startup.runonce.Task03020PostgresqlIndiciesFK;
import com.dotmarketing.startup.runonce.Task03025CreateFoundationForNotificationSystem;
import com.dotmarketing.startup.runonce.Task03030CreateIndicesForVersionTables;
import com.dotmarketing.startup.runonce.Task03035FixContainerCheckTrigger;
import com.dotmarketing.startup.runonce.Task03040AddIndexesToStructureFields;
import com.dotmarketing.startup.runonce.Task03045AddLicenseRepoModel;


public class TaskLocatorUtil {
File
TaskLocatorUtil.java
Developer's decision
Manual
Kind of conflict
Import