From ac0ddd49cda816d115d56b8a4fae12c0ffb0dd67 Mon Sep 17 00:00:00 2001 From: Preston-Crary Date: Tue, 2 Feb 2016 16:42:22 -0800 Subject: [PATCH] LPS-61952 DL: java files --- .../test/AssetPublisherExportImportTest.java | 8 ++-- ...portImportPortletPreferencesProcessor.java | 8 ++-- .../v1_0_0/UpgradePortletPreferences.java | 2 +- .../lar/BlogsEntryStagedModelDataHandler.java | 2 +- .../action/EditEntryMVCActionCommand.java | 2 +- .../BookmarksAdminConfigurationAction.java | 2 +- .../BookmarksPortletToolbarContributor.java | 2 +- .../bookmarks/web/search/EntriesChecker.java | 2 +- .../configurator/GoogleDocsConfigurator.java | 6 +-- .../GoogleDocsDLDisplayContextFactory.java | 16 ++++---- ...ogleDocsDLEditFileEntryDisplayContext.java | 8 ++-- .../context/GoogleDocsDLFilePicker.java | 2 +- ...leDocsDLViewFileVersionDisplayContext.java | 4 +- .../GoogleDocsIGDisplayContextFactory.java | 6 +-- .../context/GoogleDocsUIItemsProcessor.java | 2 +- .../LegacyGoogleDocsMetadataHelper.java | 10 ++--- .../migration/LegacyGoogleDocsMigration.java | 10 ++--- .../util/GoogleDocsDLFileEntryTypeHelper.java | 6 +-- .../docs/util/GoogleDocsMetadataHelper.java | 10 ++--- .../DLItemSelectorViewDisplayContext.java | 2 +- .../internal/BaseCMISRepositoryFactory.java | 4 +- .../CMISAtomPubRepositoryFactory.java | 4 +- .../cmis/internal/CMISRepository.java | 24 +++++------ .../CMISWebServicesRepositoryFactory.java | 4 +- .../cmis/internal/model/CMISFileEntry.java | 10 ++--- .../cmis/internal/model/CMISFileVersion.java | 6 +-- .../cmis/internal/model/CMISFolder.java | 8 ++-- .../search/test/CMISQueryBuilderTest.java | 2 +- .../RepositorySearchQueryBuilderImpl.java | 4 +- .../atom/FileEntryAtomCollectionAdapter.java | 4 +- .../atom/FolderAtomCollectionAdapter.java | 4 +- ...FileEntryMetadataDDMPermissionSupport.java | 2 +- ...MetadataProcessorDDMPermissionSupport.java | 2 +- ...cturesPortalInstanceLifecycleListener.java | 10 ++--- ...DLFileEntryTypeStagedModelDataHandler.java | 8 ++-- .../lar/FileEntryStagedModelDataHandler.java | 28 ++++++------- .../FileShortcutStagedModelDataHandler.java | 10 ++--- .../lar/FolderStagedModelDataHandler.java | 14 +++---- .../document/library/lar/FolderUtil.java | 6 +-- .../lar/RepositoryStagedModelDataHandler.java | 6 +-- .../lar/xstream/FileEntryConverter.java | 2 +- .../lar/xstream/FileVersionConverter.java | 2 +- .../library/lar/xstream/FolderConverter.java | 2 +- .../DLFileEntrySearchResultContributor.java | 6 +-- .../DLFileEntryPermissionUpdateHandler.java | 6 +-- ...LFileEntryTypePermissionUpdateHandler.java | 6 +-- .../DLFolderPermissionUpdateHandler.java | 6 +-- .../library/store/IgnoreDuplicatesStore.java | 4 +- .../store/IgnoreDuplicatesStoreWrapper.java | 4 +- .../library/trash/DLBaseTrashHandler.java | 8 ++-- .../trash/DLFileEntryTrashHandler.java | 24 +++++------ .../trash/DLFileShortcutTrashHandler.java | 16 ++++---- .../library/trash/DLFolderTrashHandler.java | 16 ++++---- .../verify/DLServiceVerifyProcess.java | 36 ++++++++--------- .../workflow/DLFileEntryWorkflowHandler.java | 18 ++++----- .../SearchResultUtilDLFileEntryTest.java | 4 +- ...leEntryTypeStagedModelDataHandlerTest.java | 8 ++-- .../lar/test/DLPortletDataHandlerTest.java | 20 +++++----- .../FileEntryStagedModelDataHandlerTest.java | 20 +++++----- ...ileShortcutStagedModelDataHandlerTest.java | 16 ++++---- .../FolderStagedModelDataHandlerTest.java | 16 ++++---- .../RepositoryStagedModelDataHandlerTest.java | 4 +- .../DocumentLibraryUserNotificationTest.java | 6 +-- .../search/test/DLFileEntrySearchTest.java | 20 +++++----- .../DLFileEntryMetadataLocalServiceTest.java | 16 ++++---- .../test/DLFileEntryTypeServiceTest.java | 16 ++++---- .../service/test/DLFileVersionTest.java | 24 +++++------ .../DLFileEntryActivityInterpreterTest.java | 10 ++--- .../test/DLFolderActivityInterpreterTest.java | 6 +-- .../test/DLServiceVerifyProcessTest.java | 24 +++++------ .../library/webdav/test/WebDAVOSXTest.java | 4 +- .../data/mapping/util/DLDDMDisplay.java | 2 +- .../web/asset/DLFileEntryAssetRenderer.java | 6 +-- .../DLFileEntryAssetRendererFactory.java | 14 +++---- .../web/asset/DLFolderAssetRenderer.java | 2 +- .../asset/DLFolderAssetRendererFactory.java | 4 +- .../DLFileEntryCustomAttributesDisplay.java | 2 +- .../DLFolderCustomAttributesDisplay.java | 2 +- .../DLDisplayContextFactoryReference.java | 2 +- .../context/DLDisplayContextProvider.java | 8 ++-- .../DefaultDLEditFileEntryDisplayContext.java | 8 ++-- ...efaultDLViewFileVersionDisplayContext.java | 8 ++-- .../DLPortletInstanceSettingsHelper.java | 2 +- .../logic/FileEntryDisplayContextHelper.java | 4 +- .../FileVersionDisplayContextHelper.java | 4 +- .../display/context/logic/UIItemsBuilder.java | 8 ++-- ...portImportPortletPreferencesProcessor.java | 6 +-- .../library/web/lar/DLPortletDataHandler.java | 28 ++++++------- .../portlet/DLAdminEditPortletProvider.java | 2 +- .../web/portlet/DLEditPortletProvider.java | 2 +- .../web/portlet/action/ActionUtil.java | 10 ++--- .../CompareVersionsMVCRenderCommand.java | 8 ++-- .../action/DLFileEntryFindActionHelper.java | 2 +- .../action/DLFolderFindActionHelper.java | 2 +- .../action/EditEntryMVCActionCommand.java | 18 ++++----- .../action/EditFileEntryMVCActionCommand.java | 34 ++++++++-------- .../EditFileEntryTypeMVCActionCommand.java | 12 +++--- .../EditFileEntryTypeMVCRenderCommand.java | 10 ++--- .../EditFileShortcutMVCActionCommand.java | 12 +++--- .../EditFileShortcutMVCRenderCommand.java | 2 +- .../action/EditFolderMVCActionCommand.java | 22 +++++----- .../action/EditFolderMVCResourceCommand.java | 4 +- .../EditRepositoryMVCActionCommand.java | 10 ++--- .../portlet/action/GetFileActionHelper.java | 10 ++--- .../action/GetFileEntryMVCRenderCommand.java | 4 +- .../action/GetFolderMVCRenderCommand.java | 2 +- .../action/MoveEntryMVCRenderCommand.java | 2 +- ...ValidateRootFolderConfigurationAction.java | 6 +-- ...ssFromDesktopPortletConfigurationIcon.java | 2 +- ...leteFileEntryPortletConfigurationIcon.java | 2 +- .../DeleteFolderPortletConfigurationIcon.java | 4 +- ...loadFileEntryPortletConfigurationIcon.java | 2 +- .../EditFolderPortletConfigurationIcon.java | 4 +- ...tryPermissionPortletConfigurationIcon.java | 2 +- ...derPermissionPortletConfigurationIcon.java | 4 +- ...MoveFileEntryPortletConfigurationIcon.java | 2 +- ...ficeFileEntryPortletConfigurationIcon.java | 2 +- .../PermissionsPortletConfigurationIcon.java | 2 +- ...oryPermissionPortletConfigurationIcon.java | 2 +- .../DLPortletToolbarContributor.java | 14 +++---- .../DLPortletRatingsDefinition.java | 2 +- .../library/web/search/EntriesChecker.java | 8 ++-- .../internal/DLPortletInstanceSettings.java | 4 +- .../DLFileEntryActivityInterpreter.java | 6 +-- .../social/DLFolderActivityInterpreter.java | 2 +- ...tLibraryPortletDisplayTemplateHandler.java | 10 ++--- .../trash/DLFileShortcutTrashRenderer.java | 6 +-- .../DLFileShortcutTrashRendererFactory.java | 6 +-- .../web/upload/FileEntryDLUploadHandler.java | 8 ++-- .../library/web/util/DLBreadcrumbUtil.java | 4 +- .../document/library/web/util/IGUtil.java | 4 +- .../web/webdav/DLWebDAVStorageImpl.java | 24 +++++------ .../document_library/folder_action.jsp | 2 +- .../impl/DDLRecordLocalServiceImpl.java | 2 +- .../dynamic/data/lists/util/impl/DDLImpl.java | 2 +- .../lists/exporter/test/DDLExporterTest.java | 4 +- .../template/DDLDisplayTemplateHelper.java | 4 +- ...ntLibraryDDMFormFieldValueTransformer.java | 6 +-- ...ormValuesExportImportContentProcessor.java | 4 +- ...umentLibraryDDMFormFieldValueRenderer.java | 2 +- .../impl/DocumentLibraryFieldRenderer.java | 4 +- .../mapping/upgrade/DDMServiceUpgrade.java | 6 +-- .../v1_0_0/UpgradeDynamicDataMapping.java | 24 +++++------ .../data/mapping/util/impl/DDMImpl.java | 4 +- .../impl/DefaultDDMStructureHelperImpl.java | 2 +- .../render/DDMFormFieldValueRendererTest.java | 2 +- .../storage/test/StorageAdapterTest.java | 4 +- .../test/UpgradeDynamicDataMappingTest.java | 4 +- .../importer/util/FileSystemImporter.java | 16 ++++---- .../importer/util/ResourceImporter.java | 2 +- .../BaseTextExportImportContentProcessor.java | 10 ++--- .../lar/ExportImportHelperImpl.java | 2 +- .../exportimport/staging/StagingImpl.java | 8 ++-- .../test/ExportImportHelperUtilTest.java | 4 +- .../action/ExportImportMVCActionCommand.java | 2 +- .../action/ImportLayoutsMVCActionCommand.java | 4 +- .../action/UploadImageMVCActionCommand.java | 10 ++--- .../action/UploadImageMVCResourceCommand.java | 2 +- ...rRepositoryEntryBrowserReturnTypeUtil.java | 2 +- ...temSelectorRepositoryEntryBrowserUtil.java | 6 +-- .../impl/JournalArticleLocalServiceImpl.java | 2 +- .../util/impl/JournalConverterImpl.java | 2 +- .../verify/JournalServiceVerifyProcess.java | 2 +- .../util/test/JournalConverterUtilTest.java | 6 +-- .../journal/web/portlet/JournalPortlet.java | 4 +- .../web/portlet/action/ActionUtil.java | 2 +- .../journal/web/util/ExportArticleUtil.java | 2 +- .../journal/web/util/JournalRSSUtil.java | 6 +-- .../admin/web/portlet/LayoutAdminPortlet.java | 2 +- .../portlet/LayoutPrototypePagePortlet.java | 2 +- .../marketplace/model/impl/AppImpl.java | 4 +- .../service/impl/AppLocalServiceImpl.java | 4 +- .../lar/MBMessageStagedModelDataHandler.java | 4 +- .../boards/trash/MBMessageTrashHandler.java | 2 +- .../MBMessageStagedModelDataHandlerTest.java | 8 ++-- .../action/EditMessageMVCActionCommand.java | 10 ++--- .../action/EditCompanyMVCActionCommand.java | 2 +- .../RecentDocumentsMessageListener.java | 2 +- .../impl/ScreensAssetEntryServiceImpl.java | 2 +- ...tLibraryExtraSettingsMVCActionCommand.java | 4 +- .../action/EditServerMVCActionCommand.java | 2 +- .../EditOrganizationMVCActionCommand.java | 2 +- .../action/EditUserMVCActionCommand.java | 2 +- .../WikiDLStoreConvertProcess.java | 2 +- .../impl/mediawiki/MediaWikiImporter.java | 2 +- .../lar/WikiPageStagedModelDataHandler.java | 4 +- .../liferay/wiki/model/impl/WikiNodeImpl.java | 2 +- .../liferay/wiki/model/impl/WikiPageImpl.java | 2 +- .../impl/WikiNodeLocalServiceImpl.java | 2 +- .../impl/WikiPageLocalServiceImpl.java | 2 +- .../wiki/trash/WikiPageTrashHandler.java | 2 +- .../attachments/test/WikiAttachmentsTest.java | 6 +-- .../WikiPageStagedModelDataHandlerTest.java | 8 ++-- .../test/WikiActivityInterpreterTest.java | 2 +- .../liferay/wiki/WikiAttachmentsHelper.java | 2 +- .../util/WikiSocialActivityHelper.java | 2 +- .../EditPageAttachmentsMVCActionCommand.java | 22 +++++----- .../action/GetPageAttachmentAction.java | 2 +- .../ConfigurationAdminBundleActivator.java | 2 +- .../liferay/portal/store/cmis/CMISStore.java | 10 ++--- .../com/liferay/portal/store/db/DBStore.java | 14 +++---- .../portal/store/db/DBStoreRegistrator.java | 4 +- .../ConfigurationAdminBundleActivator.java | 2 +- .../test/AdvancedFileSystemStoreTest.java | 2 +- .../file/system/test/FileSystemStoreTest.java | 2 +- .../file/system/AdvancedFileSystemStore.java | 8 ++-- .../store/file/system/FileSystemStore.java | 10 ++--- .../ConfigurationAdminBundleActivator.java | 2 +- .../liferay/portal/store/jcr/JCRStore.java | 8 ++-- .../ConfigurationAdminBundleActivator.java | 2 +- .../com/liferay/portal/store/s3/S3Store.java | 8 ++-- .../wrapper/SafeFileNameStoreWrapper.java | 6 +-- .../task/model/impl/BackgroundTaskImpl.java | 2 +- .../impl/BackgroundTaskLocalServiceImpl.java | 2 +- .../container/upload/test/TestFileEntry.java | 4 +- .../tools/sample/sql/builder/DataFactory.java | 20 +++++----- .../DocumentLibraryConvertProcess.java | 12 +++--- ...entLibraryExtraSettingsConvertProcess.java | 2 +- .../deploy/hot/HookHotDeployListener.java | 10 ++--- .../src/com/liferay/portal/image/DLHook.java | 6 +-- .../liferay/portal/image/FileSystemHook.java | 2 +- .../metadata/XugglerRawMetadataProcessor.java | 4 +- .../liferay/portal/model/impl/ImageImpl.java | 6 +-- .../PortletFileRepositoryImpl.java | 10 ++--- .../repository/RepositoryProviderImpl.java | 26 ++++++------ .../capabilities/CapabilityRepository.java | 2 +- .../LiferayBulkOperationCapability.java | 4 +- .../LiferayCommentCapability.java | 2 +- .../LiferayProcessorCapability.java | 2 +- .../LiferayRelatedModelCapability.java | 2 +- .../capabilities/LiferaySyncCapability.java | 6 +-- .../LiferayThumbnailCapability.java | 4 +- .../capabilities/LiferayTrashCapability.java | 12 +++--- .../LiferayWorkflowCapability.java | 12 +++--- .../MinimalWorkflowCapability.java | 2 +- .../TemporaryFileEntriesCapabilityImpl.java | 4 +- .../util/DLAppServiceAdapter.java | 8 ++-- .../util/DLFileEntryServiceAdapter.java | 10 ++--- .../util/DLFileVersionServiceAdapter.java | 10 ++--- .../util/DLFolderServiceAdapter.java | 8 ++-- .../util/RepositoryEntryChecker.java | 2 +- .../util/RepositoryEntryConverter.java | 2 +- .../LegacyExternalRepositoryFactory.java | 4 +- .../LiferayLocalRepository.java | 28 ++++++------- .../liferayrepository/LiferayRepository.java | 28 ++++++------- .../LiferayRepositoryBase.java | 30 +++++++------- .../LiferayRepositoryDefiner.java | 4 +- .../LiferayRepositoryFactory.java | 20 +++++----- ...LiferayWorkflowLocalRepositoryWrapper.java | 2 +- .../LiferayWorkflowRepositoryWrapper.java | 2 +- .../model/LiferayFileEntry.java | 10 ++--- .../model/LiferayFileShortcut.java | 4 +- .../model/LiferayFileVersion.java | 6 +-- .../model/LiferayFolder.java | 4 +- ...LiferayFileEntrySocialActivityManager.java | 2 +- ...erayFileShortcutSocialActivityManager.java | 2 +- .../LiferayFolderSocialActivityManager.java | 2 +- .../liferayrepository/util/LiferayBase.java | 6 +-- .../portletrepository/PortletRepository.java | 20 +++++----- .../PortletRepositoryDefiner.java | 2 +- .../TemporaryFileEntryRepository.java | 20 +++++----- .../impl/RepositoryLocalServiceImpl.java | 4 +- .../service/impl/RepositoryServiceImpl.java | 6 +-- .../methods/GetDocsMetaInfoMethodImpl.java | 2 +- .../UpgradeDocumentLibrary.java | 4 +- .../v6_0_0/UpgradeDocumentLibrary.java | 4 +- .../v6_0_12_to_6_1_0/UpgradeAsset.java | 5 +-- .../UpgradeDocumentLibrary.java | 4 +- .../v6_0_3/UpgradeDocumentLibrary.java | 4 +- .../portal/upgrade/v6_1_0/UpgradeAsset.java | 5 +-- .../upgrade/v6_1_0/UpgradeAssetPublisher.java | 5 +-- .../v6_1_0/UpgradeDocumentLibrary.java | 8 ++-- .../upgrade/v6_1_0/UpgradeImageGallery.java | 26 +++++++----- .../upgrade/v6_1_0/UpgradeWorkflow.java | 9 ++--- .../v6_2_0/UpgradeDocumentLibrary.java | 4 +- .../v6_2_0/UpgradeDynamicDataMapping.java | 4 +- .../UpgradeMessageBoardsAttachments.java | 2 +- .../portal/upgrade/v6_2_0/UpgradeSearch.java | 4 +- .../portal/upgrade/v6_2_0/UpgradeSocial.java | 4 +- .../v6_2_0/UpgradeWikiAttachments.java | 2 +- .../v7_0_0/UpgradeDocumentLibrary.java | 6 +-- .../upgrade/v7_0_0/UpgradeSubscription.java | 6 +-- .../com/liferay/portal/util/PortalImpl.java | 6 +-- .../liferay/portal/verify/VerifyAsset.java | 6 +-- .../model/DLFileEntryVerifiableModel.java | 2 +- .../model/DLFileShortcutVerifiableModel.java | 2 +- .../verify/model/DLFolderVerifiableModel.java | 2 +- .../portal/webserver/WebServerServlet.java | 26 ++++++------ .../blogs/model/impl/BlogsEntryImpl.java | 2 +- .../impl/BlogsEntryLocalServiceImpl.java | 2 +- .../antivirus/AntivirusScannerImpl.java | 2 + .../antivirus/ClamAntivirusScannerImpl.java | 3 ++ .../antivirus/DummyAntivirusScannerImpl.java | 2 + .../asset/DLFileEntryClassType.java | 4 +- .../asset/DLFileEntryClassTypeReader.java | 8 ++-- .../asset/DLFileEntryDDMFormValuesReader.java | 4 +- .../constants/DLConstants.java | 2 +- .../documentlibrary/lar/FileEntryUtil.java | 10 ++--- .../AudioProcessorMessageListener.java | 2 +- .../CheckFileRankMessageListener.java | 2 +- .../ImageProcessorMessageListener.java | 2 +- .../PDFProcessorMessageListener.java | 2 +- .../RawMetadataProcessorMessageListener.java | 2 +- .../VideoProcessorMessageListener.java | 2 +- .../model/impl/DLFileEntryImpl.java | 32 +++++++-------- .../model/impl/DLFileEntryMetadataImpl.java | 4 +- .../model/impl/DLFileEntryTypeImpl.java | 4 +- .../model/impl/DLFileShortcutImpl.java | 8 ++-- .../model/impl/DLFileVersionImpl.java | 16 ++++---- .../model/impl/DLFolderImpl.java | 10 ++--- .../impl/DLAppHelperLocalServiceImpl.java | 26 ++++++------ .../service/impl/DLAppLocalServiceImpl.java | 12 +++--- .../service/impl/DLAppServiceImpl.java | 12 +++--- .../impl/DLContentLocalServiceImpl.java | 6 +-- .../impl/DLFileEntryLocalServiceImpl.java | 40 +++++++++---------- .../DLFileEntryMetadataLocalServiceImpl.java | 4 +- .../service/impl/DLFileEntryServiceImpl.java | 10 ++--- .../impl/DLFileEntryTypeLocalServiceImpl.java | 24 +++++------ .../impl/DLFileEntryTypeServiceImpl.java | 2 +- .../impl/DLFileRankLocalServiceImpl.java | 6 +-- .../impl/DLFileShortcutLocalServiceImpl.java | 10 ++--- .../impl/DLFileShortcutServiceImpl.java | 4 +- .../impl/DLFileVersionLocalServiceImpl.java | 8 ++-- .../impl/DLFileVersionServiceImpl.java | 2 +- .../impl/DLFolderLocalServiceImpl.java | 28 ++++++------- .../service/impl/DLFolderServiceImpl.java | 4 +- .../impl/DLSyncEventLocalServiceImpl.java | 2 +- .../service/impl/DLTrashLocalServiceImpl.java | 2 +- .../service/impl/DLTrashServiceImpl.java | 2 +- .../permission/DLFileEntryPermission.java | 16 ++++---- .../permission/DLFileEntryTypePermission.java | 4 +- .../permission/DLFileShortcutPermission.java | 6 +-- .../permission/DLFolderPermission.java | 12 +++--- .../service/permission/DLPermission.java | 4 +- .../impl/DLFileEntryFinderImpl.java | 6 +-- .../impl/DLFileEntryMetadataFinderImpl.java | 4 +- .../impl/DLFileEntryTypeFinderImpl.java | 4 +- .../impl/DLFileRankFinderImpl.java | 4 +- .../persistence/impl/DLFolderFinderImpl.java | 14 +++---- .../sharepoint/DLSharepointStorageImpl.java | 10 ++--- .../documentlibrary/store/DLStoreImpl.java | 8 ++-- .../documentlibrary/store/StoreFactory.java | 2 + .../documentlibrary/store/StoreProxyBean.java | 1 + .../util/AudioProcessorImpl.java | 7 +++- .../util/DLFileEntryIndexer.java | 18 ++++----- .../util/DLFileEntryLockListener.java | 4 +- .../util/DLFileEntryMetadataIndexer.java | 6 +-- .../documentlibrary/util/DLFolderIndexer.java | 4 +- .../portlet/documentlibrary/util/DLImpl.java | 32 ++++++++------- .../util/DLOpenSearchImpl.java | 2 +- .../util/DLProcessorRegistryImpl.java | 3 ++ .../documentlibrary/util/DLSearcher.java | 4 +- .../documentlibrary/util/DLValidatorImpl.java | 14 ++++--- .../util/ImageProcessorImpl.java | 8 ++-- .../util/PDFProcessorImpl.java | 9 +++-- .../util/RawMetadataProcessorImpl.java | 10 +++-- .../util/RepositoryModelUtil.java | 10 ++--- .../util/VideoProcessorImpl.java | 7 +++- .../DLFileEntryOrderByComparator.java | 2 +- .../comparator/DLFolderOrderByComparator.java | 2 +- .../webdav/DLFileEntryResourceImpl.java | 2 +- .../impl/ExportImportLocalServiceImpl.java | 2 +- .../service/impl/StagingLocalServiceImpl.java | 8 ++-- .../model/impl/MBMessageImpl.java | 2 +- .../model/impl/MBThreadImpl.java | 2 +- .../impl/MBMessageLocalServiceImpl.java | 2 +- .../impl/MBThreadLocalServiceImpl.java | 2 +- .../portlet/messageboards/util/MBUtil.java | 4 +- .../liferay/portlet/trash/util/TrashImpl.java | 2 +- .../DocumentLibraryConvertProcessTest.java | 18 ++++----- .../BaseDisplayContextProviderTest.java | 2 +- .../TestBaseDisplayContextFactoryImpl.java | 4 +- .../PortletFileRepositoryTest.java | 8 ++-- .../repository/RepositoryFactoryTest.java | 2 +- .../repository/RepositoryProviderTest.java | 12 +++--- .../portal/repository/RepositoryTest.java | 10 ++--- .../TemporaryFileEntriesCapabilityTest.java | 6 +-- .../service/CompanyLocalServiceTest.java | 8 ++-- .../portal/webserver/WebServerRangeTest.java | 2 +- .../portal/webserver/WebServerTrashTest.java | 4 +- .../service/AssetTagStatsServiceTest.java | 6 +-- .../BlogsEntryImageSelectorHelperTest.java | 4 +- .../BaseBlogsEntryImageTestCase.java | 4 +- .../blogs/ratings/DLFileEntryRatingsTest.java | 6 +-- .../blogs/ratings/DLFolderRatingsTest.java | 4 +- .../DLFileEntryDDMFormValuesReaderTest.java | 12 +++--- .../search/DLFolderSearchTest.java | 10 ++--- .../service/BaseDLAppTestCase.java | 5 ++- .../service/DLAppLocalServiceTest.java | 10 +++-- .../service/DLAppServiceTest.java | 18 +++++---- .../service/DLCheckInCheckOutTest.java | 7 ++-- .../service/DLContentLocalServiceTest.java | 5 ++- .../service/DLFileEntryExtensionTest.java | 8 ++-- .../service/DLFileEntryLocalServiceTest.java | 25 +++++++----- .../DLFileEntryLocalServiceTreeTest.java | 7 +++- .../service/DLFileEntryServiceTest.java | 16 +++++--- .../DLFileShortcutLocalServiceTreeTest.java | 7 +++- .../service/DLFileVersionHistoryTest.java | 7 +++- .../DLFileVersionLocalServiceTreeTest.java | 9 +++-- .../service/DLFileVersionUpdateTest.java | 3 +- .../service/DLFolderLocalServiceTest.java | 6 ++- .../service/DLFolderLocalServiceTreeTest.java | 7 +++- .../service/PDFProcessorTest.java | 7 ++-- .../service/http/DLAppServiceHttpTest.java | 2 +- .../service/http/DLAppServiceJsonTest.java | 2 +- .../service/http/DLAppServiceSoapTest.java | 2 +- .../DLFileEntryPermissionCheckerTest.java | 8 ++-- .../DLFolderPermissionCheckerTest.java | 6 +-- .../persistence/DLFileEntryFinderTest.java | 18 ++++----- .../DLFileEntryTypeFinderTest.java | 7 ++-- .../persistence/DLFolderFinderTest.java | 13 +++--- .../store/StoreFactoryTest.java | 1 + .../bundle/storefactory/DelegatorStore.java | 4 +- .../storefactory/FirstStoreWrapper.java | 4 +- .../bundle/storefactory/LastStoreWrapper.java | 4 +- .../store/bundle/storefactory/TestStore.java | 4 +- .../DLSubscriptionAuthorTest.java | 2 +- .../DLSubscriptionClassTypeTest.java | 10 ++--- .../DLSubscriptionContainerModelTest.java | 2 +- .../DLSubscriptionLocalizedContentTest.java | 2 +- .../DLSubscriptionRootContainerModelTest.java | 4 +- .../trash/DLFileEntryTrashHandlerTest.java | 26 ++++++------ .../trash/DLFileShortcutTrashHandlerTest.java | 16 ++++---- .../trash/DLFolderTrashHandlerTest.java | 10 ++--- .../util/DLDirectoryNameAndFileNameTest.java | 11 ++--- .../util/RepositoryModelUtilTest.java | 18 ++++----- .../attachments/MBAttachmentsTest.java | 6 +-- .../RatingsDataTransformerUtilTest.java | 8 ++-- .../service/SocialActivityServiceTest.java | 6 +-- ...rashEntryLocalServiceCheckEntriesTest.java | 8 ++-- .../search/BaseIndexerGetFullQueryTest.java | 2 +- .../context/BaseDLDisplayContextFactory.java | 2 +- .../BaseDLEditFileEntryDisplayContext.java | 4 +- .../context/DLDisplayContextFactory.java | 2 +- .../library/kernel/store/BaseStore.java | 2 +- .../kernel/util/AudioProcessorUtil.java | 2 +- .../document/library/kernel/util/DL.java | 6 +-- .../kernel/util/DLPreviewableProcessor.java | 2 +- .../document/library/kernel/util/DLUtil.java | 6 +-- .../library/kernel/util/DLValidator.java | 12 +++--- .../library/kernel/util/DLValidatorUtil.java | 12 +++--- .../kernel/util/ImageProcessorUtil.java | 2 +- .../library/kernel/util/PDFProcessorUtil.java | 2 +- .../kernel/util/RawMetadataProcessorUtil.java | 2 +- .../kernel/util/VideoProcessorUtil.java | 2 +- .../DLContentVersionComparator.java | 2 +- .../DLFileVersionVersionComparator.java | 2 +- .../FileRankCreateDateComparator.java | 2 +- .../util/comparator/FolderIdComparator.java | 2 +- .../RepositoryModelCreateDateComparator.java | 6 +-- ...RepositoryModelModifiedDateComparator.java | 6 +-- .../RepositoryModelReadCountComparator.java | 8 ++-- .../RepositoryModelSizeComparator.java | 8 ++-- .../RepositoryModelTitleComparator.java | 6 +-- .../comparator/VersionNumberComparator.java | 2 +- .../kernel/display/context/IGUIItemKeys.java | 2 +- .../kernel/repository/BaseRepository.java | 4 +- .../kernel/repository/BaseRepositoryImpl.java | 6 +-- .../proxy/BaseRepositoryProxyBean.java | 4 +- .../repository/util/ModelValidatorUtil.java | 2 +- .../v6_2_0/BaseUpgradeAttachments.java | 34 +++++++++------- .../kernel/upload/BaseUploadHandler.java | 6 +-- .../portal/kernel/util/TempFileEntryUtil.java | 4 +- .../portal/kernel/webdav/WebDAVUtil.java | 2 +- .../exception/InvalidFolderException.java | 4 +- .../store/test/BaseStoreTestCase.java | 8 ++-- .../util/test/DLAppTestUtil.java | 8 ++-- .../documentlibrary/util/test/DLTestUtil.java | 14 +++---- 468 files changed, 1659 insertions(+), 1578 deletions(-) diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/lar/test/AssetPublisherExportImportTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/lar/test/AssetPublisherExportImportTest.java index 497b7de0ab72a3..f0ea238e3b4697 100644 --- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/lar/test/AssetPublisherExportImportTest.java +++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/lar/test/AssetPublisherExportImportTest.java @@ -26,6 +26,10 @@ import com.liferay.asset.publisher.web.display.context.AssetEntryResult; import com.liferay.asset.publisher.web.display.context.AssetPublisherDisplayContext; import com.liferay.asset.publisher.web.util.AssetPublisherUtil; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.test.util.DDMStructureTestUtil; import com.liferay.exportimport.kernel.configuration.ExportImportConfigurationConstants; @@ -73,10 +77,6 @@ import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.util.test.LayoutTestUtil; import com.liferay.portlet.asset.util.test.AssetTestUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; import java.io.Serializable; diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/exportimport/portlet/preferences/processor/AssetPublisherExportImportPortletPreferencesProcessor.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/exportimport/portlet/preferences/processor/AssetPublisherExportImportPortletPreferencesProcessor.java index e1b8963b22f407..46f5ceccc25d56 100644 --- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/exportimport/portlet/preferences/processor/AssetPublisherExportImportPortletPreferencesProcessor.java +++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/exportimport/portlet/preferences/processor/AssetPublisherExportImportPortletPreferencesProcessor.java @@ -27,6 +27,10 @@ import com.liferay.asset.publisher.web.configuration.AssetPublisherWebConfigurationValues; import com.liferay.asset.publisher.web.constants.AssetPublisherPortletKeys; import com.liferay.asset.publisher.web.util.AssetPublisherUtil; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.service.persistence.DLFileEntryTypeUtil; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalService; import com.liferay.dynamic.data.mapping.service.persistence.DDMStructureUtil; @@ -69,10 +73,6 @@ import com.liferay.portal.service.LayoutLocalService; import com.liferay.portal.service.OrganizationLocalService; import com.liferay.portal.service.PortletLocalService; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.service.persistence.DLFileEntryTypeUtil; import java.io.Serializable; diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/upgrade/v1_0_0/UpgradePortletPreferences.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/upgrade/v1_0_0/UpgradePortletPreferences.java index d7e882101dbb89..ade05aa9ad7081 100644 --- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/upgrade/v1_0_0/UpgradePortletPreferences.java +++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/upgrade/v1_0_0/UpgradePortletPreferences.java @@ -15,6 +15,7 @@ package com.liferay.asset.publisher.web.upgrade.v1_0_0; import com.liferay.asset.publisher.web.constants.AssetPublisherPortletKeys; +import com.liferay.document.library.kernel.model.DLFileEntryType; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.json.JSONArray; import com.liferay.portal.kernel.json.JSONFactoryUtil; @@ -32,7 +33,6 @@ import com.liferay.portal.kernel.xml.Document; import com.liferay.portal.kernel.xml.Element; import com.liferay.portal.kernel.xml.SAXReaderUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/lar/BlogsEntryStagedModelDataHandler.java b/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/lar/BlogsEntryStagedModelDataHandler.java index 06b4c3719c8fd1..5e22eb80be8344 100644 --- a/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/lar/BlogsEntryStagedModelDataHandler.java +++ b/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/lar/BlogsEntryStagedModelDataHandler.java @@ -17,6 +17,7 @@ import com.liferay.blogs.exportimport.content.processor.BlogsEntryExportImportContentProcessor; import com.liferay.blogs.kernel.model.BlogsEntry; import com.liferay.blogs.kernel.service.BlogsEntryLocalService; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.exportimport.kernel.lar.ExportImportPathUtil; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.exportimport.kernel.lar.StagedModelDataHandler; @@ -44,7 +45,6 @@ import com.liferay.portal.service.ImageLocalService; import com.liferay.portal.service.ServiceContext; import com.liferay.portlet.documentlibrary.lar.FileEntryUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import java.io.InputStream; diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/portlet/action/EditEntryMVCActionCommand.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/portlet/action/EditEntryMVCActionCommand.java index fa0716ed3e2d9c..0849004503d271 100644 --- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/portlet/action/EditEntryMVCActionCommand.java +++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/portlet/action/EditEntryMVCActionCommand.java @@ -28,6 +28,7 @@ import com.liferay.blogs.kernel.service.BlogsEntryLocalService; import com.liferay.blogs.kernel.service.BlogsEntryService; import com.liferay.blogs.web.constants.BlogsPortletKeys; +import com.liferay.document.library.kernel.exception.FileSizeException; import com.liferay.portal.kernel.editor.EditorConstants; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.json.JSONArray; @@ -71,7 +72,6 @@ import com.liferay.portlet.blogs.BlogsEntryAttachmentFileEntryHelper; import com.liferay.portlet.blogs.BlogsEntryAttachmentFileEntryReference; import com.liferay.portlet.blogs.BlogsEntryImageSelectorHelper; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; import com.liferay.trash.kernel.service.TrashEntryService; import com.liferay.trash.kernel.util.TrashUtil; diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/portlet/action/BookmarksAdminConfigurationAction.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/portlet/action/BookmarksAdminConfigurationAction.java index 242a38fd559b1d..fcd92f0e284469 100644 --- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/portlet/action/BookmarksAdminConfigurationAction.java +++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/portlet/action/BookmarksAdminConfigurationAction.java @@ -17,11 +17,11 @@ import com.liferay.bookmarks.constants.BookmarksPortletKeys; import com.liferay.bookmarks.model.BookmarksFolderConstants; import com.liferay.bookmarks.service.BookmarksFolderLocalService; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; import com.liferay.portal.kernel.portlet.BaseJSPSettingsConfigurationAction; import com.liferay.portal.kernel.portlet.ConfigurationAction; import com.liferay.portal.kernel.servlet.SessionErrors; import com.liferay.portal.kernel.util.GetterUtil; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/portlet/toolbar/contributor/BookmarksPortletToolbarContributor.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/portlet/toolbar/contributor/BookmarksPortletToolbarContributor.java index 1b8055bb1a1b1b..cf51bed7a96498 100644 --- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/portlet/toolbar/contributor/BookmarksPortletToolbarContributor.java +++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/portlet/toolbar/contributor/BookmarksPortletToolbarContributor.java @@ -22,6 +22,7 @@ import com.liferay.bookmarks.model.BookmarksFolder; import com.liferay.bookmarks.model.BookmarksFolderConstants; import com.liferay.bookmarks.service.BookmarksFolderService; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.bean.BeanParamUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.language.LanguageUtil; @@ -42,7 +43,6 @@ import com.liferay.portal.kernel.theme.ThemeDisplay; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.util.ArrayList; import java.util.List; diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/search/EntriesChecker.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/search/EntriesChecker.java index da46030e225581..08455193dfd55e 100644 --- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/search/EntriesChecker.java +++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/search/EntriesChecker.java @@ -20,6 +20,7 @@ import com.liferay.bookmarks.service.BookmarksFolderLocalServiceUtil; import com.liferay.bookmarks.service.permission.BookmarksEntryPermissionChecker; import com.liferay.bookmarks.service.permission.BookmarksFolderPermissionChecker; +import com.liferay.document.library.kernel.model.DLFileShortcut; import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker; import com.liferay.portal.kernel.dao.search.RowChecker; import com.liferay.portal.kernel.portlet.LiferayPortletRequest; @@ -33,7 +34,6 @@ import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; import javax.servlet.http.HttpServletRequest; diff --git a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/configuration/configurator/GoogleDocsConfigurator.java b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/configuration/configurator/GoogleDocsConfigurator.java index 6aa5c4cd66d9ea..dd623de826aa9a 100644 --- a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/configuration/configurator/GoogleDocsConfigurator.java +++ b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/configuration/configurator/GoogleDocsConfigurator.java @@ -16,6 +16,9 @@ import com.liferay.document.library.google.docs.migration.LegacyGoogleDocsMigration; import com.liferay.document.library.google.docs.util.GoogleDocsDLFileEntryTypeHelper; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; import com.liferay.dynamic.data.mapping.kernel.DDMStructureLinkManager; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalService; import com.liferay.dynamic.data.mapping.storage.StorageEngine; @@ -26,9 +29,6 @@ import com.liferay.portal.service.ClassNameLocalService; import com.liferay.portal.service.CompanyLocalService; import com.liferay.portal.service.UserLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLDisplayContextFactory.java b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLDisplayContextFactory.java index a960b6480ebdb2..b375aceeb65348 100644 --- a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLDisplayContextFactory.java +++ b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLDisplayContextFactory.java @@ -15,6 +15,14 @@ package com.liferay.document.library.google.docs.display.context; import com.liferay.document.library.google.docs.util.GoogleDocsMetadataHelper; +import com.liferay.document.library.kernel.display.context.DLDisplayContextFactory; +import com.liferay.document.library.kernel.display.context.DLEditFileEntryDisplayContext; +import com.liferay.document.library.kernel.display.context.DLViewFileVersionDisplayContext; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalService; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalService; import com.liferay.dynamic.data.mapping.storage.StorageEngine; @@ -23,14 +31,6 @@ import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.display.context.DLDisplayContextFactory; -import com.liferay.portlet.documentlibrary.display.context.DLEditFileEntryDisplayContext; -import com.liferay.portlet.documentlibrary.display.context.DLViewFileVersionDisplayContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalService; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLEditFileEntryDisplayContext.java b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLEditFileEntryDisplayContext.java index 03712970c549ab..ad6030c0857d39 100644 --- a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLEditFileEntryDisplayContext.java +++ b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLEditFileEntryDisplayContext.java @@ -15,16 +15,16 @@ package com.liferay.document.library.google.docs.display.context; import com.liferay.document.library.google.docs.util.GoogleDocsConstants; +import com.liferay.document.library.kernel.display.context.BaseDLEditFileEntryDisplayContext; +import com.liferay.document.library.kernel.display.context.DLEditFileEntryDisplayContext; +import com.liferay.document.library.kernel.display.context.DLFilePicker; +import com.liferay.document.library.kernel.model.DLFileEntryType; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.theme.PortletDisplay; import com.liferay.portal.kernel.theme.ThemeDisplay; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.display.context.BaseDLEditFileEntryDisplayContext; -import com.liferay.portlet.documentlibrary.display.context.DLEditFileEntryDisplayContext; -import com.liferay.portlet.documentlibrary.display.context.DLFilePicker; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; import java.util.UUID; diff --git a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLFilePicker.java b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLFilePicker.java index 85696ab2ad2786..8b94995d786942 100644 --- a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLFilePicker.java +++ b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLFilePicker.java @@ -17,9 +17,9 @@ import com.liferay.document.library.google.docs.util.FreeMarkerRenderer; import com.liferay.document.library.google.docs.util.GoogleDocsConfigurationHelper; import com.liferay.document.library.google.docs.util.GoogleDocsConstants; +import com.liferay.document.library.kernel.display.context.DLFilePicker; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.theme.ThemeDisplay; -import com.liferay.portlet.documentlibrary.display.context.DLFilePicker; import freemarker.template.TemplateException; diff --git a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLViewFileVersionDisplayContext.java b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLViewFileVersionDisplayContext.java index 5fa2c975b6db77..d6d53d78edc43f 100644 --- a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLViewFileVersionDisplayContext.java +++ b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsDLViewFileVersionDisplayContext.java @@ -17,6 +17,8 @@ import com.liferay.document.library.google.docs.util.GoogleDocsConstants; import com.liferay.document.library.google.docs.util.GoogleDocsMetadataHelper; import com.liferay.document.library.google.docs.util.ResourceUtil; +import com.liferay.document.library.kernel.display.context.BaseDLViewFileVersionDisplayContext; +import com.liferay.document.library.kernel.display.context.DLViewFileVersionDisplayContext; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileVersion; @@ -24,8 +26,6 @@ import com.liferay.portal.kernel.servlet.taglib.ui.ToolbarItem; import com.liferay.portal.kernel.util.ResourceBundleUtil; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.display.context.BaseDLViewFileVersionDisplayContext; -import com.liferay.portlet.documentlibrary.display.context.DLViewFileVersionDisplayContext; import java.io.IOException; import java.io.PrintWriter; diff --git a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsIGDisplayContextFactory.java b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsIGDisplayContextFactory.java index 66bbbe1df57205..35c83934eb4a97 100644 --- a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsIGDisplayContextFactory.java +++ b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsIGDisplayContextFactory.java @@ -15,6 +15,9 @@ package com.liferay.document.library.google.docs.display.context; import com.liferay.document.library.google.docs.util.GoogleDocsMetadataHelper; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalService; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalService; import com.liferay.dynamic.data.mapping.storage.StorageEngine; import com.liferay.image.gallery.display.kernel.display.context.IGDisplayContextFactory; @@ -24,9 +27,6 @@ import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalService; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsUIItemsProcessor.java b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsUIItemsProcessor.java index 9b43e6cfe71bef..7e9b254c21b256 100644 --- a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsUIItemsProcessor.java +++ b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/display/context/GoogleDocsUIItemsProcessor.java @@ -17,6 +17,7 @@ import com.liferay.document.library.google.docs.util.GoogleDocsConstants; import com.liferay.document.library.google.docs.util.GoogleDocsMetadataHelper; import com.liferay.document.library.google.docs.util.ResourceUtil; +import com.liferay.document.library.kernel.display.context.DLUIItemKeys; import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.servlet.taglib.ui.MenuItem; import com.liferay.portal.kernel.servlet.taglib.ui.ToolbarItem; @@ -26,7 +27,6 @@ import com.liferay.portal.kernel.servlet.taglib.ui.URLUIItem; import com.liferay.portal.kernel.theme.ThemeDisplay; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.display.context.DLUIItemKeys; import java.util.List; import java.util.ResourceBundle; diff --git a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/migration/LegacyGoogleDocsMetadataHelper.java b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/migration/LegacyGoogleDocsMetadataHelper.java index b4622ec40a6c6f..d412249a1ed859 100644 --- a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/migration/LegacyGoogleDocsMetadataHelper.java +++ b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/migration/LegacyGoogleDocsMetadataHelper.java @@ -14,6 +14,11 @@ package com.liferay.document.library.google.docs.migration; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalServiceUtil; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.model.DDMStructureConstants; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalService; @@ -24,11 +29,6 @@ import com.liferay.dynamic.data.mapping.util.DDMFormValuesToFieldsConverterUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalServiceUtil; import java.io.Serializable; diff --git a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/migration/LegacyGoogleDocsMigration.java b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/migration/LegacyGoogleDocsMigration.java index 20711775db1f5f..d51ea9ed5fac5a 100644 --- a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/migration/LegacyGoogleDocsMigration.java +++ b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/migration/LegacyGoogleDocsMigration.java @@ -17,6 +17,11 @@ import com.liferay.document.library.google.docs.util.GoogleDocsConstants; import com.liferay.document.library.google.docs.util.GoogleDocsDLFileEntryTypeHelper; import com.liferay.document.library.google.docs.util.GoogleDocsMetadataHelper; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalService; import com.liferay.dynamic.data.mapping.storage.StorageEngine; @@ -25,11 +30,6 @@ import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.util.SetUtil; import com.liferay.portal.model.Company; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; /** * @author Iván Zaera diff --git a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/util/GoogleDocsDLFileEntryTypeHelper.java b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/util/GoogleDocsDLFileEntryTypeHelper.java index b231af4d1d2aaa..3ae83baa4a9d52 100644 --- a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/util/GoogleDocsDLFileEntryTypeHelper.java +++ b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/util/GoogleDocsDLFileEntryTypeHelper.java @@ -14,6 +14,9 @@ package com.liferay.document.library.google.docs.util; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; import com.liferay.dynamic.data.mapping.io.DDMFormXSDDeserializerUtil; import com.liferay.dynamic.data.mapping.model.DDMForm; import com.liferay.dynamic.data.mapping.model.DDMFormLayout; @@ -29,9 +32,6 @@ import com.liferay.portal.service.ClassNameLocalService; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalService; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; import java.util.HashMap; import java.util.List; diff --git a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/util/GoogleDocsMetadataHelper.java b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/util/GoogleDocsMetadataHelper.java index 2518989cc22262..c648b25e4e1319 100644 --- a/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/util/GoogleDocsMetadataHelper.java +++ b/modules/apps/document-library/document-library-google-docs/src/main/java/com/liferay/document/library/google/docs/util/GoogleDocsMetadataHelper.java @@ -15,6 +15,11 @@ package com.liferay.document.library.google.docs.util; import com.liferay.counter.kernel.service.CounterLocalServiceUtil; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalService; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalService; import com.liferay.dynamic.data.mapping.storage.DDMFormValues; @@ -26,11 +31,6 @@ import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalService; import java.io.Serializable; diff --git a/modules/apps/document-library/document-library-item-selector-web/src/main/java/com/liferay/document/library/item/selector/web/display/context/DLItemSelectorViewDisplayContext.java b/modules/apps/document-library/document-library-item-selector-web/src/main/java/com/liferay/document/library/item/selector/web/display/context/DLItemSelectorViewDisplayContext.java index a06bdf8bf86a51..c4333d52e51271 100644 --- a/modules/apps/document-library/document-library-item-selector-web/src/main/java/com/liferay/document/library/item/selector/web/display/context/DLItemSelectorViewDisplayContext.java +++ b/modules/apps/document-library/document-library-item-selector-web/src/main/java/com/liferay/document/library/item/selector/web/display/context/DLItemSelectorViewDisplayContext.java @@ -15,12 +15,12 @@ package com.liferay.document.library.item.selector.web.display.context; import com.liferay.document.library.item.selector.web.DLItemSelectorView; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.item.selector.ItemSelectorCriterion; import com.liferay.portal.kernel.portlet.LiferayPortletResponse; import com.liferay.portal.kernel.portlet.PortletURLUtil; import com.liferay.portal.kernel.util.ParamUtil; import com.liferay.portal.kernel.util.PortletKeys; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.util.Locale; diff --git a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/BaseCMISRepositoryFactory.java b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/BaseCMISRepositoryFactory.java index da5576692d42a7..37983ba18150d5 100644 --- a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/BaseCMISRepositoryFactory.java +++ b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/BaseCMISRepositoryFactory.java @@ -15,6 +15,8 @@ package com.liferay.document.library.repository.cmis.internal; import com.liferay.asset.kernel.service.AssetEntryLocalService; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; import com.liferay.document.library.repository.cmis.CMISRepositoryHandler; import com.liferay.document.library.repository.cmis.configuration.CMISRepositoryConfiguration; import com.liferay.document.library.repository.cmis.search.BaseCmisSearchQueryBuilder; @@ -30,8 +32,6 @@ import com.liferay.portal.service.RepositoryEntryLocalService; import com.liferay.portal.service.RepositoryLocalService; import com.liferay.portal.service.UserLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; /** * @author Adolfo Pérez diff --git a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISAtomPubRepositoryFactory.java b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISAtomPubRepositoryFactory.java index 2bf3a5db215f10..1c673610ed7024 100644 --- a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISAtomPubRepositoryFactory.java +++ b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISAtomPubRepositoryFactory.java @@ -17,6 +17,8 @@ import aQute.bnd.annotation.metatype.Configurable; import com.liferay.asset.kernel.service.AssetEntryLocalService; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; import com.liferay.document.library.repository.cmis.configuration.CMISRepositoryConfiguration; import com.liferay.document.library.repository.cmis.internal.constants.CMISRepositoryConstants; import com.liferay.portal.kernel.lock.LockManager; @@ -25,8 +27,6 @@ import com.liferay.portal.service.RepositoryEntryLocalService; import com.liferay.portal.service.RepositoryLocalService; import com.liferay.portal.service.UserLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; import java.util.Map; diff --git a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISRepository.java b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISRepository.java index a9a02d26372812..3a91bc69e1a316 100644 --- a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISRepository.java +++ b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISRepository.java @@ -14,6 +14,18 @@ package com.liferay.document.library.repository.cmis.internal; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.DuplicateFolderNameException; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFileVersionException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelCreateDateComparator; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelModifiedDateComparator; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelSizeComparator; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelTitleComparator; import com.liferay.document.library.repository.cmis.BaseCmisRepository; import com.liferay.document.library.repository.cmis.CMISRepositoryHandler; import com.liferay.document.library.repository.cmis.configuration.CMISRepositoryConfiguration; @@ -60,18 +72,6 @@ import com.liferay.portal.model.RepositoryEntry; import com.liferay.portal.service.RepositoryEntryLocalServiceUtil; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFolderNameException; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileVersionException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelCreateDateComparator; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelModifiedDateComparator; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelSizeComparator; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelTitleComparator; import java.io.InputStream; diff --git a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISWebServicesRepositoryFactory.java b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISWebServicesRepositoryFactory.java index 7bab98f77ec171..c41faf0f404a3f 100644 --- a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISWebServicesRepositoryFactory.java +++ b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISWebServicesRepositoryFactory.java @@ -17,6 +17,8 @@ import aQute.bnd.annotation.metatype.Configurable; import com.liferay.asset.kernel.service.AssetEntryLocalService; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; import com.liferay.document.library.repository.cmis.configuration.CMISRepositoryConfiguration; import com.liferay.document.library.repository.cmis.internal.constants.CMISRepositoryConstants; import com.liferay.portal.kernel.lock.LockManager; @@ -25,8 +27,6 @@ import com.liferay.portal.service.RepositoryEntryLocalService; import com.liferay.portal.service.RepositoryLocalService; import com.liferay.portal.service.UserLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; import java.util.Map; diff --git a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/model/CMISFileEntry.java b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/model/CMISFileEntry.java index 5de5be255be40f..bd91d25cc3e1aa 100644 --- a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/model/CMISFileEntry.java +++ b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/model/CMISFileEntry.java @@ -14,6 +14,11 @@ package com.liferay.document.library.repository.cmis.internal.model; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFileVersionException; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.service.DLAppHelperLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.document.library.repository.cmis.internal.CMISRepository; import com.liferay.exportimport.kernel.lar.StagedModelType; import com.liferay.portal.kernel.exception.PortalException; @@ -42,11 +47,6 @@ import com.liferay.portal.model.RepositoryEntry; import com.liferay.portal.model.User; import com.liferay.portal.service.RepositoryEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileVersionException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.io.InputStream; import java.io.Serializable; diff --git a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/model/CMISFileVersion.java b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/model/CMISFileVersion.java index 3834c86be3a268..600154739769bd 100644 --- a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/model/CMISFileVersion.java +++ b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/model/CMISFileVersion.java @@ -14,6 +14,9 @@ package com.liferay.document.library.repository.cmis.internal.model; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.service.DLAppHelperLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.document.library.repository.cmis.internal.CMISRepository; import com.liferay.expando.kernel.model.ExpandoBridge; import com.liferay.exportimport.kernel.lar.StagedModelType; @@ -31,9 +34,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.User; import com.liferay.portal.service.UserLocalServiceUtil; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.io.InputStream; import java.io.Serializable; diff --git a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/model/CMISFolder.java b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/model/CMISFolder.java index 65d3efe311d9de..7f43ab8fe306be 100644 --- a/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/model/CMISFolder.java +++ b/modules/apps/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/model/CMISFolder.java @@ -14,6 +14,10 @@ package com.liferay.document.library.repository.cmis.internal.model; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.document.library.repository.cmis.internal.CMISRepository; import com.liferay.exportimport.kernel.lar.StagedModelType; import com.liferay.portal.kernel.exception.PortalException; @@ -27,10 +31,6 @@ import com.liferay.portal.kernel.util.CharPool; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.model.User; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; import java.io.Serializable; diff --git a/modules/apps/document-library/document-library-repository-cmis-test/src/testIntegration/java/com/liferay/document/library/repository/cmis/search/test/CMISQueryBuilderTest.java b/modules/apps/document-library/document-library-repository-cmis-test/src/testIntegration/java/com/liferay/document/library/repository/cmis/search/test/CMISQueryBuilderTest.java index 878f7cdc50ec1e..6d8d53ba2db7e3 100644 --- a/modules/apps/document-library/document-library-repository-cmis-test/src/testIntegration/java/com/liferay/document/library/repository/cmis/search/test/CMISQueryBuilderTest.java +++ b/modules/apps/document-library/document-library-repository-cmis-test/src/testIntegration/java/com/liferay/document/library/repository/cmis/search/test/CMISQueryBuilderTest.java @@ -15,6 +15,7 @@ package com.liferay.document.library.repository.cmis.search.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.document.library.repository.cmis.search.BaseCmisSearchQueryBuilder; import com.liferay.document.library.repository.cmis.search.CMISSearchQueryBuilder; import com.liferay.portal.kernel.repository.search.RepositorySearchQueryBuilderUtil; @@ -35,7 +36,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.test.ServiceTestUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery; diff --git a/modules/apps/document-library/document-library-repository-search/src/main/java/com/liferay/document/library/repository/search/internal/RepositorySearchQueryBuilderImpl.java b/modules/apps/document-library/document-library-repository-search/src/main/java/com/liferay/document/library/repository/search/internal/RepositorySearchQueryBuilderImpl.java index 41c76b75f1bf18..6198c7e38c5a9c 100644 --- a/modules/apps/document-library/document-library-repository-search/src/main/java/com/liferay/document/library/repository/search/internal/RepositorySearchQueryBuilderImpl.java +++ b/modules/apps/document-library/document-library-repository-search/src/main/java/com/liferay/document/library/repository/search/internal/RepositorySearchQueryBuilderImpl.java @@ -14,6 +14,8 @@ package com.liferay.document.library.repository.search.internal; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppService; import com.liferay.portal.kernel.repository.search.RepositorySearchQueryBuilder; import com.liferay.portal.kernel.repository.search.RepositorySearchQueryTermBuilder; import com.liferay.portal.kernel.search.BooleanClause; @@ -30,8 +32,6 @@ import com.liferay.portal.kernel.search.generic.BooleanQueryImpl; import com.liferay.portal.kernel.util.ArrayUtil; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/atom/FileEntryAtomCollectionAdapter.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/atom/FileEntryAtomCollectionAdapter.java index ee17afdeb601a2..7ca9fb7e8d5dd7 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/atom/FileEntryAtomCollectionAdapter.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/atom/FileEntryAtomCollectionAdapter.java @@ -14,6 +14,8 @@ package com.liferay.document.library.atom; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelTitleComparator; import com.liferay.portal.atom.AtomPager; import com.liferay.portal.atom.AtomUtil; import com.liferay.portal.kernel.atom.AtomCollectionAdapter; @@ -30,8 +32,6 @@ import com.liferay.portal.kernel.util.MimeTypesUtil; import com.liferay.portal.kernel.util.StreamUtil; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelTitleComparator; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/atom/FolderAtomCollectionAdapter.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/atom/FolderAtomCollectionAdapter.java index 6b8131b5406cb7..9563e51e3759fc 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/atom/FolderAtomCollectionAdapter.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/atom/FolderAtomCollectionAdapter.java @@ -14,6 +14,8 @@ package com.liferay.document.library.atom; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.util.comparator.FolderNameComparator; import com.liferay.portal.atom.AtomPager; import com.liferay.portal.atom.AtomUtil; import com.liferay.portal.kernel.atom.AtomCollectionAdapter; @@ -25,8 +27,6 @@ import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.util.comparator.FolderNameComparator; import java.util.ArrayList; import java.util.Date; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/ddm/DLFileEntryMetadataDDMPermissionSupport.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/ddm/DLFileEntryMetadataDDMPermissionSupport.java index 78aa9165e60687..03e6476e77ff6e 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/ddm/DLFileEntryMetadataDDMPermissionSupport.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/ddm/DLFileEntryMetadataDDMPermissionSupport.java @@ -25,7 +25,7 @@ @Component( immediate = true, property = { - "model.class.name=com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata" + "model.class.name=com.liferay.document.library.kernel.model.DLFileEntryMetadata" } ) public class DLFileEntryMetadataDDMPermissionSupport diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/ddm/RawMetadataProcessorDDMPermissionSupport.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/ddm/RawMetadataProcessorDDMPermissionSupport.java index c146cf9b9b9f76..7495414f0c4be0 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/ddm/RawMetadataProcessorDDMPermissionSupport.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/ddm/RawMetadataProcessorDDMPermissionSupport.java @@ -26,7 +26,7 @@ immediate = true, property = { "default.model.resource.name=true", - "model.class.name=com.liferay.portlet.documentlibrary.util.RawMetadataProcessor" + "model.class.name=com.liferay.document.library.kernel.util.RawMetadataProcessor" } ) public class RawMetadataProcessorDDMPermissionSupport diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/instance/lifecycle/AddDefaultDocumentLibraryStructuresPortalInstanceLifecycleListener.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/instance/lifecycle/AddDefaultDocumentLibraryStructuresPortalInstanceLifecycleListener.java index 7ce0aa0d8ea964..20dbe848665df7 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/instance/lifecycle/AddDefaultDocumentLibraryStructuresPortalInstanceLifecycleListener.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/instance/lifecycle/AddDefaultDocumentLibraryStructuresPortalInstanceLifecycleListener.java @@ -14,6 +14,11 @@ package com.liferay.document.library.instance.lifecycle; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.util.RawMetadataProcessor; import com.liferay.dynamic.data.mapping.io.DDMFormXSDDeserializer; import com.liferay.dynamic.data.mapping.model.DDMForm; import com.liferay.dynamic.data.mapping.model.DDMFormLayout; @@ -42,11 +47,6 @@ import com.liferay.portal.service.GroupLocalService; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalService; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.util.RawMetadataProcessor; import java.io.StringReader; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/DLFileEntryTypeStagedModelDataHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/DLFileEntryTypeStagedModelDataHandler.java index 9199831fd9c08b..1e699df3b6670b 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/DLFileEntryTypeStagedModelDataHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/DLFileEntryTypeStagedModelDataHandler.java @@ -14,6 +14,10 @@ package com.liferay.document.library.lar; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalService; import com.liferay.exportimport.kernel.lar.ExportImportPathUtil; @@ -33,10 +37,6 @@ import com.liferay.portal.model.UserConstants; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalService; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.HashMap; import java.util.List; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileEntryStagedModelDataHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileEntryStagedModelDataHandler.java index c0e8c708757964..3a8f178da0b29e 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileEntryStagedModelDataHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileEntryStagedModelDataHandler.java @@ -14,6 +14,20 @@ package com.liferay.document.library.lar; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLTrashService; +import com.liferay.document.library.kernel.util.DLProcessorRegistryUtil; +import com.liferay.document.library.kernel.util.DLProcessorThreadLocal; import com.liferay.dynamic.data.mapping.exportimport.content.processor.DDMFormValuesExportImportContentProcessor; import com.liferay.dynamic.data.mapping.io.DDMFormValuesJSONDeserializer; import com.liferay.dynamic.data.mapping.io.DDMFormValuesJSONSerializer; @@ -51,20 +65,6 @@ import com.liferay.portal.service.RepositoryLocalService; import com.liferay.portal.service.ServiceContext; import com.liferay.portlet.documentlibrary.lar.FileEntryUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLTrashService; -import com.liferay.portlet.documentlibrary.util.DLProcessorRegistryUtil; -import com.liferay.portlet.documentlibrary.util.DLProcessorThreadLocal; import com.liferay.trash.kernel.util.TrashUtil; import java.io.IOException; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileShortcutStagedModelDataHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileShortcutStagedModelDataHandler.java index eb99dd3877f538..7e166474ebbdf4 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileShortcutStagedModelDataHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileShortcutStagedModelDataHandler.java @@ -14,6 +14,11 @@ package com.liferay.document.library.lar; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalService; import com.liferay.exportimport.kernel.lar.ExportImportPathUtil; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.exportimport.kernel.lar.StagedModelDataHandler; @@ -34,11 +39,6 @@ import com.liferay.portal.repository.liferayrepository.model.LiferayFileShortcut; import com.liferay.portal.service.ServiceContext; import com.liferay.portlet.documentlibrary.lar.FileEntryUtil; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalService; import java.util.ArrayList; import java.util.List; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FolderStagedModelDataHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FolderStagedModelDataHandler.java index d20f458b41afc0..d8ad763cb9b89f 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FolderStagedModelDataHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FolderStagedModelDataHandler.java @@ -14,6 +14,13 @@ package com.liferay.document.library.lar; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; import com.liferay.exportimport.kernel.lar.ExportImportPathUtil; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.exportimport.kernel.lar.PortletDataException; @@ -41,13 +48,6 @@ import com.liferay.portal.service.RepositoryLocalService; import com.liferay.portal.service.ServiceContext; import com.liferay.portlet.documentlibrary.lar.FileEntryUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; import java.util.ArrayList; import java.util.List; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FolderUtil.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FolderUtil.java index 9f53552afc3f2b..e38458225ccbba 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FolderUtil.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FolderUtil.java @@ -14,11 +14,11 @@ package com.liferay.document.library.lar; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.persistence.DLFolderUtil; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.repository.liferayrepository.model.LiferayFolder; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.persistence.DLFolderUtil; import com.liferay.portlet.documentlibrary.util.RepositoryModelUtil; import java.util.List; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/RepositoryStagedModelDataHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/RepositoryStagedModelDataHandler.java index cf35c1be45c908..53bf9555b4373f 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/RepositoryStagedModelDataHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/RepositoryStagedModelDataHandler.java @@ -14,6 +14,9 @@ package com.liferay.document.library.lar; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.exportimport.kernel.lar.ExportImportPathUtil; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.exportimport.kernel.lar.StagedModelDataHandler; @@ -32,9 +35,6 @@ import com.liferay.portal.service.RepositoryEntryLocalService; import com.liferay.portal.service.RepositoryLocalService; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import java.util.List; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/xstream/FileEntryConverter.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/xstream/FileEntryConverter.java index ae27539656a351..55c19a504e7789 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/xstream/FileEntryConverter.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/xstream/FileEntryConverter.java @@ -14,6 +14,7 @@ package com.liferay.document.library.lar.xstream; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.exportimport.kernel.xstream.BaseXStreamConverter; import com.liferay.exportimport.kernel.xstream.XStreamHierarchicalStreamReader; import com.liferay.exportimport.kernel.xstream.XStreamUnmarshallingContext; @@ -22,7 +23,6 @@ import com.liferay.portal.kernel.repository.proxy.FileVersionProxyBean; import com.liferay.portal.repository.liferayrepository.model.LiferayFileEntry; import com.liferay.portal.repository.liferayrepository.model.LiferayFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import com.liferay.portlet.documentlibrary.model.impl.DLFileEntryImpl; import java.util.LinkedList; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/xstream/FileVersionConverter.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/xstream/FileVersionConverter.java index 5744ac89a8b2b7..de6049bae52344 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/xstream/FileVersionConverter.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/xstream/FileVersionConverter.java @@ -14,13 +14,13 @@ package com.liferay.document.library.lar.xstream; +import com.liferay.document.library.kernel.model.DLFileVersion; import com.liferay.exportimport.kernel.xstream.BaseXStreamConverter; import com.liferay.exportimport.kernel.xstream.XStreamHierarchicalStreamReader; import com.liferay.exportimport.kernel.xstream.XStreamUnmarshallingContext; import com.liferay.portal.kernel.bean.BeanPropertiesUtil; import com.liferay.portal.kernel.repository.proxy.FileVersionProxyBean; import com.liferay.portal.repository.liferayrepository.model.LiferayFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; import com.liferay.portlet.documentlibrary.model.impl.DLFileVersionImpl; import java.util.LinkedList; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/xstream/FolderConverter.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/xstream/FolderConverter.java index 34fac91a313402..db4ace06984b69 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/xstream/FolderConverter.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/xstream/FolderConverter.java @@ -14,13 +14,13 @@ package com.liferay.document.library.lar.xstream; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.exportimport.kernel.xstream.BaseXStreamConverter; import com.liferay.exportimport.kernel.xstream.XStreamHierarchicalStreamReader; import com.liferay.exportimport.kernel.xstream.XStreamUnmarshallingContext; import com.liferay.portal.kernel.bean.BeanPropertiesUtil; import com.liferay.portal.kernel.repository.proxy.FolderProxyBean; import com.liferay.portal.repository.liferayrepository.model.LiferayFolder; -import com.liferay.portlet.documentlibrary.model.DLFolder; import com.liferay.portlet.documentlibrary.model.impl.DLFolderImpl; import java.util.LinkedList; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/search/DLFileEntrySearchResultContributor.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/search/DLFileEntrySearchResultContributor.java index 600e41e0b2f6a5..6129e791616a22 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/search/DLFileEntrySearchResultContributor.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/search/DLFileEntrySearchResultContributor.java @@ -14,6 +14,9 @@ package com.liferay.document.library.search; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.search.Document; @@ -26,9 +29,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.ClassName; import com.liferay.portal.service.ClassNameLocalService; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import java.util.Locale; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/service/permission/DLFileEntryPermissionUpdateHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/service/permission/DLFileEntryPermissionUpdateHandler.java index fcabb3fe932bce..49358a3f8a0fd4 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/service/permission/DLFileEntryPermissionUpdateHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/service/permission/DLFileEntryPermissionUpdateHandler.java @@ -14,10 +14,10 @@ package com.liferay.document.library.service.permission; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; import com.liferay.portal.kernel.security.permission.PermissionUpdateHandler; import com.liferay.portal.kernel.util.GetterUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; import java.util.Date; @@ -28,7 +28,7 @@ * @author Gergely Mathe */ @Component( - property = {"model.class.name=com.liferay.portlet.documentlibrary.model.DLFileEntry"}, + property = {"model.class.name=com.liferay.document.library.kernel.model.DLFileEntry"}, service = PermissionUpdateHandler.class ) public class DLFileEntryPermissionUpdateHandler diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/service/permission/DLFileEntryTypePermissionUpdateHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/service/permission/DLFileEntryTypePermissionUpdateHandler.java index 5b756ee21e11bc..185909a6343617 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/service/permission/DLFileEntryTypePermissionUpdateHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/service/permission/DLFileEntryTypePermissionUpdateHandler.java @@ -14,10 +14,10 @@ package com.liferay.document.library.service.permission; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; import com.liferay.portal.kernel.security.permission.PermissionUpdateHandler; import com.liferay.portal.kernel.util.GetterUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; import java.util.Date; @@ -28,7 +28,7 @@ * @author Gergely Mathe */ @Component( - property = {"model.class.name=com.liferay.portlet.documentlibrary.model.DLFileEntryType"}, + property = {"model.class.name=com.liferay.document.library.kernel.model.DLFileEntryType"}, service = PermissionUpdateHandler.class ) public class DLFileEntryTypePermissionUpdateHandler diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/service/permission/DLFolderPermissionUpdateHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/service/permission/DLFolderPermissionUpdateHandler.java index ba9bae10b5a0ba..1d79b385583e11 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/service/permission/DLFolderPermissionUpdateHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/service/permission/DLFolderPermissionUpdateHandler.java @@ -14,10 +14,10 @@ package com.liferay.document.library.service.permission; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLFolderLocalService; import com.liferay.portal.kernel.security.permission.PermissionUpdateHandler; import com.liferay.portal.kernel.util.GetterUtil; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; import java.util.Date; @@ -28,7 +28,7 @@ * @author Gergely Mathe */ @Component( - property = {"model.class.name=com.liferay.portlet.documentlibrary.model.DLFolder"}, + property = {"model.class.name=com.liferay.document.library.kernel.model.DLFolder"}, service = PermissionUpdateHandler.class ) public class DLFolderPermissionUpdateHandler diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/store/IgnoreDuplicatesStore.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/store/IgnoreDuplicatesStore.java index 265a31b95677cb..5c82b84d779904 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/store/IgnoreDuplicatesStore.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/store/IgnoreDuplicatesStore.java @@ -14,9 +14,9 @@ package com.liferay.document.library.store; +import com.liferay.document.library.kernel.exception.DuplicateFileException; +import com.liferay.document.library.kernel.store.Store; import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileException; -import com.liferay.portlet.documentlibrary.store.Store; import java.io.File; import java.io.InputStream; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/store/IgnoreDuplicatesStoreWrapper.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/store/IgnoreDuplicatesStoreWrapper.java index 24bb2b00a87f98..e50b0bb756222c 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/store/IgnoreDuplicatesStoreWrapper.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/store/IgnoreDuplicatesStoreWrapper.java @@ -14,8 +14,8 @@ package com.liferay.document.library.store; -import com.liferay.portlet.documentlibrary.store.Store; -import com.liferay.portlet.documentlibrary.store.StoreWrapper; +import com.liferay.document.library.kernel.store.Store; +import com.liferay.document.library.kernel.store.StoreWrapper; import org.osgi.service.component.annotations.Component; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLBaseTrashHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLBaseTrashHandler.java index b0ee2ea254be30..2e1e1ab8dd2756 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLBaseTrashHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLBaseTrashHandler.java @@ -14,6 +14,10 @@ package com.liferay.document.library.trash; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.DocumentRepository; import com.liferay.portal.kernel.repository.Repository; @@ -32,10 +36,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.model.ContainerModel; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.util.ArrayList; import java.util.List; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLFileEntryTrashHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLFileEntryTrashHandler.java index e25d90419b994a..21f7da1e8d30fa 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLFileEntryTrashHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLFileEntryTrashHandler.java @@ -14,6 +14,17 @@ package com.liferay.document.library.trash; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; +import com.liferay.document.library.kernel.service.DLTrashLocalService; +import com.liferay.document.library.kernel.util.DLUtil; +import com.liferay.document.library.kernel.util.DLValidatorUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -37,19 +48,8 @@ import com.liferay.portal.model.ContainerModel; import com.liferay.portal.model.TrashedModel; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; -import com.liferay.portlet.documentlibrary.service.DLTrashLocalService; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; -import com.liferay.portlet.documentlibrary.util.DLUtil; -import com.liferay.portlet.documentlibrary.util.DLValidatorUtil; import com.liferay.trash.kernel.exception.RestoreEntryException; import com.liferay.trash.kernel.model.TrashEntry; import com.liferay.trash.kernel.model.TrashEntryConstants; @@ -68,7 +68,7 @@ */ @Component( property = { - "model.class.name=com.liferay.portlet.documentlibrary.model.DLFileEntry" + "model.class.name=com.liferay.document.library.kernel.model.DLFileEntry" }, service = TrashHandler.class ) diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLFileShortcutTrashHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLFileShortcutTrashHandler.java index 8a222fe501e09e..0ac32bc86e5a49 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLFileShortcutTrashHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLFileShortcutTrashHandler.java @@ -14,6 +14,12 @@ package com.liferay.document.library.trash; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -34,14 +40,8 @@ import com.liferay.portal.model.ContainerModel; import com.liferay.portal.model.TrashedModel; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import com.liferay.portlet.documentlibrary.service.permission.DLFileShortcutPermission; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.trash.kernel.model.TrashEntry; import javax.portlet.PortletRequest; @@ -56,7 +56,7 @@ */ @Component( property = { - "model.class.name=com.liferay.portlet.documentlibrary.model.DLFileShortcut" + "model.class.name=com.liferay.document.library.kernel.model.DLFileShortcut" }, service = TrashHandler.class ) @@ -311,7 +311,7 @@ protected void setDLAppLocalService(DLAppLocalService dlAppLocalService) { } @Reference( - target = "(model.class.name=com.liferay.portlet.documentlibrary.model.DLFileShortcut)", + target = "(model.class.name=com.liferay.document.library.kernel.model.DLFileShortcut)", unbind = "-" ) protected void setTrashRendererFactory( diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLFolderTrashHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLFolderTrashHandler.java index 2503585a84efc5..5c2cfbb0b1e601 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLFolderTrashHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/trash/DLFolderTrashHandler.java @@ -16,6 +16,13 @@ import com.liferay.asset.kernel.AssetRendererFactoryRegistryUtil; import com.liferay.asset.kernel.model.AssetRendererFactory; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -33,14 +40,7 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.ContainerModel; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.trash.kernel.exception.RestoreEntryException; import com.liferay.trash.kernel.model.TrashEntry; import com.liferay.trash.kernel.model.TrashEntryConstants; @@ -58,7 +58,7 @@ */ @Component( property = { - "model.class.name=com.liferay.portlet.documentlibrary.model.DLFolder" + "model.class.name=com.liferay.document.library.kernel.model.DLFolder" }, service = TrashHandler.class ) diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/verify/DLServiceVerifyProcess.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/verify/DLServiceVerifyProcess.java index bd7de4ad7ad725..1f0c62837dfd69 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/verify/DLServiceVerifyProcess.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/verify/DLServiceVerifyProcess.java @@ -15,6 +15,24 @@ package com.liferay.document.library.verify; import com.liferay.counter.kernel.service.CounterLocalService; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.DuplicateFolderNameException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; +import com.liferay.document.library.kernel.store.DLStoreUtil; +import com.liferay.document.library.kernel.util.DLUtil; +import com.liferay.document.library.kernel.util.DLValidatorUtil; +import com.liferay.document.library.kernel.util.comparator.DLFileVersionVersionComparator; import com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery; import com.liferay.portal.kernel.dao.orm.Criterion; import com.liferay.portal.kernel.dao.orm.DynamicQuery; @@ -40,24 +58,6 @@ import com.liferay.portal.repository.liferayrepository.model.LiferayFolder; import com.liferay.portal.util.PortalInstances; import com.liferay.portal.verify.VerifyProcess; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFolderNameException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; -import com.liferay.portlet.documentlibrary.util.DLValidatorUtil; -import com.liferay.portlet.documentlibrary.util.comparator.DLFileVersionVersionComparator; import com.liferay.portlet.documentlibrary.webdav.DLWebDAVUtil; import java.io.InputStream; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/workflow/DLFileEntryWorkflowHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/workflow/DLFileEntryWorkflowHandler.java index bdac69112f6c16..5cc06be9973572 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/workflow/DLFileEntryWorkflowHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/workflow/DLFileEntryWorkflowHandler.java @@ -17,6 +17,14 @@ import com.liferay.asset.kernel.AssetRendererFactoryRegistryUtil; import com.liferay.asset.kernel.model.AssetRenderer; import com.liferay.asset.kernel.model.AssetRendererFactory; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.security.permission.ResourceActionsUtil; import com.liferay.portal.kernel.util.GetterUtil; @@ -26,14 +34,6 @@ import com.liferay.portal.model.WorkflowDefinitionLink; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.WorkflowDefinitionLinkLocalService; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; import java.io.Serializable; @@ -50,7 +50,7 @@ */ @Component( property = { - "model.class.name=com.liferay.portlet.documentlibrary.model.DLFileEntry" + "model.class.name=com.liferay.document.library.kernel.model.DLFileEntry" }, service = WorkflowHandler.class ) diff --git a/modules/apps/document-library/document-library-test/src/test/java/com/liferay/document/library/search/SearchResultUtilDLFileEntryTest.java b/modules/apps/document-library/document-library-test/src/test/java/com/liferay/document/library/search/SearchResultUtilDLFileEntryTest.java index 248137d121d62c..694dfe07d5d15a 100644 --- a/modules/apps/document-library/document-library-test/src/test/java/com/liferay/document/library/search/SearchResultUtilDLFileEntryTest.java +++ b/modules/apps/document-library/document-library-test/src/test/java/com/liferay/document/library/search/SearchResultUtilDLFileEntryTest.java @@ -16,6 +16,8 @@ import com.liferay.asset.kernel.AssetRendererFactoryRegistryUtil; import com.liferay.asset.kernel.model.AssetRendererFactory; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.search.Document; import com.liferay.portal.kernel.search.Field; @@ -39,8 +41,6 @@ import com.liferay.portal.search.test.BaseSearchResultUtilTestCase; import com.liferay.portal.search.test.SearchTestUtil; import com.liferay.portal.service.ClassNameLocalService; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import com.liferay.registry.collections.ServiceTrackerCollections; import java.lang.reflect.InvocationHandler; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/DLFileEntryTypeStagedModelDataHandlerTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/DLFileEntryTypeStagedModelDataHandlerTest.java index 2454d01e3c8a2d..c69aa62f9452b2 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/DLFileEntryTypeStagedModelDataHandlerTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/DLFileEntryTypeStagedModelDataHandlerTest.java @@ -15,6 +15,10 @@ package com.liferay.document.library.lar.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.mapping.kernel.DDMStructureManagerUtil; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.test.util.DDMStructureTestUtil; @@ -28,10 +32,6 @@ import com.liferay.portal.model.StagedModel; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.HashMap; import java.util.List; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/DLPortletDataHandlerTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/DLPortletDataHandlerTest.java index 89af11f2916386..706153638c059c 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/DLPortletDataHandlerTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/DLPortletDataHandlerTest.java @@ -15,6 +15,16 @@ package com.liferay.document.library.lar.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.document.library.web.lar.DLPortletDataHandler; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; @@ -46,16 +56,6 @@ import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portlet.PortletPreferencesImpl; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLTrashServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import com.liferay.portlet.dynamicdatamapping.util.test.DDMStructureTestUtil; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/FileEntryStagedModelDataHandlerTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/FileEntryStagedModelDataHandlerTest.java index bae87e02062e40..7c9c694fde4d03 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/FileEntryStagedModelDataHandlerTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/FileEntryStagedModelDataHandlerTest.java @@ -15,6 +15,16 @@ package com.liferay.document.library.lar.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.mapping.kernel.DDMStructureManagerUtil; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.test.util.DDMStructureTestUtil; @@ -41,16 +51,6 @@ import com.liferay.portal.service.ServiceContextThreadLocal; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import java.util.HashMap; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/FileShortcutStagedModelDataHandlerTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/FileShortcutStagedModelDataHandlerTest.java index b1be57505cc902..460ed8ba6f0cec 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/FileShortcutStagedModelDataHandlerTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/FileShortcutStagedModelDataHandlerTest.java @@ -16,6 +16,14 @@ import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; import com.liferay.asset.kernel.model.AssetEntry; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -32,14 +40,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; import java.util.HashMap; import java.util.List; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/FolderStagedModelDataHandlerTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/FolderStagedModelDataHandlerTest.java index b7a5e748266b2e..a85b2ea72b8909 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/FolderStagedModelDataHandlerTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/FolderStagedModelDataHandlerTest.java @@ -15,6 +15,14 @@ package com.liferay.document.library.lar.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.mapping.kernel.DDMStructureManagerUtil; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.test.util.DDMStructureTestUtil; @@ -36,14 +44,6 @@ import com.liferay.portal.service.CompanyLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.ArrayList; import java.util.HashMap; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/RepositoryStagedModelDataHandlerTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/RepositoryStagedModelDataHandlerTest.java index 9290576ba94dcf..9057969405dba9 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/RepositoryStagedModelDataHandlerTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/lar/test/RepositoryStagedModelDataHandlerTest.java @@ -15,6 +15,8 @@ package com.liferay.document.library.lar.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.rule.TransactionalTestRule; @@ -33,8 +35,6 @@ import com.liferay.portal.service.RepositoryLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; import java.util.HashMap; import java.util.List; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/notifications/test/DocumentLibraryUserNotificationTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/notifications/test/DocumentLibraryUserNotificationTest.java index b11ec9534f5bba..743c5c63b1976b 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/notifications/test/DocumentLibraryUserNotificationTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/notifications/test/DocumentLibraryUserNotificationTest.java @@ -15,6 +15,9 @@ package com.liferay.document.library.notifications.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; @@ -32,9 +35,6 @@ import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.test.rule.SynchronousMailTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import com.liferay.portlet.notifications.test.BaseUserNotificationTestCase; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/search/test/DLFileEntrySearchTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/search/test/DLFileEntrySearchTest.java index fe47c3878b0b1a..41133d115e3633 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/search/test/DLFileEntrySearchTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/search/test/DLFileEntrySearchTest.java @@ -15,6 +15,16 @@ package com.liferay.document.library.search.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; import com.liferay.dynamic.data.mapping.kernel.DDMFormFieldValue; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.dynamic.data.mapping.kernel.LocalizedValue; @@ -57,16 +67,6 @@ import com.liferay.portal.security.permission.SimplePermissionChecker; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLTrashServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import java.io.File; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryMetadataLocalServiceTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryMetadataLocalServiceTest.java index bed4399eb33953..f2849368ad681f 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryMetadataLocalServiceTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryMetadataLocalServiceTest.java @@ -15,6 +15,14 @@ package com.liferay.document.library.service.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; import com.liferay.dynamic.data.mapping.io.DDMFormXSDDeserializerUtil; import com.liferay.dynamic.data.mapping.kernel.DDMForm; import com.liferay.dynamic.data.mapping.kernel.DDMFormField; @@ -39,14 +47,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; import java.io.ByteArrayInputStream; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryTypeServiceTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryTypeServiceTest.java index 554456ddfb8add..a3fa338648122b 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryTypeServiceTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryTypeServiceTest.java @@ -15,6 +15,14 @@ package com.liferay.document.library.service.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; import com.liferay.dynamic.data.mapping.io.DDMFormXSDDeserializerUtil; import com.liferay.dynamic.data.mapping.model.DDMForm; import com.liferay.dynamic.data.mapping.model.DDMStructure; @@ -47,14 +55,6 @@ import com.liferay.portal.security.permission.SimplePermissionChecker; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; import java.util.List; import java.util.Locale; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileVersionTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileVersionTest.java index ced78b7e7e9d76..a3eb6b3b853c3b 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileVersionTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileVersionTest.java @@ -15,6 +15,16 @@ package com.liferay.document.library.service.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileVersionLocalServiceUtil; import com.liferay.dynamic.data.mapping.kernel.DDMForm; import com.liferay.dynamic.data.mapping.kernel.DDMFormFieldValue; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; @@ -50,16 +60,6 @@ import com.liferay.portal.security.permission.SimplePermissionChecker; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalServiceUtil; import java.io.Serializable; @@ -400,7 +400,7 @@ protected void setUpPrincipalThreadLocal() throws Exception { protected void setUpResourcePermission() throws Exception { RoleTestUtil.addResourcePermission( - RoleConstants.GUEST, "com.liferay.portlet.documentlibrary", + RoleConstants.GUEST, "com.liferay.document.library.kernel", ResourceConstants.SCOPE_GROUP, String.valueOf(_group.getGroupId()), ActionKeys.VIEW); } @@ -415,7 +415,7 @@ protected void tearDownPrincipalThreadLocal() { protected void tearDownResourcePermission() throws Exception { RoleTestUtil.removeResourcePermission( - RoleConstants.GUEST, "com.liferay.portlet.documentlibrary", + RoleConstants.GUEST, "com.liferay.document.library.kernel", ResourceConstants.SCOPE_GROUP, String.valueOf(_group.getGroupId()), ActionKeys.VIEW); } diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/social/test/DLFileEntryActivityInterpreterTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/social/test/DLFileEntryActivityInterpreterTest.java index e71428c6ca7720..1d5b4164c5a689 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/social/test/DLFileEntryActivityInterpreterTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/social/test/DLFileEntryActivityInterpreterTest.java @@ -15,6 +15,11 @@ package com.liferay.document.library.social.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -29,11 +34,6 @@ import com.liferay.portal.service.test.ServiceTestUtil; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLTrashServiceUtil; import com.liferay.portlet.documentlibrary.social.DLActivityKeys; import com.liferay.portlet.social.test.BaseSocialActivityInterpreterTestCase; import com.liferay.social.kernel.model.SocialActivityConstants; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/social/test/DLFolderActivityInterpreterTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/social/test/DLFolderActivityInterpreterTest.java index e1ce0399236957..a341f715f2ae27 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/social/test/DLFolderActivityInterpreterTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/social/test/DLFolderActivityInterpreterTest.java @@ -15,6 +15,9 @@ package com.liferay.document.library.social.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; import com.liferay.document.library.web.social.DLFolderActivityInterpreter; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -26,9 +29,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.test.ServiceTestUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLTrashServiceUtil; import com.liferay.portlet.social.test.BaseSocialActivityInterpreterTestCase; import com.liferay.social.kernel.model.SocialActivityConstants; import com.liferay.social.kernel.model.SocialActivityInterpreter; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/verify/test/DLServiceVerifyProcessTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/verify/test/DLServiceVerifyProcessTest.java index cd1eb7eef1ff9b..72cbe559009b2a 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/verify/test/DLServiceVerifyProcessTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/verify/test/DLServiceVerifyProcessTest.java @@ -15,6 +15,18 @@ package com.liferay.document.library.verify.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; import com.liferay.document.library.verify.DLServiceVerifyProcess; import com.liferay.dynamic.data.mapping.io.DDMFormXSDDeserializerUtil; import com.liferay.dynamic.data.mapping.kernel.DDMForm; @@ -52,18 +64,6 @@ import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.verify.VerifyProcess; import com.liferay.portal.verify.test.BaseVerifyProcessTestCase; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLTrashServiceUtil; import com.liferay.registry.Registry; import com.liferay.registry.RegistryUtil; diff --git a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/webdav/test/WebDAVOSXTest.java b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/webdav/test/WebDAVOSXTest.java index 785cb63dd2d030..e26d0782e55a7d 100644 --- a/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/webdav/test/WebDAVOSXTest.java +++ b/modules/apps/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/webdav/test/WebDAVOSXTest.java @@ -15,6 +15,8 @@ package com.liferay.document.library.webdav.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -33,8 +35,6 @@ import com.liferay.portal.service.GroupLocalServiceUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import java.util.HashMap; import java.util.Map; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/dynamic/data/mapping/util/DLDDMDisplay.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/dynamic/data/mapping/util/DLDDMDisplay.java index e8c358a5396613..6a7d2510c65a35 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/dynamic/data/mapping/util/DLDDMDisplay.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/dynamic/data/mapping/util/DLDDMDisplay.java @@ -14,13 +14,13 @@ package com.liferay.document.library.dynamic.data.mapping.util; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; import com.liferay.dynamic.data.mapping.storage.StorageType; import com.liferay.dynamic.data.mapping.util.BaseDDMDisplay; import com.liferay.dynamic.data.mapping.util.DDMDisplay; import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.util.PortletKeys; import com.liferay.portal.kernel.util.ResourceBundleUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; import java.util.Locale; import java.util.ResourceBundle; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFileEntryAssetRenderer.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFileEntryAssetRenderer.java index 4c9cc01e9ae181..c358f7e603dfc7 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFileEntryAssetRenderer.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFileEntryAssetRenderer.java @@ -17,6 +17,9 @@ import com.liferay.asset.kernel.model.AssetRendererFactory; import com.liferay.asset.kernel.model.BaseJSPAssetRenderer; import com.liferay.asset.kernel.model.DDMFormValuesReader; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.LiferayPortletRequest; @@ -37,10 +40,7 @@ import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.util.PropsValues; import com.liferay.portlet.documentlibrary.asset.DLFileEntryDDMFormValuesReader; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.portlet.documentlibrary.util.DocumentConversionUtil; import com.liferay.trash.kernel.util.TrashUtil; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFileEntryAssetRendererFactory.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFileEntryAssetRendererFactory.java index 0786fa6b7c24ef..5d3bc5d154f029 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFileEntryAssetRendererFactory.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFileEntryAssetRendererFactory.java @@ -18,6 +18,13 @@ import com.liferay.asset.kernel.model.AssetRendererFactory; import com.liferay.asset.kernel.model.BaseAssetRendererFactory; import com.liferay.asset.kernel.model.ClassTypeReader; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.language.LanguageUtil; @@ -31,13 +38,6 @@ import com.liferay.portal.kernel.util.Constants; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portlet.documentlibrary.asset.DLFileEntryClassTypeReader; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryTypePermission; import com.liferay.portlet.documentlibrary.service.permission.DLPermission; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFolderAssetRenderer.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFolderAssetRenderer.java index 053693aae4cb5a..283c338ea34dcb 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFolderAssetRenderer.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFolderAssetRenderer.java @@ -16,6 +16,7 @@ import com.liferay.asset.kernel.model.AssetRendererFactory; import com.liferay.asset.kernel.model.BaseJSPAssetRenderer; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.log.Log; @@ -28,7 +29,6 @@ import com.liferay.portal.kernel.trash.TrashRenderer; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.model.DLFolder; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; import com.liferay.trash.kernel.util.TrashUtil; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFolderAssetRendererFactory.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFolderAssetRendererFactory.java index 5662808da00d3e..0a284a2d8d30ec 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFolderAssetRendererFactory.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/asset/DLFolderAssetRendererFactory.java @@ -17,14 +17,14 @@ import com.liferay.asset.kernel.model.AssetRenderer; import com.liferay.asset.kernel.model.AssetRendererFactory; import com.liferay.asset.kernel.model.BaseAssetRendererFactory; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.LiferayPortletResponse; import com.liferay.portal.kernel.portlet.LiferayPortletURL; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.security.permission.PermissionChecker; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; import javax.portlet.PortletRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/custom/attributes/DLFileEntryCustomAttributesDisplay.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/custom/attributes/DLFileEntryCustomAttributesDisplay.java index 30e525e9d9992f..5f0b1b30335105 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/custom/attributes/DLFileEntryCustomAttributesDisplay.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/custom/attributes/DLFileEntryCustomAttributesDisplay.java @@ -14,10 +14,10 @@ package com.liferay.document.library.web.custom.attributes; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.expando.kernel.model.BaseCustomAttributesDisplay; import com.liferay.expando.kernel.model.CustomAttributesDisplay; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import org.osgi.service.component.annotations.Component; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/custom/attributes/DLFolderCustomAttributesDisplay.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/custom/attributes/DLFolderCustomAttributesDisplay.java index 44e9ae74ec4866..1c840fdf761cb8 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/custom/attributes/DLFolderCustomAttributesDisplay.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/custom/attributes/DLFolderCustomAttributesDisplay.java @@ -14,10 +14,10 @@ package com.liferay.document.library.web.custom.attributes; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.expando.kernel.model.BaseCustomAttributesDisplay; import com.liferay.expando.kernel.model.CustomAttributesDisplay; -import com.liferay.portlet.documentlibrary.model.DLFolder; import org.osgi.service.component.annotations.Component; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DLDisplayContextFactoryReference.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DLDisplayContextFactoryReference.java index 36403eb3cf3463..cb474512d47d0b 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DLDisplayContextFactoryReference.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DLDisplayContextFactoryReference.java @@ -14,8 +14,8 @@ package com.liferay.document.library.web.display.context; +import com.liferay.document.library.kernel.display.context.DLDisplayContextFactory; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.display.context.DLDisplayContextFactory; import com.liferay.registry.ServiceReference; /** diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DLDisplayContextProvider.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DLDisplayContextProvider.java index 1cb264f6f3f2ef..159961c3333184 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DLDisplayContextProvider.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DLDisplayContextProvider.java @@ -15,6 +15,10 @@ package com.liferay.document.library.web.display.context; import com.liferay.document.library.display.context.DLMimeTypeDisplayContext; +import com.liferay.document.library.kernel.display.context.DLDisplayContextFactory; +import com.liferay.document.library.kernel.display.context.DLEditFileEntryDisplayContext; +import com.liferay.document.library.kernel.display.context.DLViewFileVersionDisplayContext; +import com.liferay.document.library.kernel.model.DLFileEntryType; import com.liferay.osgi.service.tracker.collections.list.ServiceTrackerList; import com.liferay.osgi.service.tracker.collections.list.ServiceTrackerListFactory; import com.liferay.portal.kernel.exception.PortalException; @@ -22,10 +26,6 @@ import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.display.context.DLDisplayContextFactory; -import com.liferay.portlet.documentlibrary.display.context.DLEditFileEntryDisplayContext; -import com.liferay.portlet.documentlibrary.display.context.DLViewFileVersionDisplayContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; import java.util.Map; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DefaultDLEditFileEntryDisplayContext.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DefaultDLEditFileEntryDisplayContext.java index d2ae33647d5622..55bab0c5acab18 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DefaultDLEditFileEntryDisplayContext.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DefaultDLEditFileEntryDisplayContext.java @@ -14,6 +14,10 @@ package com.liferay.document.library.web.display.context; +import com.liferay.document.library.kernel.display.context.DLEditFileEntryDisplayContext; +import com.liferay.document.library.kernel.display.context.DLFilePicker; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.document.library.web.display.context.logic.FileEntryDisplayContextHelper; import com.liferay.document.library.web.display.context.logic.FileVersionDisplayContextHelper; import com.liferay.document.library.web.display.context.util.DLRequestHelper; @@ -29,10 +33,6 @@ import com.liferay.portal.kernel.util.PrefsPropsUtil; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.display.context.DLEditFileEntryDisplayContext; -import com.liferay.portlet.documentlibrary.display.context.DLFilePicker; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.UUID; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DefaultDLViewFileVersionDisplayContext.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DefaultDLViewFileVersionDisplayContext.java index 50cc38640134bb..07124cece1e0bb 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DefaultDLViewFileVersionDisplayContext.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/DefaultDLViewFileVersionDisplayContext.java @@ -15,6 +15,10 @@ package com.liferay.document.library.web.display.context; import com.liferay.document.library.display.context.DLMimeTypeDisplayContext; +import com.liferay.document.library.kernel.display.context.DLViewFileVersionDisplayContext; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalServiceUtil; import com.liferay.document.library.web.display.context.logic.DLPortletInstanceSettingsHelper; import com.liferay.document.library.web.display.context.logic.FileEntryDisplayContextHelper; import com.liferay.document.library.web.display.context.logic.FileVersionDisplayContextHelper; @@ -33,10 +37,6 @@ import com.liferay.portal.kernel.servlet.taglib.ui.MenuItem; import com.liferay.portal.kernel.servlet.taglib.ui.ToolbarItem; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.display.context.DLViewFileVersionDisplayContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalServiceUtil; import java.io.IOException; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/DLPortletInstanceSettingsHelper.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/DLPortletInstanceSettingsHelper.java index beffb136d8c3dc..d00556dab62811 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/DLPortletInstanceSettingsHelper.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/DLPortletInstanceSettingsHelper.java @@ -14,6 +14,7 @@ package com.liferay.document.library.web.display.context.logic; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.document.library.web.display.context.util.DLRequestHelper; import com.liferay.document.library.web.settings.internal.DLPortletInstanceSettings; @@ -26,7 +27,6 @@ import com.liferay.portal.kernel.util.SetUtil; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.ArrayList; import java.util.Arrays; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/FileEntryDisplayContextHelper.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/FileEntryDisplayContextHelper.java index 824c7024105dc3..1ba13f6fc1dfa5 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/FileEntryDisplayContextHelper.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/FileEntryDisplayContextHelper.java @@ -14,12 +14,12 @@ package com.liferay.document.library.web.display.context.logic; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryType; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.security.permission.ActionKeys; import com.liferay.portal.kernel.security.permission.PermissionChecker; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; /** diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/FileVersionDisplayContextHelper.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/FileVersionDisplayContextHelper.java index ea6b2013eeb826..5b6bfcf15df770 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/FileVersionDisplayContextHelper.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/FileVersionDisplayContextHelper.java @@ -14,9 +14,9 @@ package com.liferay.document.library.web.display.context.logic; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.util.DLUtil; /** * @author Iván Zaera diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/UIItemsBuilder.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/UIItemsBuilder.java index 7d0f12eaba331b..3ab0b08c8281ca 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/UIItemsBuilder.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/display/context/logic/UIItemsBuilder.java @@ -14,6 +14,10 @@ package com.liferay.document.library.web.display.context.logic; +import com.liferay.document.library.kernel.display.context.DLUIItemKeys; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.bean.BeanParamUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; @@ -52,10 +56,6 @@ import com.liferay.portal.kernel.util.TextFormatter; import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.display.context.DLUIItemKeys; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.taglib.security.PermissionsURLTag; import com.liferay.trash.kernel.util.TrashUtil; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/exportimport/portlet/preferences/processor/DLExportImportPortletPreferencesProcessor.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/exportimport/portlet/preferences/processor/DLExportImportPortletPreferencesProcessor.java index f2f3cd4e18177c..22bf0380f42276 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/exportimport/portlet/preferences/processor/DLExportImportPortletPreferencesProcessor.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/exportimport/portlet/preferences/processor/DLExportImportPortletPreferencesProcessor.java @@ -14,6 +14,9 @@ package com.liferay.document.library.web.exportimport.portlet.preferences.processor; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.exportimport.kernel.lar.PortletDataException; @@ -31,9 +34,6 @@ import com.liferay.portal.kernel.xml.Element; import com.liferay.portlet.display.template.exportimport.portlet.preferences.processor.PortletDisplayTemplateExportCapability; import com.liferay.portlet.display.template.exportimport.portlet.preferences.processor.PortletDisplayTemplateImportCapability; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import java.util.List; import java.util.Map; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/lar/DLPortletDataHandler.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/lar/DLPortletDataHandler.java index 43ebc5ad8596ca..22333686b51670 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/lar/DLPortletDataHandler.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/lar/DLPortletDataHandler.java @@ -14,6 +14,20 @@ package com.liferay.document.library.web.lar; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileRank; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.exportimport.kernel.lar.BasePortletDataHandler; import com.liferay.exportimport.kernel.lar.PortletDataContext; @@ -49,20 +63,6 @@ import com.liferay.portal.service.RepositoryLocalService; import com.liferay.portal.util.PropsValues; import com.liferay.portlet.documentlibrary.constants.DLConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileRank; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; import com.liferay.portlet.documentlibrary.service.permission.DLPermission; import java.util.List; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/DLAdminEditPortletProvider.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/DLAdminEditPortletProvider.java index 432b674de13875..bea8282eed1811 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/DLAdminEditPortletProvider.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/DLAdminEditPortletProvider.java @@ -31,7 +31,7 @@ "model.class.name=com.liferay.portal.kernel.repository.model.FileEntry", "model.class.name=com.liferay.portal.kernel.repository.model.Folder", "model.class.name=com.liferay.portal.kernel.repository.model.FileShortcut", - "model.class.name=com.liferay.portlet.documentlibrary.model.DLFileEntryType" + "model.class.name=com.liferay.document.library.kernel.model.DLFileEntryType" }, service = { EditPortletProvider.class, ManagePortletProvider.class, diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/DLEditPortletProvider.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/DLEditPortletProvider.java index ff3cfbc86c3486..55450317c66445 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/DLEditPortletProvider.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/DLEditPortletProvider.java @@ -31,7 +31,7 @@ "model.class.name=com.liferay.portal.kernel.repository.model.FileEntry", "model.class.name=com.liferay.portal.kernel.repository.model.Folder", "model.class.name=com.liferay.portal.kernel.repository.model.FileShortcut", - "model.class.name=com.liferay.portlet.documentlibrary.model.DLFileEntryType", + "model.class.name=com.liferay.document.library.kernel.model.DLFileEntryType", "service.ranking:Integer=100" }, service = {EditPortletProvider.class, ViewPortletProvider.class} diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/ActionUtil.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/ActionUtil.java index 89df3bc4aca3ed..67622b131861db 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/ActionUtil.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/ActionUtil.java @@ -14,6 +14,11 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.util.RawMetadataProcessorUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil; @@ -32,12 +37,7 @@ import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.model.Repository; import com.liferay.portal.service.RepositoryServiceUtil; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; import com.liferay.portlet.documentlibrary.service.permission.DLPermission; -import com.liferay.portlet.documentlibrary.util.RawMetadataProcessorUtil; import java.util.ArrayList; import java.util.List; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/CompareVersionsMVCRenderCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/CompareVersionsMVCRenderCommand.java index 9c71e07c72f59c..ab612d4272078b 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/CompareVersionsMVCRenderCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/CompareVersionsMVCRenderCommand.java @@ -14,6 +14,10 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.diff.DiffResult; import com.liferay.portal.kernel.diff.DiffUtil; @@ -27,10 +31,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.portlet.documentlibrary.util.DocumentConversionUtil; import java.io.FileInputStream; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/DLFileEntryFindActionHelper.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/DLFileEntryFindActionHelper.java index 0d22f6b62d5ff9..94be00f1862460 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/DLFileEntryFindActionHelper.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/DLFileEntryFindActionHelper.java @@ -14,10 +14,10 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.portal.kernel.portlet.PortletLayoutFinder; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.struts.FindActionHelper; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import javax.portlet.PortletURL; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/DLFolderFindActionHelper.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/DLFolderFindActionHelper.java index 503f334e7100c5..be1deea0533851 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/DLFolderFindActionHelper.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/DLFolderFindActionHelper.java @@ -14,12 +14,12 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.portlet.PortletLayoutFinder; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.model.PortletConstants; import com.liferay.portal.struts.FindActionHelper; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import javax.portlet.PortletURL; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditEntryMVCActionCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditEntryMVCActionCommand.java index f7ba942c0928da..6902432840a56a 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditEntryMVCActionCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditEntryMVCActionCommand.java @@ -16,6 +16,15 @@ import com.liferay.asset.kernel.exception.AssetCategoryException; import com.liferay.asset.kernel.exception.AssetTagException; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.DuplicateFolderNameException; +import com.liferay.document.library.kernel.exception.InvalidFolderException; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.exception.SourceFileNameException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.service.DLTrashService; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.lock.DuplicateLockException; import com.liferay.portal.kernel.portlet.LiferayWindowState; @@ -36,15 +45,6 @@ import com.liferay.portal.model.TrashedModel; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFolderNameException; -import com.liferay.portlet.documentlibrary.exception.InvalidFolderException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.exception.SourceFileNameException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.service.DLTrashService; import com.liferay.trash.kernel.service.TrashEntryService; import com.liferay.trash.kernel.util.TrashUtil; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileEntryMVCActionCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileEntryMVCActionCommand.java index 28e045ba88fe84..5a153f90e0058e 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileEntryMVCActionCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileEntryMVCActionCommand.java @@ -17,6 +17,23 @@ import com.liferay.asset.kernel.exception.AssetCategoryException; import com.liferay.asset.kernel.exception.AssetTagException; import com.liferay.asset.kernel.model.AssetVocabulary; +import com.liferay.document.library.kernel.antivirus.AntivirusScannerException; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.DuplicateFolderNameException; +import com.liferay.document.library.kernel.exception.FileEntryLockException; +import com.liferay.document.library.kernel.exception.FileExtensionException; +import com.liferay.document.library.kernel.exception.FileMimeTypeException; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.exception.FileSizeException; +import com.liferay.document.library.kernel.exception.InvalidFileEntryTypeException; +import com.liferay.document.library.kernel.exception.InvalidFileVersionException; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.exception.SourceFileNameException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.service.DLTrashService; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.document.library.web.settings.internal.DLPortletInstanceSettings; import com.liferay.dynamic.data.mapping.kernel.StorageFieldRequiredException; @@ -65,23 +82,6 @@ import com.liferay.portal.service.ServiceContextFactory; import com.liferay.portal.util.PrefsPropsUtil; import com.liferay.portlet.PortletURLImpl; -import com.liferay.portlet.documentlibrary.antivirus.AntivirusScannerException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFolderNameException; -import com.liferay.portlet.documentlibrary.exception.FileEntryLockException; -import com.liferay.portlet.documentlibrary.exception.FileExtensionException; -import com.liferay.portlet.documentlibrary.exception.FileMimeTypeException; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; -import com.liferay.portlet.documentlibrary.exception.InvalidFileEntryTypeException; -import com.liferay.portlet.documentlibrary.exception.InvalidFileVersionException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.exception.SourceFileNameException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.service.DLTrashService; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.trash.kernel.service.TrashEntryService; import com.liferay.trash.kernel.util.TrashUtil; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileEntryTypeMVCActionCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileEntryTypeMVCActionCommand.java index f2540e5708e212..3c19fcba3f8121 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileEntryTypeMVCActionCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileEntryTypeMVCActionCommand.java @@ -14,6 +14,12 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryTypeException; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryTypeException; +import com.liferay.document.library.kernel.exception.NoSuchMetadataSetException; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeService; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.dynamic.data.mapping.kernel.DDMForm; import com.liferay.dynamic.data.mapping.kernel.NoSuchStructureException; @@ -41,12 +47,6 @@ import com.liferay.portal.service.GroupLocalService; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryTypeException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryTypeException; -import com.liferay.portlet.documentlibrary.exception.NoSuchMetadataSetException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeService; import java.util.Locale; import java.util.Map; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileEntryTypeMVCRenderCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileEntryTypeMVCRenderCommand.java index 5e2bd7fd563f15..dd0907500ea302 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileEntryTypeMVCRenderCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileEntryTypeMVCRenderCommand.java @@ -14,6 +14,11 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryTypeException; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.service.DLFileEntryTypeService; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.kernel.DDMStructureManagerUtil; @@ -23,11 +28,6 @@ import com.liferay.portal.kernel.util.ParamUtil; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryTypeException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeService; -import com.liferay.portlet.documentlibrary.util.DLUtil; import javax.portlet.PortletException; import javax.portlet.RenderRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileShortcutMVCActionCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileShortcutMVCActionCommand.java index 66ed997e83c2d9..7415103fdeafbd 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileShortcutMVCActionCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileShortcutMVCActionCommand.java @@ -14,6 +14,12 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.FileShortcutPermissionException; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFileShortcutException; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.service.DLTrashService; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.portlet.bridges.mvc.BaseMVCActionCommand; import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand; @@ -25,12 +31,6 @@ import com.liferay.portal.model.TrashedModel; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; -import com.liferay.portlet.documentlibrary.exception.FileShortcutPermissionException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileShortcutException; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.service.DLTrashService; import com.liferay.trash.kernel.util.TrashUtil; import javax.portlet.ActionRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileShortcutMVCRenderCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileShortcutMVCRenderCommand.java index 1cc68873b7bc50..8c0e31d0aa05bb 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileShortcutMVCRenderCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFileShortcutMVCRenderCommand.java @@ -14,13 +14,13 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.NoSuchFileShortcutException; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.security.auth.PrincipalException; import com.liferay.portal.kernel.servlet.SessionErrors; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileShortcutException; import javax.portlet.PortletException; import javax.portlet.RenderRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFolderMVCActionCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFolderMVCActionCommand.java index 8489e76c43287b..4d8fba2329a6e7 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFolderMVCActionCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFolderMVCActionCommand.java @@ -14,6 +14,17 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.DuplicateFileException; +import com.liferay.document.library.kernel.exception.DuplicateFolderNameException; +import com.liferay.document.library.kernel.exception.FolderNameException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.exception.RequiredFileEntryTypeException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.service.DLTrashService; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.exception.PortalException; @@ -42,17 +53,6 @@ import com.liferay.portal.model.TrashedModel; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFolderNameException; -import com.liferay.portlet.documentlibrary.exception.FolderNameException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.exception.RequiredFileEntryTypeException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.service.DLTrashService; import com.liferay.trash.kernel.util.TrashUtil; import java.io.File; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFolderMVCResourceCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFolderMVCResourceCommand.java index 263c3921a1ad8c..1a0d677815782b 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFolderMVCResourceCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditFolderMVCResourceCommand.java @@ -14,6 +14,8 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppService; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.language.LanguageUtil; @@ -31,8 +33,6 @@ import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.kernel.zip.ZipWriter; import com.liferay.portal.kernel.zip.ZipWriterFactoryUtil; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppService; import java.io.File; import java.io.FileInputStream; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditRepositoryMVCActionCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditRepositoryMVCActionCommand.java index f50e2c356531dd..ed6a59b31584ad 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditRepositoryMVCActionCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/EditRepositoryMVCActionCommand.java @@ -14,6 +14,11 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.DuplicateFolderNameException; +import com.liferay.document.library.kernel.exception.DuplicateRepositoryNameException; +import com.liferay.document.library.kernel.exception.FolderNameException; +import com.liferay.document.library.kernel.exception.RepositoryNameException; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.exception.InvalidRepositoryException; import com.liferay.portal.exception.NoSuchRepositoryException; @@ -32,11 +37,6 @@ import com.liferay.portal.service.RepositoryService; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; -import com.liferay.portlet.documentlibrary.exception.DuplicateFolderNameException; -import com.liferay.portlet.documentlibrary.exception.DuplicateRepositoryNameException; -import com.liferay.portlet.documentlibrary.exception.FolderNameException; -import com.liferay.portlet.documentlibrary.exception.RepositoryNameException; -import com.liferay.portlet.documentlibrary.model.DLFolder; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/GetFileActionHelper.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/GetFileActionHelper.java index e00ab6fe854d3e..7ef8cb501577f5 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/GetFileActionHelper.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/GetFileActionHelper.java @@ -14,6 +14,11 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.flash.FlashMagicBytesUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; @@ -33,12 +38,7 @@ import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.model.User; import com.liferay.portal.repository.liferayrepository.model.LiferayFileEntry; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.portlet.documentlibrary.util.DocumentConversionUtil; import java.io.File; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/GetFileEntryMVCRenderCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/GetFileEntryMVCRenderCommand.java index 017574d92c80b9..faeb0e9dbd3513 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/GetFileEntryMVCRenderCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/GetFileEntryMVCRenderCommand.java @@ -14,6 +14,8 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFileVersionException; import com.liferay.portal.exception.NoSuchRepositoryEntryException; import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -23,8 +25,6 @@ import com.liferay.portal.kernel.util.ParamUtil; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileVersionException; import javax.portlet.PortletException; import javax.portlet.RenderRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/GetFolderMVCRenderCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/GetFolderMVCRenderCommand.java index 68fc7896f64554..081f9474cf90fa 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/GetFolderMVCRenderCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/GetFolderMVCRenderCommand.java @@ -14,12 +14,12 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.security.auth.PrincipalException; import com.liferay.portal.kernel.servlet.SessionErrors; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; import javax.portlet.PortletException; import javax.portlet.RenderRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/MoveEntryMVCRenderCommand.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/MoveEntryMVCRenderCommand.java index 97ec0fcd264232..7e1c1fd4169ed3 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/MoveEntryMVCRenderCommand.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/MoveEntryMVCRenderCommand.java @@ -14,6 +14,7 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -22,7 +23,6 @@ import com.liferay.portal.kernel.security.auth.PrincipalException; import com.liferay.portal.kernel.servlet.SessionErrors; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; import java.util.List; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/ValidateRootFolderConfigurationAction.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/ValidateRootFolderConfigurationAction.java index 6d6d3facd1dd4f..ae6757bd89ec00 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/ValidateRootFolderConfigurationAction.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/action/ValidateRootFolderConfigurationAction.java @@ -14,6 +14,9 @@ package com.liferay.document.library.web.portlet.action; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.portal.exception.NoSuchRepositoryEntryException; import com.liferay.portal.kernel.portlet.BaseJSPSettingsConfigurationAction; import com.liferay.portal.kernel.servlet.SessionErrors; @@ -21,9 +24,6 @@ import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.ParamUtil; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/AccessFromDesktopPortletConfigurationIcon.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/AccessFromDesktopPortletConfigurationIcon.java index 272760f2b70640..7a3a3493d6ee0d 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/AccessFromDesktopPortletConfigurationIcon.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/AccessFromDesktopPortletConfigurationIcon.java @@ -14,11 +14,11 @@ package com.liferay.document.library.web.portlet.configuration.icon; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.portlet.configuration.icon.BaseJSPPortletConfigurationIcon; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.security.permission.ActionKeys; import com.liferay.portal.kernel.theme.PortletDisplay; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; import javax.portlet.PortletRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/DeleteFileEntryPortletConfigurationIcon.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/DeleteFileEntryPortletConfigurationIcon.java index 0bb0a381b9f177..cf0bdd0289d6ef 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/DeleteFileEntryPortletConfigurationIcon.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/DeleteFileEntryPortletConfigurationIcon.java @@ -14,6 +14,7 @@ package com.liferay.document.library.web.portlet.configuration.icon; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.document.library.web.display.context.logic.FileEntryDisplayContextHelper; import com.liferay.portal.kernel.exception.PortalException; @@ -21,7 +22,6 @@ import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.util.Constants; import com.liferay.portal.kernel.util.PortalUtil; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.trash.kernel.util.TrashUtil; import javax.portlet.ActionRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/DeleteFolderPortletConfigurationIcon.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/DeleteFolderPortletConfigurationIcon.java index 38827f328871c4..c9980829144e59 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/DeleteFolderPortletConfigurationIcon.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/DeleteFolderPortletConfigurationIcon.java @@ -14,6 +14,8 @@ package com.liferay.document.library.web.portlet.configuration.icon; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.configuration.icon.BasePortletConfigurationIcon; @@ -21,8 +23,6 @@ import com.liferay.portal.kernel.security.permission.ActionKeys; import com.liferay.portal.kernel.util.Constants; import com.liferay.portal.kernel.util.PortalUtil; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; import com.liferay.trash.kernel.util.TrashUtil; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/DownloadFileEntryPortletConfigurationIcon.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/DownloadFileEntryPortletConfigurationIcon.java index 506a9245178b0e..ca8e336cbd7a1f 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/DownloadFileEntryPortletConfigurationIcon.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/DownloadFileEntryPortletConfigurationIcon.java @@ -14,13 +14,13 @@ package com.liferay.document.library.web.portlet.configuration.icon; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.document.library.web.display.context.logic.FileEntryDisplayContextHelper; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.configuration.icon.BasePortletConfigurationIcon; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileVersion; import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portlet.documentlibrary.util.DLUtil; import javax.portlet.PortletRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/EditFolderPortletConfigurationIcon.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/EditFolderPortletConfigurationIcon.java index 7b969557bc8826..11b4c0c677dc0c 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/EditFolderPortletConfigurationIcon.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/EditFolderPortletConfigurationIcon.java @@ -14,6 +14,8 @@ package com.liferay.document.library.web.portlet.configuration.icon; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.configuration.icon.BasePortletConfigurationIcon; @@ -22,8 +24,6 @@ import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.workflow.WorkflowEngineManagerUtil; import com.liferay.portal.kernel.workflow.WorkflowHandlerRegistryUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; import javax.portlet.PortletRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/FileEntryPermissionPortletConfigurationIcon.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/FileEntryPermissionPortletConfigurationIcon.java index 8cd4da58411448..d3a2f62a21dc29 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/FileEntryPermissionPortletConfigurationIcon.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/FileEntryPermissionPortletConfigurationIcon.java @@ -14,12 +14,12 @@ package com.liferay.document.library.web.portlet.configuration.icon; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; import com.liferay.portal.kernel.portlet.LiferayWindowState; import com.liferay.portal.kernel.portlet.configuration.icon.BasePortletConfigurationIcon; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.util.HtmlUtil; import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; import com.liferay.taglib.security.PermissionsURLTag; import javax.portlet.PortletRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/FolderPermissionPortletConfigurationIcon.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/FolderPermissionPortletConfigurationIcon.java index d9d860feb17f8a..b74ef6af99b8f7 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/FolderPermissionPortletConfigurationIcon.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/FolderPermissionPortletConfigurationIcon.java @@ -14,6 +14,7 @@ package com.liferay.document.library.web.portlet.configuration.icon; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.LiferayWindowState; import com.liferay.portal.kernel.portlet.configuration.icon.BasePortletConfigurationIcon; @@ -21,7 +22,6 @@ import com.liferay.portal.kernel.security.permission.ActionKeys; import com.liferay.portal.kernel.util.HtmlUtil; import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; import com.liferay.taglib.security.PermissionsURLTag; @@ -61,7 +61,7 @@ public String getURL() { } else { url = PermissionsURLTag.doTag( - null, "com.liferay.portlet.documentlibrary", + null, "com.liferay.document.library.kernel", HtmlUtil.unescape(themeDisplay.getScopeGroupName()), null, String.valueOf(themeDisplay.getScopeGroupId()), LiferayWindowState.POP_UP.toString(), null, diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/MoveFileEntryPortletConfigurationIcon.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/MoveFileEntryPortletConfigurationIcon.java index 2251a1afdc2d2c..4399866287fcf3 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/MoveFileEntryPortletConfigurationIcon.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/MoveFileEntryPortletConfigurationIcon.java @@ -14,13 +14,13 @@ package com.liferay.document.library.web.portlet.configuration.icon; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.document.library.web.display.context.logic.FileEntryDisplayContextHelper; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.configuration.icon.BasePortletConfigurationIcon; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.util.PortalUtil; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import javax.portlet.PortletRequest; import javax.portlet.PortletURL; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/OpenInMSOfficeFileEntryPortletConfigurationIcon.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/OpenInMSOfficeFileEntryPortletConfigurationIcon.java index 6ec1ac6ed1b3ae..88c7ecdc2c8732 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/OpenInMSOfficeFileEntryPortletConfigurationIcon.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/OpenInMSOfficeFileEntryPortletConfigurationIcon.java @@ -14,6 +14,7 @@ package com.liferay.document.library.web.portlet.configuration.icon; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.document.library.web.display.context.logic.UIItemsBuilder; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.configuration.icon.BasePortletConfigurationIcon; @@ -23,7 +24,6 @@ import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.util.DLUtil; import javax.portlet.PortletRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java index f2d57ac9332e83..262791cea80954 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java @@ -46,7 +46,7 @@ public String getURL() { try { url = PermissionsURLTag.doTag( - StringPool.BLANK, "com.liferay.portlet.documentlibrary", + StringPool.BLANK, "com.liferay.document.library.kernel", themeDisplay.getScopeGroupName(), null, String.valueOf(themeDisplay.getScopeGroupId()), LiferayWindowState.POP_UP.toString(), null, diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/RepositoryPermissionPortletConfigurationIcon.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/RepositoryPermissionPortletConfigurationIcon.java index 8feea9b4296b83..4b4a94de2f2b68 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/RepositoryPermissionPortletConfigurationIcon.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/configuration/icon/RepositoryPermissionPortletConfigurationIcon.java @@ -14,12 +14,12 @@ package com.liferay.document.library.web.portlet.configuration.icon; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.portlet.LiferayWindowState; import com.liferay.portal.kernel.portlet.configuration.icon.BasePortletConfigurationIcon; import com.liferay.portal.kernel.util.HtmlUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.model.Repository; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.taglib.security.PermissionsURLTag; import javax.portlet.PortletRequest; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/toolbar/contributor/DLPortletToolbarContributor.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/toolbar/contributor/DLPortletToolbarContributor.java index acdca14f773d41..5df1c0cb2561fd 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/toolbar/contributor/DLPortletToolbarContributor.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/portlet/toolbar/contributor/DLPortletToolbarContributor.java @@ -14,6 +14,12 @@ package com.liferay.document.library.web.portlet.toolbar.contributor; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeService; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.document.library.web.settings.internal.DLPortletInstanceSettings; import com.liferay.portal.kernel.bean.BeanParamUtil; @@ -35,12 +41,6 @@ import com.liferay.portal.kernel.util.Constants; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeService; import java.util.ArrayList; import java.util.Collections; @@ -409,7 +409,7 @@ protected List getPortletTitleMenuItems( } @Reference( - target = "(model.class.name=com.liferay.portlet.documentlibrary.model.DLFolder)", + target = "(model.class.name=com.liferay.document.library.kernel.model.DLFolder)", unbind = "-" ) protected void setBaseModelPermissionChecker( diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/ratings/definition/DLPortletRatingsDefinition.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/ratings/definition/DLPortletRatingsDefinition.java index ca04c256bbcc10..659bd0019f9d43 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/ratings/definition/DLPortletRatingsDefinition.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/ratings/definition/DLPortletRatingsDefinition.java @@ -25,7 +25,7 @@ */ @Component( property = { - "model.class.name=com.liferay.portlet.documentlibrary.model.DLFileEntry" + "model.class.name=com.liferay.document.library.kernel.model.DLFileEntry" } ) public class DLPortletRatingsDefinition implements PortletRatingsDefinition { diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/search/EntriesChecker.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/search/EntriesChecker.java index e4866e204a5c40..9ac5297818a419 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/search/EntriesChecker.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/search/EntriesChecker.java @@ -14,6 +14,10 @@ package com.liferay.document.library.web.search; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFileShortcutException; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; import com.liferay.portal.exception.NoSuchRepositoryEntryException; import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker; import com.liferay.portal.kernel.dao.search.RowChecker; @@ -29,10 +33,6 @@ import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileShortcutException; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; import com.liferay.portlet.documentlibrary.service.permission.DLFileShortcutPermission; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/settings/internal/DLPortletInstanceSettings.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/settings/internal/DLPortletInstanceSettings.java index 04c3df4ea4feec..f973e6c2501dc4 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/settings/internal/DLPortletInstanceSettings.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/settings/internal/DLPortletInstanceSettings.java @@ -14,6 +14,8 @@ package com.liferay.document.library.web.settings.internal; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.settings.FallbackKeys; @@ -25,8 +27,6 @@ import com.liferay.portal.kernel.util.ArrayUtil; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.model.Layout; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.Map; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/social/DLFileEntryActivityInterpreter.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/social/DLFileEntryActivityInterpreter.java index ff074c05e90696..db7b47f1189fe6 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/social/DLFileEntryActivityInterpreter.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/social/DLFileEntryActivityInterpreter.java @@ -17,6 +17,9 @@ import com.liferay.asset.kernel.AssetRendererFactoryRegistryUtil; import com.liferay.asset.kernel.model.AssetRenderer; import com.liferay.asset.kernel.model.AssetRendererFactory; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.document.library.web.util.DLResourceBundleLoader; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -26,9 +29,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; import com.liferay.portlet.documentlibrary.social.DLActivityKeys; import com.liferay.social.kernel.model.BaseSocialActivityInterpreter; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/social/DLFolderActivityInterpreter.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/social/DLFolderActivityInterpreter.java index eafed0c7aa3453..7a483182cc0b9a 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/social/DLFolderActivityInterpreter.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/social/DLFolderActivityInterpreter.java @@ -14,13 +14,13 @@ package com.liferay.document.library.web.social; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.document.library.web.util.DLResourceBundleLoader; import com.liferay.portal.kernel.security.permission.PermissionChecker; import com.liferay.portal.kernel.util.ResourceBundleLoader; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolder; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; import com.liferay.social.kernel.model.BaseSocialActivityInterpreter; import com.liferay.social.kernel.model.SocialActivity; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/template/DocumentLibraryPortletDisplayTemplateHandler.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/template/DocumentLibraryPortletDisplayTemplateHandler.java index 46cdae0e640dbb..16d9ba92dd3b5f 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/template/DocumentLibraryPortletDisplayTemplateHandler.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/template/DocumentLibraryPortletDisplayTemplateHandler.java @@ -17,6 +17,11 @@ import aQute.bnd.annotation.metatype.Configurable; import com.liferay.document.library.configuration.DLConfiguration; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeService; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.log.Log; @@ -28,11 +33,6 @@ import com.liferay.portal.kernel.template.TemplateVariableGroup; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeService; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.HashMap; import java.util.List; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/trash/DLFileShortcutTrashRenderer.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/trash/DLFileShortcutTrashRenderer.java index 3c742dab185b38..45e287c2272004 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/trash/DLFileShortcutTrashRenderer.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/trash/DLFileShortcutTrashRenderer.java @@ -14,14 +14,14 @@ package com.liferay.document.library.web.trash; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.portal.kernel.trash.BaseTrashRenderer; import com.liferay.portal.kernel.trash.TrashHandler; import com.liferay.portal.kernel.trash.TrashHandlerRegistryUtil; import com.liferay.portal.kernel.trash.TrashRenderer; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; import com.liferay.trash.kernel.util.TrashUtil; import java.util.Locale; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/trash/DLFileShortcutTrashRendererFactory.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/trash/DLFileShortcutTrashRendererFactory.java index 900af62ad8eaa0..c24bbd2e858f70 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/trash/DLFileShortcutTrashRendererFactory.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/trash/DLFileShortcutTrashRendererFactory.java @@ -14,11 +14,11 @@ package com.liferay.document.library.web.trash; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalService; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.trash.TrashRenderer; import com.liferay.portal.kernel.trash.TrashRendererFactory; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; @@ -28,7 +28,7 @@ */ @Component( immediate = true, - property = {"model.class.name=com.liferay.portlet.documentlibrary.model.DLFileShortcut"}, + property = {"model.class.name=com.liferay.document.library.kernel.model.DLFileShortcut"}, service = TrashRendererFactory.class ) public class DLFileShortcutTrashRendererFactory diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/upload/FileEntryDLUploadHandler.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/upload/FileEntryDLUploadHandler.java index e726b3f23e8d7f..250bb4e117e4f2 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/upload/FileEntryDLUploadHandler.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/upload/FileEntryDLUploadHandler.java @@ -14,6 +14,10 @@ package com.liferay.document.library.web.upload; +import com.liferay.document.library.kernel.exception.FileSizeException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -29,11 +33,7 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; import com.liferay.portal.util.PrefsPropsUtil; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.io.InputStream; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/util/DLBreadcrumbUtil.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/util/DLBreadcrumbUtil.java index f6ea1536180511..47374618d57192 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/util/DLBreadcrumbUtil.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/util/DLBreadcrumbUtil.java @@ -14,6 +14,8 @@ package com.liferay.document.library.web.util; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.document.library.web.settings.internal.DLPortletInstanceSettings; import com.liferay.portal.kernel.portlet.LiferayPortletResponse; import com.liferay.portal.kernel.portlet.LiferayWindowState; @@ -25,8 +27,6 @@ import com.liferay.portal.kernel.util.ParamUtil; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import java.util.Collections; import java.util.HashMap; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/util/IGUtil.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/util/IGUtil.java index 36df80c7dccd0f..cc42c1260d07b4 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/util/IGUtil.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/util/IGUtil.java @@ -14,6 +14,8 @@ package com.liferay.document.library.web.util; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.portal.kernel.portlet.LiferayWindowState; import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil; import com.liferay.portal.kernel.repository.model.Folder; @@ -22,8 +24,6 @@ import com.liferay.portal.kernel.util.ParamUtil; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import java.util.Collections; import java.util.List; diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/webdav/DLWebDAVStorageImpl.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/webdav/DLWebDAVStorageImpl.java index 0bda40c9ee4fc4..eb769efd1aef5e 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/webdav/DLWebDAVStorageImpl.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/webdav/DLWebDAVStorageImpl.java @@ -20,6 +20,18 @@ import com.liferay.asset.kernel.service.AssetEntryLocalService; import com.liferay.asset.kernel.service.AssetLinkLocalService; import com.liferay.asset.kernel.service.AssetTagLocalService; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.DuplicateFolderNameException; +import com.liferay.document.library.kernel.exception.FileSizeException; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.service.DLTrashService; +import com.liferay.document.library.kernel.util.DL; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.expando.kernel.model.ExpandoBridge; import com.liferay.portal.kernel.exception.PortalException; @@ -54,18 +66,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; import com.liferay.portal.webdav.LockException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFolderNameException; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.service.DLTrashService; -import com.liferay.portlet.documentlibrary.util.DL; import com.liferay.portlet.documentlibrary.webdav.DLFileEntryResourceImpl; import com.liferay.portlet.documentlibrary.webdav.DLWebDAVUtil; import com.liferay.trash.kernel.util.TrashUtil; diff --git a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/folder_action.jsp b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/folder_action.jsp index 948dc93a0055c6..28c7bc6147665e 100644 --- a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/folder_action.jsp +++ b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/folder_action.jsp @@ -84,7 +84,7 @@ if (folder != null) { showPermissionsURL = DLFolderPermission.contains(permissionChecker, folder, ActionKeys.PERMISSIONS); } else { - modelResource = "com.liferay.portlet.documentlibrary"; + modelResource = "com.liferay.document.library.kernel"; modelResourceDescription = themeDisplay.getScopeGroupName(); resourcePrimKey = String.valueOf(scopeGroupId); diff --git a/modules/apps/dynamic-data-lists/dynamic-data-lists-service/src/main/java/com/liferay/dynamic/data/lists/service/impl/DDLRecordLocalServiceImpl.java b/modules/apps/dynamic-data-lists/dynamic-data-lists-service/src/main/java/com/liferay/dynamic/data/lists/service/impl/DDLRecordLocalServiceImpl.java index 091dbe194d71c9..29ecd99fd5f2ec 100644 --- a/modules/apps/dynamic-data-lists/dynamic-data-lists-service/src/main/java/com/liferay/dynamic/data/lists/service/impl/DDLRecordLocalServiceImpl.java +++ b/modules/apps/dynamic-data-lists/dynamic-data-lists-service/src/main/java/com/liferay/dynamic/data/lists/service/impl/DDLRecordLocalServiceImpl.java @@ -14,6 +14,7 @@ package com.liferay.dynamic.data.lists.service.impl; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.lists.model.DDLRecord; import com.liferay.dynamic.data.lists.model.DDLRecordConstants; import com.liferay.dynamic.data.lists.model.DDLRecordSet; @@ -54,7 +55,6 @@ import com.liferay.portal.model.SystemEventConstants; import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.io.Serializable; diff --git a/modules/apps/dynamic-data-lists/dynamic-data-lists-service/src/main/java/com/liferay/dynamic/data/lists/util/impl/DDLImpl.java b/modules/apps/dynamic-data-lists/dynamic-data-lists-service/src/main/java/com/liferay/dynamic/data/lists/util/impl/DDLImpl.java index 5028a45320c59c..1f604ca163ac8c 100644 --- a/modules/apps/dynamic-data-lists/dynamic-data-lists-service/src/main/java/com/liferay/dynamic/data/lists/util/impl/DDLImpl.java +++ b/modules/apps/dynamic-data-lists/dynamic-data-lists-service/src/main/java/com/liferay/dynamic/data/lists/util/impl/DDLImpl.java @@ -14,6 +14,7 @@ package com.liferay.dynamic.data.lists.util.impl; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.dynamic.data.lists.exception.NoSuchRecordException; import com.liferay.dynamic.data.lists.model.DDLRecord; import com.liferay.dynamic.data.lists.model.DDLRecordConstants; @@ -51,7 +52,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.service.LayoutService; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import java.util.ArrayList; import java.util.Date; diff --git a/modules/apps/dynamic-data-lists/dynamic-data-lists-test/src/testIntegration/java/com/liferay/dynamic/data/lists/exporter/test/DDLExporterTest.java b/modules/apps/dynamic-data-lists/dynamic-data-lists-test/src/testIntegration/java/com/liferay/dynamic/data/lists/exporter/test/DDLExporterTest.java index 2a215b38888fda..fef9b4b129194a 100644 --- a/modules/apps/dynamic-data-lists/dynamic-data-lists-test/src/testIntegration/java/com/liferay/dynamic/data/lists/exporter/test/DDLExporterTest.java +++ b/modules/apps/dynamic-data-lists/dynamic-data-lists-test/src/testIntegration/java/com/liferay/dynamic/data/lists/exporter/test/DDLExporterTest.java @@ -15,6 +15,8 @@ package com.liferay.dynamic.data.lists.exporter.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.dynamic.data.lists.exporter.DDLExporter; import com.liferay.dynamic.data.lists.exporter.DDLExporterFactoryUtil; import com.liferay.dynamic.data.lists.helper.DDLRecordSetTestHelper; @@ -58,8 +60,6 @@ import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.util.test.LayoutTestUtil; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import java.io.File; diff --git a/modules/apps/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/template/DDLDisplayTemplateHelper.java b/modules/apps/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/template/DDLDisplayTemplateHelper.java index d454fc68c6da79..1cd39730a9b55e 100644 --- a/modules/apps/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/template/DDLDisplayTemplateHelper.java +++ b/modules/apps/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/template/DDLDisplayTemplateHelper.java @@ -14,6 +14,8 @@ package com.liferay.dynamic.data.lists.web.template; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.lists.model.DDLRecord; import com.liferay.dynamic.data.lists.service.DDLRecordLocalServiceUtil; import com.liferay.dynamic.data.mapping.model.Value; @@ -32,8 +34,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.Layout; import com.liferay.portal.service.LayoutLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.List; import java.util.Locale; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/util/DocumentLibraryDDMFormFieldValueTransformer.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/util/DocumentLibraryDDMFormFieldValueTransformer.java index 9b2b790e092e9a..13e97d0c414140 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/util/DocumentLibraryDDMFormFieldValueTransformer.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/util/DocumentLibraryDDMFormFieldValueTransformer.java @@ -14,6 +14,9 @@ package com.liferay.dynamic.data.mapping.util; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.mapping.model.Value; import com.liferay.dynamic.data.mapping.storage.DDMFormFieldValue; import com.liferay.portal.kernel.exception.PortalException; @@ -23,9 +26,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.Locale; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/exportimport/content/processor/DDMFormValuesExportImportContentProcessor.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/exportimport/content/processor/DDMFormValuesExportImportContentProcessor.java index 04b0cdeb9c274d..fa79250b4ae214 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/exportimport/content/processor/DDMFormValuesExportImportContentProcessor.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/exportimport/content/processor/DDMFormValuesExportImportContentProcessor.java @@ -14,6 +14,8 @@ package com.liferay.dynamic.data.mapping.exportimport.content.processor; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.service.DLAppService; import com.liferay.dynamic.data.mapping.model.DDMFormFieldType; import com.liferay.dynamic.data.mapping.model.Value; import com.liferay.dynamic.data.mapping.storage.DDMFormFieldValue; @@ -36,8 +38,6 @@ import com.liferay.portal.model.Layout; import com.liferay.portal.model.StagedModel; import com.liferay.portal.service.LayoutLocalService; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.service.DLAppService; import java.util.Locale; import java.util.Map; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/render/impl/DocumentLibraryDDMFormFieldValueRenderer.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/render/impl/DocumentLibraryDDMFormFieldValueRenderer.java index 9705f63306b4f7..ee463b714bef6f 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/render/impl/DocumentLibraryDDMFormFieldValueRenderer.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/render/impl/DocumentLibraryDDMFormFieldValueRenderer.java @@ -14,6 +14,7 @@ package com.liferay.dynamic.data.mapping.render.impl; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.dynamic.data.mapping.model.DDMFormFieldType; import com.liferay.dynamic.data.mapping.model.Value; import com.liferay.dynamic.data.mapping.render.BaseDDMFormFieldValueRenderer; @@ -25,7 +26,6 @@ import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import java.util.Locale; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/storage/impl/DocumentLibraryFieldRenderer.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/storage/impl/DocumentLibraryFieldRenderer.java index fb24707b04079e..74b5101e6a61db 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/storage/impl/DocumentLibraryFieldRenderer.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/storage/impl/DocumentLibraryFieldRenderer.java @@ -14,6 +14,8 @@ package com.liferay.dynamic.data.mapping.storage.impl; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; import com.liferay.dynamic.data.mapping.storage.BaseFieldRenderer; import com.liferay.dynamic.data.mapping.storage.Field; import com.liferay.portal.kernel.json.JSONException; @@ -27,8 +29,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; import java.io.Serializable; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/upgrade/DDMServiceUpgrade.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/upgrade/DDMServiceUpgrade.java index 5efaf238f770a4..7dedd51472b50d 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/upgrade/DDMServiceUpgrade.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/upgrade/DDMServiceUpgrade.java @@ -15,6 +15,9 @@ package com.liferay.dynamic.data.mapping.upgrade; import com.liferay.asset.kernel.service.AssetEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; import com.liferay.dynamic.data.mapping.upgrade.v1_0_0.UpgradeClassNames; import com.liferay.dynamic.data.mapping.upgrade.v1_0_0.UpgradeCompanyId; import com.liferay.dynamic.data.mapping.upgrade.v1_0_0.UpgradeDynamicDataMapping; @@ -28,9 +31,6 @@ import com.liferay.portal.service.ResourceActionLocalService; import com.liferay.portal.service.ResourcePermissionLocalService; import com.liferay.portal.upgrade.registry.UpgradeStepRegistrator; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; import java.util.HashMap; import java.util.Map; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/upgrade/v1_0_0/UpgradeDynamicDataMapping.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/upgrade/v1_0_0/UpgradeDynamicDataMapping.java index 439d711ba3ad9d..f6448f02cd2990 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/upgrade/v1_0_0/UpgradeDynamicDataMapping.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/upgrade/v1_0_0/UpgradeDynamicDataMapping.java @@ -16,6 +16,16 @@ import com.liferay.asset.kernel.model.AssetEntry; import com.liferay.asset.kernel.service.AssetEntryLocalService; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; +import com.liferay.document.library.kernel.store.DLStoreUtil; import com.liferay.dynamic.data.mapping.io.DDMFormJSONDeserializerUtil; import com.liferay.dynamic.data.mapping.io.DDMFormJSONSerializerUtil; import com.liferay.dynamic.data.mapping.io.DDMFormLayoutJSONSerializerUtil; @@ -83,16 +93,6 @@ import com.liferay.portal.model.RoleConstants; import com.liferay.portal.service.ResourceActionLocalService; import com.liferay.portal.service.ResourcePermissionLocalService; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import java.io.File; @@ -1417,12 +1417,12 @@ protected void upgradeXMLStorageAdapter() throws Exception { static { _structureModelResourceNames.put( - "com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata", + "com.liferay.document.library.kernel.model.DLFileEntryMetadata", "com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata-" + DDMStructure.class.getName()); _structureModelResourceNames.put( - "com.liferay.portlet.documentlibrary.util.RawMetadataProcessor", + "com.liferay.document.library.kernel.util.RawMetadataProcessor", DDMStructure.class.getName()); _structureModelResourceNames.put( diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/util/impl/DDMImpl.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/util/impl/DDMImpl.java index a840618897af92..6949f7943558a6 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/util/impl/DDMImpl.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/util/impl/DDMImpl.java @@ -14,6 +14,8 @@ package com.liferay.dynamic.data.mapping.util.impl; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.mapping.exception.StructureDefinitionException; import com.liferay.dynamic.data.mapping.io.DDMFormJSONDeserializerUtil; import com.liferay.dynamic.data.mapping.io.DDMFormValuesJSONDeserializerUtil; @@ -72,8 +74,6 @@ import com.liferay.portal.service.ImageLocalService; import com.liferay.portal.service.LayoutLocalService; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.io.File; import java.io.Serializable; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/util/impl/DefaultDDMStructureHelperImpl.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/util/impl/DefaultDDMStructureHelperImpl.java index 10f0571e1d2d42..4668c1b9881b03 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/util/impl/DefaultDDMStructureHelperImpl.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/util/impl/DefaultDDMStructureHelperImpl.java @@ -14,6 +14,7 @@ package com.liferay.dynamic.data.mapping.util.impl; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; import com.liferay.dynamic.data.mapping.io.DDMFormJSONDeserializer; import com.liferay.dynamic.data.mapping.io.DDMFormLayoutJSONDeserializer; import com.liferay.dynamic.data.mapping.io.DDMFormXSDDeserializer; @@ -43,7 +44,6 @@ import com.liferay.portal.kernel.xml.Element; import com.liferay.portal.kernel.xml.UnsecureSAXReaderUtil; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; import java.util.HashMap; import java.util.List; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/test/java/com/liferay/dynamic/data/mapping/render/DDMFormFieldValueRendererTest.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/test/java/com/liferay/dynamic/data/mapping/render/DDMFormFieldValueRendererTest.java index 2b03a935fefe38..b68a299a71fdca 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/test/java/com/liferay/dynamic/data/mapping/render/DDMFormFieldValueRendererTest.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/test/java/com/liferay/dynamic/data/mapping/render/DDMFormFieldValueRendererTest.java @@ -14,6 +14,7 @@ package com.liferay.dynamic.data.mapping.render; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.dynamic.data.mapping.BaseDDMTestCase; import com.liferay.dynamic.data.mapping.model.DDMForm; import com.liferay.dynamic.data.mapping.model.DDMFormField; @@ -47,7 +48,6 @@ import com.liferay.portal.util.DateFormatFactoryImpl; import com.liferay.portal.util.FastDateFormatFactoryImpl; import com.liferay.portal.util.HtmlImpl; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import org.junit.Assert; import org.junit.Before; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/storage/test/StorageAdapterTest.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/storage/test/StorageAdapterTest.java index ab07d00e20da41..9f4f8a256d95fd 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/storage/test/StorageAdapterTest.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/storage/test/StorageAdapterTest.java @@ -15,6 +15,8 @@ package com.liferay.dynamic.data.mapping.storage.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.dynamic.data.mapping.form.evaluator.DDMFormFieldEvaluationResult; import com.liferay.dynamic.data.mapping.model.DDMForm; import com.liferay.dynamic.data.mapping.model.DDMFormField; @@ -51,8 +53,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import java.io.Serializable; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/upgrade/v1_0_0/test/UpgradeDynamicDataMappingTest.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/upgrade/v1_0_0/test/UpgradeDynamicDataMappingTest.java index 28fcf3e6810d85..bb5b3ba92b7205 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/upgrade/v1_0_0/test/UpgradeDynamicDataMappingTest.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/upgrade/v1_0_0/test/UpgradeDynamicDataMappingTest.java @@ -1375,12 +1375,12 @@ protected void setUpUpgradeDynamicDataMapping() { static { _structureModelResourceNames.put( - "com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata", + "com.liferay.document.library.kernel.model.DLFileEntryMetadata", "com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata-" + DDMStructure.class.getName()); _structureModelResourceNames.put( - "com.liferay.portlet.documentlibrary.util.RawMetadataProcessor", + "com.liferay.document.library.kernel.util.RawMetadataProcessor", DDMStructure.class.getName()); _structureModelResourceNames.put( diff --git a/modules/apps/export-import/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/util/FileSystemImporter.java b/modules/apps/export-import/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/util/FileSystemImporter.java index 7f1e2abfa78439..7e4a66b1ff9184 100644 --- a/modules/apps/export-import/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/util/FileSystemImporter.java +++ b/modules/apps/export-import/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/util/FileSystemImporter.java @@ -19,6 +19,14 @@ import com.liferay.asset.kernel.model.AssetTag; import com.liferay.asset.kernel.service.AssetTagLocalServiceUtil; import com.liferay.blogs.kernel.model.BlogsEntry; +import com.liferay.document.library.kernel.exception.DuplicateFileException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.lists.model.DDLRecordSet; import com.liferay.dynamic.data.mapping.io.DDMFormXSDDeserializerUtil; import com.liferay.dynamic.data.mapping.model.DDMForm; @@ -86,14 +94,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextThreadLocal; import com.liferay.portal.service.ThemeLocalServiceUtil; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.wiki.model.WikiPage; import java.io.BufferedInputStream; diff --git a/modules/apps/export-import/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/util/ResourceImporter.java b/modules/apps/export-import/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/util/ResourceImporter.java index 5588d1e9ec49ad..aad70174f9cfe3 100644 --- a/modules/apps/export-import/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/util/ResourceImporter.java +++ b/modules/apps/export-import/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/util/ResourceImporter.java @@ -14,6 +14,7 @@ package com.liferay.exportimport.resources.importer.util; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.dynamic.data.lists.model.DDLRecordSet; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.model.DDMTemplateConstants; @@ -24,7 +25,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.io.File; import java.io.InputStream; diff --git a/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/content/processor/base/BaseTextExportImportContentProcessor.java b/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/content/processor/base/BaseTextExportImportContentProcessor.java index bde1bdd3b59cda..0db0565d9f2ad9 100644 --- a/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/content/processor/base/BaseTextExportImportContentProcessor.java +++ b/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/content/processor/base/BaseTextExportImportContentProcessor.java @@ -14,6 +14,11 @@ package com.liferay.exportimport.content.processor.base; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.exportimport.content.processor.ExportImportContentProcessor; import com.liferay.exportimport.kernel.lar.ExportImportPathUtil; import com.liferay.exportimport.kernel.lar.PortletDataContext; @@ -50,11 +55,6 @@ import com.liferay.portal.service.LayoutFriendlyURLLocalServiceUtil; import com.liferay.portal.service.LayoutLocalServiceUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.ArrayList; import java.util.HashMap; diff --git a/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/lar/ExportImportHelperImpl.java b/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/lar/ExportImportHelperImpl.java index 286af24a1281c0..5b8312ce78fc76 100644 --- a/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/lar/ExportImportHelperImpl.java +++ b/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/lar/ExportImportHelperImpl.java @@ -14,6 +14,7 @@ package com.liferay.exportimport.lar; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; import com.liferay.exportimport.kernel.lar.DefaultConfigurationPortletDataHandler; import com.liferay.exportimport.kernel.lar.ExportImportDateUtil; import com.liferay.exportimport.kernel.lar.ExportImportHelper; @@ -87,7 +88,6 @@ import com.liferay.portal.service.SystemEventLocalService; import com.liferay.portal.service.UserLocalService; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; import java.io.File; import java.io.InputStream; diff --git a/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/staging/StagingImpl.java b/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/staging/StagingImpl.java index 48b5f716ba1c3b..08d8ecc5b29819 100644 --- a/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/staging/StagingImpl.java +++ b/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/staging/StagingImpl.java @@ -14,6 +14,10 @@ package com.liferay.exportimport.staging; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.FileExtensionException; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.exception.FileSizeException; import com.liferay.exportimport.kernel.background.task.BackgroundTaskExecutorNames; import com.liferay.exportimport.kernel.configuration.ExportImportConfigurationConstants; import com.liferay.exportimport.kernel.configuration.ExportImportConfigurationParameterMapFactory; @@ -124,10 +128,6 @@ import com.liferay.portal.service.http.GroupServiceHttp; import com.liferay.portal.util.PrefsPropsUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.FileExtensionException; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; import com.liferay.portlet.exportimport.staging.ProxiedLayoutsThreadLocal; import java.io.Serializable; diff --git a/modules/apps/export-import/export-import-test/src/testIntegration/java/com/liferay/exportimport/test/ExportImportHelperUtilTest.java b/modules/apps/export-import/export-import-test/src/testIntegration/java/com/liferay/exportimport/test/ExportImportHelperUtilTest.java index 807e2aac99b9ae..0720882b3993de 100644 --- a/modules/apps/export-import/export-import-test/src/testIntegration/java/com/liferay/exportimport/test/ExportImportHelperUtilTest.java +++ b/modules/apps/export-import/export-import-test/src/testIntegration/java/com/liferay/exportimport/test/ExportImportHelperUtilTest.java @@ -15,6 +15,8 @@ package com.liferay.exportimport.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.exportimport.kernel.configuration.ExportImportConfigurationConstants; import com.liferay.exportimport.kernel.configuration.ExportImportConfigurationSettingsMapFactory; import com.liferay.exportimport.kernel.lar.ExportImportHelperUtil; @@ -74,8 +76,6 @@ import com.liferay.portal.util.PortalImpl; import com.liferay.portal.util.PropsValues; import com.liferay.portal.util.test.LayoutTestUtil; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import java.io.File; import java.io.InputStream; diff --git a/modules/apps/export-import/export-import-web/src/main/java/com/liferay/exportimport/web/portlet/action/ExportImportMVCActionCommand.java b/modules/apps/export-import/export-import-web/src/main/java/com/liferay/exportimport/web/portlet/action/ExportImportMVCActionCommand.java index 6e92327a80d4d3..9420433ee42fae 100644 --- a/modules/apps/export-import/export-import-web/src/main/java/com/liferay/exportimport/web/portlet/action/ExportImportMVCActionCommand.java +++ b/modules/apps/export-import/export-import-web/src/main/java/com/liferay/exportimport/web/portlet/action/ExportImportMVCActionCommand.java @@ -14,6 +14,7 @@ package com.liferay.exportimport.web.portlet.action; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; import com.liferay.dynamic.data.mapping.exception.StructureDuplicateStructureKeyException; import com.liferay.exportimport.kernel.configuration.ExportImportConfigurationConstants; import com.liferay.exportimport.kernel.configuration.ExportImportConfigurationSettingsMapFactory; @@ -52,7 +53,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.model.Portlet; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; import java.io.InputStream; import java.io.Serializable; diff --git a/modules/apps/export-import/export-import-web/src/main/java/com/liferay/exportimport/web/portlet/action/ImportLayoutsMVCActionCommand.java b/modules/apps/export-import/export-import-web/src/main/java/com/liferay/exportimport/web/portlet/action/ImportLayoutsMVCActionCommand.java index 7b0432f0ceeb19..2ea23ed90de307 100644 --- a/modules/apps/export-import/export-import-web/src/main/java/com/liferay/exportimport/web/portlet/action/ImportLayoutsMVCActionCommand.java +++ b/modules/apps/export-import/export-import-web/src/main/java/com/liferay/exportimport/web/portlet/action/ImportLayoutsMVCActionCommand.java @@ -14,6 +14,8 @@ package com.liferay.exportimport.web.portlet.action; +import com.liferay.document.library.kernel.exception.FileSizeException; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; import com.liferay.exportimport.kernel.configuration.ExportImportConfigurationConstants; import com.liferay.exportimport.kernel.configuration.ExportImportConfigurationSettingsMapFactory; import com.liferay.exportimport.kernel.exception.LARFileException; @@ -53,8 +55,6 @@ import com.liferay.portal.kernel.util.StreamUtil; import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.service.LayoutService; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; import java.io.InputStream; import java.io.Serializable; diff --git a/modules/apps/image-uploader/image-uploader-web/src/main/java/com/liferay/image/uploader/web/portlet/action/UploadImageMVCActionCommand.java b/modules/apps/image-uploader/image-uploader-web/src/main/java/com/liferay/image/uploader/web/portlet/action/UploadImageMVCActionCommand.java index 9b3262a9abcc23..11cd14289f8c75 100644 --- a/modules/apps/image-uploader/image-uploader-web/src/main/java/com/liferay/image/uploader/web/portlet/action/UploadImageMVCActionCommand.java +++ b/modules/apps/image-uploader/image-uploader-web/src/main/java/com/liferay/image/uploader/web/portlet/action/UploadImageMVCActionCommand.java @@ -14,6 +14,11 @@ package com.liferay.image.uploader.web.portlet.action; +import com.liferay.document.library.kernel.antivirus.AntivirusScannerException; +import com.liferay.document.library.kernel.exception.FileExtensionException; +import com.liferay.document.library.kernel.exception.FileSizeException; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFileException; import com.liferay.image.uploader.web.constants.ImageUploaderPortletKeys; import com.liferay.image.uploader.web.util.UploadImageUtil; import com.liferay.portal.exception.ImageTypeException; @@ -52,11 +57,6 @@ import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.util.PrefsPropsUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.antivirus.AntivirusScannerException; -import com.liferay.portlet.documentlibrary.exception.FileExtensionException; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; import java.awt.image.RenderedImage; diff --git a/modules/apps/image-uploader/image-uploader-web/src/main/java/com/liferay/image/uploader/web/portlet/action/UploadImageMVCResourceCommand.java b/modules/apps/image-uploader/image-uploader-web/src/main/java/com/liferay/image/uploader/web/portlet/action/UploadImageMVCResourceCommand.java index f9d360a5d46fd2..72633f56c5c1a5 100644 --- a/modules/apps/image-uploader/image-uploader-web/src/main/java/com/liferay/image/uploader/web/portlet/action/UploadImageMVCResourceCommand.java +++ b/modules/apps/image-uploader/image-uploader-web/src/main/java/com/liferay/image/uploader/web/portlet/action/UploadImageMVCResourceCommand.java @@ -14,6 +14,7 @@ package com.liferay.image.uploader.web.portlet.action; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; import com.liferay.image.uploader.web.constants.ImageUploaderPortletKeys; import com.liferay.image.uploader.web.util.UploadImageUtil; import com.liferay.portal.kernel.flash.FlashMagicBytesUtil; @@ -28,7 +29,6 @@ import com.liferay.portal.kernel.util.Constants; import com.liferay.portal.kernel.util.MimeTypesUtil; import com.liferay.portal.kernel.util.ParamUtil; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; import java.io.InputStream; diff --git a/modules/apps/item-selector/item-selector-taglib/src/main/java/com/liferay/item/selector/taglib/ItemSelectorRepositoryEntryBrowserReturnTypeUtil.java b/modules/apps/item-selector/item-selector-taglib/src/main/java/com/liferay/item/selector/taglib/ItemSelectorRepositoryEntryBrowserReturnTypeUtil.java index 6dfb058e57255c..07ba6ca047ec6c 100644 --- a/modules/apps/item-selector/item-selector-taglib/src/main/java/com/liferay/item/selector/taglib/ItemSelectorRepositoryEntryBrowserReturnTypeUtil.java +++ b/modules/apps/item-selector/item-selector-taglib/src/main/java/com/liferay/item/selector/taglib/ItemSelectorRepositoryEntryBrowserReturnTypeUtil.java @@ -14,6 +14,7 @@ package com.liferay.item.selector.taglib; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.item.selector.ItemSelectorReturnType; import com.liferay.item.selector.criteria.FileEntryItemSelectorReturnType; import com.liferay.item.selector.criteria.URLItemSelectorReturnType; @@ -24,7 +25,6 @@ import com.liferay.portal.kernel.util.ClassUtil; import com.liferay.portal.kernel.util.ListUtil; import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.Iterator; import java.util.List; diff --git a/modules/apps/item-selector/item-selector-taglib/src/main/java/com/liferay/item/selector/taglib/util/ItemSelectorRepositoryEntryBrowserUtil.java b/modules/apps/item-selector/item-selector-taglib/src/main/java/com/liferay/item/selector/taglib/util/ItemSelectorRepositoryEntryBrowserUtil.java index c2b62e698eebe6..b875a938c6ce67 100644 --- a/modules/apps/item-selector/item-selector-taglib/src/main/java/com/liferay/item/selector/taglib/util/ItemSelectorRepositoryEntryBrowserUtil.java +++ b/modules/apps/item-selector/item-selector-taglib/src/main/java/com/liferay/item/selector/taglib/util/ItemSelectorRepositoryEntryBrowserUtil.java @@ -14,6 +14,9 @@ package com.liferay.item.selector.taglib.util; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.json.JSONArray; import com.liferay.portal.kernel.json.JSONFactoryUtil; @@ -33,9 +36,6 @@ import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.model.Group; import com.liferay.portal.util.WebKeys; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.Collections; import java.util.List; diff --git a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/service/impl/JournalArticleLocalServiceImpl.java b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/service/impl/JournalArticleLocalServiceImpl.java index d3f060d180ec9e..7708ae3b17483c 100644 --- a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/service/impl/JournalArticleLocalServiceImpl.java +++ b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/service/impl/JournalArticleLocalServiceImpl.java @@ -17,6 +17,7 @@ import com.liferay.asset.kernel.model.AssetEntry; import com.liferay.asset.kernel.model.AssetLink; import com.liferay.asset.kernel.model.AssetLinkConstants; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.mapping.exception.NoSuchStructureException; import com.liferay.dynamic.data.mapping.exception.NoSuchTemplateException; import com.liferay.dynamic.data.mapping.exception.StorageFieldNameException; @@ -158,7 +159,6 @@ import com.liferay.portal.service.ServiceContextUtil; import com.liferay.portal.spring.extender.service.ServiceReference; import com.liferay.portal.util.PrefsPropsUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.social.kernel.model.SocialActivityConstants; import com.liferay.trash.kernel.model.TrashEntry; import com.liferay.trash.kernel.model.TrashVersion; diff --git a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/util/impl/JournalConverterImpl.java b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/util/impl/JournalConverterImpl.java index 582eed4b232854..5f675b9df8d0ee 100644 --- a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/util/impl/JournalConverterImpl.java +++ b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/util/impl/JournalConverterImpl.java @@ -14,6 +14,7 @@ package com.liferay.journal.util.impl; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.storage.Field; import com.liferay.dynamic.data.mapping.storage.FieldConstants; @@ -48,7 +49,6 @@ import com.liferay.portal.kernel.xml.XPath; import com.liferay.portal.model.Group; import com.liferay.portal.service.GroupLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import com.liferay.util.xml.XMLUtil; import java.io.Serializable; diff --git a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/verify/JournalServiceVerifyProcess.java b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/verify/JournalServiceVerifyProcess.java index 71ad0f844bd37d..7597f8c8209fb8 100644 --- a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/verify/JournalServiceVerifyProcess.java +++ b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/verify/JournalServiceVerifyProcess.java @@ -16,6 +16,7 @@ import com.liferay.asset.kernel.model.AssetEntry; import com.liferay.asset.kernel.service.AssetEntryLocalService; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.dynamic.data.mapping.exception.NoSuchStructureException; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalService; @@ -67,7 +68,6 @@ import com.liferay.portal.util.PortalInstances; import com.liferay.portal.verify.VerifyLayout; import com.liferay.portal.verify.VerifyProcess; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/modules/apps/journal/journal-test/src/testIntegration/java/com/liferay/journal/util/test/JournalConverterUtilTest.java b/modules/apps/journal/journal-test/src/testIntegration/java/com/liferay/journal/util/test/JournalConverterUtilTest.java index 0e6913148cce55..fb9ea624cee296 100644 --- a/modules/apps/journal/journal-test/src/testIntegration/java/com/liferay/journal/util/test/JournalConverterUtilTest.java +++ b/modules/apps/journal/journal-test/src/testIntegration/java/com/liferay/journal/util/test/JournalConverterUtilTest.java @@ -15,6 +15,9 @@ package com.liferay.journal.util.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.mapping.io.DDMFormXSDDeserializerUtil; import com.liferay.dynamic.data.mapping.model.DDMForm; import com.liferay.dynamic.data.mapping.model.DDMFormField; @@ -61,9 +64,6 @@ import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.util.test.LayoutTestUtil; import com.liferay.portal.xml.XMLSchemaImpl; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.registry.Registry; import com.liferay.registry.RegistryUtil; diff --git a/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/portlet/JournalPortlet.java b/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/portlet/JournalPortlet.java index 5a61f902431702..c2d6b37c7d447b 100644 --- a/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/portlet/JournalPortlet.java +++ b/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/portlet/JournalPortlet.java @@ -18,6 +18,8 @@ import com.liferay.asset.kernel.exception.AssetCategoryException; import com.liferay.asset.kernel.exception.AssetTagException; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.FileSizeException; import com.liferay.dynamic.data.mapping.exception.NoSuchStructureException; import com.liferay.dynamic.data.mapping.exception.NoSuchTemplateException; import com.liferay.dynamic.data.mapping.exception.StorageFieldRequiredException; @@ -101,8 +103,6 @@ import com.liferay.portal.service.LayoutLocalService; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; import com.liferay.trash.kernel.service.TrashEntryService; import com.liferay.trash.kernel.util.TrashUtil; diff --git a/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/portlet/action/ActionUtil.java b/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/portlet/action/ActionUtil.java index ead0399bfc2289..ec5057f50568e8 100644 --- a/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/portlet/action/ActionUtil.java +++ b/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/portlet/action/ActionUtil.java @@ -14,6 +14,7 @@ package com.liferay.journal.web.portlet.action; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.service.DDMStructureServiceUtil; import com.liferay.dynamic.data.mapping.storage.Field; @@ -61,7 +62,6 @@ import com.liferay.portal.kernel.xml.XPath; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import java.io.Serializable; diff --git a/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/util/ExportArticleUtil.java b/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/util/ExportArticleUtil.java index eb7e185633b1d4..a0af5499690257 100644 --- a/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/util/ExportArticleUtil.java +++ b/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/util/ExportArticleUtil.java @@ -14,6 +14,7 @@ package com.liferay.journal.web.util; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.journal.model.JournalArticleDisplay; import com.liferay.journal.util.JournalContent; import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayInputStream; @@ -31,7 +32,6 @@ import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.portlet.documentlibrary.util.DocumentConversionUtil; import java.io.File; diff --git a/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/util/JournalRSSUtil.java b/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/util/JournalRSSUtil.java index b414f2bc927a79..3d5f25e0d674a2 100644 --- a/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/util/JournalRSSUtil.java +++ b/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/util/JournalRSSUtil.java @@ -14,6 +14,9 @@ package com.liferay.journal.web.util; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.util.ImageProcessorUtil; import com.liferay.journal.exception.NoSuchFeedException; import com.liferay.journal.model.JournalArticle; import com.liferay.journal.model.JournalArticleConstants; @@ -56,9 +59,6 @@ import com.liferay.portal.model.Layout; import com.liferay.portal.service.ImageLocalService; import com.liferay.portal.service.LayoutLocalService; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.util.ImageProcessorUtil; import com.liferay.util.RSSUtil; import com.sun.syndication.feed.synd.SyndContent; diff --git a/modules/apps/layout/layout-admin-web/src/main/java/com/liferay/layout/admin/web/portlet/LayoutAdminPortlet.java b/modules/apps/layout/layout-admin-web/src/main/java/com/liferay/layout/admin/web/portlet/LayoutAdminPortlet.java index 2379ac28dd0aae..1ee1fe6357ec3c 100644 --- a/modules/apps/layout/layout-admin-web/src/main/java/com/liferay/layout/admin/web/portlet/LayoutAdminPortlet.java +++ b/modules/apps/layout/layout-admin-web/src/main/java/com/liferay/layout/admin/web/portlet/LayoutAdminPortlet.java @@ -15,6 +15,7 @@ package com.liferay.layout.admin.web.portlet; import com.liferay.application.list.GroupProvider; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.layout.admin.web.constants.LayoutAdminPortletKeys; import com.liferay.layout.admin.web.constants.LayoutAdminWebKeys; import com.liferay.mobile.device.rules.model.MDRAction; @@ -87,7 +88,6 @@ import com.liferay.portal.service.ServiceContextThreadLocal; import com.liferay.portal.service.ThemeLocalService; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import com.liferay.portlet.sites.action.ActionUtil; import com.liferay.sites.kernel.util.SitesUtil; diff --git a/modules/apps/layout/layout-admin-web/src/main/java/com/liferay/layout/admin/web/portlet/LayoutPrototypePagePortlet.java b/modules/apps/layout/layout-admin-web/src/main/java/com/liferay/layout/admin/web/portlet/LayoutPrototypePagePortlet.java index c2c0f4f4490b06..168c08bfd85855 100644 --- a/modules/apps/layout/layout-admin-web/src/main/java/com/liferay/layout/admin/web/portlet/LayoutPrototypePagePortlet.java +++ b/modules/apps/layout/layout-admin-web/src/main/java/com/liferay/layout/admin/web/portlet/LayoutPrototypePagePortlet.java @@ -14,6 +14,7 @@ package com.liferay.layout.admin.web.portlet; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.layout.admin.web.constants.LayoutAdminPortletKeys; import com.liferay.mobile.device.rules.service.MDRActionLocalService; import com.liferay.mobile.device.rules.service.MDRActionService; @@ -30,7 +31,6 @@ import com.liferay.portal.service.LayoutSetService; import com.liferay.portal.service.PortletLocalService; import com.liferay.portal.service.ThemeLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import javax.portlet.Portlet; diff --git a/modules/apps/marketplace/marketplace-service/src/main/java/com/liferay/marketplace/model/impl/AppImpl.java b/modules/apps/marketplace/marketplace-service/src/main/java/com/liferay/marketplace/model/impl/AppImpl.java index 4b2c94e522a752..e707e7375751e3 100644 --- a/modules/apps/marketplace/marketplace-service/src/main/java/com/liferay/marketplace/model/impl/AppImpl.java +++ b/modules/apps/marketplace/marketplace-service/src/main/java/com/liferay/marketplace/model/impl/AppImpl.java @@ -16,6 +16,8 @@ import aQute.bnd.annotation.ProviderType; +import com.liferay.document.library.kernel.store.DLStoreUtil; +import com.liferay.document.library.kernel.store.Store; import com.liferay.marketplace.bundle.BundleManagerUtil; import com.liferay.marketplace.model.Module; import com.liferay.marketplace.service.ModuleLocalServiceUtil; @@ -25,8 +27,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.CompanyConstants; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; -import com.liferay.portlet.documentlibrary.store.Store; import java.util.ArrayList; import java.util.List; diff --git a/modules/apps/marketplace/marketplace-service/src/main/java/com/liferay/marketplace/service/impl/AppLocalServiceImpl.java b/modules/apps/marketplace/marketplace-service/src/main/java/com/liferay/marketplace/service/impl/AppLocalServiceImpl.java index e774a682c4629a..4a40d992c6f654 100644 --- a/modules/apps/marketplace/marketplace-service/src/main/java/com/liferay/marketplace/service/impl/AppLocalServiceImpl.java +++ b/modules/apps/marketplace/marketplace-service/src/main/java/com/liferay/marketplace/service/impl/AppLocalServiceImpl.java @@ -14,6 +14,8 @@ package com.liferay.marketplace.service.impl; +import com.liferay.document.library.kernel.exception.NoSuchFileException; +import com.liferay.document.library.kernel.store.DLStoreUtil; import com.liferay.marketplace.bundle.BundleManagerUtil; import com.liferay.marketplace.exception.AppPropertiesException; import com.liferay.marketplace.exception.AppTitleException; @@ -43,8 +45,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.CompanyConstants; import com.liferay.portal.model.User; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import java.io.File; import java.io.IOException; diff --git a/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/lar/MBMessageStagedModelDataHandler.java b/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/lar/MBMessageStagedModelDataHandler.java index 8e2d1cfc5a83a1..eb3db133fae63d 100644 --- a/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/lar/MBMessageStagedModelDataHandler.java +++ b/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/lar/MBMessageStagedModelDataHandler.java @@ -14,6 +14,8 @@ package com.liferay.message.boards.lar; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.exportimport.kernel.lar.ExportImportPathUtil; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.exportimport.kernel.lar.StagedModelDataHandler; @@ -42,8 +44,6 @@ import com.liferay.portal.kernel.xml.Element; import com.liferay.portal.service.ServiceContext; import com.liferay.portlet.documentlibrary.lar.FileEntryUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.ratings.kernel.model.RatingsEntry; import com.liferay.ratings.kernel.service.RatingsEntryLocalService; diff --git a/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/trash/MBMessageTrashHandler.java b/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/trash/MBMessageTrashHandler.java index a29fc1d59b9c1b..93b261e43ae1aa 100644 --- a/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/trash/MBMessageTrashHandler.java +++ b/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/trash/MBMessageTrashHandler.java @@ -14,6 +14,7 @@ package com.liferay.message.boards.trash; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.message.boards.kernel.model.MBMessage; import com.liferay.message.boards.kernel.model.MBThread; import com.liferay.message.boards.kernel.service.MBMessageLocalService; @@ -27,7 +28,6 @@ import com.liferay.portal.kernel.trash.TrashHandler; import com.liferay.portal.model.ContainerModel; import com.liferay.portal.model.TrashedModel; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import com.liferay.portlet.messageboards.service.permission.MBMessagePermission; import com.liferay.portlet.messageboards.util.MBMessageAttachmentsUtil; import com.liferay.trash.kernel.model.TrashEntry; diff --git a/modules/apps/message-boards/message-boards-test/src/testIntegration/java/com/liferay/message/boards/lar/test/MBMessageStagedModelDataHandlerTest.java b/modules/apps/message-boards/message-boards-test/src/testIntegration/java/com/liferay/message/boards/lar/test/MBMessageStagedModelDataHandlerTest.java index 706df916d49375..d516442c4248fb 100644 --- a/modules/apps/message-boards/message-boards-test/src/testIntegration/java/com/liferay/message/boards/lar/test/MBMessageStagedModelDataHandlerTest.java +++ b/modules/apps/message-boards/message-boards-test/src/testIntegration/java/com/liferay/message/boards/lar/test/MBMessageStagedModelDataHandlerTest.java @@ -15,6 +15,10 @@ package com.liferay.message.boards.lar.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.exportimport.kernel.lar.ExportImportClassedModelUtil; import com.liferay.exportimport.kernel.lar.StagedModelDataHandler; import com.liferay.exportimport.kernel.lar.StagedModelDataHandlerRegistryUtil; @@ -45,10 +49,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.persistence.RepositoryUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolder; import com.liferay.portlet.messageboards.util.test.MBTestUtil; import java.io.InputStream; diff --git a/modules/apps/message-boards/message-boards-web/src/main/java/com/liferay/message/boards/web/portlet/action/EditMessageMVCActionCommand.java b/modules/apps/message-boards/message-boards-web/src/main/java/com/liferay/message/boards/web/portlet/action/EditMessageMVCActionCommand.java index f0e1dad3a67e91..b1607315ac5b97 100644 --- a/modules/apps/message-boards/message-boards-web/src/main/java/com/liferay/message/boards/web/portlet/action/EditMessageMVCActionCommand.java +++ b/modules/apps/message-boards/message-boards-web/src/main/java/com/liferay/message/boards/web/portlet/action/EditMessageMVCActionCommand.java @@ -16,6 +16,11 @@ import com.liferay.asset.kernel.exception.AssetCategoryException; import com.liferay.asset.kernel.exception.AssetTagException; +import com.liferay.document.library.kernel.antivirus.AntivirusScannerException; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.FileExtensionException; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.exception.FileSizeException; import com.liferay.message.boards.kernel.exception.LockedThreadException; import com.liferay.message.boards.kernel.exception.MessageBodyException; import com.liferay.message.boards.kernel.exception.MessageSubjectException; @@ -57,11 +62,6 @@ import com.liferay.portal.service.ServiceContextFactory; import com.liferay.portal.util.PropsValues; import com.liferay.portlet.ActionResponseImpl; -import com.liferay.portlet.documentlibrary.antivirus.AntivirusScannerException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.FileExtensionException; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; import com.liferay.portlet.messageboards.MBGroupServiceSettings; import com.liferay.portlet.messageboards.service.permission.MBMessagePermission; diff --git a/modules/apps/portal-settings/portal-settings-web/src/main/java/com/liferay/portal/settings/web/portlet/action/EditCompanyMVCActionCommand.java b/modules/apps/portal-settings/portal-settings-web/src/main/java/com/liferay/portal/settings/web/portlet/action/EditCompanyMVCActionCommand.java index 8e2dafbc1daa46..6b3657dde3b91b 100644 --- a/modules/apps/portal-settings/portal-settings-web/src/main/java/com/liferay/portal/settings/web/portlet/action/EditCompanyMVCActionCommand.java +++ b/modules/apps/portal-settings/portal-settings-web/src/main/java/com/liferay/portal/settings/web/portlet/action/EditCompanyMVCActionCommand.java @@ -14,6 +14,7 @@ package com.liferay.portal.settings.web.portlet.action; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.portal.LocaleException; import com.liferay.portal.exception.AccountNameException; import com.liferay.portal.exception.AddressCityException; @@ -46,7 +47,6 @@ import com.liferay.portal.model.Website; import com.liferay.portal.service.CompanyService; import com.liferay.portal.settings.web.constants.PortalSettingsPortletKeys; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import com.liferay.users.admin.kernel.util.UsersAdminUtil; import java.util.List; diff --git a/modules/apps/recent-documents/recent-documents-web/src/main/java/com/liferay/recent/documents/web/messaging/RecentDocumentsMessageListener.java b/modules/apps/recent-documents/recent-documents-web/src/main/java/com/liferay/recent/documents/web/messaging/RecentDocumentsMessageListener.java index d569b5a9dd8617..d1d5c1546417aa 100644 --- a/modules/apps/recent-documents/recent-documents-web/src/main/java/com/liferay/recent/documents/web/messaging/RecentDocumentsMessageListener.java +++ b/modules/apps/recent-documents/recent-documents-web/src/main/java/com/liferay/recent/documents/web/messaging/RecentDocumentsMessageListener.java @@ -14,6 +14,7 @@ package com.liferay.recent.documents.web.messaging; +import com.liferay.document.library.kernel.service.DLFileRankLocalService; import com.liferay.portal.kernel.messaging.BaseSchedulerEntryMessageListener; import com.liferay.portal.kernel.messaging.DestinationNames; import com.liferay.portal.kernel.messaging.Message; @@ -23,7 +24,6 @@ import com.liferay.portal.kernel.scheduler.TimeUnit; import com.liferay.portal.kernel.scheduler.TriggerFactory; import com.liferay.portal.kernel.scheduler.TriggerFactoryUtil; -import com.liferay.portlet.documentlibrary.service.DLFileRankLocalService; import java.util.Map; diff --git a/modules/apps/screens/screens-service/src/main/java/com/liferay/screens/service/impl/ScreensAssetEntryServiceImpl.java b/modules/apps/screens/screens-service/src/main/java/com/liferay/screens/service/impl/ScreensAssetEntryServiceImpl.java index a63de924806466..cc5e23e18227b2 100644 --- a/modules/apps/screens/screens-service/src/main/java/com/liferay/screens/service/impl/ScreensAssetEntryServiceImpl.java +++ b/modules/apps/screens/screens-service/src/main/java/com/liferay/screens/service/impl/ScreensAssetEntryServiceImpl.java @@ -145,7 +145,7 @@ protected JSONObject getAssetObjectJSONObject(AssetEntry assetEntry) String className = assetEntry.getClassName(); if (className.equals( - "com.liferay.portlet.documentlibrary.model.DLFileEntry")) { + "com.liferay.document.library.kernel.model.DLFileEntry")) { return getFileEntryJSONObject(assetEntry); } diff --git a/modules/apps/server-admin/server-admin-web/src/main/java/com/liferay/server/admin/web/portlet/action/EditDocumentLibraryExtraSettingsMVCActionCommand.java b/modules/apps/server-admin/server-admin-web/src/main/java/com/liferay/server/admin/web/portlet/action/EditDocumentLibraryExtraSettingsMVCActionCommand.java index 8af6ebeadc9885..4d7da981786c60 100644 --- a/modules/apps/server-admin/server-admin-web/src/main/java/com/liferay/server/admin/web/portlet/action/EditDocumentLibraryExtraSettingsMVCActionCommand.java +++ b/modules/apps/server-admin/server-admin-web/src/main/java/com/liferay/server/admin/web/portlet/action/EditDocumentLibraryExtraSettingsMVCActionCommand.java @@ -14,6 +14,8 @@ package com.liferay.server.admin.web.portlet.action; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; import com.liferay.expando.kernel.model.ExpandoBridge; import com.liferay.expando.kernel.util.ExpandoBridgeFactoryUtil; import com.liferay.expando.kernel.util.ExpandoPresetUtil; @@ -26,8 +28,6 @@ import com.liferay.portal.kernel.util.PortletKeys; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; diff --git a/modules/apps/server-admin/server-admin-web/src/main/java/com/liferay/server/admin/web/portlet/action/EditServerMVCActionCommand.java b/modules/apps/server-admin/server-admin-web/src/main/java/com/liferay/server/admin/web/portlet/action/EditServerMVCActionCommand.java index b80e708b6ee395..b3be0041f2075c 100644 --- a/modules/apps/server-admin/server-admin-web/src/main/java/com/liferay/server/admin/web/portlet/action/EditServerMVCActionCommand.java +++ b/modules/apps/server-admin/server-admin-web/src/main/java/com/liferay/server/admin/web/portlet/action/EditServerMVCActionCommand.java @@ -14,6 +14,7 @@ package com.liferay.server.admin.web.portlet.action; +import com.liferay.document.library.kernel.util.DLPreviewableProcessor; import com.liferay.mail.kernel.model.Account; import com.liferay.mail.kernel.service.MailService; import com.liferay.portal.captcha.CaptchaImpl; @@ -88,7 +89,6 @@ import com.liferay.portal.util.ShutdownUtil; import com.liferay.portlet.ActionResponseImpl; import com.liferay.portlet.admin.util.CleanUpPermissionsUtil; -import com.liferay.portlet.documentlibrary.util.DLPreviewableProcessor; import com.liferay.util.log4j.Log4JUtil; import java.io.File; diff --git a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/portlet/action/EditOrganizationMVCActionCommand.java b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/portlet/action/EditOrganizationMVCActionCommand.java index 7f7b56a6d5d5af..e44848de053f0f 100644 --- a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/portlet/action/EditOrganizationMVCActionCommand.java +++ b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/portlet/action/EditOrganizationMVCActionCommand.java @@ -14,6 +14,7 @@ package com.liferay.users.admin.web.portlet.action; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.portal.exception.AddressCityException; import com.liferay.portal.exception.AddressStreetException; import com.liferay.portal.exception.AddressZipException; @@ -57,7 +58,6 @@ import com.liferay.portal.service.OrganizationService; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import com.liferay.sites.kernel.util.SitesUtil; import com.liferay.users.admin.constants.UsersAdminPortletKeys; import com.liferay.users.admin.kernel.util.UsersAdminUtil; diff --git a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/portlet/action/EditUserMVCActionCommand.java b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/portlet/action/EditUserMVCActionCommand.java index 9eeca554f88a29..88fe1567499df9 100644 --- a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/portlet/action/EditUserMVCActionCommand.java +++ b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/portlet/action/EditUserMVCActionCommand.java @@ -18,6 +18,7 @@ import com.liferay.announcements.kernel.model.AnnouncementsDelivery; import com.liferay.announcements.kernel.model.AnnouncementsEntryConstants; import com.liferay.announcements.kernel.service.AnnouncementsDeliveryLocalService; +import com.liferay.document.library.kernel.service.DLAppLocalService; import com.liferay.portal.exception.AddressCityException; import com.liferay.portal.exception.AddressStreetException; import com.liferay.portal.exception.AddressZipException; @@ -90,7 +91,6 @@ import com.liferay.portlet.InvokerPortletImpl; import com.liferay.portlet.admin.util.AdminUtil; import com.liferay.portlet.announcements.model.impl.AnnouncementsDeliveryImpl; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; import com.liferay.sites.kernel.util.SitesUtil; import com.liferay.users.admin.constants.UsersAdminPortletKeys; import com.liferay.users.admin.kernel.util.UsersAdmin; diff --git a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/convert/documentlibrary/WikiDLStoreConvertProcess.java b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/convert/documentlibrary/WikiDLStoreConvertProcess.java index 3796c039840479..0819c5000590a2 100644 --- a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/convert/documentlibrary/WikiDLStoreConvertProcess.java +++ b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/convert/documentlibrary/WikiDLStoreConvertProcess.java @@ -14,6 +14,7 @@ package com.liferay.wiki.convert.documentlibrary; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.convert.documentlibrary.DLStoreConvertProcess; import com.liferay.portal.convert.documentlibrary.DLStoreConverter; import com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery; @@ -23,7 +24,6 @@ import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.util.MaintenanceUtil; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.wiki.model.WikiPage; import com.liferay.wiki.service.WikiPageLocalService; diff --git a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/importer/impl/mediawiki/MediaWikiImporter.java b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/importer/impl/mediawiki/MediaWikiImporter.java index b8d5531dae0ee7..84f56e06b6a83d 100644 --- a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/importer/impl/mediawiki/MediaWikiImporter.java +++ b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/importer/impl/mediawiki/MediaWikiImporter.java @@ -16,6 +16,7 @@ import com.liferay.asset.kernel.model.AssetTag; import com.liferay.asset.kernel.service.AssetTagLocalService; +import com.liferay.document.library.kernel.store.DLStoreUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.io.unsync.UnsyncBufferedReader; @@ -44,7 +45,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalService; import com.liferay.portlet.asset.util.AssetUtil; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import com.liferay.wiki.configuration.WikiGroupServiceConfiguration; import com.liferay.wiki.exception.ImportFilesException; import com.liferay.wiki.exception.NoSuchPageException; diff --git a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/lar/WikiPageStagedModelDataHandler.java b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/lar/WikiPageStagedModelDataHandler.java index fb35f0ff03a142..2735823f3148d8 100644 --- a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/lar/WikiPageStagedModelDataHandler.java +++ b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/lar/WikiPageStagedModelDataHandler.java @@ -14,6 +14,8 @@ package com.liferay.wiki.lar; +import com.liferay.document.library.kernel.exception.NoSuchFileException; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.exportimport.kernel.lar.ExportImportPathUtil; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.exportimport.kernel.lar.StagedModelDataHandler; @@ -33,9 +35,7 @@ import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.kernel.xml.Element; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; import com.liferay.portlet.documentlibrary.lar.FileEntryUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import com.liferay.wiki.exportimport.content.processor.WikiPageExportImportContentProcessor; import com.liferay.wiki.model.WikiNode; import com.liferay.wiki.model.WikiPage; diff --git a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/model/impl/WikiNodeImpl.java b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/model/impl/WikiNodeImpl.java index 96b1422cc0faec..5754af98847868 100644 --- a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/model/impl/WikiNodeImpl.java +++ b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/model/impl/WikiNodeImpl.java @@ -14,6 +14,7 @@ package com.liferay.wiki.model.impl; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portletfilerepository.PortletFileRepositoryUtil; @@ -21,7 +22,6 @@ import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.model.Repository; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.wiki.constants.WikiPortletKeys; import com.liferay.wiki.model.WikiPage; import com.liferay.wiki.service.WikiPageLocalServiceUtil; diff --git a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/model/impl/WikiPageImpl.java b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/model/impl/WikiPageImpl.java index f813a2639ad90d..59eba220c1a8c5 100644 --- a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/model/impl/WikiPageImpl.java +++ b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/model/impl/WikiPageImpl.java @@ -14,6 +14,7 @@ package com.liferay.wiki.model.impl; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.log.Log; @@ -26,7 +27,6 @@ import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.model.Repository; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.wiki.constants.WikiPortletKeys; import com.liferay.wiki.model.WikiNode; import com.liferay.wiki.model.WikiPage; diff --git a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/service/impl/WikiNodeLocalServiceImpl.java b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/service/impl/WikiNodeLocalServiceImpl.java index 9f2dd9f0fd77bc..5196fec7c889e7 100644 --- a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/service/impl/WikiNodeLocalServiceImpl.java +++ b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/service/impl/WikiNodeLocalServiceImpl.java @@ -14,6 +14,7 @@ package com.liferay.wiki.service.impl; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; @@ -33,7 +34,6 @@ import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.spring.extender.service.ServiceReference; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.trash.kernel.model.TrashEntry; import com.liferay.trash.kernel.util.TrashUtil; import com.liferay.wiki.configuration.WikiGroupServiceConfiguration; diff --git a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/service/impl/WikiPageLocalServiceImpl.java b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/service/impl/WikiPageLocalServiceImpl.java index 43e42cf4f538fe..65ddb89d4a5ca6 100644 --- a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/service/impl/WikiPageLocalServiceImpl.java +++ b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/service/impl/WikiPageLocalServiceImpl.java @@ -17,6 +17,7 @@ import com.liferay.asset.kernel.model.AssetEntry; import com.liferay.asset.kernel.model.AssetLink; import com.liferay.asset.kernel.model.AssetLinkConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.expando.kernel.model.ExpandoBridge; import com.liferay.expando.kernel.util.ExpandoBridgeUtil; import com.liferay.portal.kernel.comment.CommentManagerUtil; @@ -73,7 +74,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.spring.extender.service.ServiceReference; import com.liferay.portal.util.LayoutURLUtil; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.social.kernel.model.SocialActivityConstants; import com.liferay.trash.kernel.model.TrashEntry; import com.liferay.trash.kernel.model.TrashVersion; diff --git a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/trash/WikiPageTrashHandler.java b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/trash/WikiPageTrashHandler.java index 506e720bddc64b..c788c1cccc0b7f 100644 --- a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/trash/WikiPageTrashHandler.java +++ b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/trash/WikiPageTrashHandler.java @@ -14,6 +14,7 @@ package com.liferay.wiki.trash; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.PortletURLFactoryUtil; import com.liferay.portal.kernel.portletfilerepository.PortletFileRepositoryUtil; @@ -33,7 +34,6 @@ import com.liferay.portal.model.LayoutConstants; import com.liferay.portal.model.SystemEvent; import com.liferay.portal.model.TrashedModel; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import com.liferay.trash.kernel.exception.RestoreEntryException; import com.liferay.trash.kernel.model.TrashEntry; import com.liferay.trash.kernel.model.TrashEntryConstants; diff --git a/modules/apps/wiki/wiki-test/src/testIntegration/java/com/liferay/wiki/attachments/test/WikiAttachmentsTest.java b/modules/apps/wiki/wiki-test/src/testIntegration/java/com/liferay/wiki/attachments/test/WikiAttachmentsTest.java index ab00080da98693..072c8c6779a306 100644 --- a/modules/apps/wiki/wiki-test/src/testIntegration/java/com/liferay/wiki/attachments/test/WikiAttachmentsTest.java +++ b/modules/apps/wiki/wiki-test/src/testIntegration/java/com/liferay/wiki/attachments/test/WikiAttachmentsTest.java @@ -15,6 +15,9 @@ package com.liferay.wiki.attachments.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.rule.DeleteAfterTestRun; @@ -26,9 +29,6 @@ import com.liferay.portal.model.Group; import com.liferay.portal.service.test.ServiceTestUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; import com.liferay.trash.kernel.service.TrashEntryServiceUtil; import com.liferay.wiki.model.WikiNode; import com.liferay.wiki.model.WikiPage; diff --git a/modules/apps/wiki/wiki-test/src/testIntegration/java/com/liferay/wiki/lar/test/WikiPageStagedModelDataHandlerTest.java b/modules/apps/wiki/wiki-test/src/testIntegration/java/com/liferay/wiki/lar/test/WikiPageStagedModelDataHandlerTest.java index 3230a2b7d52843..68a9ad5ae03ebd 100644 --- a/modules/apps/wiki/wiki-test/src/testIntegration/java/com/liferay/wiki/lar/test/WikiPageStagedModelDataHandlerTest.java +++ b/modules/apps/wiki/wiki-test/src/testIntegration/java/com/liferay/wiki/lar/test/WikiPageStagedModelDataHandlerTest.java @@ -15,6 +15,10 @@ package com.liferay.wiki.lar.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.exportimport.kernel.lar.ExportImportClassedModelUtil; import com.liferay.exportimport.kernel.lar.StagedModelDataHandler; import com.liferay.exportimport.kernel.lar.StagedModelDataHandlerRegistryUtil; @@ -35,10 +39,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.persistence.RepositoryUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolder; import com.liferay.wiki.attachments.test.WikiAttachmentsTest; import com.liferay.wiki.model.WikiNode; import com.liferay.wiki.model.WikiPage; diff --git a/modules/apps/wiki/wiki-test/src/testIntegration/java/com/liferay/wiki/social/test/WikiActivityInterpreterTest.java b/modules/apps/wiki/wiki-test/src/testIntegration/java/com/liferay/wiki/social/test/WikiActivityInterpreterTest.java index 7f4657a976d059..f9755eae80e763 100644 --- a/modules/apps/wiki/wiki-test/src/testIntegration/java/com/liferay/wiki/social/test/WikiActivityInterpreterTest.java +++ b/modules/apps/wiki/wiki-test/src/testIntegration/java/com/liferay/wiki/social/test/WikiActivityInterpreterTest.java @@ -15,6 +15,7 @@ package com.liferay.wiki.social.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.rule.Sync; @@ -22,7 +23,6 @@ import com.liferay.portal.kernel.test.util.RandomTestUtil; import com.liferay.portal.kernel.test.util.TestPropsValues; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; import com.liferay.portlet.social.test.BaseSocialActivityInterpreterTestCase; import com.liferay.social.kernel.model.SocialActivityConstants; import com.liferay.social.kernel.model.SocialActivityInterpreter; diff --git a/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/WikiAttachmentsHelper.java b/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/WikiAttachmentsHelper.java index bb526cf986fbb4..2d22a80d45428c 100644 --- a/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/WikiAttachmentsHelper.java +++ b/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/WikiAttachmentsHelper.java @@ -14,6 +14,7 @@ package com.liferay.wiki; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.theme.ThemeDisplay; import com.liferay.portal.kernel.upload.UploadPortletRequest; @@ -25,7 +26,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.model.TrashedModel; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import com.liferay.trash.kernel.service.TrashEntryService; import com.liferay.trash.kernel.util.TrashUtil; import com.liferay.wiki.service.WikiPageService; diff --git a/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/display/context/util/WikiSocialActivityHelper.java b/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/display/context/util/WikiSocialActivityHelper.java index efc78a098bbfdf..3899d1ba077a9c 100644 --- a/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/display/context/util/WikiSocialActivityHelper.java +++ b/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/display/context/util/WikiSocialActivityHelper.java @@ -14,6 +14,7 @@ package com.liferay.wiki.web.display.context.util; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.language.LanguageUtil; @@ -26,7 +27,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.User; import com.liferay.portal.service.UserLocalServiceUtil; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; import com.liferay.social.kernel.model.SocialActivity; import com.liferay.social.kernel.model.SocialActivityConstants; import com.liferay.wiki.model.WikiNode; diff --git a/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/portlet/action/EditPageAttachmentsMVCActionCommand.java b/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/portlet/action/EditPageAttachmentsMVCActionCommand.java index 2bc484d738f2a0..d188cd87eed99b 100644 --- a/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/portlet/action/EditPageAttachmentsMVCActionCommand.java +++ b/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/portlet/action/EditPageAttachmentsMVCActionCommand.java @@ -16,6 +16,17 @@ import com.liferay.asset.kernel.exception.AssetCategoryException; import com.liferay.asset.kernel.exception.AssetTagException; +import com.liferay.document.library.kernel.antivirus.AntivirusScannerException; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.DuplicateFolderNameException; +import com.liferay.document.library.kernel.exception.FileExtensionException; +import com.liferay.document.library.kernel.exception.FileMimeTypeException; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.exception.FileSizeException; +import com.liferay.document.library.kernel.exception.InvalidFileVersionException; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.exception.SourceFileNameException; import com.liferay.dynamic.data.mapping.kernel.StorageFieldRequiredException; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.json.JSONFactoryUtil; @@ -43,17 +54,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.model.TrashedModel; -import com.liferay.portlet.documentlibrary.antivirus.AntivirusScannerException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFolderNameException; -import com.liferay.portlet.documentlibrary.exception.FileExtensionException; -import com.liferay.portlet.documentlibrary.exception.FileMimeTypeException; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; -import com.liferay.portlet.documentlibrary.exception.InvalidFileVersionException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.exception.SourceFileNameException; import com.liferay.taglib.util.RestoreEntryUtil; import com.liferay.trash.kernel.util.TrashUtil; import com.liferay.wiki.WikiAttachmentsHelper; diff --git a/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/portlet/action/GetPageAttachmentAction.java b/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/portlet/action/GetPageAttachmentAction.java index a596450efbc9be..784b1827ccb095 100644 --- a/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/portlet/action/GetPageAttachmentAction.java +++ b/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/portlet/action/GetPageAttachmentAction.java @@ -14,6 +14,7 @@ package com.liferay.wiki.web.portlet.action; +import com.liferay.document.library.kernel.exception.NoSuchFileException; import com.liferay.portal.kernel.flash.FlashMagicBytesUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -27,7 +28,6 @@ import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.workflow.WorkflowConstants; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; import com.liferay.trash.kernel.util.TrashUtil; import com.liferay.wiki.exception.NoSuchPageException; import com.liferay.wiki.importer.impl.mediawiki.MediaWikiImporter; diff --git a/modules/portal-store/portal-store-cmis-test/src/main/java/com/liferay/portal/store/cmis/test/activator/configuration/ConfigurationAdminBundleActivator.java b/modules/portal-store/portal-store-cmis-test/src/main/java/com/liferay/portal/store/cmis/test/activator/configuration/ConfigurationAdminBundleActivator.java index 8f97279b57a636..cff84f2c95205a 100644 --- a/modules/portal-store/portal-store-cmis-test/src/main/java/com/liferay/portal/store/cmis/test/activator/configuration/ConfigurationAdminBundleActivator.java +++ b/modules/portal-store/portal-store-cmis-test/src/main/java/com/liferay/portal/store/cmis/test/activator/configuration/ConfigurationAdminBundleActivator.java @@ -14,10 +14,10 @@ package com.liferay.portal.store.cmis.test.activator.configuration; +import com.liferay.document.library.kernel.store.Store; import com.liferay.osgi.util.ServiceTrackerFactory; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.PropsUtil; -import com.liferay.portlet.documentlibrary.store.Store; import java.io.IOException; diff --git a/modules/portal-store/portal-store-cmis/src/main/java/com/liferay/portal/store/cmis/CMISStore.java b/modules/portal-store/portal-store-cmis/src/main/java/com/liferay/portal/store/cmis/CMISStore.java index 8841acba9706d8..33ada42c2c1b7e 100644 --- a/modules/portal-store/portal-store-cmis/src/main/java/com/liferay/portal/store/cmis/CMISStore.java +++ b/modules/portal-store/portal-store-cmis/src/main/java/com/liferay/portal/store/cmis/CMISStore.java @@ -16,6 +16,11 @@ import aQute.bnd.annotation.metatype.Configurable; +import com.liferay.document.library.kernel.exception.DuplicateFileException; +import com.liferay.document.library.kernel.exception.NoSuchFileException; +import com.liferay.document.library.kernel.store.BaseStore; +import com.liferay.document.library.kernel.store.Store; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.util.CharPool; import com.liferay.portal.kernel.util.ContentTypes; import com.liferay.portal.kernel.util.ListUtil; @@ -24,11 +29,6 @@ import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.store.cmis.configuration.CMISStoreConfiguration; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; -import com.liferay.portlet.documentlibrary.store.BaseStore; -import com.liferay.portlet.documentlibrary.store.Store; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.io.InputStream; diff --git a/modules/portal-store/portal-store-db/src/main/java/com/liferay/portal/store/db/DBStore.java b/modules/portal-store/portal-store-db/src/main/java/com/liferay/portal/store/db/DBStore.java index b76095cc0bbc49..7a74e87d75f64f 100644 --- a/modules/portal-store/portal-store-db/src/main/java/com/liferay/portal/store/db/DBStore.java +++ b/modules/portal-store/portal-store-db/src/main/java/com/liferay/portal/store/db/DBStore.java @@ -14,6 +14,13 @@ package com.liferay.portal.store.db; +import com.liferay.document.library.kernel.exception.DuplicateFileException; +import com.liferay.document.library.kernel.exception.NoSuchContentException; +import com.liferay.document.library.kernel.exception.NoSuchFileException; +import com.liferay.document.library.kernel.model.DLContent; +import com.liferay.document.library.kernel.service.DLContentLocalService; +import com.liferay.document.library.kernel.store.BaseStore; +import com.liferay.document.library.kernel.store.Store; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayInputStream; @@ -23,13 +30,6 @@ import com.liferay.portal.kernel.transaction.Transactional; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.StringBundler; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileException; -import com.liferay.portlet.documentlibrary.exception.NoSuchContentException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; -import com.liferay.portlet.documentlibrary.model.DLContent; -import com.liferay.portlet.documentlibrary.service.DLContentLocalService; -import com.liferay.portlet.documentlibrary.store.BaseStore; -import com.liferay.portlet.documentlibrary.store.Store; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/modules/portal-store/portal-store-db/src/main/java/com/liferay/portal/store/db/DBStoreRegistrator.java b/modules/portal-store/portal-store-db/src/main/java/com/liferay/portal/store/db/DBStoreRegistrator.java index 3003717f4f30e3..2d29882370f018 100644 --- a/modules/portal-store/portal-store-db/src/main/java/com/liferay/portal/store/db/DBStoreRegistrator.java +++ b/modules/portal-store/portal-store-db/src/main/java/com/liferay/portal/store/db/DBStoreRegistrator.java @@ -14,6 +14,8 @@ package com.liferay.portal.store.db; +import com.liferay.document.library.kernel.store.BaseStore; +import com.liferay.document.library.kernel.store.Store; import com.liferay.portal.kernel.bean.PortalBeanLocatorUtil; import com.liferay.portal.kernel.dao.db.DB; import com.liferay.portal.kernel.dao.db.DBManagerUtil; @@ -25,8 +27,6 @@ import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ProxyUtil; import com.liferay.portal.spring.aop.MethodInterceptorInvocationHandler; -import com.liferay.portlet.documentlibrary.store.BaseStore; -import com.liferay.portlet.documentlibrary.store.Store; import com.liferay.portlet.documentlibrary.store.TempFileMethodInterceptor; import java.io.File; diff --git a/modules/portal-store/portal-store-file-system-test/src/main/java/com/liferay/portal/store/file/system/test/activator/configuration/ConfigurationAdminBundleActivator.java b/modules/portal-store/portal-store-file-system-test/src/main/java/com/liferay/portal/store/file/system/test/activator/configuration/ConfigurationAdminBundleActivator.java index daa42cf38c53bc..433bde03abbc87 100644 --- a/modules/portal-store/portal-store-file-system-test/src/main/java/com/liferay/portal/store/file/system/test/activator/configuration/ConfigurationAdminBundleActivator.java +++ b/modules/portal-store/portal-store-file-system-test/src/main/java/com/liferay/portal/store/file/system/test/activator/configuration/ConfigurationAdminBundleActivator.java @@ -14,11 +14,11 @@ package com.liferay.portal.store.file.system.test.activator.configuration; +import com.liferay.document.library.kernel.store.Store; import com.liferay.osgi.util.ServiceTrackerFactory; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.PropsUtil; -import com.liferay.portlet.documentlibrary.store.Store; import java.util.Dictionary; import java.util.Hashtable; diff --git a/modules/portal-store/portal-store-file-system-test/src/testIntegration/java/com/liferay/portal/store/file/system/test/AdvancedFileSystemStoreTest.java b/modules/portal-store/portal-store-file-system-test/src/testIntegration/java/com/liferay/portal/store/file/system/test/AdvancedFileSystemStoreTest.java index b7b19c4563c154..bb6d73d8520ea1 100644 --- a/modules/portal-store/portal-store-file-system-test/src/testIntegration/java/com/liferay/portal/store/file/system/test/AdvancedFileSystemStoreTest.java +++ b/modules/portal-store/portal-store-file-system-test/src/testIntegration/java/com/liferay/portal/store/file/system/test/AdvancedFileSystemStoreTest.java @@ -15,12 +15,12 @@ package com.liferay.portal.store.file.system.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.store.StoreWrapper; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.util.TestPropsValues; import com.liferay.portal.module.framework.test.ModuleFrameworkTestUtil; import com.liferay.portal.service.test.ServiceTestUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.store.StoreWrapper; import com.liferay.portlet.documentlibrary.store.test.BaseStoreTestCase; import java.util.Collection; diff --git a/modules/portal-store/portal-store-file-system-test/src/testIntegration/java/com/liferay/portal/store/file/system/test/FileSystemStoreTest.java b/modules/portal-store/portal-store-file-system-test/src/testIntegration/java/com/liferay/portal/store/file/system/test/FileSystemStoreTest.java index 19e2875759c86f..6bc9c32d39b72f 100644 --- a/modules/portal-store/portal-store-file-system-test/src/testIntegration/java/com/liferay/portal/store/file/system/test/FileSystemStoreTest.java +++ b/modules/portal-store/portal-store-file-system-test/src/testIntegration/java/com/liferay/portal/store/file/system/test/FileSystemStoreTest.java @@ -15,12 +15,12 @@ package com.liferay.portal.store.file.system.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; +import com.liferay.document.library.kernel.store.StoreWrapper; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.util.TestPropsValues; import com.liferay.portal.module.framework.test.ModuleFrameworkTestUtil; import com.liferay.portal.service.test.ServiceTestUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.store.StoreWrapper; import com.liferay.portlet.documentlibrary.store.test.BaseStoreTestCase; import java.util.Collection; diff --git a/modules/portal-store/portal-store-file-system/src/main/java/com/liferay/portal/store/file/system/AdvancedFileSystemStore.java b/modules/portal-store/portal-store-file-system/src/main/java/com/liferay/portal/store/file/system/AdvancedFileSystemStore.java index f5fcee5af21be7..67a681c8ffa6cd 100644 --- a/modules/portal-store/portal-store-file-system/src/main/java/com/liferay/portal/store/file/system/AdvancedFileSystemStore.java +++ b/modules/portal-store/portal-store-file-system/src/main/java/com/liferay/portal/store/file/system/AdvancedFileSystemStore.java @@ -16,6 +16,10 @@ import aQute.bnd.annotation.metatype.Configurable; +import com.liferay.document.library.kernel.exception.DuplicateFileException; +import com.liferay.document.library.kernel.exception.NoSuchFileException; +import com.liferay.document.library.kernel.store.Store; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.convert.documentlibrary.FileSystemStoreRootDirException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.util.CharPool; @@ -25,10 +29,6 @@ import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.store.file.system.configuration.AdvancedFileSystemStoreConfiguration; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; -import com.liferay.portlet.documentlibrary.store.Store; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.io.File; diff --git a/modules/portal-store/portal-store-file-system/src/main/java/com/liferay/portal/store/file/system/FileSystemStore.java b/modules/portal-store/portal-store-file-system/src/main/java/com/liferay/portal/store/file/system/FileSystemStore.java index 0dc458ff0de9da..df7044e04d5628 100644 --- a/modules/portal-store/portal-store-file-system/src/main/java/com/liferay/portal/store/file/system/FileSystemStore.java +++ b/modules/portal-store/portal-store-file-system/src/main/java/com/liferay/portal/store/file/system/FileSystemStore.java @@ -16,6 +16,11 @@ import aQute.bnd.annotation.metatype.Configurable; +import com.liferay.document.library.kernel.exception.DuplicateFileException; +import com.liferay.document.library.kernel.exception.NoSuchFileException; +import com.liferay.document.library.kernel.store.BaseStore; +import com.liferay.document.library.kernel.store.Store; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.convert.documentlibrary.FileSystemStoreRootDirException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.util.ArrayUtil; @@ -26,11 +31,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.store.file.system.configuration.AdvancedFileSystemStoreConfiguration; import com.liferay.portal.store.file.system.configuration.FileSystemStoreConfiguration; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; -import com.liferay.portlet.documentlibrary.store.BaseStore; -import com.liferay.portlet.documentlibrary.store.Store; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.io.File; import java.io.FileInputStream; diff --git a/modules/portal-store/portal-store-jcr-test/src/main/java/com/liferay/portal/store/jcr/test/activator/configuration/ConfigurationAdminBundleActivator.java b/modules/portal-store/portal-store-jcr-test/src/main/java/com/liferay/portal/store/jcr/test/activator/configuration/ConfigurationAdminBundleActivator.java index c30f44f235b134..0d48490ff16744 100644 --- a/modules/portal-store/portal-store-jcr-test/src/main/java/com/liferay/portal/store/jcr/test/activator/configuration/ConfigurationAdminBundleActivator.java +++ b/modules/portal-store/portal-store-jcr-test/src/main/java/com/liferay/portal/store/jcr/test/activator/configuration/ConfigurationAdminBundleActivator.java @@ -14,8 +14,8 @@ package com.liferay.portal.store.jcr.test.activator.configuration; +import com.liferay.document.library.kernel.store.Store; import com.liferay.osgi.util.ServiceTrackerFactory; -import com.liferay.portlet.documentlibrary.store.Store; import java.io.IOException; diff --git a/modules/portal-store/portal-store-jcr/src/main/java/com/liferay/portal/store/jcr/JCRStore.java b/modules/portal-store/portal-store-jcr/src/main/java/com/liferay/portal/store/jcr/JCRStore.java index 117fc0c4001f1d..077710dcebd0d1 100644 --- a/modules/portal-store/portal-store-jcr/src/main/java/com/liferay/portal/store/jcr/JCRStore.java +++ b/modules/portal-store/portal-store-jcr/src/main/java/com/liferay/portal/store/jcr/JCRStore.java @@ -16,6 +16,10 @@ import aQute.bnd.annotation.metatype.Configurable; +import com.liferay.document.library.kernel.exception.DuplicateFileException; +import com.liferay.document.library.kernel.exception.NoSuchFileException; +import com.liferay.document.library.kernel.store.BaseStore; +import com.liferay.document.library.kernel.store.Store; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -25,10 +29,6 @@ import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.store.jcr.configuration.JCRStoreConfiguration; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; -import com.liferay.portlet.documentlibrary.store.BaseStore; -import com.liferay.portlet.documentlibrary.store.Store; import java.io.InputStream; diff --git a/modules/portal-store/portal-store-s3-test/src/main/java/com/liferay/portal/store/s3/test/activator/configuration/ConfigurationAdminBundleActivator.java b/modules/portal-store/portal-store-s3-test/src/main/java/com/liferay/portal/store/s3/test/activator/configuration/ConfigurationAdminBundleActivator.java index 03b43206bd4021..da2be0896ef11d 100644 --- a/modules/portal-store/portal-store-s3-test/src/main/java/com/liferay/portal/store/s3/test/activator/configuration/ConfigurationAdminBundleActivator.java +++ b/modules/portal-store/portal-store-s3-test/src/main/java/com/liferay/portal/store/s3/test/activator/configuration/ConfigurationAdminBundleActivator.java @@ -14,10 +14,10 @@ package com.liferay.portal.store.s3.test.activator.configuration; +import com.liferay.document.library.kernel.store.Store; import com.liferay.osgi.util.ServiceTrackerFactory; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.PropsUtil; -import com.liferay.portlet.documentlibrary.store.Store; import java.io.IOException; diff --git a/modules/portal-store/portal-store-s3/src/main/java/com/liferay/portal/store/s3/S3Store.java b/modules/portal-store/portal-store-s3/src/main/java/com/liferay/portal/store/s3/S3Store.java index f8ed2a4470f77e..35c31460d4d148 100644 --- a/modules/portal-store/portal-store-s3/src/main/java/com/liferay/portal/store/s3/S3Store.java +++ b/modules/portal-store/portal-store-s3/src/main/java/com/liferay/portal/store/s3/S3Store.java @@ -41,6 +41,10 @@ import com.amazonaws.services.s3.model.S3ObjectSummary; import com.amazonaws.services.s3.model.StorageClass; +import com.liferay.document.library.kernel.exception.DuplicateFileException; +import com.liferay.document.library.kernel.exception.NoSuchFileException; +import com.liferay.document.library.kernel.store.BaseStore; +import com.liferay.document.library.kernel.store.Store; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; @@ -51,10 +55,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.store.s3.configuration.S3StoreConfiguration; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; -import com.liferay.portlet.documentlibrary.store.BaseStore; -import com.liferay.portlet.documentlibrary.store.Store; import java.io.File; import java.io.IOException; diff --git a/modules/portal-store/portal-store-safe-file-name-wrapper/src/main/java/com/liferay/portal/store/safe/file/name/wrapper/SafeFileNameStoreWrapper.java b/modules/portal-store/portal-store-safe-file-name-wrapper/src/main/java/com/liferay/portal/store/safe/file/name/wrapper/SafeFileNameStoreWrapper.java index 9ae1567120ffa7..0acbb55a998c7f 100644 --- a/modules/portal-store/portal-store-safe-file-name-wrapper/src/main/java/com/liferay/portal/store/safe/file/name/wrapper/SafeFileNameStoreWrapper.java +++ b/modules/portal-store/portal-store-safe-file-name-wrapper/src/main/java/com/liferay/portal/store/safe/file/name/wrapper/SafeFileNameStoreWrapper.java @@ -14,11 +14,11 @@ package com.liferay.portal.store.safe.file.name.wrapper; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.store.Store; +import com.liferay.document.library.kernel.store.StoreWrapper; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.util.FileUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.store.Store; -import com.liferay.portlet.documentlibrary.store.StoreWrapper; import java.io.File; import java.io.InputStream; diff --git a/modules/portal/portal-background-task-service/src/main/java/com/liferay/portal/background/task/model/impl/BackgroundTaskImpl.java b/modules/portal/portal-background-task-service/src/main/java/com/liferay/portal/background/task/model/impl/BackgroundTaskImpl.java index 5804c64c7e2b83..2d47cb445b0e78 100644 --- a/modules/portal/portal-background-task-service/src/main/java/com/liferay/portal/background/task/model/impl/BackgroundTaskImpl.java +++ b/modules/portal/portal-background-task-service/src/main/java/com/liferay/portal/background/task/model/impl/BackgroundTaskImpl.java @@ -14,6 +14,7 @@ package com.liferay.portal.background.task.model.impl; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.background.task.service.BackgroundTaskLocalServiceUtil; import com.liferay.portal.kernel.backgroundtask.BackgroundTaskConstants; import com.liferay.portal.kernel.dao.orm.QueryUtil; @@ -27,7 +28,6 @@ import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.model.Repository; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.io.File; import java.io.InputStream; diff --git a/modules/portal/portal-background-task-service/src/main/java/com/liferay/portal/background/task/service/impl/BackgroundTaskLocalServiceImpl.java b/modules/portal/portal-background-task-service/src/main/java/com/liferay/portal/background/task/service/impl/BackgroundTaskLocalServiceImpl.java index 26f0de69244c20..4234e0d990ac5a 100644 --- a/modules/portal/portal-background-task-service/src/main/java/com/liferay/portal/background/task/service/impl/BackgroundTaskLocalServiceImpl.java +++ b/modules/portal/portal-background-task-service/src/main/java/com/liferay/portal/background/task/service/impl/BackgroundTaskLocalServiceImpl.java @@ -14,6 +14,7 @@ package com.liferay.portal.background.task.service.impl; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.background.task.internal.BackgroundTaskImpl; import com.liferay.portal.background.task.model.BackgroundTask; import com.liferay.portal.background.task.service.base.BackgroundTaskLocalServiceBaseImpl; @@ -42,7 +43,6 @@ import com.liferay.portal.model.UserConstants; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.spring.extender.service.ServiceReference; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.io.File; import java.io.InputStream; diff --git a/modules/portal/portal-portlet-container-test/src/testIntegration/java/com/liferay/portal/portlet/container/upload/test/TestFileEntry.java b/modules/portal/portal-portlet-container-test/src/testIntegration/java/com/liferay/portal/portlet/container/upload/test/TestFileEntry.java index acd6e2d1195a27..39078993eb9763 100644 --- a/modules/portal/portal-portlet-container-test/src/testIntegration/java/com/liferay/portal/portlet/container/upload/test/TestFileEntry.java +++ b/modules/portal/portal-portlet-container-test/src/testIntegration/java/com/liferay/portal/portlet/container/upload/test/TestFileEntry.java @@ -14,6 +14,8 @@ package com.liferay.portal.portlet.container.upload.test; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.expando.kernel.model.ExpandoBridge; import com.liferay.exportimport.kernel.lar.StagedModelType; import com.liferay.portal.kernel.exception.PortalException; @@ -27,8 +29,6 @@ import com.liferay.portal.kernel.security.permission.PermissionChecker; import com.liferay.portal.kernel.test.util.RandomTestUtil; import com.liferay.portal.kernel.util.StringBundler; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import java.io.InputStream; import java.io.Serializable; diff --git a/modules/util/portal-tools-sample-sql-builder/src/main/java/com/liferay/portal/tools/sample/sql/builder/DataFactory.java b/modules/util/portal-tools-sample-sql-builder/src/main/java/com/liferay/portal/tools/sample/sql/builder/DataFactory.java index b0330ce71756ed..5770a6623657cf 100644 --- a/modules/util/portal-tools-sample-sql-builder/src/main/java/com/liferay/portal/tools/sample/sql/builder/DataFactory.java +++ b/modules/util/portal-tools-sample-sql-builder/src/main/java/com/liferay/portal/tools/sample/sql/builder/DataFactory.java @@ -30,6 +30,16 @@ import com.liferay.counter.kernel.model.Counter; import com.liferay.counter.kernel.model.CounterModel; import com.liferay.counter.model.impl.CounterModelImpl; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryMetadataModel; +import com.liferay.document.library.kernel.model.DLFileEntryModel; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFileEntryTypeModel; +import com.liferay.document.library.kernel.model.DLFileVersionModel; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderModel; import com.liferay.document.library.web.constants.DLPortletKeys; import com.liferay.dynamic.data.lists.constants.DDLPortletKeys; import com.liferay.dynamic.data.lists.model.DDLRecordConstants; @@ -162,16 +172,6 @@ import com.liferay.portlet.blogs.model.impl.BlogsEntryModelImpl; import com.liferay.portlet.blogs.model.impl.BlogsStatsUserModelImpl; import com.liferay.portlet.blogs.social.BlogsActivityKeys; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadataModel; -import com.liferay.portlet.documentlibrary.model.DLFileEntryModel; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeModel; -import com.liferay.portlet.documentlibrary.model.DLFileVersionModel; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderModel; import com.liferay.portlet.documentlibrary.model.impl.DLFileEntryMetadataModelImpl; import com.liferay.portlet.documentlibrary.model.impl.DLFileEntryModelImpl; import com.liferay.portlet.documentlibrary.model.impl.DLFileEntryTypeModelImpl; diff --git a/portal-impl/src/com/liferay/portal/convert/documentlibrary/DocumentLibraryConvertProcess.java b/portal-impl/src/com/liferay/portal/convert/documentlibrary/DocumentLibraryConvertProcess.java index eb9609086f9e70..10e1b109c9cdb1 100644 --- a/portal-impl/src/com/liferay/portal/convert/documentlibrary/DocumentLibraryConvertProcess.java +++ b/portal-impl/src/com/liferay/portal/convert/documentlibrary/DocumentLibraryConvertProcess.java @@ -14,6 +14,12 @@ package com.liferay.portal.convert.documentlibrary; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.store.Store; +import com.liferay.document.library.kernel.util.DLPreviewableProcessor; +import com.liferay.document.library.kernel.util.comparator.FileVersionVersionComparator; import com.liferay.message.boards.kernel.model.MBMessage; import com.liferay.message.boards.kernel.service.MBMessageLocalServiceUtil; import com.liferay.portal.convert.BaseConvertProcess; @@ -38,13 +44,7 @@ import com.liferay.portal.service.ImageLocalServiceUtil; import com.liferay.portal.util.MaintenanceUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.store.Store; import com.liferay.portlet.documentlibrary.store.StoreFactory; -import com.liferay.portlet.documentlibrary.util.DLPreviewableProcessor; -import com.liferay.portlet.documentlibrary.util.comparator.FileVersionVersionComparator; import com.liferay.registry.Registry; import com.liferay.registry.RegistryUtil; diff --git a/portal-impl/src/com/liferay/portal/convert/documentlibrary/DocumentLibraryExtraSettingsConvertProcess.java b/portal-impl/src/com/liferay/portal/convert/documentlibrary/DocumentLibraryExtraSettingsConvertProcess.java index b1597f18d5fe5f..104596f236c000 100644 --- a/portal-impl/src/com/liferay/portal/convert/documentlibrary/DocumentLibraryExtraSettingsConvertProcess.java +++ b/portal-impl/src/com/liferay/portal/convert/documentlibrary/DocumentLibraryExtraSettingsConvertProcess.java @@ -14,10 +14,10 @@ package com.liferay.portal.convert.documentlibrary; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; import com.liferay.portal.convert.BaseConvertProcess; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; /** * @author Alexander Chow diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java index aba461824d0b9d..2a1a601a59decb 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java @@ -14,6 +14,11 @@ package com.liferay.portal.deploy.hot; +import com.liferay.document.library.kernel.antivirus.AntivirusScanner; +import com.liferay.document.library.kernel.antivirus.AntivirusScannerUtil; +import com.liferay.document.library.kernel.antivirus.AntivirusScannerWrapper; +import com.liferay.document.library.kernel.util.DLProcessor; +import com.liferay.document.library.kernel.util.DLProcessorRegistryUtil; import com.liferay.portal.captcha.CaptchaImpl; import com.liferay.portal.kernel.bean.BeanLocatorException; import com.liferay.portal.kernel.bean.ClassLoaderBeanHandler; @@ -116,12 +121,7 @@ import com.liferay.portal.util.PortalInstances; import com.liferay.portal.util.PropsUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.antivirus.AntivirusScanner; -import com.liferay.portlet.documentlibrary.antivirus.AntivirusScannerUtil; -import com.liferay.portlet.documentlibrary.antivirus.AntivirusScannerWrapper; import com.liferay.portlet.documentlibrary.store.StoreFactory; -import com.liferay.portlet.documentlibrary.util.DLProcessor; -import com.liferay.portlet.documentlibrary.util.DLProcessorRegistryUtil; import com.liferay.registry.Registry; import com.liferay.registry.RegistryUtil; import com.liferay.registry.ServiceRegistration; diff --git a/portal-impl/src/com/liferay/portal/image/DLHook.java b/portal-impl/src/com/liferay/portal/image/DLHook.java index ca2cd8d834f40c..7eef53140f5402 100644 --- a/portal-impl/src/com/liferay/portal/image/DLHook.java +++ b/portal-impl/src/com/liferay/portal/image/DLHook.java @@ -14,15 +14,15 @@ package com.liferay.portal.image; +import com.liferay.document.library.kernel.exception.NoSuchFileException; +import com.liferay.document.library.kernel.store.DLStoreUtil; +import com.liferay.document.library.kernel.util.DLValidatorUtil; import com.liferay.portal.exception.NoSuchImageException; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.model.Image; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; -import com.liferay.portlet.documentlibrary.util.DLValidatorUtil; import java.io.IOException; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portal/image/FileSystemHook.java b/portal-impl/src/com/liferay/portal/image/FileSystemHook.java index 47438e5f8e26e5..f044e28a6abd80 100644 --- a/portal-impl/src/com/liferay/portal/image/FileSystemHook.java +++ b/portal-impl/src/com/liferay/portal/image/FileSystemHook.java @@ -14,6 +14,7 @@ package com.liferay.portal.image; +import com.liferay.document.library.kernel.exception.NoSuchFileException; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.util.FileUtil; @@ -21,7 +22,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.model.Image; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; import java.io.File; import java.io.FileInputStream; diff --git a/portal-impl/src/com/liferay/portal/metadata/XugglerRawMetadataProcessor.java b/portal-impl/src/com/liferay/portal/metadata/XugglerRawMetadataProcessor.java index f524f83ddafa3f..565ea73004925b 100644 --- a/portal-impl/src/com/liferay/portal/metadata/XugglerRawMetadataProcessor.java +++ b/portal-impl/src/com/liferay/portal/metadata/XugglerRawMetadataProcessor.java @@ -14,6 +14,8 @@ package com.liferay.portal.metadata; +import com.liferay.document.library.kernel.util.AudioProcessorUtil; +import com.liferay.document.library.kernel.util.VideoProcessorUtil; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -24,8 +26,6 @@ import com.liferay.portal.kernel.util.Time; import com.liferay.portal.kernel.xml.Element; import com.liferay.portal.kernel.xuggler.XugglerUtil; -import com.liferay.portlet.documentlibrary.util.AudioProcessorUtil; -import com.liferay.portlet.documentlibrary.util.VideoProcessorUtil; import com.xuggle.xuggler.IContainer; diff --git a/portal-impl/src/com/liferay/portal/model/impl/ImageImpl.java b/portal-impl/src/com/liferay/portal/model/impl/ImageImpl.java index 075d854e20ed2c..394873027febec 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/ImageImpl.java +++ b/portal-impl/src/com/liferay/portal/model/impl/ImageImpl.java @@ -14,14 +14,14 @@ package com.liferay.portal.model.impl; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.store.DLStoreUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portal/portletfilerepository/PortletFileRepositoryImpl.java b/portal-impl/src/com/liferay/portal/portletfilerepository/PortletFileRepositoryImpl.java index 1b733d6eb2fcb6..1bf80e5d9f8a81 100644 --- a/portal-impl/src/com/liferay/portal/portletfilerepository/PortletFileRepositoryImpl.java +++ b/portal-impl/src/com/liferay/portal/portletfilerepository/PortletFileRepositoryImpl.java @@ -14,6 +14,11 @@ package com.liferay.portal.portletfilerepository; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLTrashLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLAppHelperThreadLocal; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; @@ -50,11 +55,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.webserver.WebServerServlet; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLTrashLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLAppHelperThreadLocal; import com.liferay.trash.kernel.util.TrashUtil; import java.io.File; diff --git a/portal-impl/src/com/liferay/portal/repository/RepositoryProviderImpl.java b/portal-impl/src/com/liferay/portal/repository/RepositoryProviderImpl.java index cff8134eee5f94..983ec1b83e1ea9 100644 --- a/portal-impl/src/com/liferay/portal/repository/RepositoryProviderImpl.java +++ b/portal-impl/src/com/liferay/portal/repository/RepositoryProviderImpl.java @@ -14,6 +14,19 @@ package com.liferay.portal.repository; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFileShortcutException; +import com.liferay.document.library.kernel.exception.NoSuchFileVersionException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryServiceUtil; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; import com.liferay.portal.exception.NoSuchRepositoryException; import com.liferay.portal.kernel.bean.BeanReference; import com.liferay.portal.kernel.exception.PortalException; @@ -31,19 +44,6 @@ import com.liferay.portal.service.GroupLocalService; import com.liferay.portal.service.RepositoryEntryLocalService; import com.liferay.portal.service.RepositoryLocalService; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileShortcutException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileVersionException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/CapabilityRepository.java b/portal-impl/src/com/liferay/portal/repository/capabilities/CapabilityRepository.java index 548f2e9a498220..8fc80192b84567 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/CapabilityRepository.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/CapabilityRepository.java @@ -14,6 +14,7 @@ package com.liferay.portal.repository.capabilities; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.lock.Lock; import com.liferay.portal.kernel.repository.Repository; @@ -31,7 +32,6 @@ import com.liferay.portal.kernel.search.SearchException; import com.liferay.portal.kernel.util.OrderByComparator; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.io.File; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayBulkOperationCapability.java b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayBulkOperationCapability.java index 77cb1d49d56ea5..6e897b3b30b206 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayBulkOperationCapability.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayBulkOperationCapability.java @@ -14,6 +14,8 @@ package com.liferay.portal.repository.capabilities; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery; import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; @@ -27,8 +29,6 @@ import com.liferay.portal.repository.capabilities.util.DLFolderServiceAdapter; import com.liferay.portal.repository.liferayrepository.model.LiferayFileEntry; import com.liferay.portal.repository.liferayrepository.model.LiferayFolder; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolder; import java.util.HashMap; import java.util.Map; diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayCommentCapability.java b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayCommentCapability.java index ca39b1d3491f46..8e2f024ec85ea0 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayCommentCapability.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayCommentCapability.java @@ -14,6 +14,7 @@ package com.liferay.portal.repository.capabilities; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; import com.liferay.portal.kernel.comment.CommentManagerUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.capabilities.CommentCapability; @@ -22,7 +23,6 @@ import com.liferay.portal.kernel.repository.event.RepositoryEventType; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.registry.RepositoryEventRegistry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; /** * @author Adolfo Pérez diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayProcessorCapability.java b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayProcessorCapability.java index 459e3f1e54c68a..ee33b282cbdbe9 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayProcessorCapability.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayProcessorCapability.java @@ -14,6 +14,7 @@ package com.liferay.portal.repository.capabilities; +import com.liferay.document.library.kernel.util.DLProcessorRegistryUtil; import com.liferay.portal.kernel.repository.LocalRepository; import com.liferay.portal.kernel.repository.Repository; import com.liferay.portal.kernel.repository.capabilities.ProcessorCapability; @@ -27,7 +28,6 @@ import com.liferay.portal.repository.liferayrepository.LiferayProcessorLocalRepositoryWrapper; import com.liferay.portal.repository.liferayrepository.LiferayProcessorRepositoryWrapper; import com.liferay.portal.repository.util.RepositoryWrapperAware; -import com.liferay.portlet.documentlibrary.util.DLProcessorRegistryUtil; import java.util.concurrent.Callable; diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayRelatedModelCapability.java b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayRelatedModelCapability.java index edb7714f40683e..39b68bfb76d44f 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayRelatedModelCapability.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayRelatedModelCapability.java @@ -14,11 +14,11 @@ package com.liferay.portal.repository.capabilities; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.portal.kernel.repository.capabilities.RelatedModelCapability; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.repository.capabilities.util.RepositoryEntryChecker; import com.liferay.portal.repository.capabilities.util.RepositoryEntryConverter; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; /** * @author Iván Zaera diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferaySyncCapability.java b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferaySyncCapability.java index f41390a1aab3f8..6c45e3496ec880 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferaySyncCapability.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferaySyncCapability.java @@ -14,6 +14,9 @@ package com.liferay.portal.repository.capabilities; +import com.liferay.document.library.kernel.model.DLSyncConstants; +import com.liferay.document.library.kernel.model.DLSyncEvent; +import com.liferay.document.library.kernel.service.DLSyncEventLocalService; import com.liferay.portal.kernel.messaging.DestinationNames; import com.liferay.portal.kernel.messaging.Message; import com.liferay.portal.kernel.messaging.MessageBusUtil; @@ -31,9 +34,6 @@ import com.liferay.portal.repository.capabilities.util.GroupServiceAdapter; import com.liferay.portal.repository.liferayrepository.model.LiferayFileEntry; import com.liferay.portal.repository.liferayrepository.model.LiferayFolder; -import com.liferay.portlet.documentlibrary.model.DLSyncConstants; -import com.liferay.portlet.documentlibrary.model.DLSyncEvent; -import com.liferay.portlet.documentlibrary.service.DLSyncEventLocalService; import java.util.HashMap; import java.util.Map; diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayThumbnailCapability.java b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayThumbnailCapability.java index 504bd9b11265f1..a26ce47a52567e 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayThumbnailCapability.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayThumbnailCapability.java @@ -14,14 +14,14 @@ package com.liferay.portal.repository.capabilities; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.capabilities.ThumbnailCapability; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.repository.capabilities.util.RepositoryEntryChecker; import com.liferay.portal.repository.capabilities.util.RepositoryEntryConverter; import com.liferay.portal.repository.liferayrepository.model.LiferayFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; /** * @author Iván Zaera diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayTrashCapability.java b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayTrashCapability.java index a5973f19d9d153..0566ff0a46fa65 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayTrashCapability.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayTrashCapability.java @@ -14,6 +14,12 @@ package com.liferay.portal.repository.capabilities; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; import com.liferay.portal.kernel.dao.orm.QueryDefinition; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.exception.PortalException; @@ -34,12 +40,6 @@ import com.liferay.portal.repository.capabilities.util.RepositoryServiceAdapter; import com.liferay.portal.repository.liferayrepository.model.LiferayFileEntry; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; import com.liferay.trash.kernel.model.TrashEntry; import com.liferay.trash.kernel.service.TrashEntryLocalService; import com.liferay.trash.kernel.service.TrashVersionLocalService; diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayWorkflowCapability.java b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayWorkflowCapability.java index 7b80fce37d1e34..85366837071590 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayWorkflowCapability.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/LiferayWorkflowCapability.java @@ -14,6 +14,12 @@ package com.liferay.portal.repository.capabilities; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLSyncConstants; +import com.liferay.document.library.kernel.util.DLAppHelperThreadLocal; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.LocalRepository; import com.liferay.portal.kernel.repository.Repository; @@ -28,12 +34,6 @@ import com.liferay.portal.repository.liferayrepository.LiferayWorkflowRepositoryWrapper; import com.liferay.portal.repository.util.RepositoryWrapperAware; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLSyncConstants; -import com.liferay.portlet.documentlibrary.util.DLAppHelperThreadLocal; -import com.liferay.portlet.documentlibrary.util.DLUtil; /** * @author Adolfo Pérez diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/MinimalWorkflowCapability.java b/portal-impl/src/com/liferay/portal/repository/capabilities/MinimalWorkflowCapability.java index b37d38fcd173d1..fb0a55567b1b6d 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/MinimalWorkflowCapability.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/MinimalWorkflowCapability.java @@ -14,6 +14,7 @@ package com.liferay.portal.repository.capabilities; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.LocalRepository; import com.liferay.portal.kernel.repository.Repository; @@ -26,7 +27,6 @@ import com.liferay.portal.repository.liferayrepository.LiferayWorkflowRepositoryWrapper; import com.liferay.portal.repository.util.RepositoryWrapperAware; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import java.io.Serializable; diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/TemporaryFileEntriesCapabilityImpl.java b/portal-impl/src/com/liferay/portal/repository/capabilities/TemporaryFileEntriesCapabilityImpl.java index 40bf211abca6ad..0ebe74b7119ab6 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/TemporaryFileEntriesCapabilityImpl.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/TemporaryFileEntriesCapabilityImpl.java @@ -14,6 +14,8 @@ package com.liferay.portal.repository.capabilities; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.exception.NoSuchModelException; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.exception.PortalException; @@ -34,8 +36,6 @@ import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.io.File; import java.io.IOException; diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLAppServiceAdapter.java b/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLAppServiceAdapter.java index 4e0d06be77bc02..678aae4dbbf6fa 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLAppServiceAdapter.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLAppServiceAdapter.java @@ -14,13 +14,13 @@ package com.liferay.portal.repository.capabilities.util; +import com.liferay.document.library.kernel.service.DLAppLocalService; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.DocumentRepository; import com.liferay.portal.kernel.repository.LocalRepository; -import com.liferay.portlet.documentlibrary.service.DLAppLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppService; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; /** * @author Iván Zaera diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLFileEntryServiceAdapter.java b/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLFileEntryServiceAdapter.java index b7f4f2aaf596e6..424503a4a31fa7 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLFileEntryServiceAdapter.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLFileEntryServiceAdapter.java @@ -14,6 +14,11 @@ package com.liferay.portal.repository.capabilities.util; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryService; +import com.liferay.document.library.kernel.service.DLFileEntryServiceUtil; import com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.DocumentRepository; @@ -22,11 +27,6 @@ import com.liferay.portal.kernel.util.OrderByComparator; import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil; import java.io.Serializable; diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLFileVersionServiceAdapter.java b/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLFileVersionServiceAdapter.java index fb24fce08c67fd..e473524695a1fe 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLFileVersionServiceAdapter.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLFileVersionServiceAdapter.java @@ -14,14 +14,14 @@ package com.liferay.portal.repository.capabilities.util; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileVersionService; +import com.liferay.document.library.kernel.service.DLFileVersionServiceUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.DocumentRepository; import com.liferay.portal.kernel.repository.LocalRepository; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileVersionService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionServiceUtil; /** * @author Iván Zaera diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLFolderServiceAdapter.java b/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLFolderServiceAdapter.java index de37f8575c3d5f..a1554ff5229a6a 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLFolderServiceAdapter.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/util/DLFolderServiceAdapter.java @@ -14,16 +14,16 @@ package com.liferay.portal.repository.capabilities.util; +import com.liferay.document.library.kernel.service.DLFolderLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderService; +import com.liferay.document.library.kernel.service.DLFolderServiceUtil; import com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery; import com.liferay.portal.kernel.dao.orm.QueryDefinition; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.DocumentRepository; import com.liferay.portal.kernel.repository.LocalRepository; import com.liferay.portal.kernel.security.auth.PrincipalException; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderService; -import com.liferay.portlet.documentlibrary.service.DLFolderServiceUtil; import java.util.List; diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/util/RepositoryEntryChecker.java b/portal-impl/src/com/liferay/portal/repository/capabilities/util/RepositoryEntryChecker.java index 1c0555b919d62e..c3dc13e488873d 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/util/RepositoryEntryChecker.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/util/RepositoryEntryChecker.java @@ -14,10 +14,10 @@ package com.liferay.portal.repository.capabilities.util; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.repository.DocumentRepository; import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; /** * @author Iván Zaera diff --git a/portal-impl/src/com/liferay/portal/repository/capabilities/util/RepositoryEntryConverter.java b/portal-impl/src/com/liferay/portal/repository/capabilities/util/RepositoryEntryConverter.java index 29832596f97d24..7294bcc8590e8f 100644 --- a/portal-impl/src/com/liferay/portal/repository/capabilities/util/RepositoryEntryConverter.java +++ b/portal-impl/src/com/liferay/portal/repository/capabilities/util/RepositoryEntryConverter.java @@ -14,8 +14,8 @@ package com.liferay.portal.repository.capabilities.util; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; /** * @author Iván Zaera diff --git a/portal-impl/src/com/liferay/portal/repository/external/LegacyExternalRepositoryFactory.java b/portal-impl/src/com/liferay/portal/repository/external/LegacyExternalRepositoryFactory.java index 0ba69ca1e9583b..90f87bfa163fe2 100644 --- a/portal-impl/src/com/liferay/portal/repository/external/LegacyExternalRepositoryFactory.java +++ b/portal-impl/src/com/liferay/portal/repository/external/LegacyExternalRepositoryFactory.java @@ -15,6 +15,8 @@ package com.liferay.portal.repository.external; import com.liferay.asset.kernel.service.AssetEntryLocalService; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; import com.liferay.exportimport.kernel.lar.ExportImportThreadLocal; import com.liferay.portal.kernel.bean.BeanReference; import com.liferay.portal.kernel.exception.PortalException; @@ -31,8 +33,6 @@ import com.liferay.portal.service.RepositoryEntryLocalService; import com.liferay.portal.service.RepositoryLocalService; import com.liferay.portal.service.UserLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; /** * @author Adolfo Pérez diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayLocalRepository.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayLocalRepository.java index 39d6517515e2ac..b53ed83beff90c 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayLocalRepository.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayLocalRepository.java @@ -14,6 +14,20 @@ package com.liferay.portal.repository.liferayrepository; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; +import com.liferay.document.library.kernel.service.DLFolderService; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.portal.kernel.dao.orm.QueryDefinition; import com.liferay.portal.kernel.exception.PortalException; @@ -36,20 +50,6 @@ import com.liferay.portal.service.RepositoryService; import com.liferay.portal.service.ResourceLocalService; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderService; import com.liferay.portlet.documentlibrary.util.RepositoryModelUtil; import com.liferay.portlet.documentlibrary.util.comparator.DLFileEntryOrderByComparator; import com.liferay.portlet.documentlibrary.util.comparator.DLFolderOrderByComparator; diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepository.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepository.java index d3fe020a514974..e9519f3398f10d 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepository.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepository.java @@ -14,6 +14,20 @@ package com.liferay.portal.repository.liferayrepository; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; +import com.liferay.document.library.kernel.service.DLFolderService; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.portal.kernel.dao.orm.QueryDefinition; import com.liferay.portal.kernel.exception.PortalException; @@ -43,20 +57,6 @@ import com.liferay.portal.service.RepositoryService; import com.liferay.portal.service.ResourceLocalService; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderService; import com.liferay.portlet.documentlibrary.util.DLSearcher; import com.liferay.portlet.documentlibrary.util.RepositoryModelUtil; import com.liferay.portlet.documentlibrary.util.comparator.DLFileEntryOrderByComparator; diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepositoryBase.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepositoryBase.java index 3e33df3e7bc11f..c8b6c592fb00b2 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepositoryBase.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepositoryBase.java @@ -14,6 +14,21 @@ package com.liferay.portal.repository.liferayrepository; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; +import com.liferay.document.library.kernel.service.DLFolderService; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.kernel.StorageEngineManagerUtil; @@ -27,21 +42,6 @@ import com.liferay.portal.service.RepositoryService; import com.liferay.portal.service.ResourceLocalService; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderService; import java.util.ArrayList; import java.util.HashMap; diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepositoryDefiner.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepositoryDefiner.java index 6ae1cec7649a06..2dc6af44ef4b7a 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepositoryDefiner.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepositoryDefiner.java @@ -14,6 +14,8 @@ package com.liferay.portal.repository.liferayrepository; +import com.liferay.document.library.kernel.service.DLAppHelperLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLSyncEventLocalServiceUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.DocumentRepository; import com.liferay.portal.kernel.repository.LocalRepository; @@ -50,8 +52,6 @@ import com.liferay.portal.repository.capabilities.util.RepositoryEntryConverter; import com.liferay.portal.repository.capabilities.util.RepositoryServiceAdapter; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLSyncEventLocalServiceUtil; import com.liferay.trash.kernel.service.TrashEntryLocalServiceUtil; import com.liferay.trash.kernel.service.TrashVersionLocalServiceUtil; diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepositoryFactory.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepositoryFactory.java index 4606780f3174ae..783835ac1cd819 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepositoryFactory.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayRepositoryFactory.java @@ -14,6 +14,16 @@ package com.liferay.portal.repository.liferayrepository; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; +import com.liferay.document.library.kernel.service.DLFolderService; import com.liferay.portal.kernel.bean.BeanReference; import com.liferay.portal.kernel.repository.LocalRepository; import com.liferay.portal.kernel.repository.Repository; @@ -21,16 +31,6 @@ import com.liferay.portal.service.RepositoryLocalService; import com.liferay.portal.service.RepositoryService; import com.liferay.portal.service.ResourceLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderService; /** * @author Adolfo Pérez diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayWorkflowLocalRepositoryWrapper.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayWorkflowLocalRepositoryWrapper.java index 9e02fbd6933dfa..b04aab3fad015e 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayWorkflowLocalRepositoryWrapper.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayWorkflowLocalRepositoryWrapper.java @@ -14,13 +14,13 @@ package com.liferay.portal.repository.liferayrepository; +import com.liferay.document.library.kernel.service.DLAppHelperLocalServiceUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.LocalRepository; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.repository.capabilities.WorkflowSupport; import com.liferay.portal.repository.util.LocalRepositoryWrapper; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalServiceUtil; import java.io.File; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayWorkflowRepositoryWrapper.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayWorkflowRepositoryWrapper.java index 19cd27ba26d9cb..a2bfb059b1f650 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayWorkflowRepositoryWrapper.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/LiferayWorkflowRepositoryWrapper.java @@ -14,13 +14,13 @@ package com.liferay.portal.repository.liferayrepository; +import com.liferay.document.library.kernel.service.DLAppHelperLocalServiceUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.Repository; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.repository.capabilities.WorkflowSupport; import com.liferay.portal.repository.util.RepositoryWrapper; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalServiceUtil; import java.io.File; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileEntry.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileEntry.java index a9ac53d9a37fed..7b9ca662eb34aa 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileEntry.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileEntry.java @@ -14,6 +14,11 @@ package com.liferay.portal.repository.liferayrepository.model; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.service.DLAppHelperLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileVersionLocalServiceUtil; import com.liferay.expando.kernel.model.ExpandoBridge; import com.liferay.exportimport.kernel.lar.StagedModelType; import com.liferay.portal.kernel.exception.PortalException; @@ -34,11 +39,6 @@ import com.liferay.portal.kernel.util.ContentTypes; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalServiceUtil; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; import com.liferay.portlet.documentlibrary.util.RepositoryModelUtil; diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileShortcut.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileShortcut.java index 2d81aadc2ca96f..0035beaf4b7229 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileShortcut.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileShortcut.java @@ -14,6 +14,8 @@ package com.liferay.portal.repository.liferayrepository.model; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; import com.liferay.expando.kernel.model.ExpandoBridge; import com.liferay.exportimport.kernel.lar.StagedModelType; import com.liferay.portal.kernel.exception.PortalException; @@ -23,8 +25,6 @@ import com.liferay.portal.kernel.repository.model.RepositoryModelOperation; import com.liferay.portal.kernel.security.permission.PermissionChecker; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; import com.liferay.portlet.documentlibrary.service.permission.DLFileShortcutPermission; import java.io.Serializable; diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileVersion.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileVersion.java index 588335250e2a0e..65cb4322f4165c 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileVersion.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileVersion.java @@ -14,6 +14,9 @@ package com.liferay.portal.repository.liferayrepository.model; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.service.DLAppHelperLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; import com.liferay.expando.kernel.model.ExpandoBridge; import com.liferay.exportimport.kernel.lar.StagedModelType; import com.liferay.portal.kernel.exception.PortalException; @@ -24,9 +27,6 @@ import com.liferay.portal.kernel.repository.model.RepositoryModelOperation; import com.liferay.portal.kernel.security.auth.PrincipalThreadLocal; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; import java.io.File; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFolder.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFolder.java index a6640837b9955d..edf059b4f90703 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFolder.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFolder.java @@ -14,6 +14,8 @@ package com.liferay.portal.repository.liferayrepository.model; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.expando.kernel.model.ExpandoBridge; import com.liferay.exportimport.kernel.lar.StagedModelType; import com.liferay.portal.kernel.exception.PortalException; @@ -21,8 +23,6 @@ import com.liferay.portal.kernel.repository.model.RepositoryModelOperation; import com.liferay.portal.kernel.security.permission.PermissionChecker; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; import com.liferay.portlet.documentlibrary.util.RepositoryModelUtil; diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/social/LiferayFileEntrySocialActivityManager.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/social/LiferayFileEntrySocialActivityManager.java index 84d8c4461732f2..6a9c24d873f4cd 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/social/LiferayFileEntrySocialActivityManager.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/social/LiferayFileEntrySocialActivityManager.java @@ -14,12 +14,12 @@ package com.liferay.portal.repository.liferayrepository.social; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; import com.liferay.portal.kernel.bean.BeanReference; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.social.BaseSocialActivityManager; import com.liferay.portal.kernel.social.SocialActivityManager; import com.liferay.portal.kernel.spring.osgi.OSGiBeanProperties; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; import com.liferay.social.kernel.service.SocialActivityLocalService; /** diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/social/LiferayFileShortcutSocialActivityManager.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/social/LiferayFileShortcutSocialActivityManager.java index 7d3e6bede386b9..eae313c0f93514 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/social/LiferayFileShortcutSocialActivityManager.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/social/LiferayFileShortcutSocialActivityManager.java @@ -14,12 +14,12 @@ package com.liferay.portal.repository.liferayrepository.social; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; import com.liferay.portal.kernel.bean.BeanReference; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.social.BaseSocialActivityManager; import com.liferay.portal.kernel.social.SocialActivityManager; import com.liferay.portal.kernel.spring.osgi.OSGiBeanProperties; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; import com.liferay.social.kernel.service.SocialActivityLocalService; /** diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/social/LiferayFolderSocialActivityManager.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/social/LiferayFolderSocialActivityManager.java index 62a22a4b3528e5..d6e307045c5349 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/social/LiferayFolderSocialActivityManager.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/social/LiferayFolderSocialActivityManager.java @@ -14,12 +14,12 @@ package com.liferay.portal.repository.liferayrepository.social; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.bean.BeanReference; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.social.BaseSocialActivityManager; import com.liferay.portal.kernel.social.SocialActivityManager; import com.liferay.portal.kernel.spring.osgi.OSGiBeanProperties; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.social.kernel.service.SocialActivityLocalService; /** diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/util/LiferayBase.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/util/LiferayBase.java index a8e8646a6b00d0..f2670d134fe6ec 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/util/LiferayBase.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/util/LiferayBase.java @@ -14,13 +14,13 @@ package com.liferay.portal.repository.liferayrepository.util; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileVersion; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.repository.model.RepositoryEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; import com.liferay.portlet.documentlibrary.util.RepositoryModelUtil; import java.util.List; diff --git a/portal-impl/src/com/liferay/portal/repository/portletrepository/PortletRepository.java b/portal-impl/src/com/liferay/portal/repository/portletrepository/PortletRepository.java index 46b53554da9684..46f71f1a8167d6 100644 --- a/portal-impl/src/com/liferay/portal/repository/portletrepository/PortletRepository.java +++ b/portal-impl/src/com/liferay/portal/repository/portletrepository/PortletRepository.java @@ -14,20 +14,20 @@ package com.liferay.portal.repository.portletrepository; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; +import com.liferay.document.library.kernel.service.DLFolderService; import com.liferay.portal.repository.liferayrepository.LiferayRepository; import com.liferay.portal.service.RepositoryLocalService; import com.liferay.portal.service.RepositoryService; import com.liferay.portal.service.ResourceLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderService; /** * @author Adolfo Pérez diff --git a/portal-impl/src/com/liferay/portal/repository/portletrepository/PortletRepositoryDefiner.java b/portal-impl/src/com/liferay/portal/repository/portletrepository/PortletRepositoryDefiner.java index 7e91be6f8c18b0..ba2f1a2c37a998 100644 --- a/portal-impl/src/com/liferay/portal/repository/portletrepository/PortletRepositoryDefiner.java +++ b/portal-impl/src/com/liferay/portal/repository/portletrepository/PortletRepositoryDefiner.java @@ -14,6 +14,7 @@ package com.liferay.portal.repository.portletrepository; +import com.liferay.document.library.kernel.service.DLAppHelperLocalServiceUtil; import com.liferay.portal.kernel.repository.DocumentRepository; import com.liferay.portal.kernel.repository.RepositoryFactory; import com.liferay.portal.kernel.repository.capabilities.ProcessorCapability; @@ -33,7 +34,6 @@ import com.liferay.portal.repository.capabilities.util.RepositoryEntryChecker; import com.liferay.portal.repository.capabilities.util.RepositoryEntryConverter; import com.liferay.portal.repository.capabilities.util.RepositoryServiceAdapter; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalServiceUtil; import com.liferay.trash.kernel.service.TrashEntryLocalServiceUtil; import com.liferay.trash.kernel.service.TrashVersionLocalServiceUtil; diff --git a/portal-impl/src/com/liferay/portal/repository/temporaryrepository/TemporaryFileEntryRepository.java b/portal-impl/src/com/liferay/portal/repository/temporaryrepository/TemporaryFileEntryRepository.java index 7e69ca16c2504c..6b1ae12d689e2b 100644 --- a/portal-impl/src/com/liferay/portal/repository/temporaryrepository/TemporaryFileEntryRepository.java +++ b/portal-impl/src/com/liferay/portal/repository/temporaryrepository/TemporaryFileEntryRepository.java @@ -14,20 +14,20 @@ package com.liferay.portal.repository.temporaryrepository; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryLocalService; +import com.liferay.document.library.kernel.service.DLFileEntryService; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalService; +import com.liferay.document.library.kernel.service.DLFileShortcutService; +import com.liferay.document.library.kernel.service.DLFileVersionLocalService; +import com.liferay.document.library.kernel.service.DLFileVersionService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; +import com.liferay.document.library.kernel.service.DLFolderService; import com.liferay.portal.repository.liferayrepository.LiferayRepository; import com.liferay.portal.service.RepositoryLocalService; import com.liferay.portal.service.RepositoryService; import com.liferay.portal.service.ResourceLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryService; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalService; -import com.liferay.portlet.documentlibrary.service.DLFileVersionService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderService; /** * @author Iván Zaera diff --git a/portal-impl/src/com/liferay/portal/service/impl/RepositoryLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/RepositoryLocalServiceImpl.java index 3c81c2b4a2151e..5058bb3a73728d 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/RepositoryLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/RepositoryLocalServiceImpl.java @@ -14,6 +14,8 @@ package com.liferay.portal.service.impl; +import com.liferay.document.library.kernel.exception.RepositoryNameException; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.exception.InvalidRepositoryException; import com.liferay.portal.exception.NoSuchRepositoryException; import com.liferay.portal.kernel.bean.BeanReference; @@ -35,8 +37,6 @@ import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.base.RepositoryLocalServiceBaseImpl; -import com.liferay.portlet.documentlibrary.exception.RepositoryNameException; -import com.liferay.portlet.documentlibrary.model.DLFolder; import java.util.List; diff --git a/portal-impl/src/com/liferay/portal/service/impl/RepositoryServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/RepositoryServiceImpl.java index 4d39d86091e314..0b87136e4e5acd 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/RepositoryServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/RepositoryServiceImpl.java @@ -14,6 +14,9 @@ package com.liferay.portal.service.impl; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.exception.NoSuchRepositoryException; import com.liferay.portal.kernel.bean.BeanReference; import com.liferay.portal.kernel.exception.PortalException; @@ -29,9 +32,6 @@ import com.liferay.portal.repository.registry.RepositoryClassDefinitionCatalog; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.base.RepositoryServiceBaseImpl; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; import com.liferay.portlet.documentlibrary.service.permission.DLPermission; diff --git a/portal-impl/src/com/liferay/portal/sharepoint/methods/GetDocsMetaInfoMethodImpl.java b/portal-impl/src/com/liferay/portal/sharepoint/methods/GetDocsMetaInfoMethodImpl.java index 868ed9edac7574..f10c6276948a5d 100644 --- a/portal-impl/src/com/liferay/portal/sharepoint/methods/GetDocsMetaInfoMethodImpl.java +++ b/portal-impl/src/com/liferay/portal/sharepoint/methods/GetDocsMetaInfoMethodImpl.java @@ -14,12 +14,12 @@ package com.liferay.portal.sharepoint.methods; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; import com.liferay.portal.sharepoint.Property; import com.liferay.portal.sharepoint.ResponseElement; import com.liferay.portal.sharepoint.SharepointRequest; import com.liferay.portal.sharepoint.SharepointStorage; import com.liferay.portal.sharepoint.Tree; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; import java.util.ArrayList; import java.util.List; diff --git a/portal-impl/src/com/liferay/portal/upgrade/v5_2_8_to_6_0_5/UpgradeDocumentLibrary.java b/portal-impl/src/com/liferay/portal/upgrade/v5_2_8_to_6_0_5/UpgradeDocumentLibrary.java index 1b1c441700e811..472fdb8f670026 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v5_2_8_to_6_0_5/UpgradeDocumentLibrary.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v5_2_8_to_6_0_5/UpgradeDocumentLibrary.java @@ -14,6 +14,8 @@ package com.liferay.portal.upgrade.v5_2_8_to_6_0_5; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.store.DLStoreUtil; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -31,8 +33,6 @@ import com.liferay.portal.upgrade.v6_0_0.util.DLFileEntryVersionUpgradeColumnImpl; import com.liferay.portal.upgrade.v6_0_0.util.DLFileRankTable; import com.liferay.portal.upgrade.v6_0_0.util.DLFileShortcutTable; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_0_0/UpgradeDocumentLibrary.java b/portal-impl/src/com/liferay/portal/upgrade/v6_0_0/UpgradeDocumentLibrary.java index 19a51910466e2c..d785202681779d 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_0_0/UpgradeDocumentLibrary.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_0_0/UpgradeDocumentLibrary.java @@ -14,6 +14,8 @@ package com.liferay.portal.upgrade.v6_0_0; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.store.DLStoreUtil; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -30,8 +32,6 @@ import com.liferay.portal.upgrade.v6_0_0.util.DLFileRankTable; import com.liferay.portal.upgrade.v6_0_0.util.DLFileShortcutTable; import com.liferay.portal.upgrade.v6_0_0.util.DLFileVersionTable; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_0_12_to_6_1_0/UpgradeAsset.java b/portal-impl/src/com/liferay/portal/upgrade/v6_0_12_to_6_1_0/UpgradeAsset.java index e8ac59df2351aa..824835162fbc94 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_0_12_to_6_1_0/UpgradeAsset.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_0_12_to_6_1_0/UpgradeAsset.java @@ -14,14 +14,13 @@ package com.liferay.portal.upgrade.v6_0_12_to_6_1_0; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.upgrade.UpgradeProcess; import com.liferay.portal.kernel.upgrade.util.UpgradeProcessUtil; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; import java.sql.Connection; import java.sql.PreparedStatement; @@ -102,7 +101,7 @@ protected void updateAssetClassTypeId() throws Exception { protected void updateIGImageClassName() throws Exception { long dlFileEntryClassNameId = PortalUtil.getClassNameId( - DLFileEntry.class.getName()); + "com.liferay.document.library.kernel.model.DLFileEntry"); long igImageClassNameId = PortalUtil.getClassNameId( "com.liferay.portlet.imagegallery.model.IGImage"); diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_0_12_to_6_1_0/UpgradeDocumentLibrary.java b/portal-impl/src/com/liferay/portal/upgrade/v6_0_12_to_6_1_0/UpgradeDocumentLibrary.java index e90ac612697f7d..d876248e62aea7 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_0_12_to_6_1_0/UpgradeDocumentLibrary.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_0_12_to_6_1_0/UpgradeDocumentLibrary.java @@ -14,6 +14,8 @@ package com.liferay.portal.upgrade.v6_0_12_to_6_1_0; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.util.ImageProcessorUtil; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -23,9 +25,7 @@ import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.repository.liferayrepository.model.LiferayFileVersion; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; import com.liferay.portlet.documentlibrary.model.impl.DLFileVersionImpl; -import com.liferay.portlet.documentlibrary.util.ImageProcessorUtil; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_0_3/UpgradeDocumentLibrary.java b/portal-impl/src/com/liferay/portal/upgrade/v6_0_3/UpgradeDocumentLibrary.java index c18b7ac2e5a3c4..d5c8374482f619 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_0_3/UpgradeDocumentLibrary.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_0_3/UpgradeDocumentLibrary.java @@ -18,7 +18,6 @@ import com.liferay.portal.kernel.upgrade.UpgradeProcess; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.PortalUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import java.sql.Connection; import java.sql.PreparedStatement; @@ -80,7 +79,8 @@ protected void updateFileEntries() throws Exception { List tableIds = new ArrayList<>(); try { - long classNameId = PortalUtil.getClassNameId(DLFileEntry.class); + long classNameId = PortalUtil.getClassNameId( + "com.liferay.portlet.documentlibrary.model.DLFileEntry"); con = DataAccess.getUpgradeOptimizedConnection(); diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeAsset.java b/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeAsset.java index 178f0e575db3f4..f2ed1785e2f2f0 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeAsset.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeAsset.java @@ -14,6 +14,7 @@ package com.liferay.portal.upgrade.v6_1_0; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.upgrade.UpgradeProcess; import com.liferay.portal.kernel.upgrade.util.UpgradeProcessUtil; @@ -21,8 +22,6 @@ import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.upgrade.v6_1_0.util.AssetEntryTable; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; import java.sql.Connection; import java.sql.PreparedStatement; @@ -114,7 +113,7 @@ protected void updateAssetClassTypeId() throws Exception { protected void updateIGImageClassName() throws Exception { long dlFileEntryClassNameId = PortalUtil.getClassNameId( - DLFileEntry.class.getName()); + "com.liferay.portlet.documentlibrary.model.DLFileEntry"); long igImageClassNameId = PortalUtil.getClassNameId( "com.liferay.portlet.imagegallery.model.IGImage"); diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeAssetPublisher.java b/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeAssetPublisher.java index affe36d86515e7..992054b715f187 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeAssetPublisher.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeAssetPublisher.java @@ -14,6 +14,7 @@ package com.liferay.portal.upgrade.v6_1_0; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil; import com.liferay.portal.kernel.upgrade.BaseUpgradePortletPreferences; @@ -21,8 +22,6 @@ import com.liferay.portal.kernel.util.ListUtil; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; import java.sql.Connection; import java.sql.PreparedStatement; @@ -94,7 +93,7 @@ protected String upgradePreferences( } long dlFileEntryClassNameId = PortalUtil.getClassNameId( - DLFileEntry.class.getName()); + "com.liferay.portlet.documentlibrary.model.DLFileEntry"); long igImageClassNameId = PortalUtil.getClassNameId( "com.liferay.portlet.imagegallery.model.IGImage"); diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeDocumentLibrary.java b/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeDocumentLibrary.java index f75125653f708a..1464c6e1e4c38f 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeDocumentLibrary.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeDocumentLibrary.java @@ -14,6 +14,8 @@ package com.liferay.portal.upgrade.v6_1_0; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.util.ImageProcessorUtil; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -28,10 +30,7 @@ import com.liferay.portal.repository.liferayrepository.model.LiferayFileVersion; import com.liferay.portal.upgrade.v6_1_0.util.DLFileVersionTable; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; import com.liferay.portlet.documentlibrary.model.impl.DLFileVersionImpl; -import com.liferay.portlet.documentlibrary.util.ImageProcessorUtil; import java.sql.Connection; import java.sql.PreparedStatement; @@ -319,7 +318,8 @@ protected void updateLocks() throws Exception { ps = con.prepareStatement( "select lockId, key_ from Lock_ where className = ?"); - ps.setString(1, DLFileEntry.class.getName()); + ps.setString( + 1, "com.liferay.portlet.documentlibrary.model.DLFileEntry"); rs = ps.executeQuery(); diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeImageGallery.java b/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeImageGallery.java index fb901233fa9647..681762a253be52 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeImageGallery.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeImageGallery.java @@ -14,6 +14,10 @@ package com.liferay.portal.upgrade.v6_1_0; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.store.DLStoreUtil; +import com.liferay.document.library.kernel.util.ImageProcessorUtil; import com.liferay.portal.image.DLHook; import com.liferay.portal.image.DatabaseHook; import com.liferay.portal.image.FileSystemHook; @@ -38,12 +42,6 @@ import com.liferay.portal.service.ImageLocalServiceUtil; import com.liferay.portal.upgrade.AutoBatchPreparedStatementUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; -import com.liferay.portlet.documentlibrary.util.ImageProcessorUtil; import java.io.IOException; import java.io.InputStream; @@ -873,10 +871,12 @@ protected void updateIGFolderEntries() throws Exception { protected void updateIGFolderPermissions() throws Exception { deleteConflictingIGPermissions( - _IG_FOLDER_CLASS_NAME, DLFolder.class.getName()); + _IG_FOLDER_CLASS_NAME, + "com.liferay.portlet.documentlibrary.model.DLFolder"); updateIGtoDLPermissions( - _IG_FOLDER_CLASS_NAME, DLFolder.class.getName()); + _IG_FOLDER_CLASS_NAME, + "com.liferay.portlet.documentlibrary.model.DLFolder"); } protected void updateIGImageEntries() throws Exception { @@ -970,7 +970,9 @@ protected void updateIGImageEntries(long companyId, long fileEntryTypeId) extension); String name = String.valueOf( - increment(DLFileEntry.class.getName())); + increment( + "com.liferay.portlet.documentlibrary.model." + + "DLFileEntry")); long size = image.getSize(); @@ -1051,10 +1053,12 @@ protected boolean updateIGImageFolderId( protected void updateIGImagePermissions() throws Exception { deleteConflictingIGPermissions( - _IG_IMAGE_CLASS_NAME, DLFileEntry.class.getName()); + _IG_IMAGE_CLASS_NAME, + "com.liferay.portlet.documentlibrary.model.DLFileEntry"); updateIGtoDLPermissions( - _IG_IMAGE_CLASS_NAME, DLFileEntry.class.getName()); + _IG_IMAGE_CLASS_NAME, + "com.liferay.portlet.documentlibrary.model.DLFileEntry"); } protected void updateIGtoDLPermissions( diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeWorkflow.java b/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeWorkflow.java index 8c499510f4d05b..03df24c82a636d 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeWorkflow.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeWorkflow.java @@ -14,12 +14,10 @@ package com.liferay.portal.upgrade.v6_1_0; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; import com.liferay.portal.kernel.upgrade.UpgradeProcess; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.StringBundler; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFolder; /** * @author Alexander Chow @@ -32,7 +30,8 @@ protected void doUpgrade() throws Exception { sb.append("update WorkflowDefinitionLink set classNameId = "); - long folderClassNameId = PortalUtil.getClassNameId(DLFolder.class); + long folderClassNameId = PortalUtil.getClassNameId( + "com.liferay.portlet.documentlibrary.model.DLFolder"); sb.append(folderClassNameId); @@ -41,7 +40,7 @@ protected void doUpgrade() throws Exception { sb.append(" where classNameId = "); long fileEntryClassNameId = PortalUtil.getClassNameId( - DLFileEntry.class); + "com.liferay.portlet.documentlibrary.model.DLFileEntry"); sb.append(fileEntryClassNameId); diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeDocumentLibrary.java b/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeDocumentLibrary.java index 80efb2a836012e..d86562011fad3b 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeDocumentLibrary.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeDocumentLibrary.java @@ -14,6 +14,8 @@ package com.liferay.portal.upgrade.v6_2_0; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.store.DLStoreUtil; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.security.auth.FullNameGenerator; import com.liferay.portal.kernel.security.auth.FullNameGeneratorFactory; @@ -25,8 +27,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.upgrade.v6_2_0.util.DLFileEntryTypeTable; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeDynamicDataMapping.java b/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeDynamicDataMapping.java index ebb79dcec4e4ff..9e402a7a828f4f 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeDynamicDataMapping.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeDynamicDataMapping.java @@ -14,6 +14,8 @@ package com.liferay.portal.upgrade.v6_2_0; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -28,8 +30,6 @@ import com.liferay.portal.kernel.xml.Element; import com.liferay.portal.kernel.xml.SAXReaderUtil; import com.liferay.portal.upgrade.v6_2_0.util.DDMTemplateTable; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; import com.liferay.util.xml.XMLUtil; import java.sql.Connection; diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeMessageBoardsAttachments.java b/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeMessageBoardsAttachments.java index d2f411c7538a44..4183e7bbb4aaf3 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeMessageBoardsAttachments.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeMessageBoardsAttachments.java @@ -14,10 +14,10 @@ package com.liferay.portal.upgrade.v6_2_0; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.message.boards.kernel.model.MBMessage; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.upgrade.v6_2_0.BaseUpgradeAttachments; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeSearch.java b/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeSearch.java index 5c9f57fc40d7a7..437dd6e752257b 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeSearch.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeSearch.java @@ -14,14 +14,14 @@ package com.liferay.portal.upgrade.v6_2_0; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.json.JSONArray; import com.liferay.portal.kernel.json.JSONFactoryUtil; import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil; import com.liferay.portal.kernel.upgrade.BaseUpgradePortletPreferences; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import javax.portlet.PortletPreferences; diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeSocial.java b/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeSocial.java index 8c8ba06929f3f8..7d12dc1daafdae 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeSocial.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeSocial.java @@ -24,7 +24,6 @@ import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.workflow.WorkflowConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import com.liferay.portlet.documentlibrary.social.DLActivityKeys; import java.sql.Connection; @@ -128,7 +127,8 @@ protected Timestamp getUniqueModifiedDate( } protected void updateDLFileVersionActivities() throws Exception { - long classNameId = PortalUtil.getClassNameId(DLFileEntry.class); + long classNameId = PortalUtil.getClassNameId( + "com.liferay.portlet.documentlibrary.model.DLFolder"); runSQL("delete from SocialActivity where classNameId = " + classNameId); diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeWikiAttachments.java b/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeWikiAttachments.java index d3b35c73105318..40271205133832 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeWikiAttachments.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeWikiAttachments.java @@ -14,10 +14,10 @@ package com.liferay.portal.upgrade.v6_2_0; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.upgrade.v6_2_0.BaseUpgradeAttachments; import com.liferay.portal.kernel.util.StringBundler; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/portal-impl/src/com/liferay/portal/upgrade/v7_0_0/UpgradeDocumentLibrary.java b/portal-impl/src/com/liferay/portal/upgrade/v7_0_0/UpgradeDocumentLibrary.java index 1118c84099ac63..2ded1ef7f71570 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v7_0_0/UpgradeDocumentLibrary.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v7_0_0/UpgradeDocumentLibrary.java @@ -14,6 +14,9 @@ package com.liferay.portal.upgrade.v7_0_0; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.log.Log; @@ -31,9 +34,6 @@ import com.liferay.portal.repository.liferayrepository.LiferayRepository; import com.liferay.portal.repository.portletrepository.PortletRepository; import com.liferay.portal.upgrade.v7_0_0.util.DLFolderTable; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/portal-impl/src/com/liferay/portal/upgrade/v7_0_0/UpgradeSubscription.java b/portal-impl/src/com/liferay/portal/upgrade/v7_0_0/UpgradeSubscription.java index 30f0caa0fe6b45..74bae1a6156aff 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v7_0_0/UpgradeSubscription.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v7_0_0/UpgradeSubscription.java @@ -15,6 +15,9 @@ package com.liferay.portal.upgrade.v7_0_0; import com.liferay.blogs.kernel.model.BlogsEntry; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.message.boards.kernel.model.MBCategory; import com.liferay.message.boards.kernel.model.MBThread; import com.liferay.portal.kernel.dao.jdbc.DataAccess; @@ -29,9 +32,6 @@ import com.liferay.portal.model.Layout; import com.liferay.portal.model.PortletPreferences; import com.liferay.portal.model.WorkflowInstanceLink; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFolder; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/portal-impl/src/com/liferay/portal/util/PortalImpl.java b/portal-impl/src/com/liferay/portal/util/PortalImpl.java index f142d58d87b03b..30243253ef141b 100644 --- a/portal-impl/src/com/liferay/portal/util/PortalImpl.java +++ b/portal-impl/src/com/liferay/portal/util/PortalImpl.java @@ -15,6 +15,9 @@ package com.liferay.portal.util; import com.liferay.blogs.kernel.model.BlogsEntry; +import com.liferay.document.library.kernel.exception.ImageSizeException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.expando.kernel.exception.ValueDataException; import com.liferay.expando.kernel.model.ExpandoBridge; import com.liferay.expando.kernel.model.ExpandoColumnConstants; @@ -206,9 +209,6 @@ import com.liferay.portlet.RenderResponseImpl; import com.liferay.portlet.StateAwareResponseImpl; import com.liferay.portlet.admin.util.OmniadminUtil; -import com.liferay.portlet.documentlibrary.exception.ImageSizeException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolder; import com.liferay.portlet.social.util.FacebookUtil; import com.liferay.registry.Registry; import com.liferay.registry.RegistryUtil; diff --git a/portal-impl/src/com/liferay/portal/verify/VerifyAsset.java b/portal-impl/src/com/liferay/portal/verify/VerifyAsset.java index 523fad222e9b79..16e2aec4abb9ce 100644 --- a/portal-impl/src/com/liferay/portal/verify/VerifyAsset.java +++ b/portal-impl/src/com/liferay/portal/verify/VerifyAsset.java @@ -16,12 +16,12 @@ import com.liferay.asset.kernel.service.AssetCategoryLocalServiceUtil; import com.liferay.asset.kernel.service.AssetEntryLocalServiceUtil; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.StringBundler; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/portal-impl/src/com/liferay/portal/verify/model/DLFileEntryVerifiableModel.java b/portal-impl/src/com/liferay/portal/verify/model/DLFileEntryVerifiableModel.java index ae90278be7a71f..1ba137499623cf 100644 --- a/portal-impl/src/com/liferay/portal/verify/model/DLFileEntryVerifiableModel.java +++ b/portal-impl/src/com/liferay/portal/verify/model/DLFileEntryVerifiableModel.java @@ -14,8 +14,8 @@ package com.liferay.portal.verify.model; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.portal.kernel.verify.model.VerifiableResourcedModel; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; /** * @author Brian Wing Shun Chan diff --git a/portal-impl/src/com/liferay/portal/verify/model/DLFileShortcutVerifiableModel.java b/portal-impl/src/com/liferay/portal/verify/model/DLFileShortcutVerifiableModel.java index 2b3118781e58f5..d8b0ba1a9a66c7 100644 --- a/portal-impl/src/com/liferay/portal/verify/model/DLFileShortcutVerifiableModel.java +++ b/portal-impl/src/com/liferay/portal/verify/model/DLFileShortcutVerifiableModel.java @@ -14,8 +14,8 @@ package com.liferay.portal.verify.model; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; import com.liferay.portal.kernel.verify.model.VerifiableResourcedModel; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; /** * @author Brian Wing Shun Chan diff --git a/portal-impl/src/com/liferay/portal/verify/model/DLFolderVerifiableModel.java b/portal-impl/src/com/liferay/portal/verify/model/DLFolderVerifiableModel.java index 89731186acddea..22b385f664ffed 100644 --- a/portal-impl/src/com/liferay/portal/verify/model/DLFolderVerifiableModel.java +++ b/portal-impl/src/com/liferay/portal/verify/model/DLFolderVerifiableModel.java @@ -14,8 +14,8 @@ package com.liferay.portal.verify.model; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.kernel.verify.model.VerifiableResourcedModel; -import com.liferay.portlet.documentlibrary.model.DLFolder; /** * @author Brian Wing Shun Chan diff --git a/portal-impl/src/com/liferay/portal/webserver/WebServerServlet.java b/portal-impl/src/com/liferay/portal/webserver/WebServerServlet.java index ed2ba830c6d66d..bc3bf690349570 100644 --- a/portal-impl/src/com/liferay/portal/webserver/WebServerServlet.java +++ b/portal-impl/src/com/liferay/portal/webserver/WebServerServlet.java @@ -14,6 +14,19 @@ package com.liferay.portal.webserver; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFileException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.util.AudioProcessorUtil; +import com.liferay.document.library.kernel.util.DLUtil; +import com.liferay.document.library.kernel.util.ImageProcessorUtil; +import com.liferay.document.library.kernel.util.PDFProcessor; +import com.liferay.document.library.kernel.util.PDFProcessorUtil; +import com.liferay.document.library.kernel.util.VideoProcessor; +import com.liferay.document.library.kernel.util.VideoProcessorUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.flash.FlashMagicBytesUtil; @@ -81,20 +94,7 @@ import com.liferay.portal.service.ImageServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.util.AudioProcessorUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.portlet.documentlibrary.util.DocumentConversionUtil; -import com.liferay.portlet.documentlibrary.util.ImageProcessorUtil; -import com.liferay.portlet.documentlibrary.util.PDFProcessor; -import com.liferay.portlet.documentlibrary.util.PDFProcessorUtil; -import com.liferay.portlet.documentlibrary.util.VideoProcessor; -import com.liferay.portlet.documentlibrary.util.VideoProcessorUtil; import com.liferay.trash.kernel.model.TrashEntry; import com.liferay.trash.kernel.util.TrashUtil; diff --git a/portal-impl/src/com/liferay/portlet/blogs/model/impl/BlogsEntryImpl.java b/portal-impl/src/com/liferay/portlet/blogs/model/impl/BlogsEntryImpl.java index 4f7cd39b1efa0b..cd32957017f6f2 100644 --- a/portal-impl/src/com/liferay/portlet/blogs/model/impl/BlogsEntryImpl.java +++ b/portal-impl/src/com/liferay/portlet/blogs/model/impl/BlogsEntryImpl.java @@ -14,6 +14,7 @@ package com.liferay.portlet.blogs.model.impl; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portletfilerepository.PortletFileRepositoryUtil; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -23,7 +24,6 @@ import com.liferay.portal.kernel.webserver.WebServerServletTokenUtil; import com.liferay.portal.model.Image; import com.liferay.portal.service.ImageLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.Date; diff --git a/portal-impl/src/com/liferay/portlet/blogs/service/impl/BlogsEntryLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/blogs/service/impl/BlogsEntryLocalServiceImpl.java index 8cd67e4b991cc7..a815d7dfc340d2 100644 --- a/portal-impl/src/com/liferay/portlet/blogs/service/impl/BlogsEntryLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/blogs/service/impl/BlogsEntryLocalServiceImpl.java @@ -24,6 +24,7 @@ import com.liferay.blogs.kernel.exception.EntryTitleException; import com.liferay.blogs.kernel.model.BlogsEntry; import com.liferay.blogs.kernel.util.comparator.EntryDisplayDateComparator; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.comment.CommentManager; import com.liferay.portal.kernel.comment.CommentManagerUtil; import com.liferay.portal.kernel.dao.orm.QueryDefinition; @@ -89,7 +90,6 @@ import com.liferay.portlet.blogs.social.BlogsActivityKeys; import com.liferay.portlet.blogs.util.BlogsUtil; import com.liferay.portlet.blogs.util.LinkbackProducerUtil; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.social.kernel.model.SocialActivityConstants; import com.liferay.trash.kernel.model.TrashEntry; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/antivirus/AntivirusScannerImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/antivirus/AntivirusScannerImpl.java index aad887db3dec6f..40d327ddd53196 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/antivirus/AntivirusScannerImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/antivirus/AntivirusScannerImpl.java @@ -14,6 +14,8 @@ package com.liferay.portlet.documentlibrary.antivirus; +import com.liferay.document.library.kernel.antivirus.AntivirusScanner; +import com.liferay.document.library.kernel.antivirus.AntivirusScannerWrapper; import com.liferay.portal.kernel.util.InstancePool; import com.liferay.portal.util.PropsValues; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/antivirus/ClamAntivirusScannerImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/antivirus/ClamAntivirusScannerImpl.java index 997f30be5ceeb0..471ad65be78dda 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/antivirus/ClamAntivirusScannerImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/antivirus/ClamAntivirusScannerImpl.java @@ -14,6 +14,9 @@ package com.liferay.portlet.documentlibrary.antivirus; +import com.liferay.document.library.kernel.antivirus.AntivirusScannerException; +import com.liferay.document.library.kernel.antivirus.BaseFileAntivirusScanner; + import java.io.File; import java.io.IOException; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/antivirus/DummyAntivirusScannerImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/antivirus/DummyAntivirusScannerImpl.java index 48d3119311437f..bcb31ee52b38f2 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/antivirus/DummyAntivirusScannerImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/antivirus/DummyAntivirusScannerImpl.java @@ -14,6 +14,8 @@ package com.liferay.portlet.documentlibrary.antivirus; +import com.liferay.document.library.kernel.antivirus.AntivirusScanner; + import java.io.File; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/asset/DLFileEntryClassType.java b/portal-impl/src/com/liferay/portlet/documentlibrary/asset/DLFileEntryClassType.java index e5669f6297b77f..bf1ecef88cf675 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/asset/DLFileEntryClassType.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/asset/DLFileEntryClassType.java @@ -16,10 +16,10 @@ import com.liferay.asset.kernel.model.ClassTypeField; import com.liferay.asset.kernel.model.DDMStructureClassType; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; import java.util.ArrayList; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/asset/DLFileEntryClassTypeReader.java b/portal-impl/src/com/liferay/portlet/documentlibrary/asset/DLFileEntryClassTypeReader.java index 4f2154c01659e8..1421ff379d5eee 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/asset/DLFileEntryClassTypeReader.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/asset/DLFileEntryClassTypeReader.java @@ -16,13 +16,13 @@ import com.liferay.asset.kernel.model.ClassType; import com.liferay.asset.kernel.model.ClassTypeReader; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeServiceUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.util.LocaleUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeServiceUtil; import java.util.ArrayList; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/asset/DLFileEntryDDMFormValuesReader.java b/portal-impl/src/com/liferay/portlet/documentlibrary/asset/DLFileEntryDDMFormValuesReader.java index 9bb1ebe49d44f7..e41c52bbf25726 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/asset/DLFileEntryDDMFormValuesReader.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/asset/DLFileEntryDDMFormValuesReader.java @@ -15,6 +15,8 @@ package com.liferay.portlet.documentlibrary.asset; import com.liferay.asset.kernel.model.BaseDDMFormValuesReader; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalServiceUtil; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.kernel.DDMStructureManagerUtil; @@ -23,8 +25,6 @@ import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileVersion; import com.liferay.portal.kernel.util.PortalUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalServiceUtil; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/constants/DLConstants.java b/portal-impl/src/com/liferay/portlet/documentlibrary/constants/DLConstants.java index 396cefa18f5bc3..2befdbf5ed379b 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/constants/DLConstants.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/constants/DLConstants.java @@ -20,6 +20,6 @@ public class DLConstants { public static final String SERVICE_NAME = - "com.liferay.portlet.documentlibrary"; + "com.liferay.document.library.kernel"; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/lar/FileEntryUtil.java b/portal-impl/src/com/liferay/portlet/documentlibrary/lar/FileEntryUtil.java index a63184698ec516..5e3c98beb2218c 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/lar/FileEntryUtil.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/lar/FileEntryUtil.java @@ -14,15 +14,15 @@ package com.liferay.portlet.documentlibrary.lar; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.persistence.DLFileEntryUtil; +import com.liferay.document.library.kernel.store.DLStoreUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayInputStream; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.repository.liferayrepository.model.LiferayFileEntry; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.persistence.DLFileEntryUtil; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import com.liferay.portlet.documentlibrary.util.RepositoryModelUtil; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/AudioProcessorMessageListener.java b/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/AudioProcessorMessageListener.java index c8da9b6248facf..7535b074238973 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/AudioProcessorMessageListener.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/AudioProcessorMessageListener.java @@ -14,8 +14,8 @@ package com.liferay.portlet.documentlibrary.messaging; +import com.liferay.document.library.kernel.util.AudioProcessorUtil; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.util.AudioProcessorUtil; /** * @author Juan González diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/CheckFileRankMessageListener.java b/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/CheckFileRankMessageListener.java index 913fd30d4834d3..141030c2a01306 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/CheckFileRankMessageListener.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/CheckFileRankMessageListener.java @@ -14,9 +14,9 @@ package com.liferay.portlet.documentlibrary.messaging; +import com.liferay.document.library.kernel.service.DLFileRankLocalServiceUtil; import com.liferay.portal.kernel.messaging.BaseMessageListener; import com.liferay.portal.kernel.messaging.Message; -import com.liferay.portlet.documentlibrary.service.DLFileRankLocalServiceUtil; /** * @author Alexander Chow diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/ImageProcessorMessageListener.java b/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/ImageProcessorMessageListener.java index ed019ce88e2342..b7faf0d9a023f0 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/ImageProcessorMessageListener.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/ImageProcessorMessageListener.java @@ -14,8 +14,8 @@ package com.liferay.portlet.documentlibrary.messaging; +import com.liferay.document.library.kernel.util.ImageProcessorUtil; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.util.ImageProcessorUtil; /** * @author Sergio González diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/PDFProcessorMessageListener.java b/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/PDFProcessorMessageListener.java index 8a780785b5cd52..7e016e7c5cb8c9 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/PDFProcessorMessageListener.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/PDFProcessorMessageListener.java @@ -14,8 +14,8 @@ package com.liferay.portlet.documentlibrary.messaging; +import com.liferay.document.library.kernel.util.PDFProcessorUtil; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.util.PDFProcessorUtil; /** * @author Alexander Chow diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/RawMetadataProcessorMessageListener.java b/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/RawMetadataProcessorMessageListener.java index 8dea7d0bbccd7e..c22233e922c6ea 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/RawMetadataProcessorMessageListener.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/RawMetadataProcessorMessageListener.java @@ -14,12 +14,12 @@ package com.liferay.portlet.documentlibrary.messaging; +import com.liferay.document.library.kernel.util.RawMetadataProcessorUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.messaging.BaseMessageListener; import com.liferay.portal.kernel.messaging.Message; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.util.RawMetadataProcessorUtil; /** * @author Miguel Pastor diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/VideoProcessorMessageListener.java b/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/VideoProcessorMessageListener.java index b7c2c94189ddf0..264e34fcbb8bc9 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/VideoProcessorMessageListener.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/messaging/VideoProcessorMessageListener.java @@ -14,8 +14,8 @@ package com.liferay.portlet.documentlibrary.messaging; +import com.liferay.document.library.kernel.util.VideoProcessorUtil; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.util.VideoProcessorUtil; /** * @author Juan González diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryImpl.java index 5fc0a67d1927d9..cc6d8db3b37d6e 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryImpl.java @@ -14,6 +14,22 @@ package com.liferay.portlet.documentlibrary.model.impl; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileVersionLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileVersionServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.kernel.StorageEngineManagerUtil; @@ -32,22 +48,6 @@ import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.model.Repository; import com.liferay.portal.service.RepositoryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileVersionServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.io.IOException; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryMetadataImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryMetadataImpl.java index f97b3ffcba0786..710b4e9a9e0943 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryMetadataImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryMetadataImpl.java @@ -14,9 +14,9 @@ package com.liferay.portlet.documentlibrary.model.impl; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.service.DLFileVersionLocalServiceUtil; import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalServiceUtil; /** * @author Alexander Chow diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryTypeImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryTypeImpl.java index cee242fcbd7c02..84fd675a6fc459 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryTypeImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryTypeImpl.java @@ -14,6 +14,8 @@ package com.liferay.portlet.documentlibrary.model.impl; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.kernel.DDMStructureLink; import com.liferay.dynamic.data.mapping.kernel.DDMStructureLinkManagerUtil; @@ -25,8 +27,6 @@ import com.liferay.portal.kernel.util.PredicateFilter; import com.liferay.portal.model.Group; import com.liferay.portal.service.GroupLocalServiceUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; import java.util.ArrayList; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileShortcutImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileShortcutImpl.java index b1892848bf489c..1651e780e7f6e2 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileShortcutImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileShortcutImpl.java @@ -14,6 +14,10 @@ package com.liferay.portlet.documentlibrary.model.impl; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -24,10 +28,6 @@ import com.liferay.portal.model.Repository; import com.liferay.portal.repository.liferayrepository.model.LiferayFolder; import com.liferay.portal.service.RepositoryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; /** * @author Brian Wing Shun Chan diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileVersionImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileVersionImpl.java index bc9e3ed5c91458..a2b99d45e6daaa 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileVersionImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileVersionImpl.java @@ -14,6 +14,14 @@ package com.liferay.portlet.documentlibrary.model.impl; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.expando.kernel.model.ExpandoBridge; import com.liferay.expando.kernel.util.ExpandoBridgeFactoryUtil; @@ -22,14 +30,6 @@ import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.UnicodeProperties; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.io.IOException; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFolderImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFolderImpl.java index 5cfcdc73a7885e..12920a278caf14 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFolderImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFolderImpl.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.model.impl; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderServiceUtil; import com.liferay.exportimport.kernel.lar.StagedModelType; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.util.CharPool; @@ -21,11 +26,6 @@ import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.model.Repository; import com.liferay.portal.service.RepositoryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderServiceUtil; import java.util.ArrayList; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLAppHelperLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLAppHelperLocalServiceImpl.java index 1f4207fbb59433..dea200449b39b4 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLAppHelperLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLAppHelperLocalServiceImpl.java @@ -17,6 +17,19 @@ import com.liferay.asset.kernel.model.AssetEntry; import com.liferay.asset.kernel.model.AssetLink; import com.liferay.asset.kernel.model.AssetLinkConstants; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.model.DLSyncConstants; +import com.liferay.document.library.kernel.service.DLAppService; +import com.liferay.document.library.kernel.util.DLAppHelperThreadLocal; +import com.liferay.document.library.kernel.util.comparator.DLFileVersionVersionComparator; import com.liferay.portal.kernel.bean.BeanReference; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.dao.orm.WildcardMode; @@ -60,22 +73,9 @@ import com.liferay.portal.repository.liferayrepository.model.LiferayFolder; import com.liferay.portal.service.ServiceContext; import com.liferay.portlet.documentlibrary.DLGroupServiceSettings; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.model.DLSyncConstants; -import com.liferay.portlet.documentlibrary.service.DLAppService; import com.liferay.portlet.documentlibrary.service.base.DLAppHelperLocalServiceBaseImpl; import com.liferay.portlet.documentlibrary.service.permission.DLPermission; import com.liferay.portlet.documentlibrary.social.DLActivityKeys; -import com.liferay.portlet.documentlibrary.util.DLAppHelperThreadLocal; -import com.liferay.portlet.documentlibrary.util.comparator.DLFileVersionVersionComparator; import com.liferay.social.kernel.model.SocialActivityConstants; import com.liferay.trash.kernel.model.TrashEntry; import com.liferay.trash.kernel.model.TrashVersion; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLAppLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLAppLocalServiceImpl.java index 11daa721e6df0b..86b262b326dbd2 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLAppLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLAppLocalServiceImpl.java @@ -14,6 +14,12 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFileRank; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.exception.NoSuchGroupException; import com.liferay.portal.kernel.bean.BeanReference; import com.liferay.portal.kernel.dao.orm.QueryUtil; @@ -43,12 +49,6 @@ import com.liferay.portal.model.UserConstants; import com.liferay.portal.repository.liferayrepository.model.LiferayFolder; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFileRank; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.base.DLAppLocalServiceBaseImpl; import com.liferay.portlet.documentlibrary.util.DLAppUtil; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLAppServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLAppServiceImpl.java index a078fc30eca51a..de3760aec63bf8 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLAppServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLAppServiceImpl.java @@ -14,6 +14,12 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.util.DLProcessorRegistryUtil; +import com.liferay.document.library.kernel.util.comparator.FolderNameComparator; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelModifiedDateComparator; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelTitleComparator; import com.liferay.portal.exception.NoSuchGroupException; import com.liferay.portal.kernel.bean.BeanReference; import com.liferay.portal.kernel.dao.orm.QueryUtil; @@ -52,16 +58,10 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.base.DLAppServiceBaseImpl; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; import com.liferay.portlet.documentlibrary.service.permission.DLPermission; import com.liferay.portlet.documentlibrary.util.DLAppUtil; -import com.liferay.portlet.documentlibrary.util.DLProcessorRegistryUtil; -import com.liferay.portlet.documentlibrary.util.comparator.FolderNameComparator; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelModifiedDateComparator; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelTitleComparator; import java.io.File; import java.io.IOException; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLContentLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLContentLocalServiceImpl.java index ca4baf88a55b3a..62ff39e6e12875 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLContentLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLContentLocalServiceImpl.java @@ -14,16 +14,16 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.exception.NoSuchContentException; +import com.liferay.document.library.kernel.model.DLContent; +import com.liferay.document.library.kernel.util.comparator.DLContentVersionComparator; import com.liferay.portal.kernel.dao.jdbc.OutputBlob; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayInputStream; import com.liferay.portal.kernel.util.OrderByComparator; import com.liferay.portal.kernel.util.StreamUtil; import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portlet.documentlibrary.exception.NoSuchContentException; -import com.liferay.portlet.documentlibrary.model.DLContent; import com.liferay.portlet.documentlibrary.service.base.DLContentLocalServiceBaseImpl; -import com.liferay.portlet.documentlibrary.util.comparator.DLContentVersionComparator; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryLocalServiceImpl.java index 3d8f27f6a12240..2ce5ccc0002434 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryLocalServiceImpl.java @@ -14,6 +14,26 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.DuplicateFolderNameException; +import com.liferay.document.library.kernel.exception.FileExtensionException; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.exception.ImageSizeException; +import com.liferay.document.library.kernel.exception.InvalidFileEntryTypeException; +import com.liferay.document.library.kernel.exception.InvalidFileVersionException; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.store.DLStoreUtil; +import com.liferay.document.library.kernel.util.DL; +import com.liferay.document.library.kernel.util.DLUtil; +import com.liferay.document.library.kernel.util.DLValidatorUtil; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelModifiedDateComparator; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.kernel.DDMStructureManagerUtil; @@ -93,29 +113,9 @@ import com.liferay.portal.util.PrefsPropsUtil; import com.liferay.portal.util.PropsValues; import com.liferay.portal.util.RepositoryUtil; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFolderNameException; -import com.liferay.portlet.documentlibrary.exception.FileExtensionException; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.exception.ImageSizeException; -import com.liferay.portlet.documentlibrary.exception.InvalidFileEntryTypeException; -import com.liferay.portlet.documentlibrary.exception.InvalidFileVersionException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.model.impl.DLFileEntryImpl; import com.liferay.portlet.documentlibrary.service.base.DLFileEntryLocalServiceBaseImpl; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; -import com.liferay.portlet.documentlibrary.util.DL; import com.liferay.portlet.documentlibrary.util.DLAppUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; -import com.liferay.portlet.documentlibrary.util.DLValidatorUtil; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelModifiedDateComparator; import java.awt.image.RenderedImage; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryMetadataLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryMetadataLocalServiceImpl.java index cbc0d96fc79f5d..2ee6c790eaf232 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryMetadataLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryMetadataLocalServiceImpl.java @@ -14,14 +14,14 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.kernel.DDMStructureLinkManagerUtil; import com.liferay.dynamic.data.mapping.kernel.StorageEngineManagerUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; import com.liferay.portlet.documentlibrary.service.base.DLFileEntryMetadataLocalServiceBaseImpl; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryServiceImpl.java index 5ca880f82be542..054442af659495 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryServiceImpl.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.exception.FileEntryLockException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.portal.kernel.dao.orm.QueryDefinition; import com.liferay.portal.kernel.exception.PortalException; @@ -28,11 +33,6 @@ import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.FileEntryLockException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.model.impl.DLFileEntryImpl; import com.liferay.portlet.documentlibrary.service.base.DLFileEntryServiceBaseImpl; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryTypeLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryTypeLocalServiceImpl.java index 6903daa3b69d56..fd634ad0c927ae 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryTypeLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryTypeLocalServiceImpl.java @@ -14,6 +14,18 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryTypeException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.exception.NoSuchMetadataSetException; +import com.liferay.document.library.kernel.exception.RequiredFileEntryTypeException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.dynamic.data.mapping.kernel.DDMForm; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.kernel.DDMStructureLink; @@ -41,19 +53,7 @@ import com.liferay.portal.repository.liferayrepository.model.LiferayFileEntry; import com.liferay.portal.repository.liferayrepository.model.LiferayFileVersion; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryTypeException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.exception.NoSuchMetadataSetException; -import com.liferay.portlet.documentlibrary.exception.RequiredFileEntryTypeException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.base.DLFileEntryTypeLocalServiceBaseImpl; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.util.ArrayList; import java.util.HashMap; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryTypeServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryTypeServiceImpl.java index 78eb6420f04524..365a3c58d5b0bb 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryTypeServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryTypeServiceImpl.java @@ -14,6 +14,7 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.model.DLFileEntryType; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.security.permission.ActionKeys; import com.liferay.portal.kernel.security.permission.PermissionChecker; @@ -21,7 +22,6 @@ import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.OrderByComparator; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; import com.liferay.portlet.documentlibrary.service.base.DLFileEntryTypeServiceBaseImpl; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryTypePermission; import com.liferay.portlet.documentlibrary.service.permission.DLPermission; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileRankLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileRankLocalServiceImpl.java index 8ead266bc2e934..65bab8cb38236f 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileRankLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileRankLocalServiceImpl.java @@ -14,6 +14,9 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.model.DLFileRank; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.util.comparator.FileRankCreateDateComparator; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; @@ -23,10 +26,7 @@ import com.liferay.portal.model.SystemEventConstants; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileRank; -import com.liferay.portlet.documentlibrary.model.DLFolder; import com.liferay.portlet.documentlibrary.service.base.DLFileRankLocalServiceBaseImpl; -import com.liferay.portlet.documentlibrary.util.comparator.FileRankCreateDateComparator; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileShortcutLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileShortcutLocalServiceImpl.java index 26fddf449bde7f..f97d0d9e15412d 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileShortcutLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileShortcutLocalServiceImpl.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery; import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.Property; @@ -28,11 +33,6 @@ import com.liferay.portal.model.SystemEventConstants; import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.base.DLFileShortcutLocalServiceBaseImpl; import java.util.Date; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileShortcutServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileShortcutServiceImpl.java index edc83891f8db11..39782284646a34 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileShortcutServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileShortcutServiceImpl.java @@ -14,12 +14,12 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.exception.FileShortcutPermissionException; +import com.liferay.document.library.kernel.model.DLFileShortcut; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.security.auth.PrincipalException; import com.liferay.portal.kernel.security.permission.ActionKeys; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.exception.FileShortcutPermissionException; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; import com.liferay.portlet.documentlibrary.service.base.DLFileShortcutServiceBaseImpl; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; import com.liferay.portlet.documentlibrary.service.permission.DLFileShortcutPermission; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileVersionLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileVersionLocalServiceImpl.java index f43a1caa3196ef..9cc17ef1cb0eeb 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileVersionLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileVersionLocalServiceImpl.java @@ -14,6 +14,10 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.exception.NoSuchFileVersionException; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.util.comparator.DLFileVersionVersionComparator; import com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery; import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.Property; @@ -22,11 +26,7 @@ import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.util.ListUtil; import com.liferay.portal.kernel.workflow.WorkflowConstants; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileVersionException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; import com.liferay.portlet.documentlibrary.service.base.DLFileVersionLocalServiceBaseImpl; -import com.liferay.portlet.documentlibrary.util.comparator.DLFileVersionVersionComparator; import java.util.Collections; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileVersionServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileVersionServiceImpl.java index e53b7793a1ee09..a0648fc4383eb8 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileVersionServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileVersionServiceImpl.java @@ -14,9 +14,9 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.model.DLFileVersion; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.security.permission.ActionKeys; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; import com.liferay.portlet.documentlibrary.service.base.DLFileVersionServiceBaseImpl; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFolderLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFolderLocalServiceImpl.java index e7aa81c9eff559..146f5a908a4047 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFolderLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFolderLocalServiceImpl.java @@ -14,6 +14,20 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.DuplicateFolderNameException; +import com.liferay.document.library.kernel.exception.FolderNameException; +import com.liferay.document.library.kernel.exception.InvalidFolderException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.exception.RequiredFileEntryTypeException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.store.DLStoreUtil; +import com.liferay.document.library.kernel.util.DLValidatorUtil; +import com.liferay.document.library.kernel.util.comparator.FolderIdComparator; import com.liferay.exportimport.kernel.lar.ExportImportThreadLocal; import com.liferay.portal.kernel.dao.orm.QueryDefinition; import com.liferay.portal.kernel.dao.orm.QueryUtil; @@ -54,22 +68,8 @@ import com.liferay.portal.repository.liferayrepository.model.LiferayFolder; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.util.RepositoryUtil; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.DuplicateFolderNameException; -import com.liferay.portlet.documentlibrary.exception.FolderNameException; -import com.liferay.portlet.documentlibrary.exception.InvalidFolderException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.exception.RequiredFileEntryTypeException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.model.impl.DLFolderImpl; import com.liferay.portlet.documentlibrary.service.base.DLFolderLocalServiceBaseImpl; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; -import com.liferay.portlet.documentlibrary.util.DLValidatorUtil; -import com.liferay.portlet.documentlibrary.util.comparator.FolderIdComparator; import java.io.Serializable; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFolderServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFolderServiceImpl.java index b2986c1ec85435..148284060fd211 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFolderServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFolderServiceImpl.java @@ -14,6 +14,8 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.dao.orm.QueryDefinition; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.lock.Lock; @@ -24,8 +26,6 @@ import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.service.ServiceContext; import com.liferay.portlet.documentlibrary.DLGroupServiceSettings; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.model.impl.DLFolderImpl; import com.liferay.portlet.documentlibrary.service.base.DLFolderServiceBaseImpl; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLSyncEventLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLSyncEventLocalServiceImpl.java index 697d8cf4582279..157eb66778c40f 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLSyncEventLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLSyncEventLocalServiceImpl.java @@ -14,13 +14,13 @@ package com.liferay.portlet.documentlibrary.service.impl; +import com.liferay.document.library.kernel.model.DLSyncEvent; import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.DynamicQueryFactoryUtil; import com.liferay.portal.kernel.dao.orm.Projection; import com.liferay.portal.kernel.dao.orm.ProjectionFactoryUtil; import com.liferay.portal.kernel.dao.orm.Property; import com.liferay.portal.kernel.dao.orm.PropertyFactoryUtil; -import com.liferay.portlet.documentlibrary.model.DLSyncEvent; import com.liferay.portlet.documentlibrary.service.base.DLSyncEventLocalServiceBaseImpl; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLTrashLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLTrashLocalServiceImpl.java index 86af58b77d0628..da3fee3a1b2d4e 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLTrashLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLTrashLocalServiceImpl.java @@ -16,6 +16,7 @@ import aQute.bnd.annotation.ProviderType; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.LocalRepository; import com.liferay.portal.kernel.repository.RepositoryProviderUtil; @@ -23,7 +24,6 @@ import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.base.DLTrashLocalServiceBaseImpl; /** diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLTrashServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLTrashServiceImpl.java index 2e1d585f5785ff..638ea498ef8865 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLTrashServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLTrashServiceImpl.java @@ -16,6 +16,7 @@ import aQute.bnd.annotation.ProviderType; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.bean.BeanReference; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.Repository; @@ -26,7 +27,6 @@ import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.security.permission.ActionKeys; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.base.DLTrashServiceBaseImpl; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; import com.liferay.portlet.documentlibrary.service.permission.DLFileShortcutPermission; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFileEntryPermission.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFileEntryPermission.java index a1ca510c67106a..191fff86fcbd2e 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFileEntryPermission.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFileEntryPermission.java @@ -14,6 +14,13 @@ package com.liferay.portlet.documentlibrary.service.permission; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.exportimport.kernel.staging.permission.StagingPermissionUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.PortletProvider; @@ -26,13 +33,6 @@ import com.liferay.portal.kernel.spring.osgi.OSGiBeanProperties; import com.liferay.portal.kernel.workflow.permission.WorkflowPermissionUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; /** * @author Brian Wing Shun Chan @@ -40,7 +40,7 @@ */ @OSGiBeanProperties( property = { - "model.class.name=com.liferay.portlet.documentlibrary.model.DLFileEntry" + "model.class.name=com.liferay.document.library.kernel.model.DLFileEntry" } ) public class DLFileEntryPermission implements BaseModelPermissionChecker { diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFileEntryTypePermission.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFileEntryTypePermission.java index 496bde717623aa..89043156cf03b2 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFileEntryTypePermission.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFileEntryTypePermission.java @@ -14,14 +14,14 @@ package com.liferay.portlet.documentlibrary.service.permission; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; import com.liferay.exportimport.kernel.staging.permission.StagingPermissionUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.PortletProvider; import com.liferay.portal.kernel.portlet.PortletProviderUtil; import com.liferay.portal.kernel.security.auth.PrincipalException; import com.liferay.portal.kernel.security.permission.PermissionChecker; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; /** * @author Alexander Chow diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFileShortcutPermission.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFileShortcutPermission.java index 9fcda8b4c410dc..8e84b9ea68273c 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFileShortcutPermission.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFileShortcutPermission.java @@ -14,6 +14,9 @@ package com.liferay.portlet.documentlibrary.service.permission; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalServiceUtil; import com.liferay.exportimport.kernel.staging.permission.StagingPermissionUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.PortletProvider; @@ -21,9 +24,6 @@ import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.security.auth.PrincipalException; import com.liferay.portal.kernel.security.permission.PermissionChecker; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalServiceUtil; /** * @author Brian Wing Shun Chan diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFolderPermission.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFolderPermission.java index 33ffc0d927ed8a..8eb5f744d5322f 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFolderPermission.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLFolderPermission.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.service.permission; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.exportimport.kernel.staging.permission.StagingPermissionUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.PortletProvider; @@ -25,18 +30,13 @@ import com.liferay.portal.kernel.security.permission.PermissionChecker; import com.liferay.portal.kernel.spring.osgi.OSGiBeanProperties; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; /** * @author Brian Wing Shun Chan */ @OSGiBeanProperties( property = { - "model.class.name=com.liferay.portlet.documentlibrary.model.DLFolder" + "model.class.name=com.liferay.document.library.kernel.model.DLFolder" } ) public class DLFolderPermission implements BaseModelPermissionChecker { diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLPermission.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLPermission.java index b9850e4d70b7b7..f847201f2daed3 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLPermission.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/permission/DLPermission.java @@ -27,12 +27,12 @@ * @author Jorge Ferrer */ @OSGiBeanProperties( - property = {"resource.name=com.liferay.portlet.documentlibrary"} + property = {"resource.name=com.liferay.document.library.kernel"} ) public class DLPermission extends BaseResourcePermissionChecker { public static final String RESOURCE_NAME = - "com.liferay.portlet.documentlibrary"; + "com.liferay.document.library.kernel"; public static void check( PermissionChecker permissionChecker, long groupId, String actionId) diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryFinderImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryFinderImpl.java index 30b83af7f1eec4..e1c80fc775f6b6 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryFinderImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryFinderImpl.java @@ -14,6 +14,9 @@ package com.liferay.portlet.documentlibrary.service.persistence.impl; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.service.persistence.DLFileEntryFinder; import com.liferay.portal.kernel.dao.orm.QueryDefinition; import com.liferay.portal.kernel.dao.orm.QueryPos; import com.liferay.portal.kernel.dao.orm.QueryUtil; @@ -29,11 +32,8 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.workflow.WorkflowConstants; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import com.liferay.portlet.documentlibrary.model.impl.DLFileEntryImpl; import com.liferay.portlet.documentlibrary.model.impl.DLFileVersionImpl; -import com.liferay.portlet.documentlibrary.service.persistence.DLFileEntryFinder; import com.liferay.util.dao.orm.CustomSQLUtil; import java.util.Collections; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryMetadataFinderImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryMetadataFinderImpl.java index b85daf1f9e7fd0..7af73f6346157b 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryMetadataFinderImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryMetadataFinderImpl.java @@ -14,12 +14,12 @@ package com.liferay.portlet.documentlibrary.service.persistence.impl; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.service.persistence.DLFileEntryMetadataFinder; import com.liferay.portal.kernel.dao.orm.SQLQuery; import com.liferay.portal.kernel.dao.orm.Session; import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; import com.liferay.portlet.documentlibrary.model.impl.DLFileEntryMetadataImpl; -import com.liferay.portlet.documentlibrary.service.persistence.DLFileEntryMetadataFinder; import com.liferay.util.dao.orm.CustomSQLUtil; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryTypeFinderImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryTypeFinderImpl.java index 1435767c4df69d..01736daa9eea6b 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryTypeFinderImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryTypeFinderImpl.java @@ -14,6 +14,8 @@ package com.liferay.portlet.documentlibrary.service.persistence.impl; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.service.persistence.DLFileEntryTypeFinder; import com.liferay.portal.kernel.dao.orm.QueryPos; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.dao.orm.SQLQuery; @@ -26,9 +28,7 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; import com.liferay.portlet.documentlibrary.model.impl.DLFileEntryTypeImpl; -import com.liferay.portlet.documentlibrary.service.persistence.DLFileEntryTypeFinder; import com.liferay.util.dao.orm.CustomSQLUtil; import java.util.Iterator; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileRankFinderImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileRankFinderImpl.java index 94d9c8e7e7d33a..9329164f179f6c 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileRankFinderImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileRankFinderImpl.java @@ -14,14 +14,14 @@ package com.liferay.portlet.documentlibrary.service.persistence.impl; +import com.liferay.document.library.kernel.model.DLFileRank; +import com.liferay.document.library.kernel.service.persistence.DLFileRankFinder; import com.liferay.portal.kernel.dao.orm.QueryPos; import com.liferay.portal.kernel.dao.orm.SQLQuery; import com.liferay.portal.kernel.dao.orm.Session; import com.liferay.portal.kernel.dao.orm.Type; import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portlet.documentlibrary.model.DLFileRank; import com.liferay.portlet.documentlibrary.model.impl.DLFileRankImpl; -import com.liferay.portlet.documentlibrary.service.persistence.DLFileRankFinder; import com.liferay.util.dao.orm.CustomSQLUtil; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFolderFinderImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFolderFinderImpl.java index 155c7d05ba887a..e35ed19fdd50bf 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFolderFinderImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFolderFinderImpl.java @@ -14,6 +14,13 @@ package com.liferay.portlet.documentlibrary.service.persistence.impl; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.persistence.DLFileEntryUtil; +import com.liferay.document.library.kernel.service.persistence.DLFileShortcutUtil; +import com.liferay.document.library.kernel.service.persistence.DLFolderFinder; +import com.liferay.document.library.kernel.service.persistence.DLFolderUtil; import com.liferay.portal.kernel.dao.orm.QueryDefinition; import com.liferay.portal.kernel.dao.orm.QueryPos; import com.liferay.portal.kernel.dao.orm.QueryUtil; @@ -27,17 +34,10 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.workflow.WorkflowConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; -import com.liferay.portlet.documentlibrary.model.DLFolder; import com.liferay.portlet.documentlibrary.model.impl.DLFileEntryImpl; import com.liferay.portlet.documentlibrary.model.impl.DLFileShortcutImpl; import com.liferay.portlet.documentlibrary.model.impl.DLFileVersionImpl; import com.liferay.portlet.documentlibrary.model.impl.DLFolderImpl; -import com.liferay.portlet.documentlibrary.service.persistence.DLFileEntryUtil; -import com.liferay.portlet.documentlibrary.service.persistence.DLFileShortcutUtil; -import com.liferay.portlet.documentlibrary.service.persistence.DLFolderFinder; -import com.liferay.portlet.documentlibrary.service.persistence.DLFolderUtil; import com.liferay.util.dao.orm.CustomSQLUtil; import java.util.ArrayList; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/sharepoint/DLSharepointStorageImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/sharepoint/DLSharepointStorageImpl.java index 35a667de7a65ad..c66189b9688cf7 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/sharepoint/DLSharepointStorageImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/sharepoint/DLSharepointStorageImpl.java @@ -15,6 +15,11 @@ package com.liferay.portlet.documentlibrary.sharepoint; import com.liferay.asset.kernel.service.AssetTagLocalServiceUtil; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -32,11 +37,6 @@ import com.liferay.portal.sharepoint.SharepointRequest; import com.liferay.portal.sharepoint.SharepointUtil; import com.liferay.portal.sharepoint.Tree; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; import java.io.File; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/store/DLStoreImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/store/DLStoreImpl.java index a36ff17ae7d15c..d87f67ed962ac1 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/store/DLStoreImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/store/DLStoreImpl.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.store; +import com.liferay.document.library.kernel.antivirus.AntivirusScannerUtil; +import com.liferay.document.library.kernel.exception.DirectoryNameException; +import com.liferay.document.library.kernel.store.DLStore; +import com.liferay.document.library.kernel.store.Store; +import com.liferay.document.library.kernel.util.DLValidatorUtil; import com.liferay.portal.kernel.bean.BeanReference; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; @@ -21,9 +26,6 @@ import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.service.GroupLocalService; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.antivirus.AntivirusScannerUtil; -import com.liferay.portlet.documentlibrary.exception.DirectoryNameException; -import com.liferay.portlet.documentlibrary.util.DLValidatorUtil; import java.io.File; import java.io.IOException; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/store/StoreFactory.java b/portal-impl/src/com/liferay/portlet/documentlibrary/store/StoreFactory.java index 68ead5ad575f74..5933e8b028d90a 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/store/StoreFactory.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/store/StoreFactory.java @@ -14,6 +14,8 @@ package com.liferay.portlet.documentlibrary.store; +import com.liferay.document.library.kernel.store.Store; +import com.liferay.document.library.kernel.store.StoreWrapper; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.PropsKeys; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/store/StoreProxyBean.java b/portal-impl/src/com/liferay/portlet/documentlibrary/store/StoreProxyBean.java index f537fa9fc2118e..e854e29e74c78d 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/store/StoreProxyBean.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/store/StoreProxyBean.java @@ -14,6 +14,7 @@ package com.liferay.portlet.documentlibrary.store; +import com.liferay.document.library.kernel.store.Store; import com.liferay.portal.kernel.messaging.proxy.BaseProxyBean; import java.io.File; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/AudioProcessorImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/AudioProcessorImpl.java index adea280e4a4bc2..937c68e5fe9c1a 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/AudioProcessorImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/AudioProcessorImpl.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLProcessorConstants; +import com.liferay.document.library.kernel.util.AudioProcessor; +import com.liferay.document.library.kernel.util.DLPreviewableProcessor; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.portal.fabric.InputResource; import com.liferay.portal.fabric.OutputResource; @@ -41,8 +46,6 @@ import com.liferay.portal.repository.liferayrepository.model.LiferayFileVersion; import com.liferay.portal.util.PropsUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLProcessorConstants; import com.liferay.util.log4j.Log4JUtil; import java.io.File; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFileEntryIndexer.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFileEntryIndexer.java index 907b8656e427e0..d6637e44980122 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFileEntryIndexer.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFileEntryIndexer.java @@ -14,6 +14,15 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.kernel.DDMStructureManager; @@ -68,15 +77,6 @@ import com.liferay.portal.service.GroupLocalServiceUtil; import com.liferay.portal.util.PrefsPropsUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; import com.liferay.portlet.documentlibrary.service.permission.DLFileEntryPermission; import java.io.IOException; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFileEntryLockListener.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFileEntryLockListener.java index f1ff9d9c40839d..8059c7caaf99e4 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFileEntryLockListener.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFileEntryLockListener.java @@ -14,14 +14,14 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.service.DLFileEntryServiceUtil; import com.liferay.portal.kernel.lock.BaseLockListener; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil; /** * @author Alexander Chow diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFileEntryMetadataIndexer.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFileEntryMetadataIndexer.java index bfd6bb1dbbe0ce..3f8a011a522717 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFileEntryMetadataIndexer.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFileEntryMetadataIndexer.java @@ -14,6 +14,9 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; import com.liferay.portal.kernel.search.BaseIndexer; import com.liferay.portal.kernel.search.DDMStructureIndexer; import com.liferay.portal.kernel.search.Document; @@ -23,9 +26,6 @@ import com.liferay.portal.kernel.search.SearchException; import com.liferay.portal.kernel.search.Summary; import com.liferay.portal.kernel.util.ArrayUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; import java.util.List; import java.util.Locale; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFolderIndexer.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFolderIndexer.java index ffd048a0a513fd..f82ceb5b9d9559 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFolderIndexer.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLFolderIndexer.java @@ -14,6 +14,8 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery; import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery; @@ -36,8 +38,6 @@ import com.liferay.portal.kernel.util.CharPool; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.StringUtil; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; import com.liferay.portlet.documentlibrary.service.permission.DLFolderPermission; import java.util.Locale; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLImpl.java index 66a5f246153881..e9d6f31e0b4182 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLImpl.java @@ -14,6 +14,24 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.util.DL; +import com.liferay.document.library.kernel.util.ImageProcessorUtil; +import com.liferay.document.library.kernel.util.PDFProcessorUtil; +import com.liferay.document.library.kernel.util.VideoProcessorUtil; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelCreateDateComparator; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelModifiedDateComparator; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelReadCountComparator; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelSizeComparator; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelTitleComparator; import com.liferay.portal.kernel.configuration.Filter; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.language.LanguageUtil; @@ -59,20 +77,6 @@ import com.liferay.portal.service.SubscriptionLocalServiceUtil; import com.liferay.portal.service.WorkflowDefinitionLinkLocalServiceUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelCreateDateComparator; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelModifiedDateComparator; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelReadCountComparator; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelSizeComparator; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelTitleComparator; import com.liferay.portlet.documentlibrary.webdav.DLWebDAVUtil; import com.liferay.registry.collections.ServiceTrackerCollections; import com.liferay.registry.collections.ServiceTrackerList; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLOpenSearchImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLOpenSearchImpl.java index 7ae8843f25f156..424c581f507ee7 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLOpenSearchImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLOpenSearchImpl.java @@ -14,12 +14,12 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.portal.kernel.search.HitsOpenSearchImpl; import com.liferay.portal.kernel.search.Indexer; import com.liferay.portal.kernel.search.IndexerRegistryUtil; import com.liferay.portal.kernel.spring.osgi.OSGiBeanProperties; import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; /** * @author Brian Wing Shun Chan diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLProcessorRegistryImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLProcessorRegistryImpl.java index d17d6b4b4a21ff..64d2b4ed17b67e 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLProcessorRegistryImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLProcessorRegistryImpl.java @@ -14,6 +14,9 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.util.DLProcessor; +import com.liferay.document.library.kernel.util.DLProcessorRegistry; +import com.liferay.document.library.kernel.util.DLProcessorThreadLocal; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLSearcher.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLSearcher.java index 03b9032f36fa4b..af1ea9b6174ae5 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLSearcher.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLSearcher.java @@ -14,11 +14,11 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.kernel.search.BaseSearcher; import com.liferay.portal.kernel.search.Field; import com.liferay.portal.kernel.search.Indexer; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolder; /** * @author Julio Camarero diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLValidatorImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLValidatorImpl.java index 202c1b48376b8b..8e83a348e2a27f 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLValidatorImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLValidatorImpl.java @@ -14,6 +14,14 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.exception.FileExtensionException; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.exception.FileSizeException; +import com.liferay.document.library.kernel.exception.FolderNameException; +import com.liferay.document.library.kernel.exception.InvalidFileVersionException; +import com.liferay.document.library.kernel.exception.SourceFileNameException; +import com.liferay.document.library.kernel.util.DLUtil; +import com.liferay.document.library.kernel.util.DLValidator; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.StringPool; @@ -22,12 +30,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.util.PrefsPropsUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.FileExtensionException; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; -import com.liferay.portlet.documentlibrary.exception.FolderNameException; -import com.liferay.portlet.documentlibrary.exception.InvalidFileVersionException; -import com.liferay.portlet.documentlibrary.exception.SourceFileNameException; import com.liferay.portlet.documentlibrary.webdav.DLWebDAVUtil; import java.io.File; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/ImageProcessorImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/ImageProcessorImpl.java index 8793ea2da81150..f477bdc0ef6bff 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/ImageProcessorImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/ImageProcessorImpl.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLProcessorConstants; +import com.liferay.document.library.kernel.store.DLStoreUtil; +import com.liferay.document.library.kernel.util.DLPreviewableProcessor; +import com.liferay.document.library.kernel.util.ImageProcessor; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.image.ImageBag; @@ -33,9 +38,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.xml.Element; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLProcessorConstants; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import java.awt.image.ColorModel; import java.awt.image.RenderedImage; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/PDFProcessorImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/PDFProcessorImpl.java index 7ab5b38c405a3b..42ac30b46096e2 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/PDFProcessorImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/PDFProcessorImpl.java @@ -14,6 +14,12 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLProcessorConstants; +import com.liferay.document.library.kernel.store.DLStoreUtil; +import com.liferay.document.library.kernel.util.DLPreviewableProcessor; +import com.liferay.document.library.kernel.util.DLUtil; +import com.liferay.document.library.kernel.util.PDFProcessor; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.portal.fabric.InputResource; import com.liferay.portal.fabric.OutputResource; @@ -43,9 +49,6 @@ import com.liferay.portal.repository.liferayrepository.model.LiferayFileVersion; import com.liferay.portal.util.PropsUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLProcessorConstants; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import com.liferay.util.log4j.Log4JUtil; import java.io.File; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/RawMetadataProcessorImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/RawMetadataProcessorImpl.java index 24357cf86638fe..1f4844627c7b91 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/RawMetadataProcessorImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/RawMetadataProcessorImpl.java @@ -14,6 +14,12 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLProcessorConstants; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLProcessor; +import com.liferay.document.library.kernel.util.RawMetadataProcessor; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.kernel.DDMStructureManagerUtil; @@ -38,10 +44,6 @@ import com.liferay.portal.repository.liferayrepository.model.LiferayFileVersion; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLProcessorConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryMetadataLocalServiceUtil; import java.io.File; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/RepositoryModelUtil.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/RepositoryModelUtil.java index 4a0ec207ac0be4..851fe497128a4c 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/RepositoryModelUtil.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/RepositoryModelUtil.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileShortcutConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.repository.model.FileVersion; @@ -24,11 +29,6 @@ import com.liferay.portal.repository.liferayrepository.model.LiferayFileShortcut; import com.liferay.portal.repository.liferayrepository.model.LiferayFileVersion; import com.liferay.portal.repository.liferayrepository.model.LiferayFolder; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileShortcutConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; import java.util.ArrayList; import java.util.Arrays; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/VideoProcessorImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/VideoProcessorImpl.java index e235c1e74658be..6c8f90cdcf9454 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/VideoProcessorImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/VideoProcessorImpl.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLProcessorConstants; +import com.liferay.document.library.kernel.util.DLPreviewableProcessor; +import com.liferay.document.library.kernel.util.DLUtil; +import com.liferay.document.library.kernel.util.VideoProcessor; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.portal.fabric.InputResource; import com.liferay.portal.fabric.OutputResource; @@ -44,8 +49,6 @@ import com.liferay.portal.repository.liferayrepository.model.LiferayFileVersion; import com.liferay.portal.util.PropsUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLProcessorConstants; import com.liferay.util.log4j.Log4JUtil; import java.awt.image.RenderedImage; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/comparator/DLFileEntryOrderByComparator.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/comparator/DLFileEntryOrderByComparator.java index fb653fd4348834..18281684051985 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/comparator/DLFileEntryOrderByComparator.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/comparator/DLFileEntryOrderByComparator.java @@ -14,11 +14,11 @@ package com.liferay.portlet.documentlibrary.util.comparator; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.util.OrderByComparator; import com.liferay.portal.kernel.util.OrderByComparatorAdapter; import com.liferay.portal.repository.liferayrepository.model.LiferayFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; /** * @author William Newbury diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/comparator/DLFolderOrderByComparator.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/comparator/DLFolderOrderByComparator.java index 6d3dfb4279f1b9..eae8feae39a568 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/comparator/DLFolderOrderByComparator.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/comparator/DLFolderOrderByComparator.java @@ -14,11 +14,11 @@ package com.liferay.portlet.documentlibrary.util.comparator; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.util.OrderByComparator; import com.liferay.portal.kernel.util.OrderByComparatorAdapter; import com.liferay.portal.repository.liferayrepository.model.LiferayFolder; -import com.liferay.portlet.documentlibrary.model.DLFolder; /** * @author William Newbury diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/webdav/DLFileEntryResourceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/webdav/DLFileEntryResourceImpl.java index 45838c22579df9..2b09825c6a1f7b 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/webdav/DLFileEntryResourceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/webdav/DLFileEntryResourceImpl.java @@ -14,6 +14,7 @@ package com.liferay.portlet.documentlibrary.webdav; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.portal.kernel.lock.Lock; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileVersion; @@ -21,7 +22,6 @@ import com.liferay.portal.kernel.webdav.BaseResourceImpl; import com.liferay.portal.kernel.webdav.WebDAVException; import com.liferay.portal.kernel.webdav.WebDAVRequest; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portlet/exportimport/service/impl/ExportImportLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/exportimport/service/impl/ExportImportLocalServiceImpl.java index 782efea01131c0..f1e9029222d1f7 100644 --- a/portal-impl/src/com/liferay/portlet/exportimport/service/impl/ExportImportLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/exportimport/service/impl/ExportImportLocalServiceImpl.java @@ -14,6 +14,7 @@ package com.liferay.portlet.exportimport.service.impl; +import com.liferay.document.library.kernel.util.DLValidatorUtil; import com.liferay.exportimport.kernel.background.task.BackgroundTaskExecutorNames; import com.liferay.exportimport.kernel.controller.ExportController; import com.liferay.exportimport.kernel.controller.ExportImportControllerRegistryUtil; @@ -32,7 +33,6 @@ import com.liferay.portal.model.Layout; import com.liferay.portal.model.Portlet; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.util.DLValidatorUtil; import com.liferay.portlet.exportimport.service.base.ExportImportLocalServiceBaseImpl; import java.io.File; diff --git a/portal-impl/src/com/liferay/portlet/exportimport/service/impl/StagingLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/exportimport/service/impl/StagingLocalServiceImpl.java index f1239ad984095d..9177626abe67a3 100644 --- a/portal-impl/src/com/liferay/portlet/exportimport/service/impl/StagingLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/exportimport/service/impl/StagingLocalServiceImpl.java @@ -14,6 +14,10 @@ package com.liferay.portlet.exportimport.service.impl; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.util.comparator.RepositoryModelTitleComparator; import com.liferay.exportimport.kernel.configuration.ExportImportConfigurationParameterMapFactory; import com.liferay.exportimport.kernel.exception.RemoteExportException; import com.liferay.exportimport.kernel.lar.ExportImportDateUtil; @@ -61,10 +65,6 @@ import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.http.GroupServiceHttp; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.util.comparator.RepositoryModelTitleComparator; import com.liferay.portlet.exportimport.service.base.StagingLocalServiceBaseImpl; import com.liferay.portlet.exportimport.staging.StagingAdvicesThreadLocal; diff --git a/portal-impl/src/com/liferay/portlet/messageboards/model/impl/MBMessageImpl.java b/portal-impl/src/com/liferay/portlet/messageboards/model/impl/MBMessageImpl.java index 64ff155a955cdd..08b3d532fe921f 100644 --- a/portal-impl/src/com/liferay/portlet/messageboards/model/impl/MBMessageImpl.java +++ b/portal-impl/src/com/liferay/portlet/messageboards/model/impl/MBMessageImpl.java @@ -15,6 +15,7 @@ package com.liferay.portlet.messageboards.model.impl; import com.liferay.asset.kernel.service.AssetTagLocalServiceUtil; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.message.boards.kernel.constants.MBConstants; import com.liferay.message.boards.kernel.model.MBCategory; import com.liferay.message.boards.kernel.model.MBCategoryConstants; @@ -33,7 +34,6 @@ import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.model.Repository; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.util.ArrayList; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/messageboards/model/impl/MBThreadImpl.java b/portal-impl/src/com/liferay/portlet/messageboards/model/impl/MBThreadImpl.java index 3c9f1f263cbfb4..d291e0b74679ed 100644 --- a/portal-impl/src/com/liferay/portlet/messageboards/model/impl/MBThreadImpl.java +++ b/portal-impl/src/com/liferay/portlet/messageboards/model/impl/MBThreadImpl.java @@ -14,6 +14,7 @@ package com.liferay.portlet.messageboards.model.impl; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.message.boards.kernel.constants.MBConstants; import com.liferay.message.boards.kernel.model.MBCategory; import com.liferay.message.boards.kernel.model.MBCategoryConstants; @@ -30,7 +31,6 @@ import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.model.Repository; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.util.HashSet; import java.util.List; diff --git a/portal-impl/src/com/liferay/portlet/messageboards/service/impl/MBMessageLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/messageboards/service/impl/MBMessageLocalServiceImpl.java index f402f87621f1c8..177ef8776ef3ab 100644 --- a/portal-impl/src/com/liferay/portlet/messageboards/service/impl/MBMessageLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/messageboards/service/impl/MBMessageLocalServiceImpl.java @@ -16,6 +16,7 @@ import com.liferay.asset.kernel.model.AssetEntry; import com.liferay.asset.kernel.model.AssetLinkConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.message.boards.kernel.constants.MBConstants; import com.liferay.message.boards.kernel.exception.DiscussionMaxCommentsException; import com.liferay.message.boards.kernel.exception.MessageBodyException; @@ -90,7 +91,6 @@ import com.liferay.portal.util.PrefsPropsUtil; import com.liferay.portal.util.PropsValues; import com.liferay.portlet.blogs.util.LinkbackProducerUtil; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.messageboards.MBGroupServiceSettings; import com.liferay.portlet.messageboards.model.impl.MBCategoryImpl; import com.liferay.portlet.messageboards.model.impl.MBMessageDisplayImpl; diff --git a/portal-impl/src/com/liferay/portlet/messageboards/service/impl/MBThreadLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/messageboards/service/impl/MBThreadLocalServiceImpl.java index 232b186e2b5790..c2e607697722a0 100644 --- a/portal-impl/src/com/liferay/portlet/messageboards/service/impl/MBThreadLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/messageboards/service/impl/MBThreadLocalServiceImpl.java @@ -15,6 +15,7 @@ package com.liferay.portlet.messageboards.service.impl; import com.liferay.asset.kernel.model.AssetEntry; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.exportimport.kernel.lar.ExportImportThreadLocal; import com.liferay.message.boards.kernel.constants.MBConstants; import com.liferay.message.boards.kernel.exception.NoSuchCategoryException; @@ -51,7 +52,6 @@ import com.liferay.portal.model.SystemEventConstants; import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.messageboards.service.base.MBThreadLocalServiceBaseImpl; import com.liferay.portlet.messageboards.util.MBUtil; import com.liferay.social.kernel.model.SocialActivityConstants; diff --git a/portal-impl/src/com/liferay/portlet/messageboards/util/MBUtil.java b/portal-impl/src/com/liferay/portlet/messageboards/util/MBUtil.java index 85ba595e954abd..d3cbb7d76b744c 100644 --- a/portal-impl/src/com/liferay/portlet/messageboards/util/MBUtil.java +++ b/portal-impl/src/com/liferay/portlet/messageboards/util/MBUtil.java @@ -14,6 +14,8 @@ package com.liferay.portlet.messageboards.util; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; import com.liferay.message.boards.kernel.model.MBBan; import com.liferay.message.boards.kernel.model.MBCategory; import com.liferay.message.boards.kernel.model.MBCategoryConstants; @@ -72,8 +74,6 @@ import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; import com.liferay.portlet.messageboards.MBGroupServiceSettings; import com.liferay.portlet.messageboards.service.permission.MBMessagePermission; import com.liferay.util.mail.JavaMailUtil; diff --git a/portal-impl/src/com/liferay/portlet/trash/util/TrashImpl.java b/portal-impl/src/com/liferay/portlet/trash/util/TrashImpl.java index 222a33d35c0ca8..02eaf0349d2ba2 100644 --- a/portal-impl/src/com/liferay/portlet/trash/util/TrashImpl.java +++ b/portal-impl/src/com/liferay/portlet/trash/util/TrashImpl.java @@ -14,6 +14,7 @@ package com.liferay.portlet.trash.util; +import com.liferay.document.library.kernel.store.DLStoreUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.log.Log; @@ -51,7 +52,6 @@ import com.liferay.portal.model.TrashedModel; import com.liferay.portal.service.GroupLocalServiceUtil; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import com.liferay.portlet.trash.model.impl.TrashEntryImpl; import com.liferay.trash.kernel.model.TrashEntry; import com.liferay.trash.kernel.model.TrashVersion; diff --git a/portal-impl/test/integration/com/liferay/portal/convert/documentlibrary/DocumentLibraryConvertProcessTest.java b/portal-impl/test/integration/com/liferay/portal/convert/documentlibrary/DocumentLibraryConvertProcessTest.java index 8965c82f4d8e17..d8196e97393297 100644 --- a/portal-impl/test/integration/com/liferay/portal/convert/documentlibrary/DocumentLibraryConvertProcessTest.java +++ b/portal-impl/test/integration/com/liferay/portal/convert/documentlibrary/DocumentLibraryConvertProcessTest.java @@ -15,6 +15,15 @@ package com.liferay.portal.convert.documentlibrary; import com.liferay.counter.kernel.service.CounterLocalServiceUtil; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLContentLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.store.Store; +import com.liferay.document.library.kernel.util.DLPreviewableProcessor; +import com.liferay.document.library.kernel.util.ImageProcessorUtil; import com.liferay.message.boards.kernel.model.MBCategoryConstants; import com.liferay.message.boards.kernel.model.MBMessage; import com.liferay.message.boards.kernel.model.MBMessageConstants; @@ -43,16 +52,7 @@ import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLContentLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.store.Store; import com.liferay.portlet.documentlibrary.store.StoreFactory; -import com.liferay.portlet.documentlibrary.util.DLPreviewableProcessor; -import com.liferay.portlet.documentlibrary.util.ImageProcessorUtil; import com.liferay.portlet.messageboards.util.test.MBTestUtil; import java.io.InputStream; diff --git a/portal-impl/test/integration/com/liferay/portal/kernel/display/context/BaseDisplayContextProviderTest.java b/portal-impl/test/integration/com/liferay/portal/kernel/display/context/BaseDisplayContextProviderTest.java index 55007900b6c2e6..57aa93acfa8eed 100644 --- a/portal-impl/test/integration/com/liferay/portal/kernel/display/context/BaseDisplayContextProviderTest.java +++ b/portal-impl/test/integration/com/liferay/portal/kernel/display/context/BaseDisplayContextProviderTest.java @@ -14,11 +14,11 @@ package com.liferay.portal.kernel.display.context; +import com.liferay.document.library.kernel.display.context.DLDisplayContextFactory; import com.liferay.portal.kernel.display.context.bundle.basedisplaycontextfactory.TestBaseDisplayContextFactoryImpl; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.test.rule.SyntheticBundleRule; -import com.liferay.portlet.documentlibrary.display.context.DLDisplayContextFactory; import java.util.Iterator; diff --git a/portal-impl/test/integration/com/liferay/portal/kernel/display/context/bundle/basedisplaycontextfactory/TestBaseDisplayContextFactoryImpl.java b/portal-impl/test/integration/com/liferay/portal/kernel/display/context/bundle/basedisplaycontextfactory/TestBaseDisplayContextFactoryImpl.java index e80dce00d37c29..ebaa69e26f62ae 100644 --- a/portal-impl/test/integration/com/liferay/portal/kernel/display/context/bundle/basedisplaycontextfactory/TestBaseDisplayContextFactoryImpl.java +++ b/portal-impl/test/integration/com/liferay/portal/kernel/display/context/bundle/basedisplaycontextfactory/TestBaseDisplayContextFactoryImpl.java @@ -14,8 +14,8 @@ package com.liferay.portal.kernel.display.context.bundle.basedisplaycontextfactory; -import com.liferay.portlet.documentlibrary.display.context.BaseDLDisplayContextFactory; -import com.liferay.portlet.documentlibrary.display.context.DLDisplayContextFactory; +import com.liferay.document.library.kernel.display.context.BaseDLDisplayContextFactory; +import com.liferay.document.library.kernel.display.context.DLDisplayContextFactory; import org.osgi.service.component.annotations.Component; diff --git a/portal-impl/test/integration/com/liferay/portal/portletfilerepository/PortletFileRepositoryTest.java b/portal-impl/test/integration/com/liferay/portal/portletfilerepository/PortletFileRepositoryTest.java index 54075899992478..40d880bae041b7 100644 --- a/portal-impl/test/integration/com/liferay/portal/portletfilerepository/PortletFileRepositoryTest.java +++ b/portal-impl/test/integration/com/liferay/portal/portletfilerepository/PortletFileRepositoryTest.java @@ -14,6 +14,10 @@ package com.liferay.portal.portletfilerepository; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portletfilerepository.PortletFileRepositoryUtil; import com.liferay.portal.kernel.repository.capabilities.WorkflowCapability; @@ -31,10 +35,6 @@ import com.liferay.portal.model.User; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import org.junit.Assert; import org.junit.Before; diff --git a/portal-impl/test/integration/com/liferay/portal/repository/RepositoryFactoryTest.java b/portal-impl/test/integration/com/liferay/portal/repository/RepositoryFactoryTest.java index b287a1ffa0f770..441a447668fe5f 100644 --- a/portal-impl/test/integration/com/liferay/portal/repository/RepositoryFactoryTest.java +++ b/portal-impl/test/integration/com/liferay/portal/repository/RepositoryFactoryTest.java @@ -14,6 +14,7 @@ package com.liferay.portal.repository; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.kernel.repository.RepositoryFactoryUtil; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.rule.DeleteAfterTestRun; @@ -21,7 +22,6 @@ import com.liferay.portal.kernel.test.util.RandomTestUtil; import com.liferay.portal.model.Group; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolder; import com.liferay.portlet.documentlibrary.util.test.DLTestUtil; import org.junit.Before; diff --git a/portal-impl/test/integration/com/liferay/portal/repository/RepositoryProviderTest.java b/portal-impl/test/integration/com/liferay/portal/repository/RepositoryProviderTest.java index 3b80d2d22d150a..7282e0c302b920 100644 --- a/portal-impl/test/integration/com/liferay/portal/repository/RepositoryProviderTest.java +++ b/portal-impl/test/integration/com/liferay/portal/repository/RepositoryProviderTest.java @@ -14,6 +14,12 @@ package com.liferay.portal.repository; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.exception.NoSuchFileVersionException; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.kernel.repository.RepositoryException; import com.liferay.portal.kernel.repository.RepositoryProviderUtil; import com.liferay.portal.kernel.security.auth.PrincipalException; @@ -26,12 +32,6 @@ import com.liferay.portal.model.Group; import com.liferay.portal.security.permission.SimplePermissionChecker; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileVersionException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; import com.liferay.portlet.documentlibrary.util.test.DLTestUtil; import org.junit.Before; diff --git a/portal-impl/test/integration/com/liferay/portal/repository/RepositoryTest.java b/portal-impl/test/integration/com/liferay/portal/repository/RepositoryTest.java index 148c8e9bf2c769..ffbec448bb2008 100644 --- a/portal-impl/test/integration/com/liferay/portal/repository/RepositoryTest.java +++ b/portal-impl/test/integration/com/liferay/portal/repository/RepositoryTest.java @@ -14,6 +14,11 @@ package com.liferay.portal.repository; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderServiceUtil; import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayInputStream; import com.liferay.portal.kernel.repository.LocalRepository; import com.liferay.portal.kernel.repository.RepositoryProviderUtil; @@ -35,11 +40,6 @@ import com.liferay.portal.service.RepositoryLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderServiceUtil; import java.io.InputStream; diff --git a/portal-impl/test/integration/com/liferay/portal/repository/capabilities/TemporaryFileEntriesCapabilityTest.java b/portal-impl/test/integration/com/liferay/portal/repository/capabilities/TemporaryFileEntriesCapabilityTest.java index f106f12df5777e..de0d2f8e9e76e2 100644 --- a/portal-impl/test/integration/com/liferay/portal/repository/capabilities/TemporaryFileEntriesCapabilityTest.java +++ b/portal-impl/test/integration/com/liferay/portal/repository/capabilities/TemporaryFileEntriesCapabilityTest.java @@ -14,6 +14,9 @@ package com.liferay.portal.repository.capabilities; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; import com.liferay.portal.kernel.repository.LocalRepository; import com.liferay.portal.kernel.repository.RepositoryProviderUtil; import com.liferay.portal.kernel.repository.capabilities.TemporaryFileEntriesCapability; @@ -33,9 +36,6 @@ import com.liferay.portal.model.User; import com.liferay.portal.service.RepositoryLocalServiceUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; import java.io.InputStream; diff --git a/portal-impl/test/integration/com/liferay/portal/service/CompanyLocalServiceTest.java b/portal-impl/test/integration/com/liferay/portal/service/CompanyLocalServiceTest.java index b301f1b1976bb3..a72cc4213ca8cf 100644 --- a/portal-impl/test/integration/com/liferay/portal/service/CompanyLocalServiceTest.java +++ b/portal-impl/test/integration/com/liferay/portal/service/CompanyLocalServiceTest.java @@ -14,6 +14,10 @@ package com.liferay.portal.service; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; import com.liferay.exportimport.kernel.service.StagingLocalServiceUtil; import com.liferay.portal.exception.AccountNameException; import com.liferay.portal.exception.CompanyMxException; @@ -51,10 +55,6 @@ import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.util.PortalInstances; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; import com.liferay.sites.kernel.util.SitesUtil; import java.io.File; diff --git a/portal-impl/test/integration/com/liferay/portal/webserver/WebServerRangeTest.java b/portal-impl/test/integration/com/liferay/portal/webserver/WebServerRangeTest.java index c52e917d34e834..efa9dcbae6352e 100644 --- a/portal-impl/test/integration/com/liferay/portal/webserver/WebServerRangeTest.java +++ b/portal-impl/test/integration/com/liferay/portal/webserver/WebServerRangeTest.java @@ -14,6 +14,7 @@ package com.liferay.portal.webserver; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.servlet.HttpHeaders; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -28,7 +29,6 @@ import com.liferay.portal.kernel.webdav.methods.Method; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import java.util.HashMap; import java.util.Map; diff --git a/portal-impl/test/integration/com/liferay/portal/webserver/WebServerTrashTest.java b/portal-impl/test/integration/com/liferay/portal/webserver/WebServerTrashTest.java index e2f4fd63c2f137..3124a300d0924e 100644 --- a/portal-impl/test/integration/com/liferay/portal/webserver/WebServerTrashTest.java +++ b/portal-impl/test/integration/com/liferay/portal/webserver/WebServerTrashTest.java @@ -14,6 +14,8 @@ package com.liferay.portal.webserver; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; import com.liferay.portal.kernel.portlet.PortletProvider; import com.liferay.portal.kernel.portlet.PortletProviderUtil; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -42,8 +44,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLTrashServiceUtil; import com.liferay.portlet.documentlibrary.service.permission.DLPermission; import com.liferay.trash.kernel.model.TrashEntry; diff --git a/portal-impl/test/integration/com/liferay/portlet/asset/service/AssetTagStatsServiceTest.java b/portal-impl/test/integration/com/liferay/portlet/asset/service/AssetTagStatsServiceTest.java index 44518b9bf1dbb1..a22b3b63ad3c92 100644 --- a/portal-impl/test/integration/com/liferay/portlet/asset/service/AssetTagStatsServiceTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/asset/service/AssetTagStatsServiceTest.java @@ -18,6 +18,9 @@ import com.liferay.asset.kernel.model.AssetTagStats; import com.liferay.asset.kernel.service.AssetTagLocalServiceUtil; import com.liferay.asset.kernel.service.AssetTagStatsLocalServiceUtil; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppHelperLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.rule.DeleteAfterTestRun; @@ -29,9 +32,6 @@ import com.liferay.portal.model.Group; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import org.junit.Assert; diff --git a/portal-impl/test/integration/com/liferay/portlet/blogs/BlogsEntryImageSelectorHelperTest.java b/portal-impl/test/integration/com/liferay/portlet/blogs/BlogsEntryImageSelectorHelperTest.java index c567dc5dc013a1..f2b51a2a09853c 100644 --- a/portal-impl/test/integration/com/liferay/portlet/blogs/BlogsEntryImageSelectorHelperTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/blogs/BlogsEntryImageSelectorHelperTest.java @@ -14,6 +14,8 @@ package com.liferay.portlet.blogs; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.servlet.taglib.ui.ImageSelector; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -30,8 +32,6 @@ import com.liferay.portal.model.Group; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import java.io.InputStream; diff --git a/portal-impl/test/integration/com/liferay/portlet/blogs/attachments/BaseBlogsEntryImageTestCase.java b/portal-impl/test/integration/com/liferay/portlet/blogs/attachments/BaseBlogsEntryImageTestCase.java index 36ec5e215b5c66..a1e8cd17d555a8 100644 --- a/portal-impl/test/integration/com/liferay/portlet/blogs/attachments/BaseBlogsEntryImageTestCase.java +++ b/portal-impl/test/integration/com/liferay/portlet/blogs/attachments/BaseBlogsEntryImageTestCase.java @@ -16,6 +16,8 @@ import com.liferay.blogs.kernel.model.BlogsEntry; import com.liferay.blogs.kernel.service.BlogsEntryLocalServiceUtil; +import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portletfilerepository.PortletFileRepositoryUtil; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -34,8 +36,6 @@ import com.liferay.portal.service.RepositoryLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portlet.blogs.constants.BlogsConstants; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.io.InputStream; diff --git a/portal-impl/test/integration/com/liferay/portlet/blogs/ratings/DLFileEntryRatingsTest.java b/portal-impl/test/integration/com/liferay/portlet/blogs/ratings/DLFileEntryRatingsTest.java index 60aa9d4290d868..35bd09cc397bb2 100644 --- a/portal-impl/test/integration/com/liferay/portlet/blogs/ratings/DLFileEntryRatingsTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/blogs/ratings/DLFileEntryRatingsTest.java @@ -14,14 +14,14 @@ package com.liferay.portlet.blogs.ratings; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.model.BaseModel; import com.liferay.portal.model.Group; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLTestUtil; import com.liferay.portlet.ratings.test.BaseRatingsTestCase; diff --git a/portal-impl/test/integration/com/liferay/portlet/blogs/ratings/DLFolderRatingsTest.java b/portal-impl/test/integration/com/liferay/portlet/blogs/ratings/DLFolderRatingsTest.java index 22b109871898b4..2128ae19d42335 100644 --- a/portal-impl/test/integration/com/liferay/portlet/blogs/ratings/DLFolderRatingsTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/blogs/ratings/DLFolderRatingsTest.java @@ -14,12 +14,12 @@ package com.liferay.portlet.blogs.ratings; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.model.BaseModel; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLTestUtil; import com.liferay.portlet.ratings.test.BaseRatingsTestCase; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/asset/DLFileEntryDDMFormValuesReaderTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/asset/DLFileEntryDDMFormValuesReaderTest.java index c919a6325cfb64..0e285d5e4d976d 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/asset/DLFileEntryDDMFormValuesReaderTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/asset/DLFileEntryDDMFormValuesReaderTest.java @@ -15,6 +15,12 @@ package com.liferay.portlet.documentlibrary.asset; import com.liferay.asset.kernel.model.DDMFormValuesReader; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; import com.liferay.dynamic.data.mapping.kernel.DDMForm; import com.liferay.dynamic.data.mapping.kernel.DDMFormField; import com.liferay.dynamic.data.mapping.kernel.DDMFormFieldValue; @@ -37,12 +43,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; import java.io.ByteArrayInputStream; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/search/DLFolderSearchTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/search/DLFolderSearchTest.java index 461ba74970f32f..77a3ee74bd1925 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/search/DLFolderSearchTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/search/DLFolderSearchTest.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.search; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.rule.Sync; @@ -24,11 +29,6 @@ import com.liferay.portal.search.test.BaseSearchTestCase; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; import org.junit.ClassRule; import org.junit.Ignore; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/BaseDLAppTestCase.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/BaseDLAppTestCase.java index fab4c4cd09aab0..f1fb0a29ab9857 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/BaseDLAppTestCase.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/BaseDLAppTestCase.java @@ -14,6 +14,9 @@ package com.liferay.portlet.documentlibrary.service; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.security.auth.PrincipalThreadLocal; import com.liferay.portal.kernel.security.permission.ActionKeys; @@ -27,8 +30,6 @@ import com.liferay.portal.model.ResourceConstants; import com.liferay.portal.model.RoleConstants; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.permission.DLPermission; import org.junit.After; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLAppLocalServiceTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLAppLocalServiceTest.java index 46e248c63354fb..faac17955ddc54 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLAppLocalServiceTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLAppLocalServiceTest.java @@ -16,6 +16,12 @@ import com.liferay.asset.kernel.model.AssetEntry; import com.liferay.asset.kernel.service.AssetEntryLocalServiceUtil; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.model.DLSyncConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.messaging.DestinationNames; import com.liferay.portal.kernel.messaging.Message; @@ -45,10 +51,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.model.DLSyncConstants; import java.io.ByteArrayInputStream; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLAppServiceTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLAppServiceTest.java index 4119e3ed29dcca..796bb44aca831e 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLAppServiceTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLAppServiceTest.java @@ -16,6 +16,16 @@ import com.liferay.asset.kernel.model.AssetEntry; import com.liferay.asset.kernel.service.AssetEntryLocalServiceUtil; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.FileExtensionException; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.exception.FileSizeException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.model.DLSyncConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; import com.liferay.portal.kernel.comment.CommentManagerUtil; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.exception.PortalException; @@ -63,14 +73,6 @@ import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.util.PropsValues; import com.liferay.portal.util.test.PrefsPropsTemporarySwapper; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.FileExtensionException; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.model.DLSyncConstants; import java.io.File; import java.io.InputStream; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLCheckInCheckOutTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLCheckInCheckOutTest.java index 9ba239652c078c..06b55a8d520ba3 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLCheckInCheckOutTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLCheckInCheckOutTest.java @@ -16,6 +16,10 @@ import com.liferay.asset.kernel.model.AssetEntry; import com.liferay.asset.kernel.service.AssetEntryLocalServiceUtil; +import com.liferay.document.library.kernel.exception.FileEntryLockException; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayInputStream; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileVersion; @@ -44,9 +48,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.exception.FileEntryLockException; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import com.liferay.portlet.documentlibrary.service.permission.DLPermission; import java.io.InputStream; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLContentLocalServiceTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLContentLocalServiceTest.java index 180b4f553f2db4..2d34260aa4aa37 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLContentLocalServiceTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLContentLocalServiceTest.java @@ -14,6 +14,9 @@ package com.liferay.portlet.documentlibrary.service; +import com.liferay.document.library.kernel.model.DLContent; +import com.liferay.document.library.kernel.service.DLContentLocalService; +import com.liferay.document.library.kernel.store.Store; import com.liferay.portal.kernel.bean.PortalBeanLocatorUtil; import com.liferay.portal.kernel.test.AssertUtils; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -22,8 +25,6 @@ import com.liferay.portal.kernel.transaction.Propagation; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLContent; -import com.liferay.portlet.documentlibrary.store.Store; import java.io.ByteArrayInputStream; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryExtensionTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryExtensionTest.java index 552cc57b5a52bf..50a164d5102dc2 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryExtensionTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryExtensionTest.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.service; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.util.RandomTestUtil; @@ -24,9 +29,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.util.DLUtil; import org.junit.Assert; import org.junit.ClassRule; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryLocalServiceTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryLocalServiceTest.java index d325df7b23ba5a..f03bf7da2fdb08 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryLocalServiceTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryLocalServiceTest.java @@ -16,6 +16,22 @@ import com.liferay.asset.kernel.model.AssetEntry; import com.liferay.asset.kernel.service.AssetEntryLocalServiceUtil; +import com.liferay.document.library.kernel.exception.DuplicateFileEntryException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileVersionLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashLocalServiceUtil; +import com.liferay.document.library.kernel.store.DLStoreUtil; import com.liferay.dynamic.data.mapping.kernel.DDMForm; import com.liferay.dynamic.data.mapping.kernel.DDMFormField; import com.liferay.dynamic.data.mapping.kernel.DDMFormFieldValue; @@ -55,15 +71,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileEntryException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import com.liferay.portlet.documentlibrary.util.test.DLTestUtil; import com.liferay.portlet.dynamicdatamapping.util.test.DDMStructureTestUtil; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryLocalServiceTreeTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryLocalServiceTreeTest.java index be62c5751dcbac..b70019f9c2ecc0 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryLocalServiceTreeTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryLocalServiceTreeTest.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.service; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -27,8 +32,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.util.ArrayList; import java.util.List; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryServiceTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryServiceTest.java index 914847a7fc7f55..abe6f6ba5718f2 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryServiceTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileEntryServiceTest.java @@ -14,6 +14,16 @@ package com.liferay.portlet.documentlibrary.service; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryServiceUtil; +import com.liferay.document.library.kernel.service.DLFileVersionLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.rule.DeleteAfterTestRun; import com.liferay.portal.kernel.test.rule.Sync; @@ -27,12 +37,6 @@ import com.liferay.portal.model.Group; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.util.DLUtil; import java.io.ByteArrayInputStream; import java.io.Serializable; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileShortcutLocalServiceTreeTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileShortcutLocalServiceTreeTest.java index b703ce21ea05f5..a145a933249a7e 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileShortcutLocalServiceTreeTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileShortcutLocalServiceTreeTest.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.service; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.repository.model.Folder; @@ -28,8 +33,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.util.ArrayList; import java.util.List; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileVersionHistoryTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileVersionHistoryTest.java index a1aabb538f78e5..6a09c02335b884 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileVersionHistoryTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileVersionHistoryTest.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.service; +import com.liferay.document.library.kernel.exception.InvalidFileVersionException; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileVersionLocalServiceUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileVersion; @@ -27,8 +32,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.exception.InvalidFileVersionException; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; import java.util.List; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileVersionLocalServiceTreeTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileVersionLocalServiceTreeTest.java index 74f3d75adc4186..2ba6491eabcfb4 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileVersionLocalServiceTreeTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileVersionLocalServiceTreeTest.java @@ -14,6 +14,12 @@ package com.liferay.portlet.documentlibrary.service; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileVersionLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -27,9 +33,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.util.ArrayList; import java.util.List; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileVersionUpdateTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileVersionUpdateTest.java index 21377e5b840bc8..e90193e8644bb0 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileVersionUpdateTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFileVersionUpdateTest.java @@ -14,6 +14,8 @@ package com.liferay.portlet.documentlibrary.service; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileVersion; @@ -25,7 +27,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; import org.junit.Assert; import org.junit.ClassRule; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFolderLocalServiceTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFolderLocalServiceTest.java index 1a12595d2efab8..a91797968749e8 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFolderLocalServiceTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFolderLocalServiceTest.java @@ -16,6 +16,10 @@ import com.liferay.asset.kernel.model.AssetEntry; import com.liferay.asset.kernel.service.AssetEntryLocalServiceUtil; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.rule.DeleteAfterTestRun; @@ -28,8 +32,6 @@ import com.liferay.portal.model.Group; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.util.ArrayList; import java.util.List; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFolderLocalServiceTreeTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFolderLocalServiceTreeTest.java index c6c1b1d3535e35..13b6057a2bda21 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFolderLocalServiceTreeTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/DLFolderLocalServiceTreeTest.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.service; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.util.RandomTestUtil; @@ -23,8 +28,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.test.BaseLocalServiceTreeTestCase; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import java.util.ArrayList; import java.util.List; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/PDFProcessorTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/PDFProcessorTest.java index 915e002dfd5ef6..b255b7917efb4a 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/PDFProcessorTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/PDFProcessorTest.java @@ -14,6 +14,10 @@ package com.liferay.portlet.documentlibrary.service; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.model.DLProcessorConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.util.DLProcessor; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.portal.kernel.messaging.DestinationNames; import com.liferay.portal.kernel.messaging.Message; @@ -31,9 +35,6 @@ import com.liferay.portal.model.Group; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.model.DLProcessorConstants; -import com.liferay.portlet.documentlibrary.util.DLProcessor; import com.liferay.registry.Registry; import com.liferay.registry.RegistryUtil; import com.liferay.registry.ServiceRegistration; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/http/DLAppServiceHttpTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/http/DLAppServiceHttpTest.java index 5b800fa4d1a31f..8e0d464ff16f14 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/http/DLAppServiceHttpTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/http/DLAppServiceHttpTest.java @@ -14,6 +14,7 @@ package com.liferay.portlet.documentlibrary.service.http; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -25,7 +26,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.http.HttpPrincipalTestUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import org.junit.After; import org.junit.Before; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/http/DLAppServiceJsonTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/http/DLAppServiceJsonTest.java index 90030436f5a1d7..45b388ea916520 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/http/DLAppServiceJsonTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/http/DLAppServiceJsonTest.java @@ -14,6 +14,7 @@ package com.liferay.portlet.documentlibrary.service.http; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.util.GroupTestUtil; import com.liferay.portal.kernel.util.ContentTypes; @@ -23,7 +24,6 @@ import com.liferay.portal.model.Group; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.util.BaseJsonClientTestCase; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/http/DLAppServiceSoapTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/http/DLAppServiceSoapTest.java index 3f200ff9e26148..b3645dc3278c2c 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/http/DLAppServiceSoapTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/http/DLAppServiceSoapTest.java @@ -19,6 +19,7 @@ import com.liferay.client.soap.portal.service.ServiceContext; import com.liferay.client.soap.portlet.documentlibrary.service.http.DLAppServiceSoap; import com.liferay.client.soap.portlet.documentlibrary.service.http.DLAppServiceSoapServiceLocator; +import com.liferay.document.library.kernel.model.DLFolderConstants; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.util.GroupTestUtil; import com.liferay.portal.kernel.util.ContentTypes; @@ -26,7 +27,6 @@ import com.liferay.portal.model.Group; import com.liferay.portal.service.http.HttpPrincipalTestUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; import org.junit.After; import org.junit.Before; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/permission/DLFileEntryPermissionCheckerTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/permission/DLFileEntryPermissionCheckerTest.java index 73d20e4168bb42..13c1eedcef9ccc 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/permission/DLFileEntryPermissionCheckerTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/permission/DLFileEntryPermissionCheckerTest.java @@ -14,6 +14,10 @@ package com.liferay.portlet.documentlibrary.service.permission; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.security.permission.ActionKeys; @@ -29,10 +33,6 @@ import com.liferay.portal.service.permission.test.BasePermissionTestCase; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; import org.junit.Assert; import org.junit.ClassRule; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/permission/DLFolderPermissionCheckerTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/permission/DLFolderPermissionCheckerTest.java index e6d8d2b0820b29..2ffaa36e55ea51 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/permission/DLFolderPermissionCheckerTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/permission/DLFolderPermissionCheckerTest.java @@ -14,6 +14,9 @@ package com.liferay.portlet.documentlibrary.service.permission; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.security.permission.ActionKeys; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -26,9 +29,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.permission.test.BasePermissionTestCase; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; import org.junit.Assert; import org.junit.ClassRule; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/persistence/DLFileEntryFinderTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/persistence/DLFileEntryFinderTest.java index 351f1764dd2eca..34f00d29c1eb78 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/persistence/DLFileEntryFinderTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/persistence/DLFileEntryFinderTest.java @@ -15,6 +15,15 @@ package com.liferay.portlet.documentlibrary.service.persistence; import com.liferay.asset.kernel.service.AssetEntryLocalServiceUtil; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileVersionLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; import com.liferay.portal.kernel.dao.orm.QueryDefinition; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -45,15 +54,6 @@ import com.liferay.portal.spring.hibernate.LastSessionRecorderUtil; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLTrashServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import java.util.ArrayList; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/persistence/DLFileEntryTypeFinderTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/persistence/DLFileEntryTypeFinderTest.java index a25cfcb10be891..74c0dde42e20d5 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/persistence/DLFileEntryTypeFinderTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/persistence/DLFileEntryTypeFinderTest.java @@ -14,6 +14,10 @@ package com.liferay.portlet.documentlibrary.service.persistence; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; +import com.liferay.document.library.kernel.service.persistence.DLFileEntryTypeFinderUtil; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.security.permission.PermissionChecker; @@ -32,9 +36,6 @@ import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; import com.liferay.portlet.dynamicdatamapping.util.test.DDMStructureTestUtil; import java.util.List; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/persistence/DLFolderFinderTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/persistence/DLFolderFinderTest.java index 5f339742c6e4da..74456fe2b191d0 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/persistence/DLFolderFinderTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/service/persistence/DLFolderFinderTest.java @@ -14,6 +14,13 @@ package com.liferay.portlet.documentlibrary.service.persistence; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; +import com.liferay.document.library.kernel.service.persistence.DLFolderFinderUtil; import com.liferay.portal.kernel.dao.orm.QueryDefinition; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; @@ -37,12 +44,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLTrashServiceUtil; import java.util.List; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/StoreFactoryTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/StoreFactoryTest.java index 066151fff00704..d039ee27b3ad53 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/StoreFactoryTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/StoreFactoryTest.java @@ -14,6 +14,7 @@ package com.liferay.portlet.documentlibrary.store; +import com.liferay.document.library.kernel.store.Store; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.util.ClassUtil; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/DelegatorStore.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/DelegatorStore.java index 28449e05dff9ab..741de596c6944c 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/DelegatorStore.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/DelegatorStore.java @@ -14,9 +14,9 @@ package com.liferay.portlet.documentlibrary.store.bundle.storefactory; +import com.liferay.document.library.kernel.store.BaseStore; +import com.liferay.document.library.kernel.store.Store; import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portlet.documentlibrary.store.BaseStore; -import com.liferay.portlet.documentlibrary.store.Store; import java.io.File; import java.io.InputStream; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/FirstStoreWrapper.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/FirstStoreWrapper.java index 0a6feabb5ce4ae..8ec9e0d5ebe499 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/FirstStoreWrapper.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/FirstStoreWrapper.java @@ -14,8 +14,8 @@ package com.liferay.portlet.documentlibrary.store.bundle.storefactory; -import com.liferay.portlet.documentlibrary.store.Store; -import com.liferay.portlet.documentlibrary.store.StoreWrapper; +import com.liferay.document.library.kernel.store.Store; +import com.liferay.document.library.kernel.store.StoreWrapper; import org.osgi.service.component.annotations.Component; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/LastStoreWrapper.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/LastStoreWrapper.java index b94a18aba23c78..acf5bd549f51f0 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/LastStoreWrapper.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/LastStoreWrapper.java @@ -14,8 +14,8 @@ package com.liferay.portlet.documentlibrary.store.bundle.storefactory; -import com.liferay.portlet.documentlibrary.store.Store; -import com.liferay.portlet.documentlibrary.store.StoreWrapper; +import com.liferay.document.library.kernel.store.Store; +import com.liferay.document.library.kernel.store.StoreWrapper; import org.osgi.service.component.annotations.Component; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/TestStore.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/TestStore.java index 747fa441d4f0c8..f8d3d4dbdff486 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/TestStore.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/store/bundle/storefactory/TestStore.java @@ -14,8 +14,8 @@ package com.liferay.portlet.documentlibrary.store.bundle.storefactory; -import com.liferay.portlet.documentlibrary.store.BaseStore; -import com.liferay.portlet.documentlibrary.store.Store; +import com.liferay.document.library.kernel.store.BaseStore; +import com.liferay.document.library.kernel.store.Store; import java.io.InputStream; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionAuthorTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionAuthorTest.java index f188ec63b06b98..b5f0628a2c57e0 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionAuthorTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionAuthorTest.java @@ -14,6 +14,7 @@ package com.liferay.portlet.documentlibrary.subscriptions; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -27,7 +28,6 @@ import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.test.rule.SynchronousMailTestRule; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import com.liferay.portlet.subscriptions.test.BaseSubscriptionAuthorTestCase; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionClassTypeTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionClassTypeTest.java index ea063469bc6ca6..b157568868d9c7 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionClassTypeTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionClassTypeTest.java @@ -14,6 +14,11 @@ package com.liferay.portlet.documentlibrary.subscriptions; +import com.liferay.document.library.kernel.model.DLFileEntryMetadata; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -28,11 +33,6 @@ import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.test.rule.SynchronousMailTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntryMetadata; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryTypeLocalServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import com.liferay.portlet.dynamicdatamapping.util.test.DDMStructureTestUtil; import com.liferay.portlet.subscriptions.test.BaseSubscriptionClassTypeTestCase; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionContainerModelTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionContainerModelTest.java index b517c3c2a6fa33..ea18661f6b43fd 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionContainerModelTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionContainerModelTest.java @@ -14,6 +14,7 @@ package com.liferay.portlet.documentlibrary.subscriptions; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -27,7 +28,6 @@ import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.test.rule.SynchronousMailTestRule; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import com.liferay.portlet.subscriptions.test.BaseSubscriptionContainerModelTestCase; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionLocalizedContentTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionLocalizedContentTest.java index fdd4298c6347a7..353c81e4ba2365 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionLocalizedContentTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionLocalizedContentTest.java @@ -14,6 +14,7 @@ package com.liferay.portlet.documentlibrary.subscriptions; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.portal.kernel.portlet.PortletProvider; import com.liferay.portal.kernel.portlet.PortletProviderUtil; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -29,7 +30,6 @@ import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.test.rule.SynchronousMailTestRule; import com.liferay.portlet.documentlibrary.constants.DLConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import com.liferay.portlet.subscriptions.test.BaseSubscriptionLocalizedContentTestCase; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionRootContainerModelTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionRootContainerModelTest.java index 3e3d44e470ef2e..06603508c4833a 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionRootContainerModelTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/subscriptions/DLSubscriptionRootContainerModelTest.java @@ -14,6 +14,8 @@ package com.liferay.portlet.documentlibrary.subscriptions; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -27,8 +29,6 @@ import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.test.rule.SynchronousMailTestRule; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import com.liferay.portlet.subscriptions.test.BaseSubscriptionRootContainerModelTestCase; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/trash/DLFileEntryTrashHandlerTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/trash/DLFileEntryTrashHandlerTest.java index b86f9a9808a24d..27397e756c6ee8 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/trash/DLFileEntryTrashHandlerTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/trash/DLFileEntryTrashHandlerTest.java @@ -15,6 +15,19 @@ package com.liferay.portlet.documentlibrary.trash; import com.liferay.asset.kernel.model.AssetEntry; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileRank; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryServiceUtil; +import com.liferay.document.library.kernel.service.DLFileRankLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; +import com.liferay.document.library.kernel.util.DLUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -36,19 +49,6 @@ import com.liferay.portal.repository.liferayrepository.model.LiferayFileEntry; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileRank; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileRankLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLTrashServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import com.liferay.portlet.trash.test.BaseTrashHandlerTestCase; import com.liferay.portlet.trash.test.DefaultWhenIsAssetable; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/trash/DLFileShortcutTrashHandlerTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/trash/DLFileShortcutTrashHandlerTest.java index cd136eba358366..60be6283fe4340 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/trash/DLFileShortcutTrashHandlerTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/trash/DLFileShortcutTrashHandlerTest.java @@ -16,6 +16,14 @@ import com.liferay.asset.kernel.model.AssetEntry; import com.liferay.asset.kernel.service.AssetEntryLocalServiceUtil; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileShortcutLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.repository.model.Folder; @@ -33,14 +41,6 @@ import com.liferay.portal.model.Group; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileShortcutLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLTrashServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil; import com.liferay.portlet.trash.test.BaseTrashHandlerTestCase; import com.liferay.portlet.trash.test.DefaultWhenIsAssetable; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/trash/DLFolderTrashHandlerTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/trash/DLFolderTrashHandlerTest.java index 3096e2dcc5aadc..d2eefed581d1f0 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/trash/DLFolderTrashHandlerTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/trash/DLFolderTrashHandlerTest.java @@ -15,6 +15,11 @@ package com.liferay.portlet.documentlibrary.trash; import com.liferay.asset.kernel.model.AssetEntry; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashServiceUtil; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.rule.Sync; @@ -28,11 +33,6 @@ import com.liferay.portal.model.Group; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLTrashServiceUtil; import com.liferay.portlet.trash.test.BaseTrashHandlerTestCase; import com.liferay.portlet.trash.test.DefaultWhenIsAssetable; import com.liferay.portlet.trash.test.DefaultWhenIsIndexableBaseModel; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/util/DLDirectoryNameAndFileNameTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/util/DLDirectoryNameAndFileNameTest.java index 89c9b0a2e77e1e..56bd1db32b6148 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/util/DLDirectoryNameAndFileNameTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/util/DLDirectoryNameAndFileNameTest.java @@ -14,6 +14,12 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.exception.FolderNameException; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.util.DLValidatorUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.test.rule.AggregateTestRule; @@ -30,11 +36,6 @@ import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.util.PropsValues; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.exception.FolderNameException; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; import org.junit.Assert; import org.junit.Before; diff --git a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/util/RepositoryModelUtilTest.java b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/util/RepositoryModelUtilTest.java index 0eb7544b9cf655..2e02f351bfa82f 100644 --- a/portal-impl/test/integration/com/liferay/portlet/documentlibrary/util/RepositoryModelUtilTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/documentlibrary/util/RepositoryModelUtilTest.java @@ -14,6 +14,15 @@ package com.liferay.portlet.documentlibrary.util; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLAppServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.portal.kernel.dao.orm.QueryDefinition; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -31,15 +40,6 @@ import com.liferay.portal.model.Group; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; import com.liferay.portlet.documentlibrary.util.test.DLTestUtil; import java.util.List; diff --git a/portal-impl/test/integration/com/liferay/portlet/messageboards/attachments/MBAttachmentsTest.java b/portal-impl/test/integration/com/liferay/portlet/messageboards/attachments/MBAttachmentsTest.java index 361849d1d4c72f..95e6c7c391c74a 100644 --- a/portal-impl/test/integration/com/liferay/portlet/messageboards/attachments/MBAttachmentsTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/messageboards/attachments/MBAttachmentsTest.java @@ -14,6 +14,9 @@ package com.liferay.portlet.messageboards.attachments; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.message.boards.kernel.model.MBCategory; import com.liferay.message.boards.kernel.model.MBCategoryConstants; import com.liferay.message.boards.kernel.model.MBMessage; @@ -34,9 +37,6 @@ import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; import com.liferay.portlet.messageboards.util.test.MBTestUtil; import com.liferay.trash.kernel.service.TrashEntryServiceUtil; diff --git a/portal-impl/test/integration/com/liferay/portlet/ratings/transformer/RatingsDataTransformerUtilTest.java b/portal-impl/test/integration/com/liferay/portlet/ratings/transformer/RatingsDataTransformerUtilTest.java index a0a6f89c8f9ffc..0eafa3a20e9cde 100644 --- a/portal-impl/test/integration/com/liferay/portlet/ratings/transformer/RatingsDataTransformerUtilTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/ratings/transformer/RatingsDataTransformerUtilTest.java @@ -66,7 +66,7 @@ public void testTransformCompanyRatingsData() throws Exception { oldPortletPreferences.setValue( "com.liferay.journal.model.JournalArticle_RatingsType", "like"); oldPortletPreferences.setValue( - "com.liferay.portlet.documentlibrary.model.DLFileEntry" + + "com.liferay.document.library.kernel.model.DLFileEntry" + "_RatingsType", "like"); oldPortletPreferences.setValue( @@ -88,7 +88,7 @@ public void testTransformCompanyRatingsData() throws Exception { unicodeProperties.setProperty( "com.liferay.journal.model.JournalArticle_RatingsType", "stars"); unicodeProperties.setProperty( - "com.liferay.portlet.documentlibrary.model.DLFileEntry" + + "com.liferay.document.library.kernel.model.DLFileEntry" + "_RatingsType", "stars"); unicodeProperties.setProperty( @@ -120,7 +120,7 @@ public void testTransformGroupRatingsData() throws Exception { oldUnicodeProperties.setProperty( "com.liferay.journal.model.JournalArticle_RatingsType", "like"); oldUnicodeProperties.setProperty( - "com.liferay.portlet.documentlibrary.model.DLFileEntry" + + "com.liferay.document.library.kernel.model.DLFileEntry" + "_RatingsType", "like"); oldUnicodeProperties.setProperty( @@ -142,7 +142,7 @@ public void testTransformGroupRatingsData() throws Exception { unicodeProperties.setProperty( "com.liferay.journal.model.JournalArticle_RatingsType", "stars"); unicodeProperties.setProperty( - "com.liferay.portlet.documentlibrary.model.DLFileEntry" + + "com.liferay.document.library.kernel.model.DLFileEntry" + "_RatingsType", "stars"); unicodeProperties.setProperty( diff --git a/portal-impl/test/integration/com/liferay/portlet/social/service/SocialActivityServiceTest.java b/portal-impl/test/integration/com/liferay/portlet/social/service/SocialActivityServiceTest.java index 51bb2a639ede4d..92b746c2df77e4 100644 --- a/portal-impl/test/integration/com/liferay/portlet/social/service/SocialActivityServiceTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/social/service/SocialActivityServiceTest.java @@ -14,6 +14,9 @@ package com.liferay.portlet.social.service; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.security.auth.PrincipalThreadLocal; @@ -41,9 +44,6 @@ import com.liferay.portal.service.test.ServiceTestUtil; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import com.liferay.portlet.documentlibrary.service.permission.DLPermission; import com.liferay.portlet.social.util.SocialActivityHierarchyEntryThreadLocal; import com.liferay.social.kernel.model.SocialActivity; diff --git a/portal-impl/test/integration/com/liferay/portlet/trash/service/TrashEntryLocalServiceCheckEntriesTest.java b/portal-impl/test/integration/com/liferay/portlet/trash/service/TrashEntryLocalServiceCheckEntriesTest.java index b077ae6530845d..9d24ecc9dc330a 100644 --- a/portal-impl/test/integration/com/liferay/portlet/trash/service/TrashEntryLocalServiceCheckEntriesTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/trash/service/TrashEntryLocalServiceCheckEntriesTest.java @@ -14,6 +14,10 @@ package com.liferay.portlet.trash.service; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLTrashLocalServiceUtil; import com.liferay.exportimport.kernel.service.StagingLocalServiceUtil; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -45,10 +49,6 @@ import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.util.test.LayoutTestUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLTrashLocalServiceUtil; import com.liferay.trash.kernel.model.TrashEntry; import com.liferay.trash.kernel.service.TrashEntryLocalServiceUtil; import com.liferay.trash.kernel.util.TrashUtil; diff --git a/portal-impl/test/unit/com/liferay/portal/kernel/search/BaseIndexerGetFullQueryTest.java b/portal-impl/test/unit/com/liferay/portal/kernel/search/BaseIndexerGetFullQueryTest.java index 15aecfb99f9bc8..f3868c4d1abddd 100644 --- a/portal-impl/test/unit/com/liferay/portal/kernel/search/BaseIndexerGetFullQueryTest.java +++ b/portal-impl/test/unit/com/liferay/portal/kernel/search/BaseIndexerGetFullQueryTest.java @@ -14,6 +14,7 @@ package com.liferay.portal.kernel.search; +import com.liferay.document.library.kernel.model.DLFileEntry; import com.liferay.message.boards.kernel.model.MBMessage; import com.liferay.portal.kernel.json.JSONFactory; import com.liferay.portal.kernel.json.JSONFactoryUtil; @@ -22,7 +23,6 @@ import com.liferay.portal.kernel.util.Props; import com.liferay.portal.kernel.util.PropsUtil; import com.liferay.portal.search.test.TestIndexerRegistry; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; import com.liferay.portlet.documentlibrary.util.DLFileEntryIndexer; import com.liferay.portlet.messageboards.util.MBMessageIndexer; import com.liferay.registry.BasicRegistryImpl; diff --git a/portal-service/src/com/liferay/document/library/kernel/display/context/BaseDLDisplayContextFactory.java b/portal-service/src/com/liferay/document/library/kernel/display/context/BaseDLDisplayContextFactory.java index 475d53f7a50a7e..722b6a25b7c5d0 100644 --- a/portal-service/src/com/liferay/document/library/kernel/display/context/BaseDLDisplayContextFactory.java +++ b/portal-service/src/com/liferay/document/library/kernel/display/context/BaseDLDisplayContextFactory.java @@ -14,11 +14,11 @@ package com.liferay.document.library.kernel.display.context; +import com.liferay.document.library.kernel.model.DLFileEntryType; import com.liferay.portal.kernel.display.context.BaseDisplayContextFactory; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/portal-service/src/com/liferay/document/library/kernel/display/context/BaseDLEditFileEntryDisplayContext.java b/portal-service/src/com/liferay/document/library/kernel/display/context/BaseDLEditFileEntryDisplayContext.java index caf70a4e030f00..6935e82daf02d2 100644 --- a/portal-service/src/com/liferay/document/library/kernel/display/context/BaseDLEditFileEntryDisplayContext.java +++ b/portal-service/src/com/liferay/document/library/kernel/display/context/BaseDLEditFileEntryDisplayContext.java @@ -14,12 +14,12 @@ package com.liferay.document.library.kernel.display.context; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryType; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; import java.util.UUID; diff --git a/portal-service/src/com/liferay/document/library/kernel/display/context/DLDisplayContextFactory.java b/portal-service/src/com/liferay/document/library/kernel/display/context/DLDisplayContextFactory.java index 9c4ce46041983b..3bdb526b6e3997 100644 --- a/portal-service/src/com/liferay/document/library/kernel/display/context/DLDisplayContextFactory.java +++ b/portal-service/src/com/liferay/document/library/kernel/display/context/DLDisplayContextFactory.java @@ -14,11 +14,11 @@ package com.liferay.document.library.kernel.display.context; +import com.liferay.document.library.kernel.model.DLFileEntryType; import com.liferay.portal.kernel.display.context.DisplayContextFactory; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/portal-service/src/com/liferay/document/library/kernel/store/BaseStore.java b/portal-service/src/com/liferay/document/library/kernel/store/BaseStore.java index eb45108d7fd396..895266c1de0c4c 100644 --- a/portal-service/src/com/liferay/document/library/kernel/store/BaseStore.java +++ b/portal-service/src/com/liferay/document/library/kernel/store/BaseStore.java @@ -14,6 +14,7 @@ package com.liferay.document.library.kernel.store; +import com.liferay.document.library.kernel.exception.NoSuchFileException; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayInputStream; @@ -23,7 +24,6 @@ import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; import java.io.File; import java.io.FileInputStream; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/AudioProcessorUtil.java b/portal-service/src/com/liferay/document/library/kernel/util/AudioProcessorUtil.java index f26a9eff1ef611..10f2951f8b2475 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/AudioProcessorUtil.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/AudioProcessorUtil.java @@ -14,8 +14,8 @@ package com.liferay.document.library.kernel.util; +import com.liferay.document.library.kernel.model.DLProcessorConstants; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.model.DLProcessorConstants; import java.io.InputStream; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/DL.java b/portal-service/src/com/liferay/document/library/kernel/util/DL.java index f5d09b49ed360b..5de051f2ee322f 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/DL.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/DL.java @@ -16,6 +16,9 @@ import aQute.bnd.annotation.ProviderType; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileVersion; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileVersion; @@ -25,9 +28,6 @@ import com.liferay.portal.kernel.util.OrderByComparator; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; import java.util.List; import java.util.Map; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/DLPreviewableProcessor.java b/portal-service/src/com/liferay/document/library/kernel/util/DLPreviewableProcessor.java index 284c867fc17366..4af99077e732ca 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/DLPreviewableProcessor.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/DLPreviewableProcessor.java @@ -14,6 +14,7 @@ package com.liferay.document.library.kernel.util; +import com.liferay.document.library.kernel.store.DLStoreUtil; import com.liferay.exportimport.kernel.lar.ExportImportPathUtil; import com.liferay.exportimport.kernel.lar.PortletDataContext; import com.liferay.portal.kernel.exception.PortalException; @@ -39,7 +40,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.xml.Element; import com.liferay.portal.model.CompanyConstants; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import java.awt.image.RenderedImage; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/DLUtil.java b/portal-service/src/com/liferay/document/library/kernel/util/DLUtil.java index 09458696cde7a5..7a62e8551b2902 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/DLUtil.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/DLUtil.java @@ -14,6 +14,9 @@ package com.liferay.document.library.kernel.util; +import com.liferay.document.library.kernel.model.DLFileEntryType; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFileVersion; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileVersion; @@ -23,9 +26,6 @@ import com.liferay.portal.kernel.theme.ThemeDisplay; import com.liferay.portal.kernel.util.OrderByComparator; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFileEntryType; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; import java.util.List; import java.util.Map; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/DLValidator.java b/portal-service/src/com/liferay/document/library/kernel/util/DLValidator.java index 99c500ba61bbb8..8c8f3646f0b34e 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/DLValidator.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/DLValidator.java @@ -14,12 +14,12 @@ package com.liferay.document.library.kernel.util; -import com.liferay.portlet.documentlibrary.exception.FileExtensionException; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; -import com.liferay.portlet.documentlibrary.exception.FolderNameException; -import com.liferay.portlet.documentlibrary.exception.InvalidFileVersionException; -import com.liferay.portlet.documentlibrary.exception.SourceFileNameException; +import com.liferay.document.library.kernel.exception.FileExtensionException; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.exception.FileSizeException; +import com.liferay.document.library.kernel.exception.FolderNameException; +import com.liferay.document.library.kernel.exception.InvalidFileVersionException; +import com.liferay.document.library.kernel.exception.SourceFileNameException; import java.io.File; import java.io.InputStream; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/DLValidatorUtil.java b/portal-service/src/com/liferay/document/library/kernel/util/DLValidatorUtil.java index 569f0a7237a7f4..5aaf8b7c6505a9 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/DLValidatorUtil.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/DLValidatorUtil.java @@ -14,13 +14,13 @@ package com.liferay.document.library.kernel.util; +import com.liferay.document.library.kernel.exception.FileExtensionException; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.exception.FileSizeException; +import com.liferay.document.library.kernel.exception.FolderNameException; +import com.liferay.document.library.kernel.exception.InvalidFileVersionException; +import com.liferay.document.library.kernel.exception.SourceFileNameException; import com.liferay.portal.kernel.security.pacl.permission.PortalRuntimePermission; -import com.liferay.portlet.documentlibrary.exception.FileExtensionException; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; -import com.liferay.portlet.documentlibrary.exception.FolderNameException; -import com.liferay.portlet.documentlibrary.exception.InvalidFileVersionException; -import com.liferay.portlet.documentlibrary.exception.SourceFileNameException; import java.io.File; import java.io.InputStream; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/ImageProcessorUtil.java b/portal-service/src/com/liferay/document/library/kernel/util/ImageProcessorUtil.java index 6540149f8149bd..f28c22c4673911 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/ImageProcessorUtil.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/ImageProcessorUtil.java @@ -14,9 +14,9 @@ package com.liferay.document.library.kernel.util; +import com.liferay.document.library.kernel.model.DLProcessorConstants; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.model.DLProcessorConstants; import java.io.InputStream; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/PDFProcessorUtil.java b/portal-service/src/com/liferay/document/library/kernel/util/PDFProcessorUtil.java index 28de1a43c2183e..8218a2d5082e57 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/PDFProcessorUtil.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/PDFProcessorUtil.java @@ -14,8 +14,8 @@ package com.liferay.document.library.kernel.util; +import com.liferay.document.library.kernel.model.DLProcessorConstants; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.model.DLProcessorConstants; import java.io.InputStream; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/RawMetadataProcessorUtil.java b/portal-service/src/com/liferay/document/library/kernel/util/RawMetadataProcessorUtil.java index 30528ae90e03ef..e302ff88fe142f 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/RawMetadataProcessorUtil.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/RawMetadataProcessorUtil.java @@ -14,10 +14,10 @@ package com.liferay.document.library.kernel.util; +import com.liferay.document.library.kernel.model.DLProcessorConstants; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.model.DLProcessorConstants; /** * Document library processor responsible for the generation of raw metadata diff --git a/portal-service/src/com/liferay/document/library/kernel/util/VideoProcessorUtil.java b/portal-service/src/com/liferay/document/library/kernel/util/VideoProcessorUtil.java index b5b63145e92147..664e5571b534a2 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/VideoProcessorUtil.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/VideoProcessorUtil.java @@ -14,8 +14,8 @@ package com.liferay.document.library.kernel.util; +import com.liferay.document.library.kernel.model.DLProcessorConstants; import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portlet.documentlibrary.model.DLProcessorConstants; import java.io.InputStream; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/comparator/DLContentVersionComparator.java b/portal-service/src/com/liferay/document/library/kernel/util/comparator/DLContentVersionComparator.java index 58802418d44326..585449b61f45ac 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/comparator/DLContentVersionComparator.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/comparator/DLContentVersionComparator.java @@ -14,8 +14,8 @@ package com.liferay.document.library.kernel.util.comparator; +import com.liferay.document.library.kernel.model.DLContent; import com.liferay.portal.kernel.util.OrderByComparator; -import com.liferay.portlet.documentlibrary.model.DLContent; /** * @author Shuyang Zhou diff --git a/portal-service/src/com/liferay/document/library/kernel/util/comparator/DLFileVersionVersionComparator.java b/portal-service/src/com/liferay/document/library/kernel/util/comparator/DLFileVersionVersionComparator.java index 7263d5e9c9dfc5..36874b1382f587 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/comparator/DLFileVersionVersionComparator.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/comparator/DLFileVersionVersionComparator.java @@ -14,7 +14,7 @@ package com.liferay.document.library.kernel.util.comparator; -import com.liferay.portlet.documentlibrary.model.DLFileVersion; +import com.liferay.document.library.kernel.model.DLFileVersion; import java.util.Comparator; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/comparator/FileRankCreateDateComparator.java b/portal-service/src/com/liferay/document/library/kernel/util/comparator/FileRankCreateDateComparator.java index 9a492a4b7fc833..c950876d46a541 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/comparator/FileRankCreateDateComparator.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/comparator/FileRankCreateDateComparator.java @@ -14,9 +14,9 @@ package com.liferay.document.library.kernel.util.comparator; +import com.liferay.document.library.kernel.model.DLFileRank; import com.liferay.portal.kernel.util.DateUtil; import com.liferay.portal.kernel.util.OrderByComparator; -import com.liferay.portlet.documentlibrary.model.DLFileRank; /** * @author Brian Wing Shun Chan diff --git a/portal-service/src/com/liferay/document/library/kernel/util/comparator/FolderIdComparator.java b/portal-service/src/com/liferay/document/library/kernel/util/comparator/FolderIdComparator.java index 163c9d4bf756eb..fb212b32d0f93e 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/comparator/FolderIdComparator.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/comparator/FolderIdComparator.java @@ -14,8 +14,8 @@ package com.liferay.document.library.kernel.util.comparator; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.kernel.util.OrderByComparator; -import com.liferay.portlet.documentlibrary.model.DLFolder; /** * @author Shinn Lok diff --git a/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelCreateDateComparator.java b/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelCreateDateComparator.java index d80c5d66e4ad04..63738f5098b78b 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelCreateDateComparator.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelCreateDateComparator.java @@ -14,13 +14,13 @@ package com.liferay.document.library.kernel.util.comparator; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.repository.model.RepositoryEntry; import com.liferay.portal.kernel.util.DateUtil; import com.liferay.portal.kernel.util.OrderByComparator; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFolder; import java.util.Date; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelModifiedDateComparator.java b/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelModifiedDateComparator.java index ff93277ba09dec..ba8551003ce2e3 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelModifiedDateComparator.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelModifiedDateComparator.java @@ -14,13 +14,13 @@ package com.liferay.document.library.kernel.util.comparator; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.repository.model.RepositoryEntry; import com.liferay.portal.kernel.util.DateUtil; import com.liferay.portal.kernel.util.OrderByComparator; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFolder; import java.util.Date; diff --git a/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelReadCountComparator.java b/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelReadCountComparator.java index b5c41ca44c2337..4ac686f9253902 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelReadCountComparator.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelReadCountComparator.java @@ -14,14 +14,14 @@ package com.liferay.document.library.kernel.util.comparator; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.util.OrderByComparator; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; /** * @author Brian Wing Shun Chan diff --git a/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelSizeComparator.java b/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelSizeComparator.java index 6aea0fce42e336..83d664e74e2737 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelSizeComparator.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelSizeComparator.java @@ -14,14 +14,14 @@ package com.liferay.document.library.kernel.util.comparator; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.util.OrderByComparator; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; /** * @author Alexander Chow diff --git a/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelTitleComparator.java b/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelTitleComparator.java index 26e3648c685c2f..f0444dbb76ee96 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelTitleComparator.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/comparator/RepositoryModelTitleComparator.java @@ -14,13 +14,13 @@ package com.liferay.document.library.kernel.util.comparator; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileShortcut; +import com.liferay.document.library.kernel.model.DLFolder; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileShortcut; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.util.OrderByComparator; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileShortcut; -import com.liferay.portlet.documentlibrary.model.DLFolder; /** * @author Brian Wing Shun Chan diff --git a/portal-service/src/com/liferay/document/library/kernel/util/comparator/VersionNumberComparator.java b/portal-service/src/com/liferay/document/library/kernel/util/comparator/VersionNumberComparator.java index ef9b264186909f..6a3b9168047ebc 100644 --- a/portal-service/src/com/liferay/document/library/kernel/util/comparator/VersionNumberComparator.java +++ b/portal-service/src/com/liferay/document/library/kernel/util/comparator/VersionNumberComparator.java @@ -14,9 +14,9 @@ package com.liferay.document.library.kernel.util.comparator; +import com.liferay.document.library.kernel.model.DLFileEntryConstants; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; -import com.liferay.portlet.documentlibrary.model.DLFileEntryConstants; import java.util.Comparator; diff --git a/portal-service/src/com/liferay/image/gallery/display/kernel/display/context/IGUIItemKeys.java b/portal-service/src/com/liferay/image/gallery/display/kernel/display/context/IGUIItemKeys.java index e02e6ff7f1e01d..4d9d62c403b503 100644 --- a/portal-service/src/com/liferay/image/gallery/display/kernel/display/context/IGUIItemKeys.java +++ b/portal-service/src/com/liferay/image/gallery/display/kernel/display/context/IGUIItemKeys.java @@ -14,7 +14,7 @@ package com.liferay.image.gallery.display.kernel.display.context; -import com.liferay.portlet.documentlibrary.display.context.DLUIItemKeys; +import com.liferay.document.library.kernel.display.context.DLUIItemKeys; /** * @author Iván Zaera diff --git a/portal-service/src/com/liferay/portal/kernel/repository/BaseRepository.java b/portal-service/src/com/liferay/portal/kernel/repository/BaseRepository.java index 7d1f6a8cd7a26f..4c309ef2459685 100644 --- a/portal-service/src/com/liferay/portal/kernel/repository/BaseRepository.java +++ b/portal-service/src/com/liferay/portal/kernel/repository/BaseRepository.java @@ -15,13 +15,13 @@ package com.liferay.portal.kernel.repository; import com.liferay.asset.kernel.service.AssetEntryLocalService; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.util.UnicodeProperties; import com.liferay.portal.service.CompanyLocalService; import com.liferay.portal.service.RepositoryEntryLocalService; import com.liferay.portal.service.UserLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; /** * @author Mika Koivisto diff --git a/portal-service/src/com/liferay/portal/kernel/repository/BaseRepositoryImpl.java b/portal-service/src/com/liferay/portal/kernel/repository/BaseRepositoryImpl.java index 6992c61d216881..28aa09115a7fd1 100644 --- a/portal-service/src/com/liferay/portal/kernel/repository/BaseRepositoryImpl.java +++ b/portal-service/src/com/liferay/portal/kernel/repository/BaseRepositoryImpl.java @@ -15,6 +15,9 @@ package com.liferay.portal.kernel.repository; import com.liferay.asset.kernel.service.AssetEntryLocalService; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; +import com.liferay.document.library.kernel.util.DL; import com.liferay.portal.exception.NoSuchRepositoryEntryException; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; @@ -38,9 +41,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalService; import com.liferay.portal.service.persistence.RepositoryEntryUtil; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; -import com.liferay.portlet.documentlibrary.util.DL; import java.io.File; import java.io.FileInputStream; diff --git a/portal-service/src/com/liferay/portal/kernel/repository/proxy/BaseRepositoryProxyBean.java b/portal-service/src/com/liferay/portal/kernel/repository/proxy/BaseRepositoryProxyBean.java index 9d3e3f958fdf85..cf63f538c5fbc4 100644 --- a/portal-service/src/com/liferay/portal/kernel/repository/proxy/BaseRepositoryProxyBean.java +++ b/portal-service/src/com/liferay/portal/kernel/repository/proxy/BaseRepositoryProxyBean.java @@ -17,6 +17,8 @@ import aQute.bnd.annotation.ProviderType; import com.liferay.asset.kernel.service.AssetEntryLocalService; +import com.liferay.document.library.kernel.service.DLAppHelperLocalService; +import com.liferay.document.library.kernel.service.DLFolderLocalService; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.lock.Lock; import com.liferay.portal.kernel.repository.BaseRepository; @@ -37,8 +39,6 @@ import com.liferay.portal.service.RepositoryEntryLocalService; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalService; -import com.liferay.portlet.documentlibrary.service.DLAppHelperLocalService; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalService; import java.io.File; import java.io.InputStream; diff --git a/portal-service/src/com/liferay/portal/kernel/repository/util/ModelValidatorUtil.java b/portal-service/src/com/liferay/portal/kernel/repository/util/ModelValidatorUtil.java index 1489950dbebad4..1f8922ae252782 100644 --- a/portal-service/src/com/liferay/portal/kernel/repository/util/ModelValidatorUtil.java +++ b/portal-service/src/com/liferay/portal/kernel/repository/util/ModelValidatorUtil.java @@ -14,11 +14,11 @@ package com.liferay.portal.kernel.repository.util; +import com.liferay.document.library.kernel.util.DLValidatorUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileContentReference; import com.liferay.portal.kernel.repository.model.ModelValidator; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portlet.documentlibrary.util.DLValidatorUtil; /** * @author Adolfo Pérez diff --git a/portal-service/src/com/liferay/portal/kernel/upgrade/v6_2_0/BaseUpgradeAttachments.java b/portal-service/src/com/liferay/portal/kernel/upgrade/v6_2_0/BaseUpgradeAttachments.java index 2b97914b27d696..102f0ac55a7e19 100644 --- a/portal-service/src/com/liferay/portal/kernel/upgrade/v6_2_0/BaseUpgradeAttachments.java +++ b/portal-service/src/com/liferay/portal/kernel/upgrade/v6_2_0/BaseUpgradeAttachments.java @@ -14,6 +14,8 @@ package com.liferay.portal.kernel.upgrade.v6_2_0; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.store.DLStoreUtil; import com.liferay.portal.kernel.dao.jdbc.DataAccess; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -30,10 +32,6 @@ import com.liferay.portal.model.ResourceConstants; import com.liferay.portal.model.ResourcePermission; import com.liferay.portal.model.RoleConstants; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.store.DLStoreUtil; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -107,7 +105,7 @@ protected long addDLFileEntry( ps.executeUpdate(); Map bitwiseValues = getBitwiseValues( - DLFileEntry.class.getName()); + "com.liferay.portlet.documentlibrary.model.DLFileEntry"); List actionIds = new ArrayList<>(); @@ -116,11 +114,15 @@ protected long addDLFileEntry( long bitwiseValue = getBitwiseValue(bitwiseValues, actionIds); addResourcePermission( - companyId, DLFileEntry.class.getName(), fileEntryId, - getRoleId(companyId, RoleConstants.GUEST), bitwiseValue); + companyId, + "com.liferay.portlet.documentlibrary.model.DLFileEntry", + fileEntryId, getRoleId(companyId, RoleConstants.GUEST), + bitwiseValue); addResourcePermission( - companyId, DLFileEntry.class.getName(), fileEntryId, - getRoleId(companyId, RoleConstants.SITE_MEMBER), bitwiseValue); + companyId, + "com.liferay.portlet.documentlibrary.model.DLFileEntry", + fileEntryId, getRoleId(companyId, RoleConstants.SITE_MEMBER), + bitwiseValue); return fileEntryId; } @@ -250,7 +252,7 @@ protected long addDLFolder( ps.executeUpdate(); Map bitwiseValues = getBitwiseValues( - DLFolder.class.getName()); + "com.liferay.portlet.documentlibrary.model.DLFolder"); List guestActionIds = new ArrayList<>(); @@ -260,8 +262,9 @@ protected long addDLFolder( bitwiseValues, guestActionIds); addResourcePermission( - companyId, DLFolder.class.getName(), folderId, - getRoleId(companyId, RoleConstants.GUEST), guestBitwiseValue); + companyId, "com.liferay.portlet.documentlibrary.model.DLFolder", + folderId, getRoleId(companyId, RoleConstants.GUEST), + guestBitwiseValue); List siteMemberActionIds = new ArrayList<>(); @@ -273,8 +276,8 @@ protected long addDLFolder( bitwiseValues, siteMemberActionIds); addResourcePermission( - companyId, DLFolder.class.getName(), folderId, - getRoleId(companyId, RoleConstants.SITE_MEMBER), + companyId, "com.liferay.portlet.documentlibrary.model.DLFolder", + folderId, getRoleId(companyId, RoleConstants.SITE_MEMBER), siteMemberBitwiseValue); return folderId; @@ -626,7 +629,8 @@ protected void updateEntryAttachments( for (String attachment : attachments) { String name = String.valueOf( - increment(DLFileEntry.class.getName())); + increment( + "com.liferay.portlet.documentlibrary.model.DLFileEntry")); String title = FileUtil.getShortFileName(attachment); diff --git a/portal-service/src/com/liferay/portal/kernel/upload/BaseUploadHandler.java b/portal-service/src/com/liferay/portal/kernel/upload/BaseUploadHandler.java index 91e4fddfcd3c53..7dd1373ec1cbee 100644 --- a/portal-service/src/com/liferay/portal/kernel/upload/BaseUploadHandler.java +++ b/portal-service/src/com/liferay/portal/kernel/upload/BaseUploadHandler.java @@ -14,6 +14,9 @@ package com.liferay.portal.kernel.upload; +import com.liferay.document.library.kernel.antivirus.AntivirusScannerException; +import com.liferay.document.library.kernel.exception.FileNameException; +import com.liferay.document.library.kernel.exception.FileSizeException; import com.liferay.portal.kernel.editor.EditorConstants; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; @@ -32,9 +35,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.antivirus.AntivirusScannerException; -import com.liferay.portlet.documentlibrary.exception.FileNameException; -import com.liferay.portlet.documentlibrary.exception.FileSizeException; import java.io.IOException; import java.io.InputStream; diff --git a/portal-service/src/com/liferay/portal/kernel/util/TempFileEntryUtil.java b/portal-service/src/com/liferay/portal/kernel/util/TempFileEntryUtil.java index 475878e95623b6..7a85bd77e5d89e 100644 --- a/portal-service/src/com/liferay/portal/kernel/util/TempFileEntryUtil.java +++ b/portal-service/src/com/liferay/portal/kernel/util/TempFileEntryUtil.java @@ -14,6 +14,8 @@ package com.liferay.portal.kernel.util; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.util.DLAppHelperThreadLocal; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.LocalRepository; import com.liferay.portal.kernel.repository.RepositoryProviderUtil; @@ -28,8 +30,6 @@ import com.liferay.portal.service.RepositoryLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalServiceUtil; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.util.DLAppHelperThreadLocal; import java.io.File; import java.io.FileInputStream; diff --git a/portal-service/src/com/liferay/portal/kernel/webdav/WebDAVUtil.java b/portal-service/src/com/liferay/portal/kernel/webdav/WebDAVUtil.java index 5b5f078451fa6c..b8612b4659befa 100644 --- a/portal-service/src/com/liferay/portal/kernel/webdav/WebDAVUtil.java +++ b/portal-service/src/com/liferay/portal/kernel/webdav/WebDAVUtil.java @@ -14,6 +14,7 @@ package com.liferay.portal.kernel.webdav; +import com.liferay.document.library.kernel.util.DL; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -36,7 +37,6 @@ import com.liferay.portal.model.User; import com.liferay.portal.service.GroupLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DL; import com.liferay.registry.Registry; import com.liferay.registry.RegistryUtil; import com.liferay.registry.ServiceReference; diff --git a/portal-service/src/com/liferay/portlet/documentlibrary/exception/InvalidFolderException.java b/portal-service/src/com/liferay/portlet/documentlibrary/exception/InvalidFolderException.java index 4be75e058819ea..ffb4925da078d3 100644 --- a/portal-service/src/com/liferay/portlet/documentlibrary/exception/InvalidFolderException.java +++ b/portal-service/src/com/liferay/portlet/documentlibrary/exception/InvalidFolderException.java @@ -16,14 +16,14 @@ import aQute.bnd.annotation.ProviderType; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import java.util.Locale; diff --git a/portal-test-internal/src/com/liferay/portlet/documentlibrary/store/test/BaseStoreTestCase.java b/portal-test-internal/src/com/liferay/portlet/documentlibrary/store/test/BaseStoreTestCase.java index d32f17099fe3de..acaa63e56077c8 100644 --- a/portal-test-internal/src/com/liferay/portlet/documentlibrary/store/test/BaseStoreTestCase.java +++ b/portal-test-internal/src/com/liferay/portlet/documentlibrary/store/test/BaseStoreTestCase.java @@ -14,6 +14,10 @@ package com.liferay.portlet.documentlibrary.store.test; +import com.liferay.document.library.kernel.exception.DuplicateFileException; +import com.liferay.document.library.kernel.exception.NoSuchFileException; +import com.liferay.document.library.kernel.store.BaseStore; +import com.liferay.document.library.kernel.store.Store; import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayInputStream; import com.liferay.portal.kernel.test.util.RandomTestUtil; import com.liferay.portal.kernel.util.SetUtil; @@ -21,10 +25,6 @@ import com.liferay.portal.test.rule.ExpectedLog; import com.liferay.portal.test.rule.ExpectedLogs; import com.liferay.portal.test.rule.ExpectedType; -import com.liferay.portlet.documentlibrary.exception.DuplicateFileException; -import com.liferay.portlet.documentlibrary.exception.NoSuchFileException; -import com.liferay.portlet.documentlibrary.store.BaseStore; -import com.liferay.portlet.documentlibrary.store.Store; import com.liferay.portlet.documentlibrary.store.StoreFactory; import java.io.BufferedInputStream; diff --git a/portal-test-internal/src/com/liferay/portlet/documentlibrary/util/test/DLAppTestUtil.java b/portal-test-internal/src/com/liferay/portlet/documentlibrary/util/test/DLAppTestUtil.java index 8c217f4cd81c56..c0adb7c7856adb 100644 --- a/portal-test-internal/src/com/liferay/portlet/documentlibrary/util/test/DLAppTestUtil.java +++ b/portal-test-internal/src/com/liferay/portlet/documentlibrary/util/test/DLAppTestUtil.java @@ -14,6 +14,10 @@ package com.liferay.portlet.documentlibrary.util.test; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLSyncConstants; +import com.liferay.document.library.kernel.service.DLAppLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.test.util.RandomTestUtil; import com.liferay.portal.kernel.test.util.TestPropsValues; @@ -24,10 +28,6 @@ import com.liferay.portal.kernel.workflow.WorkflowThreadLocal; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLSyncConstants; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; import java.io.Serializable; diff --git a/portal-test-internal/src/com/liferay/portlet/documentlibrary/util/test/DLTestUtil.java b/portal-test-internal/src/com/liferay/portlet/documentlibrary/util/test/DLTestUtil.java index 09f6cbe045403b..658eafc6dcb5b9 100644 --- a/portal-test-internal/src/com/liferay/portlet/documentlibrary/util/test/DLTestUtil.java +++ b/portal-test-internal/src/com/liferay/portlet/documentlibrary/util/test/DLTestUtil.java @@ -14,6 +14,13 @@ package com.liferay.portlet.documentlibrary.util.test; +import com.liferay.document.library.kernel.exception.NoSuchFolderException; +import com.liferay.document.library.kernel.model.DLFileEntry; +import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants; +import com.liferay.document.library.kernel.model.DLFolder; +import com.liferay.document.library.kernel.model.DLFolderConstants; +import com.liferay.document.library.kernel.service.DLFileEntryLocalServiceUtil; +import com.liferay.document.library.kernel.service.DLFolderLocalServiceUtil; import com.liferay.portal.kernel.test.util.RandomTestUtil; import com.liferay.portal.kernel.test.util.ServiceContextTestUtil; import com.liferay.portal.kernel.test.util.TestPropsValues; @@ -21,13 +28,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper; -import com.liferay.portlet.documentlibrary.exception.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.model.DLFileEntry; -import com.liferay.portlet.documentlibrary.model.DLFileEntryTypeConstants; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; -import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; import java.io.ByteArrayInputStream; import java.io.InputStream;