diff --git a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF index 5524ca7a2bc..d1dee92713d 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF @@ -12,10 +12,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui Eclipse-LazyStart: true Export-Package: org.eclipse.rse.dstore.universal.miners, - org.eclipse.rse.dstore.universal.miners.command, - org.eclipse.rse.dstore.universal.miners.environment, - org.eclipse.rse.dstore.universal.miners.filesystem, - org.eclipse.rse.dstore.universal.miners.processes, org.eclipse.rse.internal.dstore.universal.miners.command;x-internal:=true, org.eclipse.rse.internal.dstore.universal.miners.command.patterns;x-internal:=true, org.eclipse.rse.internal.dstore.universal.miners.filesystem;x-internal:=true, diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMiner.java rename to rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java index 9555f53a87a..afe3b621e69 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMiner.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.universal.miners.command; +package org.eclipse.rse.dstore.universal.miners; @@ -27,7 +27,6 @@ import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStoreAttributes; import org.eclipse.dstore.core.model.DataStoreResources; -import org.eclipse.rse.dstore.universal.miners.environment.EnvironmentMiner; import org.eclipse.rse.internal.dstore.universal.miners.command.CommandMinerThread; import org.eclipse.rse.internal.dstore.universal.miners.command.QueryPathThread; import org.eclipse.rse.internal.dstore.universal.miners.command.patterns.Patterns; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/environment/EnvironmentMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/EnvironmentMiner.java similarity index 99% rename from rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/environment/EnvironmentMiner.java rename to rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/EnvironmentMiner.java index ea540b1d9f7..9d7d2085584 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/environment/EnvironmentMiner.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/EnvironmentMiner.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.universal.miners.environment; +package org.eclipse.rse.dstore.universal.miners; import java.io.BufferedReader; import java.io.IOException; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/processes/IUniversalProcessDataStoreConstants.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/IUniversalProcessDataStoreConstants.java similarity index 97% rename from rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/processes/IUniversalProcessDataStoreConstants.java rename to rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/IUniversalProcessDataStoreConstants.java index ded21ee299a..9f7bb293e8e 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/processes/IUniversalProcessDataStoreConstants.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/IUniversalProcessDataStoreConstants.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.universal.miners.processes; +package org.eclipse.rse.dstore.universal.miners; public interface IUniversalProcessDataStoreConstants { diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalByteStreamHandler.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalByteStreamHandler.java similarity index 99% rename from rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalByteStreamHandler.java rename to rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalByteStreamHandler.java index 31d775213a9..a1c2542a1f4 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalByteStreamHandler.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalByteStreamHandler.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.universal.miners.filesystem; +package org.eclipse.rse.dstore.universal.miners; import java.io.File; import java.io.FileInputStream; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java similarity index 99% rename from rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java rename to rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java index 1fb5a42c32d..595658dc5bd 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java @@ -14,7 +14,7 @@ * Martin Oberhuber (Wind River) - Fix 154874 - handle files with space or $ in the name ********************************************************************************/ -package org.eclipse.rse.dstore.universal.miners.filesystem; +package org.eclipse.rse.dstore.universal.miners; import java.io.File; import java.io.FileReader; import java.io.IOException; @@ -31,9 +31,6 @@ import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.DataStoreResources; import org.eclipse.dstore.core.util.StringCompare; -import org.eclipse.rse.dstore.universal.miners.ICancellableHandler; -import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; -import org.eclipse.rse.dstore.universal.miners.UniversalServerUtilities; import org.eclipse.rse.internal.dstore.universal.miners.filesystem.ClassFileParser; import org.eclipse.rse.internal.dstore.universal.miners.filesystem.FileClassifier; import org.eclipse.rse.internal.dstore.universal.miners.filesystem.UniversalDownloadHandler; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/processes/UniversalProcessMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalProcessMiner.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/processes/UniversalProcessMiner.java rename to rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalProcessMiner.java index bf84ab70ef9..3f34880dcfe 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/processes/UniversalProcessMiner.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalProcessMiner.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.universal.miners.processes; +package org.eclipse.rse.dstore.universal.miners; import java.io.BufferedReader; @@ -28,8 +28,6 @@ import java.util.TreeSet; import org.eclipse.dstore.core.miners.Miner; import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; -import org.eclipse.rse.dstore.universal.miners.UniversalServerUtilities; import org.eclipse.rse.internal.dstore.universal.miners.processes.ProcessDEComparator; import org.eclipse.rse.services.clientserver.processes.HostProcessFilterImpl; import org.eclipse.rse.services.clientserver.processes.IHostProcess; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java index 14ebad09ddb..1a5904e63c5 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java @@ -35,8 +35,8 @@ import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.DataStoreAttributes; -import org.eclipse.rse.dstore.universal.miners.command.CommandMiner; -import org.eclipse.rse.dstore.universal.miners.environment.EnvironmentMiner; +import org.eclipse.rse.dstore.universal.miners.CommandMiner; +import org.eclipse.rse.dstore.universal.miners.EnvironmentMiner; import org.eclipse.rse.internal.dstore.universal.miners.command.patterns.ParsedOutput; import org.eclipse.rse.internal.dstore.universal.miners.command.patterns.Patterns; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/QueryPathThread.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/QueryPathThread.java index 440459e9977..a01f4bed51f 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/QueryPathThread.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/QueryPathThread.java @@ -27,7 +27,7 @@ import java.util.StringTokenizer; import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.rse.dstore.universal.miners.environment.EnvironmentMiner; +import org.eclipse.rse.dstore.universal.miners.EnvironmentMiner; /** * QueryPathThread is used to determine available command completions diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalDownloadHandler.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalDownloadHandler.java index b61ac98bcbd..311e8098ec8 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalDownloadHandler.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalDownloadHandler.java @@ -29,8 +29,8 @@ import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.IByteConverter; import org.eclipse.rse.dstore.universal.miners.ICancellableHandler; import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; +import org.eclipse.rse.dstore.universal.miners.UniversalFileSystemMiner; import org.eclipse.rse.dstore.universal.miners.UniversalServerUtilities; -import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalFileSystemMiner; import org.eclipse.rse.services.clientserver.IServiceConstants; import org.eclipse.rse.services.clientserver.archiveutils.AbsoluteVirtualPath; import org.eclipse.rse.services.clientserver.archiveutils.ISystemArchiveHandler; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java index f66f51cabc0..0c240c66cf7 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java @@ -29,8 +29,8 @@ import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.util.StringCompare; import org.eclipse.rse.dstore.universal.miners.ICancellableHandler; import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; +import org.eclipse.rse.dstore.universal.miners.UniversalFileSystemMiner; import org.eclipse.rse.dstore.universal.miners.UniversalServerUtilities; -import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalFileSystemMiner; import org.eclipse.rse.services.clientserver.SystemFileClassifier; import org.eclipse.rse.services.clientserver.SystemSearchString; import org.eclipse.rse.services.clientserver.archiveutils.AbsoluteVirtualPath; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/minerFile.dat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/minerFile.dat index 3fc1668ea2b..76f514a07bd 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/minerFile.dat +++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/minerFile.dat @@ -1,4 +1,4 @@ -org.eclipse.rse.dstore.universal.miners.command.CommandMiner -org.eclipse.rse.dstore.universal.miners.filesystem.UniversalFileSystemMiner -org.eclipse.rse.dstore.universal.miners.environment.EnvironmentMiner -org.eclipse.rse.dstore.universal.miners.processes.UniversalProcessMiner +org.eclipse.rse.dstore.universal.miners.CommandMiner +org.eclipse.rse.dstore.universal.miners.UniversalFileSystemMiner +org.eclipse.rse.dstore.universal.miners.EnvironmentMiner +org.eclipse.rse.dstore.universal.miners.UniversalProcessMiner diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java index df99137161b..5c2a3193d4c 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java @@ -38,8 +38,8 @@ import org.eclipse.dstore.core.model.DataStoreAttributes; import org.eclipse.dstore.core.model.DataStoreResources; import org.eclipse.dstore.core.model.IDataStoreProvider; import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; -import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalByteStreamHandler; -import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalFileSystemMiner; +import org.eclipse.rse.dstore.universal.miners.UniversalByteStreamHandler; +import org.eclipse.rse.dstore.universal.miners.UniversalFileSystemMiner; import org.eclipse.rse.internal.services.dstore.ServiceResources; import org.eclipse.rse.services.clientserver.FileTypeMatcher; import org.eclipse.rse.services.clientserver.IMatcher; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreOutputStream.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreOutputStream.java index d7273c8888a..d6a18945064 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreOutputStream.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreOutputStream.java @@ -18,7 +18,7 @@ import java.io.OutputStream; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; -import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalByteStreamHandler; +import org.eclipse.rse.dstore.universal.miners.UniversalByteStreamHandler; public class DStoreOutputStream extends OutputStream { diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java index 59759024c11..5c7c8871d3d 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java @@ -24,8 +24,8 @@ import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.IDataStoreProvider; -import org.eclipse.rse.dstore.universal.miners.processes.IUniversalProcessDataStoreConstants; -import org.eclipse.rse.dstore.universal.miners.processes.UniversalProcessMiner; +import org.eclipse.rse.dstore.universal.miners.IUniversalProcessDataStoreConstants; +import org.eclipse.rse.dstore.universal.miners.UniversalProcessMiner; import org.eclipse.rse.internal.services.dstore.ServiceResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java index da5850f70b9..a8096cdf8d0 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.IDataStoreProvider; -import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalFileSystemMiner; +import org.eclipse.rse.dstore.universal.miners.UniversalFileSystemMiner; import org.eclipse.rse.internal.services.dstore.ServiceResources; import org.eclipse.rse.internal.services.dstore.files.DStoreHostFile; import org.eclipse.rse.services.clientserver.SystemSearchString; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java index 97ec8ff4413..5d82d3c39d2 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java @@ -24,8 +24,8 @@ import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.IDataStoreProvider; -import org.eclipse.rse.dstore.universal.miners.command.CommandMiner; -import org.eclipse.rse.dstore.universal.miners.environment.EnvironmentMiner; +import org.eclipse.rse.dstore.universal.miners.CommandMiner; +import org.eclipse.rse.dstore.universal.miners.EnvironmentMiner; import org.eclipse.rse.internal.services.dstore.ServiceResources; import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider; import org.eclipse.rse.services.clientserver.messages.SystemMessage; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellThread.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellThread.java index a17c86ff16a..342f1f60751 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellThread.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellThread.java @@ -22,8 +22,8 @@ import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.DataStoreSchema; -import org.eclipse.rse.dstore.universal.miners.command.CommandMiner; -import org.eclipse.rse.dstore.universal.miners.environment.EnvironmentMiner; +import org.eclipse.rse.dstore.universal.miners.CommandMiner; +import org.eclipse.rse.dstore.universal.miners.EnvironmentMiner;